diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index bbb313fbd9..8e7f46520f 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -20,7 +20,7 @@
 /// See the License for the specific language governing permissions and
 /// limitations under the License.
 ///
-/// Copyright holder is triAGENS GmbH, Cologne, Germany
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
 ///
 /// @author Max Neunhoeffer
 ////////////////////////////////////////////////////////////////////////////////
@@ -1468,52 +1468,45 @@ function findTests() {
     return;
   }
 
-  testsCases.common = _.filter(fs.list(makePathUnix("js/common/tests")),
+  testsCases.common = _.filter(fs.list(makePathUnix("js/common/tests/shell")),
     function(p) {
-      return p.substr(0, 6) === "shell-" &&
-        p.substr(-3) === ".js";
+      return p.substr(-3) === ".js";
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/common/tests"), x);
+      return fs.join(makePathUnix("js/common/tests/shell"), x);
     }).sort();
 
-  testsCases.server_only = _.filter(fs.list(makePathUnix("js/server/tests")),
+  testsCases.server_only = _.filter(fs.list(makePathUnix("js/server/tests/shell")),
     function(p) {
-      return p.substr(0, 6) === "shell-" &&
-        p.substr(-3) === ".js";
+      return p.substr(-3) === ".js";
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/server/tests"), x);
+      return fs.join(makePathUnix("js/server/tests/shell"), x);
     }).sort();
 
-  testsCases.client_only = _.filter(fs.list(makePathUnix("js/client/tests")),
+  testsCases.client_only = _.filter(fs.list(makePathUnix("js/client/tests/shell")),
     function(p) {
-      return p.substr(0, 6) === "shell-" &&
-        p.substr(-3) === ".js";
+      return p.substr(-3) === ".js";
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/client/tests"), x);
+      return fs.join(makePathUnix("js/client/tests/shell"), x);
     }).sort();
 
-  testsCases.server_aql = _.filter(fs.list(makePathUnix("js/server/tests")),
+  testsCases.server_aql = _.filter(fs.list(makePathUnix("js/server/tests/aql")),
     function(p) {
-      return p.substr(0, 4) === "aql-" &&
-        p.substr(-3) === ".js" &&
-        p.indexOf("ranges-combined") === -1;
+      return p.substr(-3) === ".js" && p.indexOf("ranges-combined") === -1;
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/server/tests"), x);
+      return fs.join(makePathUnix("js/server/tests/aql"), x);
     }).sort();
 
   testsCases.server_aql_extended =
-    _.filter(fs.list(makePathUnix("js/server/tests")),
+    _.filter(fs.list(makePathUnix("js/server/tests/aql")),
       function(p) {
-        return p.substr(0, 4) === "aql-" &&
-          p.substr(-3) === ".js" &&
-          p.indexOf("ranges-combined") !== -1;
+        return p.substr(-3) === ".js" && p.indexOf("ranges-combined") !== -1;
       }).map(
       function(x) {
-        return fs.join(makePathUnix("js/server/tests"), x);
+        return fs.join(makePathUnix("js/server/tests/aql"), x);
       }).sort();
 
   testsCases.server_aql_performance =
diff --git a/js/client/tests/README b/js/client/tests/README
index 30a0617d2e..b8ba869900 100644
--- a/js/client/tests/README
+++ b/js/client/tests/README
@@ -1,15 +1,14 @@
 Conventions for testing framework:
 ==================================
 
-All files in this directory whose name starts with "shell-"
-and ends with ".js" automatically take part in client
-shell tests (target "shell_client").
+All files in the directory "shell" and ends with ".js" automatically
+take part in client shell tests (target "shell_client").
 
-If the filename contains the string "-cluster", then it is
-only executed when testing in cluster mode. If the filename
-contains the string "-noncluster", then it is only executed
-when testing in single instance mode.
+If the filename contains the string "-cluster", then it is only
+executed when testing in cluster mode. If the filename contains the
+string "-noncluster", then it is only executed when testing in single
+instance mode.
 
-If the filename contains the string "-disabled", then it is
-not executed at all. This is for tests that cannot be run from the
+If the filename contains the string "-disabled", then it is not
+executed at all. This is for tests that cannot be run from the
 JavaScript test framework and have to be run from the Makefile.
diff --git a/js/client/tests/shell-changeMode-noncluster-disabled.js b/js/client/tests/shell/shell-changeMode-noncluster-disabled.js
similarity index 100%
rename from js/client/tests/shell-changeMode-noncluster-disabled.js
rename to js/client/tests/shell/shell-changeMode-noncluster-disabled.js
diff --git a/js/client/tests/shell-client.js b/js/client/tests/shell/shell-client.js
similarity index 100%
rename from js/client/tests/shell-client.js
rename to js/client/tests/shell/shell-client.js
diff --git a/js/client/tests/shell-download.js b/js/client/tests/shell/shell-download.js
similarity index 100%
rename from js/client/tests/shell-download.js
rename to js/client/tests/shell/shell-download.js
diff --git a/js/client/tests/shell-endpoints.js b/js/client/tests/shell/shell-endpoints.js
similarity index 100%
rename from js/client/tests/shell-endpoints.js
rename to js/client/tests/shell/shell-endpoints.js
diff --git a/js/client/tests/shell-fm.js b/js/client/tests/shell/shell-fm.js
similarity index 100%
rename from js/client/tests/shell-fm.js
rename to js/client/tests/shell/shell-fm.js
diff --git a/js/client/tests/shell-foxx-manager-nightly-spec.js b/js/client/tests/shell/shell-foxx-manager-nightly-spec.js
similarity index 100%
rename from js/client/tests/shell-foxx-manager-nightly-spec.js
rename to js/client/tests/shell/shell-foxx-manager-nightly-spec.js
diff --git a/js/client/tests/shell-noChangeMode-noncluster.js b/js/client/tests/shell/shell-noChangeMode-noncluster.js
similarity index 100%
rename from js/client/tests/shell-noChangeMode-noncluster.js
rename to js/client/tests/shell/shell-noChangeMode-noncluster.js
diff --git a/js/client/tests/shell-request.js b/js/client/tests/shell/shell-request.js
similarity index 100%
rename from js/client/tests/shell-request.js
rename to js/client/tests/shell/shell-request.js
diff --git a/js/client/tests/shell-require-canceled.js b/js/client/tests/shell/shell-require-canceled.js
similarity index 100%
rename from js/client/tests/shell-require-canceled.js
rename to js/client/tests/shell/shell-require-canceled.js
diff --git a/js/common/tests/README b/js/common/tests/README
index 22b6225622..d4e9aa9a61 100644
--- a/js/common/tests/README
+++ b/js/common/tests/README
@@ -1,16 +1,15 @@
 Conventions for testing framework:
 ==================================
 
-All files in this directory whose name starts with "shell-"
-and ends with ".js" automatically take part in client and 
-server shell tests (targets "shell_client" and "shell_server"
-and "shell_server_only").
+All files in the directory "shell" and ends with ".js" automatically
+take part in client and server shell tests (targets "shell_client" and
+"shell_server" and "shell_server_only").
 
-If the filename contains the string "-cluster", then it is
-only executed when testing in cluster mode. If the filename
-contains the string "-noncluster", then it is only executed
-when testing in single instance mode.
+If the filename contains the string "-cluster", then it is only
+executed when testing in cluster mode. If the filename contains the
+string "-noncluster", then it is only executed when testing in single
+instance mode.
 
-If the filename contains the string "-disabled", then it is
-not executed at all. This is for tests that cannot be run from the
+If the filename contains the string "-disabled", then it is not
+executed at all. This is for tests that cannot be run from the
 JavaScript test framework and have to be run from the Makefile.
diff --git a/js/common/tests/shell-aqlfunctions.js b/js/common/tests/shell/shell-aqlfunctions.js
similarity index 100%
rename from js/common/tests/shell-aqlfunctions.js
rename to js/common/tests/shell/shell-aqlfunctions.js
diff --git a/js/common/tests/shell-attributes.js b/js/common/tests/shell/shell-attributes.js
similarity index 100%
rename from js/common/tests/shell-attributes.js
rename to js/common/tests/shell/shell-attributes.js
diff --git a/js/common/tests/shell-base64.js b/js/common/tests/shell/shell-base64.js
similarity index 100%
rename from js/common/tests/shell-base64.js
rename to js/common/tests/shell/shell-base64.js
diff --git a/js/common/tests/shell-cap-constraint-timecritical.js b/js/common/tests/shell/shell-cap-constraint-timecritical.js
similarity index 100%
rename from js/common/tests/shell-cap-constraint-timecritical.js
rename to js/common/tests/shell/shell-cap-constraint-timecritical.js
diff --git a/js/common/tests/shell-cap-constraint.js b/js/common/tests/shell/shell-cap-constraint.js
similarity index 100%
rename from js/common/tests/shell-cap-constraint.js
rename to js/common/tests/shell/shell-cap-constraint.js
diff --git a/js/common/tests/shell-cluster-collection.js b/js/common/tests/shell/shell-cluster-collection.js
similarity index 100%
rename from js/common/tests/shell-cluster-collection.js
rename to js/common/tests/shell/shell-cluster-collection.js
diff --git a/js/common/tests/shell-cluster-crud.js b/js/common/tests/shell/shell-cluster-crud.js
similarity index 100%
rename from js/common/tests/shell-cluster-crud.js
rename to js/common/tests/shell/shell-cluster-crud.js
diff --git a/js/common/tests/shell-cluster-simple.js b/js/common/tests/shell/shell-cluster-simple.js
similarity index 100%
rename from js/common/tests/shell-cluster-simple.js
rename to js/common/tests/shell/shell-cluster-simple.js
diff --git a/js/common/tests/shell-collection-noncluster.js b/js/common/tests/shell/shell-collection-noncluster.js
similarity index 100%
rename from js/common/tests/shell-collection-noncluster.js
rename to js/common/tests/shell/shell-collection-noncluster.js
diff --git a/js/common/tests/shell-collection-volatile-noncluster.js b/js/common/tests/shell/shell-collection-volatile-noncluster.js
similarity index 100%
rename from js/common/tests/shell-collection-volatile-noncluster.js
rename to js/common/tests/shell/shell-collection-volatile-noncluster.js
diff --git a/js/common/tests/shell-collection.js b/js/common/tests/shell/shell-collection.js
similarity index 100%
rename from js/common/tests/shell-collection.js
rename to js/common/tests/shell/shell-collection.js
diff --git a/js/common/tests/shell-crypto.js b/js/common/tests/shell/shell-crypto.js
similarity index 100%
rename from js/common/tests/shell-crypto.js
rename to js/common/tests/shell/shell-crypto.js
diff --git a/js/common/tests/shell-database.js b/js/common/tests/shell/shell-database.js
similarity index 100%
rename from js/common/tests/shell-database.js
rename to js/common/tests/shell/shell-database.js
diff --git a/js/common/tests/shell-document.js b/js/common/tests/shell/shell-document.js
similarity index 100%
rename from js/common/tests/shell-document.js
rename to js/common/tests/shell/shell-document.js
diff --git a/js/common/tests/shell-edge-index-noncluster.js b/js/common/tests/shell/shell-edge-index-noncluster.js
similarity index 100%
rename from js/common/tests/shell-edge-index-noncluster.js
rename to js/common/tests/shell/shell-edge-index-noncluster.js
diff --git a/js/common/tests/shell-edge.js b/js/common/tests/shell/shell-edge.js
similarity index 100%
rename from js/common/tests/shell-edge.js
rename to js/common/tests/shell/shell-edge.js
diff --git a/js/common/tests/shell-env.js b/js/common/tests/shell/shell-env.js
similarity index 100%
rename from js/common/tests/shell-env.js
rename to js/common/tests/shell/shell-env.js
diff --git a/js/common/tests/shell-errors.js b/js/common/tests/shell/shell-errors.js
similarity index 100%
rename from js/common/tests/shell-errors.js
rename to js/common/tests/shell/shell-errors.js
diff --git a/js/common/tests/shell-explain-cluster.js b/js/common/tests/shell/shell-explain-cluster.js
similarity index 100%
rename from js/common/tests/shell-explain-cluster.js
rename to js/common/tests/shell/shell-explain-cluster.js
diff --git a/js/common/tests/shell-explain-noncluster.js b/js/common/tests/shell/shell-explain-noncluster.js
similarity index 100%
rename from js/common/tests/shell-explain-noncluster.js
rename to js/common/tests/shell/shell-explain-noncluster.js
diff --git a/js/common/tests/shell-figures-noncluster.js b/js/common/tests/shell/shell-figures-noncluster.js
similarity index 100%
rename from js/common/tests/shell-figures-noncluster.js
rename to js/common/tests/shell/shell-figures-noncluster.js
diff --git a/js/common/tests/shell-foxx-manager-install-spec.js b/js/common/tests/shell/shell-foxx-manager-install-spec.js
similarity index 100%
rename from js/common/tests/shell-foxx-manager-install-spec.js
rename to js/common/tests/shell/shell-foxx-manager-install-spec.js
diff --git a/js/common/tests/shell-fs.js b/js/common/tests/shell/shell-fs.js
similarity index 100%
rename from js/common/tests/shell-fs.js
rename to js/common/tests/shell/shell-fs.js
diff --git a/js/common/tests/shell-fulltext.js b/js/common/tests/shell/shell-fulltext.js
similarity index 100%
rename from js/common/tests/shell-fulltext.js
rename to js/common/tests/shell/shell-fulltext.js
diff --git a/js/common/tests/shell-general-graph.js b/js/common/tests/shell/shell-general-graph.js
similarity index 100%
rename from js/common/tests/shell-general-graph.js
rename to js/common/tests/shell/shell-general-graph.js
diff --git a/js/common/tests/shell-graph-algorithms.js b/js/common/tests/shell/shell-graph-algorithms.js
similarity index 100%
rename from js/common/tests/shell-graph-algorithms.js
rename to js/common/tests/shell/shell-graph-algorithms.js
diff --git a/js/common/tests/shell-graph-measurement.js b/js/common/tests/shell/shell-graph-measurement.js
similarity index 100%
rename from js/common/tests/shell-graph-measurement.js
rename to js/common/tests/shell/shell-graph-measurement.js
diff --git a/js/common/tests/shell-graph-traversal.js b/js/common/tests/shell/shell-graph-traversal.js
similarity index 100%
rename from js/common/tests/shell-graph-traversal.js
rename to js/common/tests/shell/shell-graph-traversal.js
diff --git a/js/common/tests/shell-graph.js b/js/common/tests/shell/shell-graph.js
similarity index 100%
rename from js/common/tests/shell-graph.js
rename to js/common/tests/shell/shell-graph.js
diff --git a/js/common/tests/shell-hash-index-noncluster.js b/js/common/tests/shell/shell-hash-index-noncluster.js
similarity index 100%
rename from js/common/tests/shell-hash-index-noncluster.js
rename to js/common/tests/shell/shell-hash-index-noncluster.js
diff --git a/js/common/tests/shell-hash-index.js b/js/common/tests/shell/shell-hash-index.js
similarity index 100%
rename from js/common/tests/shell-hash-index.js
rename to js/common/tests/shell/shell-hash-index.js
diff --git a/js/common/tests/shell-index-ensure.js b/js/common/tests/shell/shell-index-ensure.js
similarity index 100%
rename from js/common/tests/shell-index-ensure.js
rename to js/common/tests/shell/shell-index-ensure.js
diff --git a/js/common/tests/shell-index-geo.js b/js/common/tests/shell/shell-index-geo.js
similarity index 100%
rename from js/common/tests/shell-index-geo.js
rename to js/common/tests/shell/shell-index-geo.js
diff --git a/js/common/tests/shell-index.js b/js/common/tests/shell/shell-index.js
similarity index 100%
rename from js/common/tests/shell-index.js
rename to js/common/tests/shell/shell-index.js
diff --git a/js/common/tests/shell-keygen-noncluster.js b/js/common/tests/shell/shell-keygen-noncluster.js
similarity index 100%
rename from js/common/tests/shell-keygen-noncluster.js
rename to js/common/tests/shell/shell-keygen-noncluster.js
diff --git a/js/common/tests/shell-keygen.js b/js/common/tests/shell/shell-keygen.js
similarity index 100%
rename from js/common/tests/shell-keygen.js
rename to js/common/tests/shell/shell-keygen.js
diff --git a/js/common/tests/shell-noncluster-edge.js b/js/common/tests/shell/shell-noncluster-edge.js
similarity index 100%
rename from js/common/tests/shell-noncluster-edge.js
rename to js/common/tests/shell/shell-noncluster-edge.js
diff --git a/js/common/tests/shell-query-timecritical-spec.js b/js/common/tests/shell/shell-query-timecritical-spec.js
similarity index 100%
rename from js/common/tests/shell-query-timecritical-spec.js
rename to js/common/tests/shell/shell-query-timecritical-spec.js
diff --git a/js/common/tests/shell-rename-noncluster.js b/js/common/tests/shell/shell-rename-noncluster.js
similarity index 100%
rename from js/common/tests/shell-rename-noncluster.js
rename to js/common/tests/shell/shell-rename-noncluster.js
diff --git a/js/common/tests/shell-require.js b/js/common/tests/shell/shell-require.js
similarity index 100%
rename from js/common/tests/shell-require.js
rename to js/common/tests/shell/shell-require.js
diff --git a/js/common/tests/shell-simple-query.js b/js/common/tests/shell/shell-simple-query.js
similarity index 100%
rename from js/common/tests/shell-simple-query.js
rename to js/common/tests/shell/shell-simple-query.js
diff --git a/js/common/tests/shell-statement-cluster.js b/js/common/tests/shell/shell-statement-cluster.js
similarity index 100%
rename from js/common/tests/shell-statement-cluster.js
rename to js/common/tests/shell/shell-statement-cluster.js
diff --git a/js/common/tests/shell-statement-encoding-noncluster.js b/js/common/tests/shell/shell-statement-encoding-noncluster.js
similarity index 100%
rename from js/common/tests/shell-statement-encoding-noncluster.js
rename to js/common/tests/shell/shell-statement-encoding-noncluster.js
diff --git a/js/common/tests/shell-statement-noncluster.js b/js/common/tests/shell/shell-statement-noncluster.js
similarity index 100%
rename from js/common/tests/shell-statement-noncluster.js
rename to js/common/tests/shell/shell-statement-noncluster.js
diff --git a/js/common/tests/shell-statement.js b/js/common/tests/shell/shell-statement.js
similarity index 100%
rename from js/common/tests/shell-statement.js
rename to js/common/tests/shell/shell-statement.js
diff --git a/js/common/tests/shell-tasks-timecritical.js b/js/common/tests/shell/shell-tasks-timecritical.js
similarity index 100%
rename from js/common/tests/shell-tasks-timecritical.js
rename to js/common/tests/shell/shell-tasks-timecritical.js
diff --git a/js/common/tests/shell-transactions-noncluster.js b/js/common/tests/shell/shell-transactions-noncluster.js
similarity index 100%
rename from js/common/tests/shell-transactions-noncluster.js
rename to js/common/tests/shell/shell-transactions-noncluster.js
diff --git a/js/common/tests/shell-transactions.js b/js/common/tests/shell/shell-transactions.js
similarity index 100%
rename from js/common/tests/shell-transactions.js
rename to js/common/tests/shell/shell-transactions.js
diff --git a/js/common/tests/shell-unique-constraint.js b/js/common/tests/shell/shell-unique-constraint.js
similarity index 100%
rename from js/common/tests/shell-unique-constraint.js
rename to js/common/tests/shell/shell-unique-constraint.js
diff --git a/js/common/tests/shell-unload.js b/js/common/tests/shell/shell-unload.js
similarity index 100%
rename from js/common/tests/shell-unload.js
rename to js/common/tests/shell/shell-unload.js
diff --git a/js/common/tests/shell-users.js b/js/common/tests/shell/shell-users.js
similarity index 100%
rename from js/common/tests/shell-users.js
rename to js/common/tests/shell/shell-users.js
diff --git a/js/server/tests/README b/js/server/tests/README
index dab617afff..8c6387c028 100644
--- a/js/server/tests/README
+++ b/js/server/tests/README
@@ -1,21 +1,20 @@
 Conventions for testing framework:
 ==================================
 
-All files in this directory whose name starts with "shell-"
-and ends with ".js" automatically take part in server
-shell tests (targets "shell_server" and "shell-server-only").
+All files in the directory "shell" and ends with ".js" automatically
+take part in server shell tests (targets "shell_server" and
+"shell-server-only").
 
-All files in this directory whose name starts with "ahuacatl-"
-and ends with ".js" automatically take part in server ahuacatl
-tests (target "shell_server_ahuacatl"). Those, whose filename
-contains the string "ranges-combined" are only taken if the
-flag "skipRanges" in the test options is set to false.
+All files in the directory "aql" and ends with ".js" automatically
+take part in server aql tests (target "shell_server_aql"). Those,
+whose filename contains the string "ranges-combined" are only taken if
+the flag "skipRanges" in the test options is set to false.
 
-If the filename contains the string "-cluster", then it is
-only executed when testing in cluster mode. If the filename
-contains the string "-noncluster", then it is only executed
-when testing in single instance mode.
+If the filename contains the string "-cluster", then it is only
+executed when testing in cluster mode. If the filename contains the
+string "-noncluster", then it is only executed when testing in single
+instance mode.
 
-If the filename contains the string "-disabled", then it is
-not executed at all. This is for tests that cannot be run from the
+If the filename contains the string "-disabled", then it is not
+executed at all. This is for tests that cannot be run from the
 JavaScript test framework and have to be run from the Makefile.
diff --git a/js/server/tests/aql-arithmetic.js b/js/server/tests/aql/aql-arithmetic.js
similarity index 100%
rename from js/server/tests/aql-arithmetic.js
rename to js/server/tests/aql/aql-arithmetic.js
diff --git a/js/server/tests/aql-array-access.js b/js/server/tests/aql/aql-array-access.js
similarity index 100%
rename from js/server/tests/aql-array-access.js
rename to js/server/tests/aql/aql-array-access.js
diff --git a/js/server/tests/aql-attribute-access.js b/js/server/tests/aql/aql-attribute-access.js
similarity index 100%
rename from js/server/tests/aql-attribute-access.js
rename to js/server/tests/aql/aql-attribute-access.js
diff --git a/js/server/tests/aql-bind.js b/js/server/tests/aql/aql-bind.js
similarity index 100%
rename from js/server/tests/aql-bind.js
rename to js/server/tests/aql/aql-bind.js
diff --git a/js/server/tests/aql-call-apply.js b/js/server/tests/aql/aql-call-apply.js
similarity index 100%
rename from js/server/tests/aql-call-apply.js
rename to js/server/tests/aql/aql-call-apply.js
diff --git a/js/server/tests/aql-complex.js b/js/server/tests/aql/aql-complex.js
similarity index 100%
rename from js/server/tests/aql-complex.js
rename to js/server/tests/aql/aql-complex.js
diff --git a/js/server/tests/aql-cross.js b/js/server/tests/aql/aql-cross.js
similarity index 100%
rename from js/server/tests/aql-cross.js
rename to js/server/tests/aql/aql-cross.js
diff --git a/js/server/tests/aql-distinct.js b/js/server/tests/aql/aql-distinct.js
similarity index 100%
rename from js/server/tests/aql-distinct.js
rename to js/server/tests/aql/aql-distinct.js
diff --git a/js/server/tests/aql-dynamic-attributes.js b/js/server/tests/aql/aql-dynamic-attributes.js
similarity index 100%
rename from js/server/tests/aql-dynamic-attributes.js
rename to js/server/tests/aql/aql-dynamic-attributes.js
diff --git a/js/server/tests/aql-edges-cluster.js b/js/server/tests/aql/aql-edges-cluster.js
similarity index 100%
rename from js/server/tests/aql-edges-cluster.js
rename to js/server/tests/aql/aql-edges-cluster.js
diff --git a/js/server/tests/aql-edges-noncluster.js b/js/server/tests/aql/aql-edges-noncluster.js
similarity index 100%
rename from js/server/tests/aql-edges-noncluster.js
rename to js/server/tests/aql/aql-edges-noncluster.js
diff --git a/js/server/tests/aql-escaping.js b/js/server/tests/aql/aql-escaping.js
similarity index 100%
rename from js/server/tests/aql-escaping.js
rename to js/server/tests/aql/aql-escaping.js
diff --git a/js/server/tests/aql-explain-cluster.js b/js/server/tests/aql/aql-explain-cluster.js
similarity index 100%
rename from js/server/tests/aql-explain-cluster.js
rename to js/server/tests/aql/aql-explain-cluster.js
diff --git a/js/server/tests/aql-explain-noncluster.js b/js/server/tests/aql/aql-explain-noncluster.js
similarity index 100%
rename from js/server/tests/aql-explain-noncluster.js
rename to js/server/tests/aql/aql-explain-noncluster.js
diff --git a/js/server/tests/aql-failures-noncluster.js b/js/server/tests/aql/aql-failures-noncluster.js
similarity index 100%
rename from js/server/tests/aql-failures-noncluster.js
rename to js/server/tests/aql/aql-failures-noncluster.js
diff --git a/js/server/tests/aql-fullcount.js b/js/server/tests/aql/aql-fullcount.js
similarity index 100%
rename from js/server/tests/aql-fullcount.js
rename to js/server/tests/aql/aql-fullcount.js
diff --git a/js/server/tests/aql-functions-date.js b/js/server/tests/aql/aql-functions-date.js
similarity index 100%
rename from js/server/tests/aql-functions-date.js
rename to js/server/tests/aql/aql-functions-date.js
diff --git a/js/server/tests/aql-functions-list.js b/js/server/tests/aql/aql-functions-list.js
similarity index 100%
rename from js/server/tests/aql-functions-list.js
rename to js/server/tests/aql/aql-functions-list.js
diff --git a/js/server/tests/aql-functions-misc.js b/js/server/tests/aql/aql-functions-misc.js
similarity index 100%
rename from js/server/tests/aql-functions-misc.js
rename to js/server/tests/aql/aql-functions-misc.js
diff --git a/js/server/tests/aql-functions-numeric.js b/js/server/tests/aql/aql-functions-numeric.js
similarity index 100%
rename from js/server/tests/aql-functions-numeric.js
rename to js/server/tests/aql/aql-functions-numeric.js
diff --git a/js/server/tests/aql-functions-string.js b/js/server/tests/aql/aql-functions-string.js
similarity index 100%
rename from js/server/tests/aql-functions-string.js
rename to js/server/tests/aql/aql-functions-string.js
diff --git a/js/server/tests/aql-functions-types-cxx.js b/js/server/tests/aql/aql-functions-types-cxx.js
similarity index 100%
rename from js/server/tests/aql-functions-types-cxx.js
rename to js/server/tests/aql/aql-functions-types-cxx.js
diff --git a/js/server/tests/aql-functions-types.js b/js/server/tests/aql/aql-functions-types.js
similarity index 100%
rename from js/server/tests/aql-functions-types.js
rename to js/server/tests/aql/aql-functions-types.js
diff --git a/js/server/tests/aql-functions.js b/js/server/tests/aql/aql-functions.js
similarity index 100%
rename from js/server/tests/aql-functions.js
rename to js/server/tests/aql/aql-functions.js
diff --git a/js/server/tests/aql-gather-block-cluster.js b/js/server/tests/aql/aql-gather-block-cluster.js
similarity index 100%
rename from js/server/tests/aql-gather-block-cluster.js
rename to js/server/tests/aql/aql-gather-block-cluster.js
diff --git a/js/server/tests/aql-general-graph.js b/js/server/tests/aql/aql-general-graph.js
similarity index 100%
rename from js/server/tests/aql-general-graph.js
rename to js/server/tests/aql/aql-general-graph.js
diff --git a/js/server/tests/aql-graph-traverser.js b/js/server/tests/aql/aql-graph-traverser.js
similarity index 100%
rename from js/server/tests/aql-graph-traverser.js
rename to js/server/tests/aql/aql-graph-traverser.js
diff --git a/js/server/tests/aql-graph-visitors.js b/js/server/tests/aql/aql-graph-visitors.js
similarity index 100%
rename from js/server/tests/aql-graph-visitors.js
rename to js/server/tests/aql/aql-graph-visitors.js
diff --git a/js/server/tests/aql-graph.js b/js/server/tests/aql/aql-graph.js
similarity index 100%
rename from js/server/tests/aql-graph.js
rename to js/server/tests/aql/aql-graph.js
diff --git a/js/server/tests/aql-hash-cluster.js b/js/server/tests/aql/aql-hash-cluster.js
similarity index 100%
rename from js/server/tests/aql-hash-cluster.js
rename to js/server/tests/aql/aql-hash-cluster.js
diff --git a/js/server/tests/aql-hash-noncluster.js b/js/server/tests/aql/aql-hash-noncluster.js
similarity index 100%
rename from js/server/tests/aql-hash-noncluster.js
rename to js/server/tests/aql/aql-hash-noncluster.js
diff --git a/js/server/tests/aql-is-in-polygon.js b/js/server/tests/aql/aql-is-in-polygon.js
similarity index 100%
rename from js/server/tests/aql-is-in-polygon.js
rename to js/server/tests/aql/aql-is-in-polygon.js
diff --git a/js/server/tests/aql-join-cluster.js b/js/server/tests/aql/aql-join-cluster.js
similarity index 100%
rename from js/server/tests/aql-join-cluster.js
rename to js/server/tests/aql/aql-join-cluster.js
diff --git a/js/server/tests/aql-logical.js b/js/server/tests/aql/aql-logical.js
similarity index 100%
rename from js/server/tests/aql-logical.js
rename to js/server/tests/aql/aql-logical.js
diff --git a/js/server/tests/aql-modify-cluster.js b/js/server/tests/aql/aql-modify-cluster.js
similarity index 100%
rename from js/server/tests/aql-modify-cluster.js
rename to js/server/tests/aql/aql-modify-cluster.js
diff --git a/js/server/tests/aql-modify-noncluster-serializetest.js b/js/server/tests/aql/aql-modify-noncluster-serializetest.js
similarity index 100%
rename from js/server/tests/aql-modify-noncluster-serializetest.js
rename to js/server/tests/aql/aql-modify-noncluster-serializetest.js
diff --git a/js/server/tests/aql-modify-noncluster.js b/js/server/tests/aql/aql-modify-noncluster.js
similarity index 100%
rename from js/server/tests/aql-modify-noncluster.js
rename to js/server/tests/aql/aql-modify-noncluster.js
diff --git a/js/server/tests/aql-multi-modify.js b/js/server/tests/aql/aql-multi-modify.js
similarity index 100%
rename from js/server/tests/aql-multi-modify.js
rename to js/server/tests/aql/aql-multi-modify.js
diff --git a/js/server/tests/aql-operators.js b/js/server/tests/aql/aql-operators.js
similarity index 100%
rename from js/server/tests/aql-operators.js
rename to js/server/tests/aql/aql-operators.js
diff --git a/js/server/tests/aql-optimizer-collect-aggregate.js b/js/server/tests/aql/aql-optimizer-collect-aggregate.js
similarity index 100%
rename from js/server/tests/aql-optimizer-collect-aggregate.js
rename to js/server/tests/aql/aql-optimizer-collect-aggregate.js
diff --git a/js/server/tests/aql-optimizer-collect-count.js b/js/server/tests/aql/aql-optimizer-collect-count.js
similarity index 100%
rename from js/server/tests/aql-optimizer-collect-count.js
rename to js/server/tests/aql/aql-optimizer-collect-count.js
diff --git a/js/server/tests/aql-optimizer-collect-into.js b/js/server/tests/aql/aql-optimizer-collect-into.js
similarity index 100%
rename from js/server/tests/aql-optimizer-collect-into.js
rename to js/server/tests/aql/aql-optimizer-collect-into.js
diff --git a/js/server/tests/aql-optimizer-collect-methods.js b/js/server/tests/aql/aql-optimizer-collect-methods.js
similarity index 100%
rename from js/server/tests/aql-optimizer-collect-methods.js
rename to js/server/tests/aql/aql-optimizer-collect-methods.js
diff --git a/js/server/tests/aql-optimizer-costs.js b/js/server/tests/aql/aql-optimizer-costs.js
similarity index 100%
rename from js/server/tests/aql-optimizer-costs.js
rename to js/server/tests/aql/aql-optimizer-costs.js
diff --git a/js/server/tests/aql-optimizer-dynamic-bounds.js b/js/server/tests/aql/aql-optimizer-dynamic-bounds.js
similarity index 100%
rename from js/server/tests/aql-optimizer-dynamic-bounds.js
rename to js/server/tests/aql/aql-optimizer-dynamic-bounds.js
diff --git a/js/server/tests/aql-optimizer-edge-index.js b/js/server/tests/aql/aql-optimizer-edge-index.js
similarity index 100%
rename from js/server/tests/aql-optimizer-edge-index.js
rename to js/server/tests/aql/aql-optimizer-edge-index.js
diff --git a/js/server/tests/aql-optimizer-filters.js b/js/server/tests/aql/aql-optimizer-filters.js
similarity index 100%
rename from js/server/tests/aql-optimizer-filters.js
rename to js/server/tests/aql/aql-optimizer-filters.js
diff --git a/js/server/tests/aql-optimizer-index-ranges.js b/js/server/tests/aql/aql-optimizer-index-ranges.js
similarity index 100%
rename from js/server/tests/aql-optimizer-index-ranges.js
rename to js/server/tests/aql/aql-optimizer-index-ranges.js
diff --git a/js/server/tests/aql-optimizer-indexes-in-or.js b/js/server/tests/aql/aql-optimizer-indexes-in-or.js
similarity index 100%
rename from js/server/tests/aql-optimizer-indexes-in-or.js
rename to js/server/tests/aql/aql-optimizer-indexes-in-or.js
diff --git a/js/server/tests/aql-optimizer-indexes-multi.js b/js/server/tests/aql/aql-optimizer-indexes-multi.js
similarity index 100%
rename from js/server/tests/aql-optimizer-indexes-multi.js
rename to js/server/tests/aql/aql-optimizer-indexes-multi.js
diff --git a/js/server/tests/aql-optimizer-indexes-sort.js b/js/server/tests/aql/aql-optimizer-indexes-sort.js
similarity index 100%
rename from js/server/tests/aql-optimizer-indexes-sort.js
rename to js/server/tests/aql/aql-optimizer-indexes-sort.js
diff --git a/js/server/tests/aql-optimizer-indexes.js b/js/server/tests/aql/aql-optimizer-indexes.js
similarity index 100%
rename from js/server/tests/aql-optimizer-indexes.js
rename to js/server/tests/aql/aql-optimizer-indexes.js
diff --git a/js/server/tests/aql-optimizer-keep.js b/js/server/tests/aql/aql-optimizer-keep.js
similarity index 100%
rename from js/server/tests/aql-optimizer-keep.js
rename to js/server/tests/aql/aql-optimizer-keep.js
diff --git a/js/server/tests/aql-optimizer-plans.js b/js/server/tests/aql/aql-optimizer-plans.js
similarity index 100%
rename from js/server/tests/aql-optimizer-plans.js
rename to js/server/tests/aql/aql-optimizer-plans.js
diff --git a/js/server/tests/aql-optimizer-rule-distribute-in-cluster.js b/js/server/tests/aql/aql-optimizer-rule-distribute-in-cluster.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-distribute-in-cluster.js
rename to js/server/tests/aql/aql-optimizer-rule-distribute-in-cluster.js
diff --git a/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js b/js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js
rename to js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js
diff --git a/js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js b/js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js
rename to js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js
diff --git a/js/server/tests/aql-optimizer-rule-merge-traversal-filter.js b/js/server/tests/aql/aql-optimizer-rule-merge-traversal-filter.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-merge-traversal-filter.js
rename to js/server/tests/aql/aql-optimizer-rule-merge-traversal-filter.js
diff --git a/js/server/tests/aql-optimizer-rule-move-calculations-down.js b/js/server/tests/aql/aql-optimizer-rule-move-calculations-down.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-move-calculations-down.js
rename to js/server/tests/aql/aql-optimizer-rule-move-calculations-down.js
diff --git a/js/server/tests/aql-optimizer-rule-move-calculations-up.js b/js/server/tests/aql/aql-optimizer-rule-move-calculations-up.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-move-calculations-up.js
rename to js/server/tests/aql/aql-optimizer-rule-move-calculations-up.js
diff --git a/js/server/tests/aql-optimizer-rule-move-filters-up.js b/js/server/tests/aql/aql-optimizer-rule-move-filters-up.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-move-filters-up.js
rename to js/server/tests/aql/aql-optimizer-rule-move-filters-up.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-collect-variables.js b/js/server/tests/aql/aql-optimizer-rule-remove-collect-variables.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-collect-variables.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-collect-variables.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js b/js/server/tests/aql/aql-optimizer-rule-remove-filter-covered-by-index.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-filter-covered-by-index.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-redundant-calculations.js b/js/server/tests/aql/aql-optimizer-rule-remove-redundant-calculations.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-redundant-calculations.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-redundant-calculations.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-redundant-or.js b/js/server/tests/aql/aql-optimizer-rule-remove-redundant-or.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-redundant-or.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-redundant-or.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-redundant-sorts.js b/js/server/tests/aql/aql-optimizer-rule-remove-redundant-sorts.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-redundant-sorts.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-redundant-sorts.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-sort-rand.js b/js/server/tests/aql/aql-optimizer-rule-remove-sort-rand.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-sort-rand.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-sort-rand.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-unnecessary-calculations.js b/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-calculations.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-unnecessary-calculations.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-calculations.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js b/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-filters.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-unnecessary-filters.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-filters.js
diff --git a/js/server/tests/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js b/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js
rename to js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js
diff --git a/js/server/tests/aql-optimizer-rule-replace-or-with-in.js b/js/server/tests/aql/aql-optimizer-rule-replace-or-with-in.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-replace-or-with-in.js
rename to js/server/tests/aql/aql-optimizer-rule-replace-or-with-in.js
diff --git a/js/server/tests/aql-optimizer-rule-sort-in-values.js b/js/server/tests/aql/aql-optimizer-rule-sort-in-values.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-sort-in-values.js
rename to js/server/tests/aql/aql-optimizer-rule-sort-in-values.js
diff --git a/js/server/tests/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js b/js/server/tests/aql/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js
rename to js/server/tests/aql/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js
diff --git a/js/server/tests/aql-optimizer-rule-use-index-for-sort.js b/js/server/tests/aql/aql-optimizer-rule-use-index-for-sort.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-use-index-for-sort.js
rename to js/server/tests/aql/aql-optimizer-rule-use-index-for-sort.js
diff --git a/js/server/tests/aql-optimizer-rule-use-index-range.js b/js/server/tests/aql/aql-optimizer-rule-use-index-range.js
similarity index 100%
rename from js/server/tests/aql-optimizer-rule-use-index-range.js
rename to js/server/tests/aql/aql-optimizer-rule-use-index-range.js
diff --git a/js/server/tests/aql-optimizer-stats-noncluster.js b/js/server/tests/aql/aql-optimizer-stats-noncluster.js
similarity index 100%
rename from js/server/tests/aql-optimizer-stats-noncluster.js
rename to js/server/tests/aql/aql-optimizer-stats-noncluster.js
diff --git a/js/server/tests/aql-optimizer-v8.js b/js/server/tests/aql/aql-optimizer-v8.js
similarity index 100%
rename from js/server/tests/aql-optimizer-v8.js
rename to js/server/tests/aql/aql-optimizer-v8.js
diff --git a/js/server/tests/aql-parse.js b/js/server/tests/aql/aql-parse.js
similarity index 100%
rename from js/server/tests/aql-parse.js
rename to js/server/tests/aql/aql-parse.js
diff --git a/js/server/tests/aql-primary-index-cluster.js b/js/server/tests/aql/aql-primary-index-cluster.js
similarity index 100%
rename from js/server/tests/aql-primary-index-cluster.js
rename to js/server/tests/aql/aql-primary-index-cluster.js
diff --git a/js/server/tests/aql-primary-index-noncluster.js b/js/server/tests/aql/aql-primary-index-noncluster.js
similarity index 100%
rename from js/server/tests/aql-primary-index-noncluster.js
rename to js/server/tests/aql/aql-primary-index-noncluster.js
diff --git a/js/server/tests/aql-queries-array-nested.js b/js/server/tests/aql/aql-queries-array-nested.js
similarity index 100%
rename from js/server/tests/aql-queries-array-nested.js
rename to js/server/tests/aql/aql-queries-array-nested.js
diff --git a/js/server/tests/aql-queries-array.js b/js/server/tests/aql/aql-queries-array.js
similarity index 100%
rename from js/server/tests/aql-queries-array.js
rename to js/server/tests/aql/aql-queries-array.js
diff --git a/js/server/tests/aql-queries-collection.js b/js/server/tests/aql/aql-queries-collection.js
similarity index 100%
rename from js/server/tests/aql-queries-collection.js
rename to js/server/tests/aql/aql-queries-collection.js
diff --git a/js/server/tests/aql-queries-fulltext.js b/js/server/tests/aql/aql-queries-fulltext.js
similarity index 100%
rename from js/server/tests/aql-queries-fulltext.js
rename to js/server/tests/aql/aql-queries-fulltext.js
diff --git a/js/server/tests/aql-queries-geo.js b/js/server/tests/aql/aql-queries-geo.js
similarity index 100%
rename from js/server/tests/aql-queries-geo.js
rename to js/server/tests/aql/aql-queries-geo.js
diff --git a/js/server/tests/aql-queries-noncollection.js b/js/server/tests/aql/aql-queries-noncollection.js
similarity index 100%
rename from js/server/tests/aql-queries-noncollection.js
rename to js/server/tests/aql/aql-queries-noncollection.js
diff --git a/js/server/tests/aql-queries-optimizer-in-cluster.js b/js/server/tests/aql/aql-queries-optimizer-in-cluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-in-cluster.js
rename to js/server/tests/aql/aql-queries-optimizer-in-cluster.js
diff --git a/js/server/tests/aql-queries-optimizer-in-noncluster.js b/js/server/tests/aql/aql-queries-optimizer-in-noncluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-in-noncluster.js
rename to js/server/tests/aql/aql-queries-optimizer-in-noncluster.js
diff --git a/js/server/tests/aql-queries-optimizer-limit-cluster.js b/js/server/tests/aql/aql-queries-optimizer-limit-cluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-limit-cluster.js
rename to js/server/tests/aql/aql-queries-optimizer-limit-cluster.js
diff --git a/js/server/tests/aql-queries-optimizer-limit-noncluster.js b/js/server/tests/aql/aql-queries-optimizer-limit-noncluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-limit-noncluster.js
rename to js/server/tests/aql/aql-queries-optimizer-limit-noncluster.js
diff --git a/js/server/tests/aql-queries-optimizer-ref-cluster.js b/js/server/tests/aql/aql-queries-optimizer-ref-cluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-ref-cluster.js
rename to js/server/tests/aql/aql-queries-optimizer-ref-cluster.js
diff --git a/js/server/tests/aql-queries-optimizer-ref-noncluster.js b/js/server/tests/aql/aql-queries-optimizer-ref-noncluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-ref-noncluster.js
rename to js/server/tests/aql/aql-queries-optimizer-ref-noncluster.js
diff --git a/js/server/tests/aql-queries-optimizer-sort-cluster.js b/js/server/tests/aql/aql-queries-optimizer-sort-cluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-sort-cluster.js
rename to js/server/tests/aql/aql-queries-optimizer-sort-cluster.js
diff --git a/js/server/tests/aql-queries-optimizer-sort-noncluster.js b/js/server/tests/aql/aql-queries-optimizer-sort-noncluster.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer-sort-noncluster.js
rename to js/server/tests/aql/aql-queries-optimizer-sort-noncluster.js
diff --git a/js/server/tests/aql-queries-optimizer.js b/js/server/tests/aql/aql-queries-optimizer.js
similarity index 100%
rename from js/server/tests/aql-queries-optimizer.js
rename to js/server/tests/aql/aql-queries-optimizer.js
diff --git a/js/server/tests/aql-queries-simple.js b/js/server/tests/aql/aql-queries-simple.js
similarity index 100%
rename from js/server/tests/aql-queries-simple.js
rename to js/server/tests/aql/aql-queries-simple.js
diff --git a/js/server/tests/aql-queries-variables.js b/js/server/tests/aql/aql-queries-variables.js
similarity index 100%
rename from js/server/tests/aql-queries-variables.js
rename to js/server/tests/aql/aql-queries-variables.js
diff --git a/js/server/tests/aql-query-cache-noncluster.js b/js/server/tests/aql/aql-query-cache-noncluster.js
similarity index 100%
rename from js/server/tests/aql-query-cache-noncluster.js
rename to js/server/tests/aql/aql-query-cache-noncluster.js
diff --git a/js/server/tests/aql-range.js b/js/server/tests/aql/aql-range.js
similarity index 100%
rename from js/server/tests/aql-range.js
rename to js/server/tests/aql/aql-range.js
diff --git a/js/server/tests/aql-ranges-combined-01.js b/js/server/tests/aql/aql-ranges-combined-01.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-01.js
rename to js/server/tests/aql/aql-ranges-combined-01.js
diff --git a/js/server/tests/aql-ranges-combined-02.js b/js/server/tests/aql/aql-ranges-combined-02.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-02.js
rename to js/server/tests/aql/aql-ranges-combined-02.js
diff --git a/js/server/tests/aql-ranges-combined-03.js b/js/server/tests/aql/aql-ranges-combined-03.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-03.js
rename to js/server/tests/aql/aql-ranges-combined-03.js
diff --git a/js/server/tests/aql-ranges-combined-04.js b/js/server/tests/aql/aql-ranges-combined-04.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-04.js
rename to js/server/tests/aql/aql-ranges-combined-04.js
diff --git a/js/server/tests/aql-ranges-combined-05.js b/js/server/tests/aql/aql-ranges-combined-05.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-05.js
rename to js/server/tests/aql/aql-ranges-combined-05.js
diff --git a/js/server/tests/aql-ranges-combined-06.js b/js/server/tests/aql/aql-ranges-combined-06.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-06.js
rename to js/server/tests/aql/aql-ranges-combined-06.js
diff --git a/js/server/tests/aql-ranges-combined-07.js b/js/server/tests/aql/aql-ranges-combined-07.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-07.js
rename to js/server/tests/aql/aql-ranges-combined-07.js
diff --git a/js/server/tests/aql-ranges-combined-08.js b/js/server/tests/aql/aql-ranges-combined-08.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-08.js
rename to js/server/tests/aql/aql-ranges-combined-08.js
diff --git a/js/server/tests/aql-ranges-combined-09.js b/js/server/tests/aql/aql-ranges-combined-09.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-09.js
rename to js/server/tests/aql/aql-ranges-combined-09.js
diff --git a/js/server/tests/aql-ranges-combined-10.js b/js/server/tests/aql/aql-ranges-combined-10.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-10.js
rename to js/server/tests/aql/aql-ranges-combined-10.js
diff --git a/js/server/tests/aql-ranges-combined-11.js b/js/server/tests/aql/aql-ranges-combined-11.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-11.js
rename to js/server/tests/aql/aql-ranges-combined-11.js
diff --git a/js/server/tests/aql-ranges-combined-12.js b/js/server/tests/aql/aql-ranges-combined-12.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-12.js
rename to js/server/tests/aql/aql-ranges-combined-12.js
diff --git a/js/server/tests/aql-ranges-combined-13.js b/js/server/tests/aql/aql-ranges-combined-13.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-13.js
rename to js/server/tests/aql/aql-ranges-combined-13.js
diff --git a/js/server/tests/aql-ranges-combined-14.js b/js/server/tests/aql/aql-ranges-combined-14.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-14.js
rename to js/server/tests/aql/aql-ranges-combined-14.js
diff --git a/js/server/tests/aql-ranges-combined-15.js b/js/server/tests/aql/aql-ranges-combined-15.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-15.js
rename to js/server/tests/aql/aql-ranges-combined-15.js
diff --git a/js/server/tests/aql-ranges-combined-16.js b/js/server/tests/aql/aql-ranges-combined-16.js
similarity index 100%
rename from js/server/tests/aql-ranges-combined-16.js
rename to js/server/tests/aql/aql-ranges-combined-16.js
diff --git a/js/server/tests/aql-ranges.js b/js/server/tests/aql/aql-ranges.js
similarity index 100%
rename from js/server/tests/aql-ranges.js
rename to js/server/tests/aql/aql-ranges.js
diff --git a/js/server/tests/aql-refaccess-attribute.js b/js/server/tests/aql/aql-refaccess-attribute.js
similarity index 100%
rename from js/server/tests/aql-refaccess-attribute.js
rename to js/server/tests/aql/aql-refaccess-attribute.js
diff --git a/js/server/tests/aql-refaccess-variable.js b/js/server/tests/aql/aql-refaccess-variable.js
similarity index 100%
rename from js/server/tests/aql-refaccess-variable.js
rename to js/server/tests/aql/aql-refaccess-variable.js
diff --git a/js/server/tests/aql-relational.js b/js/server/tests/aql/aql-relational.js
similarity index 100%
rename from js/server/tests/aql-relational.js
rename to js/server/tests/aql/aql-relational.js
diff --git a/js/server/tests/aql-simple-attributes.js b/js/server/tests/aql/aql-simple-attributes.js
similarity index 100%
rename from js/server/tests/aql-simple-attributes.js
rename to js/server/tests/aql/aql-simple-attributes.js
diff --git a/js/server/tests/aql-skiplist-cluster.js b/js/server/tests/aql/aql-skiplist-cluster.js
similarity index 100%
rename from js/server/tests/aql-skiplist-cluster.js
rename to js/server/tests/aql/aql-skiplist-cluster.js
diff --git a/js/server/tests/aql-skiplist-noncluster.js b/js/server/tests/aql/aql-skiplist-noncluster.js
similarity index 100%
rename from js/server/tests/aql-skiplist-noncluster.js
rename to js/server/tests/aql/aql-skiplist-noncluster.js
diff --git a/js/server/tests/aql-subquery.js b/js/server/tests/aql/aql-subquery.js
similarity index 100%
rename from js/server/tests/aql-subquery.js
rename to js/server/tests/aql/aql-subquery.js
diff --git a/js/server/tests/aql-ternary.js b/js/server/tests/aql/aql-ternary.js
similarity index 100%
rename from js/server/tests/aql-ternary.js
rename to js/server/tests/aql/aql-ternary.js
diff --git a/js/server/tests/aql-upsert-cluster.js b/js/server/tests/aql/aql-upsert-cluster.js
similarity index 100%
rename from js/server/tests/aql-upsert-cluster.js
rename to js/server/tests/aql/aql-upsert-cluster.js
diff --git a/js/server/tests/aql-variables.js b/js/server/tests/aql/aql-variables.js
similarity index 100%
rename from js/server/tests/aql-variables.js
rename to js/server/tests/aql/aql-variables.js
diff --git a/js/server/tests/aql-within-rectangle.js b/js/server/tests/aql/aql-within-rectangle.js
similarity index 100%
rename from js/server/tests/aql-within-rectangle.js
rename to js/server/tests/aql/aql-within-rectangle.js
diff --git a/js/server/tests/shell-any-cluster.js b/js/server/tests/shell/shell-any-cluster.js
similarity index 100%
rename from js/server/tests/shell-any-cluster.js
rename to js/server/tests/shell/shell-any-cluster.js
diff --git a/js/server/tests/shell-any-noncluster.js b/js/server/tests/shell/shell-any-noncluster.js
similarity index 100%
rename from js/server/tests/shell-any-noncluster.js
rename to js/server/tests/shell/shell-any-noncluster.js
diff --git a/js/server/tests/shell-array-index-noncluster.js b/js/server/tests/shell/shell-array-index-noncluster.js
similarity index 100%
rename from js/server/tests/shell-array-index-noncluster.js
rename to js/server/tests/shell/shell-array-index-noncluster.js
diff --git a/js/server/tests/shell-cluster-agency-communication.js b/js/server/tests/shell/shell-cluster-agency-communication.js
similarity index 100%
rename from js/server/tests/shell-cluster-agency-communication.js
rename to js/server/tests/shell/shell-cluster-agency-communication.js
diff --git a/js/server/tests/shell-cluster-agency.js b/js/server/tests/shell/shell-cluster-agency.js
similarity index 100%
rename from js/server/tests/shell-cluster-agency.js
rename to js/server/tests/shell/shell-cluster-agency.js
diff --git a/js/server/tests/shell-collection-not-loaded-timecritical-noncluster.js b/js/server/tests/shell/shell-collection-not-loaded-timecritical-noncluster.js
similarity index 100%
rename from js/server/tests/shell-collection-not-loaded-timecritical-noncluster.js
rename to js/server/tests/shell/shell-collection-not-loaded-timecritical-noncluster.js
diff --git a/js/server/tests/shell-compaction-noncluster-timecritical.js b/js/server/tests/shell/shell-compaction-noncluster-timecritical.js
similarity index 100%
rename from js/server/tests/shell-compaction-noncluster-timecritical.js
rename to js/server/tests/shell/shell-compaction-noncluster-timecritical.js
diff --git a/js/server/tests/shell-compaction-seq-noncluster-timecritical.js b/js/server/tests/shell/shell-compaction-seq-noncluster-timecritical.js
similarity index 100%
rename from js/server/tests/shell-compaction-seq-noncluster-timecritical.js
rename to js/server/tests/shell/shell-compaction-seq-noncluster-timecritical.js
diff --git a/js/server/tests/shell-database-noncluster.js b/js/server/tests/shell/shell-database-noncluster.js
similarity index 100%
rename from js/server/tests/shell-database-noncluster.js
rename to js/server/tests/shell/shell-database-noncluster.js
diff --git a/js/server/tests/shell-datafile-timecritical-noncluster.js b/js/server/tests/shell/shell-datafile-timecritical-noncluster.js
similarity index 100%
rename from js/server/tests/shell-datafile-timecritical-noncluster.js
rename to js/server/tests/shell/shell-datafile-timecritical-noncluster.js
diff --git a/js/server/tests/shell-foxx-base-middleware.js b/js/server/tests/shell/shell-foxx-base-middleware.js
similarity index 100%
rename from js/server/tests/shell-foxx-base-middleware.js
rename to js/server/tests/shell/shell-foxx-base-middleware.js
diff --git a/js/server/tests/shell-foxx-console.js b/js/server/tests/shell/shell-foxx-console.js
similarity index 100%
rename from js/server/tests/shell-foxx-console.js
rename to js/server/tests/shell/shell-foxx-console.js
diff --git a/js/server/tests/shell-foxx-manager-spec-nightly.js b/js/server/tests/shell/shell-foxx-manager-spec-nightly.js
similarity index 100%
rename from js/server/tests/shell-foxx-manager-spec-nightly.js
rename to js/server/tests/shell/shell-foxx-manager-spec-nightly.js
diff --git a/js/server/tests/shell-foxx-model-events-spec.js b/js/server/tests/shell/shell-foxx-model-events-spec.js
similarity index 100%
rename from js/server/tests/shell-foxx-model-events-spec.js
rename to js/server/tests/shell/shell-foxx-model-events-spec.js
diff --git a/js/server/tests/shell-foxx-model.js b/js/server/tests/shell/shell-foxx-model.js
similarity index 100%
rename from js/server/tests/shell-foxx-model.js
rename to js/server/tests/shell/shell-foxx-model.js
diff --git a/js/server/tests/shell-foxx-preprocessor.js b/js/server/tests/shell/shell-foxx-preprocessor.js
similarity index 100%
rename from js/server/tests/shell-foxx-preprocessor.js
rename to js/server/tests/shell/shell-foxx-preprocessor.js
diff --git a/js/server/tests/shell-foxx-query-spec.js b/js/server/tests/shell/shell-foxx-query-spec.js
similarity index 100%
rename from js/server/tests/shell-foxx-query-spec.js
rename to js/server/tests/shell/shell-foxx-query-spec.js
diff --git a/js/server/tests/shell-foxx-repository-spec.js b/js/server/tests/shell/shell-foxx-repository-spec.js
similarity index 100%
rename from js/server/tests/shell-foxx-repository-spec.js
rename to js/server/tests/shell/shell-foxx-repository-spec.js
diff --git a/js/server/tests/shell-foxx-template-middleware.js b/js/server/tests/shell/shell-foxx-template-middleware.js
similarity index 100%
rename from js/server/tests/shell-foxx-template-middleware.js
rename to js/server/tests/shell/shell-foxx-template-middleware.js
diff --git a/js/server/tests/shell-foxx.js b/js/server/tests/shell/shell-foxx.js
similarity index 100%
rename from js/server/tests/shell-foxx.js
rename to js/server/tests/shell/shell-foxx.js
diff --git a/js/server/tests/shell-hash-index-failures.js b/js/server/tests/shell/shell-hash-index-failures.js
similarity index 100%
rename from js/server/tests/shell-hash-index-failures.js
rename to js/server/tests/shell/shell-hash-index-failures.js
diff --git a/js/server/tests/shell-readonly-noncluster-disabled.js b/js/server/tests/shell/shell-readonly-noncluster-disabled.js
similarity index 100%
rename from js/server/tests/shell-readonly-noncluster-disabled.js
rename to js/server/tests/shell/shell-readonly-noncluster-disabled.js
diff --git a/js/server/tests/shell-routing.js b/js/server/tests/shell/shell-routing.js
similarity index 100%
rename from js/server/tests/shell-routing.js
rename to js/server/tests/shell/shell-routing.js
diff --git a/js/server/tests/shell-shaped-noncluster.js b/js/server/tests/shell/shell-shaped-noncluster.js
similarity index 100%
rename from js/server/tests/shell-shaped-noncluster.js
rename to js/server/tests/shell/shell-shaped-noncluster.js
diff --git a/js/server/tests/shell-sharding-helpers.js b/js/server/tests/shell/shell-sharding-helpers.js
similarity index 100%
rename from js/server/tests/shell-sharding-helpers.js
rename to js/server/tests/shell/shell-sharding-helpers.js
diff --git a/js/server/tests/shell-skiplist-correctness.js b/js/server/tests/shell/shell-skiplist-correctness.js
similarity index 100%
rename from js/server/tests/shell-skiplist-correctness.js
rename to js/server/tests/shell/shell-skiplist-correctness.js
diff --git a/js/server/tests/shell-skiplist-index.js b/js/server/tests/shell/shell-skiplist-index.js
similarity index 100%
rename from js/server/tests/shell-skiplist-index.js
rename to js/server/tests/shell/shell-skiplist-index.js
diff --git a/js/server/tests/shell-skiplist-rm-performance-timecritical-noncluster.js b/js/server/tests/shell/shell-skiplist-rm-performance-timecritical-noncluster.js
similarity index 100%
rename from js/server/tests/shell-skiplist-rm-performance-timecritical-noncluster.js
rename to js/server/tests/shell/shell-skiplist-rm-performance-timecritical-noncluster.js
diff --git a/js/server/tests/shell-transactions-noncluster.js b/js/server/tests/shell/shell-transactions-noncluster.js
similarity index 100%
rename from js/server/tests/shell-transactions-noncluster.js
rename to js/server/tests/shell/shell-transactions-noncluster.js
diff --git a/js/server/tests/shell-wal-noncluster-memoryintense.js b/js/server/tests/shell/shell-wal-noncluster-memoryintense.js
similarity index 100%
rename from js/server/tests/shell-wal-noncluster-memoryintense.js
rename to js/server/tests/shell/shell-wal-noncluster-memoryintense.js