diff --git a/setup.py b/setup.py
index 8b4a3a679f9a4f930a02d198d08468dde76f21d9..368d369cda4e8a41f9348e793f5c8f2fdc436fbc 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ from Cython.Distutils import build_ext
 def setup_package():
 
     ex_info = [('wetb.fatigue_tools.rainflowcounting', ['pair_range', 'peak_trough', 'rainflowcount_astm']),
-			   ('wetb.signal_tools.filters', ['cy_filters'])]
+			   ('wetb.signal.filters', ['cy_filters'])]
     extlist = [Extension('%s.%s' % (module, n),
                          [os.path.join(module.replace(".","/"), n)+'.pyx'],
                          include_dirs=[np.get_include()]) for module, names in ex_info for n in names]
diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py
index 0f559e2fb001c298c35e07d91c27087dd24c22ba..1c23189523a582029ac7679b47f75623a9d5e8f2 100644
--- a/wetb/hawc2/htc_file.py
+++ b/wetb/hawc2/htc_file.py
@@ -14,7 +14,7 @@ from io import open
 from builtins import str
 from future import standard_library
 from wetb.utils.process_exec import pexec
-from wetb.utils.cluster_tools.cluster_resource import unix_path, unix_path_old
+from wetb.utils.cluster_tools.cluster_resource import unix_path_old
 standard_library.install_aliases()
 from collections import OrderedDict
 
diff --git a/wetb/signal_tools/filters/__init__.py b/wetb/signal/filters/__init__.py
similarity index 100%
rename from wetb/signal_tools/filters/__init__.py
rename to wetb/signal/filters/__init__.py
diff --git a/wetb/signal_tools/filters/cy_filters.py b/wetb/signal/filters/cy_filters.py
similarity index 100%
rename from wetb/signal_tools/filters/cy_filters.py
rename to wetb/signal/filters/cy_filters.py
diff --git a/wetb/signal_tools/filters/cy_filters.pyx b/wetb/signal/filters/cy_filters.pyx
similarity index 100%
rename from wetb/signal_tools/filters/cy_filters.pyx
rename to wetb/signal/filters/cy_filters.pyx
diff --git a/wetb/signal_tools/filters/despike.py b/wetb/signal/filters/despike.py
similarity index 100%
rename from wetb/signal_tools/filters/despike.py
rename to wetb/signal/filters/despike.py
diff --git a/wetb/signal_tools/filters/first_order.py b/wetb/signal/filters/first_order.py
similarity index 100%
rename from wetb/signal_tools/filters/first_order.py
rename to wetb/signal/filters/first_order.py
diff --git a/wetb/signal_tools/filters/replacer.py b/wetb/signal/filters/replacer.py
similarity index 100%
rename from wetb/signal_tools/filters/replacer.py
rename to wetb/signal/filters/replacer.py
diff --git a/wetb/signal_tools/spectrum.py b/wetb/signal/spectrum.py
similarity index 100%
rename from wetb/signal_tools/spectrum.py
rename to wetb/signal/spectrum.py
diff --git a/wetb/utils/subset_mean.py b/wetb/signal/subset_mean.py
similarity index 100%
rename from wetb/utils/subset_mean.py
rename to wetb/signal/subset_mean.py
diff --git a/wetb/signal_tools/tests/test_first_order.py b/wetb/signal/tests/test_first_order.py
similarity index 100%
rename from wetb/signal_tools/tests/test_first_order.py
rename to wetb/signal/tests/test_first_order.py
diff --git a/wetb/signal_tools/tests/test_spectrum.py b/wetb/signal/tests/test_spectrum.py
similarity index 100%
rename from wetb/signal_tools/tests/test_spectrum.py
rename to wetb/signal/tests/test_spectrum.py
diff --git a/wetb/utils/cluster_tools/cluster_resource.py b/wetb/utils/cluster_tools/cluster_resource.py
index 5c128cc59a8f84fafdd630cb3d31f0c1b17acfdc..19714b5965153f03fd617c337c38c65e05281bd0 100644
--- a/wetb/utils/cluster_tools/cluster_resource.py
+++ b/wetb/utils/cluster_tools/cluster_resource.py
@@ -10,9 +10,7 @@ import re
 import threading
 
 from wetb.utils.cluster_tools import pbswrap
-from wetb.utils.cluster_tools.ssh_client import SSHClient, SharedSSHClient
-from wetb.utils.timing import print_time
-import time
+
 
 
 def unix_path(path, cwd=None, fail_on_missing=False):
@@ -122,6 +120,7 @@ class SSHPBSClusterResource(Resource):
 
 
     def new_ssh_connection(self):
+        from wetb.utils.cluster_tools.ssh_client import SSHClient
         return SSHClient(self.host, self.ssh.username, self.ssh.password, self.ssh.port)
         #return self.ssh
 
@@ -159,7 +158,11 @@ class SSHPBSClusterResource(Resource):
             jobids = list(jobids)
         self.ssh.execute("qdel %s" % (" ".join(jobids)))
         
-        
+    def setup_wine(self):    
+        self.ssh.execute("""rm -f ./config-wine-hawc2.sh &&
+wget https://gitlab.windenergy.dtu.dk/toolbox/pbsutils/raw/master/config-wine-hawc2.sh &&
+chmod 777 config-wine-hawc2.sh &&
+./config-wine-hawc2.sh""")
    
 
 
diff --git a/wetb/wind/air_density.py b/wetb/wind/air_density.py
index 0af972420c99771bf88b5bf0d2f07b9aae196be7..13780781d4234b7047ce2da6ca5d4e1308f0f392 100644
--- a/wetb/wind/air_density.py
+++ b/wetb/wind/air_density.py
@@ -175,8 +175,8 @@ def R(rh=0, t=15, P=1014):
     -------
     Specific gas constant
     """
-    assert np.all((900<P)&(P<1100)), "Pressure outside range 900 to 1100"
-    assert np.all((-50<t)&(t<100)), "Temperature outside range -50 to 100"
+    #assert np.all((900<P)&(P<1100)), "Pressure outside range 900 to 1100"
+    #assert np.all((-50<t)&(t<100)), "Temperature outside range -50 to 100"
     Tk = t + 273.15
     return P * 100 / (air_density(P, t, rh) * Tk)