diff --git a/main/tests/windmill/js/facets.js b/main/tests/client/js/facets.js
similarity index 100%
rename from main/tests/windmill/js/facets.js
rename to main/tests/client/js/facets.js
diff --git a/main/tests/windmill/js/initialize.js b/main/tests/client/js/initialize.js
similarity index 100%
rename from main/tests/windmill/js/initialize.js
rename to main/tests/client/js/initialize.js
diff --git a/main/tests/java/conf/tests.xml b/main/tests/server/conf/tests.xml
similarity index 100%
rename from main/tests/java/conf/tests.xml
rename to main/tests/server/conf/tests.xml
diff --git a/main/tests/java/lib-src/mockito-all-1.8.4-sources.jar b/main/tests/server/lib-src/mockito-all-1.8.4-sources.jar
similarity index 100%
rename from main/tests/java/lib-src/mockito-all-1.8.4-sources.jar
rename to main/tests/server/lib-src/mockito-all-1.8.4-sources.jar
diff --git a/main/tests/java/lib-src/testng-5.12.1-sources.jar b/main/tests/server/lib-src/testng-5.12.1-sources.jar
similarity index 100%
rename from main/tests/java/lib-src/testng-5.12.1-sources.jar
rename to main/tests/server/lib-src/testng-5.12.1-sources.jar
diff --git a/main/tests/java/lib/mockito-all-1.8.4.jar b/main/tests/server/lib/mockito-all-1.8.4.jar
similarity index 100%
rename from main/tests/java/lib/mockito-all-1.8.4.jar
rename to main/tests/server/lib/mockito-all-1.8.4.jar
diff --git a/main/tests/java/lib/testng-5.12.1.jar b/main/tests/server/lib/testng-5.12.1.jar
similarity index 100%
rename from main/tests/java/lib/testng-5.12.1.jar
rename to main/tests/server/lib/testng-5.12.1.jar
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletStub.java b/main/tests/server/src/com/metaweb/gridworks/tests/GridworksServletStub.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletStub.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/GridworksServletStub.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/GridworksServletTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/GridworksServletTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/GridworksServletTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandStub.java b/main/tests/server/src/com/metaweb/gridworks/tests/commands/CommandStub.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandStub.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/commands/CommandStub.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/commands/CommandTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/commands/CommandTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/commands/CommandTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/commands/util/CancelProcessesCommandTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/importers/ImporterUtilitiesTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/importers/RdfTripleImporterTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/importers/TsvCsvImporterTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/importers/XmlImporterTests.java
diff --git a/main/tests/java/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java b/main/tests/server/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java
similarity index 100%
rename from main/tests/java/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java
rename to main/tests/server/src/com/metaweb/gridworks/tests/util/ParsingUtilitiesTests.java
diff --git a/main/tests/java/src/log4j.properties b/main/tests/server/src/log4j.properties
similarity index 100%
rename from main/tests/java/src/log4j.properties
rename to main/tests/server/src/log4j.properties