diff --git a/.github/labeler.yml b/.github/labeler.yml
index a74b4ab5d5a33..350917b264933 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -225,7 +225,7 @@ DEPLOY:
 CONNECT:
   - changed-files:
     - any-glob-to-any-file: [
-     'connect/**/*',
+     'sql/connect/**/*',
      'connector/connect/**/*',
      'python/pyspark/sql/**/connect/**/*',
      'python/pyspark/ml/**/connect/**/*'
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 576f64f3a0869..0e0d5595b94fa 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -606,7 +606,7 @@ jobs:
     - name: Breaking change detection against branch-3.5
       uses: bufbuild/buf-breaking-action@v1
       with:
-        input: connect/common/src/main
+        input: sql/connect/common/src/main
         against: 'https://github.com/apache/spark.git#branch=branch-3.5,subdir=connector/connect/common/src/main'
     - name: Install Python 3.9
       uses: actions/setup-python@v5
diff --git a/.github/workflows/build_python_connect.yml b/.github/workflows/build_python_connect.yml
index 8458cdf771b19..3ac1a0117e41b 100644
--- a/.github/workflows/build_python_connect.yml
+++ b/.github/workflows/build_python_connect.yml
@@ -84,7 +84,7 @@ jobs:
           # Start a Spark Connect server for local
           PYTHONPATH="python/lib/pyspark.zip:python/lib/py4j-0.10.9.7-src.zip:$PYTHONPATH" ./sbin/start-connect-server.sh \
             --driver-java-options "-Dlog4j.configurationFile=file:$GITHUB_WORKSPACE/conf/log4j2.properties" \
-            --jars "`find connect/server/target -name spark-connect-*SNAPSHOT.jar`,`find connector/protobuf/target -name spark-protobuf-*SNAPSHOT.jar`,`find connector/avro/target -name spark-avro*SNAPSHOT.jar`"
+            --jars "`find connector/protobuf/target -name spark-protobuf-*SNAPSHOT.jar`,`find connector/avro/target -name spark-avro*SNAPSHOT.jar`"
 
           # Remove Py4J and PySpark zipped library to make sure there is no JVM connection
           mv python/lib lib.back
@@ -104,7 +104,7 @@ jobs:
           PYTHONPATH="python/lib/pyspark.zip:python/lib/py4j-0.10.9.7-src.zip:$PYTHONPATH" ./sbin/start-connect-server.sh \
             --master "local-cluster[2, 4, 1024]" \
             --driver-java-options "-Dlog4j.configurationFile=file:$GITHUB_WORKSPACE/conf/log4j2.properties" \
-            --jars "`find connect/server/target -name spark-connect-*SNAPSHOT.jar`,`find connector/protobuf/target -name spark-protobuf-*SNAPSHOT.jar`,`find connector/avro/target -name spark-avro*SNAPSHOT.jar`"
+            --jars "`find connector/protobuf/target -name spark-protobuf-*SNAPSHOT.jar`,`find connector/avro/target -name spark-avro*SNAPSHOT.jar`"
 
           # Remove Py4J and PySpark zipped library to make sure there is no JVM connection
           mv python/lib lib.back
diff --git a/.github/workflows/build_python_connect35.yml b/.github/workflows/build_python_connect35.yml
index b00fdddb4b0e0..d4eb6d02a2864 100644
--- a/.github/workflows/build_python_connect35.yml
+++ b/.github/workflows/build_python_connect35.yml
@@ -87,7 +87,7 @@ jobs:
           # Start a Spark Connect server for local
           PYTHONPATH="python/lib/pyspark.zip:python/lib/py4j-0.10.9.7-src.zip:$PYTHONPATH" ./sbin/start-connect-server.sh \
             --driver-java-options "-Dlog4j.configurationFile=file:$GITHUB_WORKSPACE/conf/log4j2.properties" \
-            --jars "`find connect/server/target -name spark-connect-*SNAPSHOT.jar`,`find connector/protobuf/target -name spark-protobuf-*SNAPSHOT.jar`,`find connector/avro/target -name spark-avro*SNAPSHOT.jar`"
+            --jars "`find connector/protobuf/target -name spark-protobuf-*SNAPSHOT.jar`,`find connector/avro/target -name spark-avro*SNAPSHOT.jar`"
 
           # Checkout to branch-3.5 to use the tests in branch-3.5.
           cd ..
diff --git a/.github/workflows/maven_test.yml b/.github/workflows/maven_test.yml
index fa30bd3abc8a5..82b72bd7e91d2 100644
--- a/.github/workflows/maven_test.yml
+++ b/.github/workflows/maven_test.yml
@@ -194,7 +194,7 @@ jobs:
           if [[ "$INCLUDED_TAGS" != "" ]]; then
             ./build/mvn $MAVEN_CLI_OPTS -pl "$TEST_MODULES" -Pyarn -Pkubernetes -Pvolcano -Phive -Phive-thriftserver -Phadoop-cloud -Pjvm-profiler -Pspark-ganglia-lgpl -Pkinesis-asl -Djava.version=${JAVA_VERSION/-ea} -Dtest.include.tags="$INCLUDED_TAGS" test -fae
           elif [[ "$MODULES_TO_TEST" == "connect" ]]; then
-            ./build/mvn $MAVEN_CLI_OPTS -Dtest.exclude.tags="$EXCLUDED_TAGS" -Djava.version=${JAVA_VERSION/-ea} -pl connector/connect/client/jvm,connect/common,connect/server test -fae
+            ./build/mvn $MAVEN_CLI_OPTS -Dtest.exclude.tags="$EXCLUDED_TAGS" -Djava.version=${JAVA_VERSION/-ea} -pl connector/connect/client/jvm,sql/connect/common,sql/connect/server test -fae
           elif [[ "$EXCLUDED_TAGS" != "" ]]; then
             ./build/mvn $MAVEN_CLI_OPTS -pl "$TEST_MODULES" -Pyarn -Pkubernetes -Pvolcano -Phive -Phive-thriftserver -Phadoop-cloud -Pjvm-profiler -Pspark-ganglia-lgpl -Pkinesis-asl -Djava.version=${JAVA_VERSION/-ea} -Dtest.exclude.tags="$EXCLUDED_TAGS" test -fae
           elif [[ "$MODULES_TO_TEST" == *"sql#hive-thriftserver"* ]]; then
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala
index a66f790e08740..52cdbd47357f3 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala
@@ -308,6 +308,7 @@ class ClientE2ETestSuite
     val testDataPath = java.nio.file.Paths
       .get(
         IntegrationTestUtils.sparkHome,
+        "sql",
         "connect",
         "common",
         "src",
@@ -347,6 +348,7 @@ class ClientE2ETestSuite
     val testDataPath = java.nio.file.Paths
       .get(
         IntegrationTestUtils.sparkHome,
+        "sql",
         "connect",
         "common",
         "src",
@@ -377,6 +379,7 @@ class ClientE2ETestSuite
     val testDataPath = java.nio.file.Paths
       .get(
         IntegrationTestUtils.sparkHome,
+        "sql",
         "connect",
         "common",
         "src",
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
index 07b03c4564bcc..571ee6791e92f 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
@@ -71,7 +71,7 @@ import org.apache.spark.util.SparkFileUtils
  * compatibility.
  *
  * Note that the plan protos are used as the input for the `ProtoToParsedPlanTestSuite` in the
- * `connect/server` module
+ * `sql/connect/server` module
  */
 // scalastyle:on
 class PlanGenerationTestSuite
@@ -88,7 +88,7 @@ class PlanGenerationTestSuite
 
   protected val queryFilePath: Path = commonResourcePath.resolve("query-tests/queries")
 
-  // A relative path to /connect/server, used by `ProtoToParsedPlanTestSuite` to run
+  // A relative path to /sql/connect/server, used by `ProtoToParsedPlanTestSuite` to run
   // with the datasource.
   protected val testDataPath: Path = java.nio.file.Paths.get(
     "../",
@@ -3325,10 +3325,10 @@ class PlanGenerationTestSuite
   /* Protobuf functions */
   // scalastyle:off line.size.limit
   // If `common.desc` needs to be updated, execute the following command to regenerate it:
-  //  1. cd connect/common/src/main/protobuf/spark/connect
+  //  1. cd sql/connect/common/src/main/protobuf/spark/connect
   //  2. protoc --include_imports --descriptor_set_out=../../../../test/resources/protobuf-tests/common.desc common.proto
   // scalastyle:on line.size.limit
-  private val testDescFilePath: String = s"${IntegrationTestUtils.sparkHome}/connect/" +
+  private val testDescFilePath: String = s"${IntegrationTestUtils.sparkHome}/sql/connect/" +
     "common/src/test/resources/protobuf-tests/common.desc"
 
   // TODO(SPARK-45030): Re-enable this test when all Maven test scenarios succeed and there
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/streaming/ClientStreamingQuerySuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/streaming/ClientStreamingQuerySuite.scala
index d79b767e0ec2b..758262ead7f1e 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/streaming/ClientStreamingQuerySuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/streaming/ClientStreamingQuerySuite.scala
@@ -42,6 +42,7 @@ class ClientStreamingQuerySuite extends QueryTest with RemoteSparkSession with L
   private val testDataPath = Paths
     .get(
       IntegrationTestUtils.sparkHome,
+      "sql",
       "connect",
       "common",
       "src",
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/ConnectFunSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/ConnectFunSuite.scala
index 608d9b477148c..3186e0fb54b2a 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/ConnectFunSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/ConnectFunSuite.scala
@@ -35,10 +35,17 @@ trait ConnectFunSuite extends AnyFunSuite { // scalastyle:ignore funsuite
   }
 
   protected def baseResourcePath: Path = {
-    getWorkspaceFilePath("connect", "client", "jvm", "src", "test", "resources").toAbsolutePath
+    getWorkspaceFilePath(
+      "sql",
+      "connect",
+      "client",
+      "jvm",
+      "src",
+      "test",
+      "resources").toAbsolutePath
   }
 
   protected def commonResourcePath: Path = {
-    getWorkspaceFilePath("connect", "common", "src", "test", "resources").toAbsolutePath
+    getWorkspaceFilePath("sql", "connect", "common", "src", "test", "resources").toAbsolutePath
   }
 }
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/RemoteSparkSession.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/RemoteSparkSession.scala
index 95326ce7e8cec..a878e42b40aa7 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/RemoteSparkSession.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/test/RemoteSparkSession.scala
@@ -60,7 +60,7 @@ object SparkConnectServerUtils {
   private lazy val sparkConnect: java.lang.Process = {
     debug("Starting the Spark Connect Server...")
     val connectJar =
-      findJar("connect/server", "spark-connect-assembly", "spark-connect").getCanonicalPath
+      findJar("sql/connect/server", "spark-connect-assembly", "spark-connect").getCanonicalPath
 
     val command = Seq.newBuilder[String]
     command += "bin/spark-submit"
diff --git a/dev/connect-check-protos.py b/dev/connect-check-protos.py
index 12a499caf866c..9ba56bae6b19c 100755
--- a/dev/connect-check-protos.py
+++ b/dev/connect-check-protos.py
@@ -75,7 +75,7 @@ def check_connect_protos():
         else:
             fail(
                 "Generated files for pyspark-connect are out of sync! "
-                "If you have touched files under connect/common/src/main/protobuf/, "
+                "If you have touched files under sql/connect/common/src/main/protobuf/, "
                 "please run ./dev/connect-gen-protos.sh. "
                 "If you haven't touched any file above, please rebase your PR against main branch."
             )
diff --git a/dev/connect-gen-protos.sh b/dev/connect-gen-protos.sh
index 546266c91f88a..2805908890eec 100755
--- a/dev/connect-gen-protos.sh
+++ b/dev/connect-gen-protos.sh
@@ -36,7 +36,7 @@ if [[ $# -eq 1 ]]; then
   OUTPUT_PATH=$1
 fi
 
-pushd connect/common/src/main
+pushd sql/connect/common/src/main
 
 LICENSE=$(cat <<'EOF'
 #
diff --git a/dev/lint-scala b/dev/lint-scala
index d44eb02ef9094..ccf79c8ea2bcc 100755
--- a/dev/lint-scala
+++ b/dev/lint-scala
@@ -29,8 +29,8 @@ ERRORS=$(./build/mvn \
     -Dscalafmt.skip=false \
     -Dscalafmt.validateOnly=true \
     -Dscalafmt.changedOnly=false \
-    -pl connect/common \
-    -pl connect/server \
+    -pl sql/connect/common \
+    -pl sql/connect/server \
     -pl connector/connect/client/jvm \
     2>&1 | grep -e "Unformatted files found" \
 )
@@ -38,7 +38,7 @@ ERRORS=$(./build/mvn \
 if test ! -z "$ERRORS"; then
   echo -e "The scalafmt check failed on connect or connector/connect at following occurrences:\n\n$ERRORS\n"
   echo "Before submitting your change, please make sure to format your code using the following command:"
-  echo "./build/mvn scalafmt:format -Dscalafmt.skip=false -Dscalafmt.validateOnly=false -Dscalafmt.changedOnly=false -pl connect/common -pl connect/server -pl connector/connect/client/jvm"
+  echo "./build/mvn scalafmt:format -Dscalafmt.skip=false -Dscalafmt.validateOnly=false -Dscalafmt.changedOnly=false -pl sql/connect/common -pl sql/connect/server -pl connector/connect/client/jvm"
   exit 1
 else
   echo -e "Scalafmt checks passed."
diff --git a/dev/protobuf-breaking-changes-check.sh b/dev/protobuf-breaking-changes-check.sh
index cb0a508f62ec8..05d90be564aba 100755
--- a/dev/protobuf-breaking-changes-check.sh
+++ b/dev/protobuf-breaking-changes-check.sh
@@ -33,7 +33,7 @@ if [[ $# -eq 1 ]]; then
   BRANCH=$1
 fi
 
-pushd connect/common/src/main &&
+pushd sql/connect/common/src/main &&
 echo "Start protobuf breaking changes checking against $BRANCH" &&
 buf breaking --against "https://github.com/apache/spark.git#branch=$BRANCH,subdir=connector/connect/common/src/main" &&
 echo "Finsh protobuf breaking changes checking: SUCCESS"
diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py
index 8e595707494cd..34fbb8450d544 100644
--- a/dev/sparktestsupport/modules.py
+++ b/dev/sparktestsupport/modules.py
@@ -324,7 +324,7 @@ def __hash__(self):
     name="connect",
     dependencies=[hive, avro, protobuf],
     source_file_regexes=[
-        "connect",
+        "sql/connect",
         "connector/connect",
     ],
     sbt_test_goals=[
diff --git a/docs/spark-connect-overview.md b/docs/spark-connect-overview.md
index fc79735cd354d..970d460ad4410 100644
--- a/docs/spark-connect-overview.md
+++ b/docs/spark-connect-overview.md
@@ -279,7 +279,7 @@ The customizations may also be passed in through CLI arguments as shown below:
 spark-connect-repl --host myhost.com --port 443 --token ABCDEFG
 {% endhighlight %}
 
-The supported list of CLI arguments may be found [here](https://github.com/apache/spark/blob/master/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClientParser.scala#L48).
+The supported list of CLI arguments may be found [here](https://github.com/apache/spark/blob/master/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClientParser.scala).
 
 #### Configure programmatically with a connection string
 
@@ -364,7 +364,7 @@ val spark = SparkSession.builder().remote("sc://localhost").build()
 
 
 **Note**: Operations that reference User Defined Code such as UDFs, filter, map, etc require a
-[ClassFinder](https://github.com/apache/spark/blob/bb41cd889efdd0602385e70b4c8f1c93740db332/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ClassFinder.scala#L26)
+[ClassFinder](https://github.com/apache/spark/blob/master/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ClassFinder.scala)
 to be registered to pickup and upload any required classfiles. Also, any JAR dependencies must be uploaded to the server using `SparkSession#AddArtifact`.
 
 Example:
diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
index 238ff88103ea5..3a774173506a8 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -150,8 +150,8 @@ List<String> buildClassPath(String appClassPath) throws IOException {
         "common/sketch",
         "common/tags",
         "common/unsafe",
-        "connect/common",
-        "connect/server",
+        "sql/connect/common",
+        "sql/connect/server",
         "core",
         "examples",
         "graphx",
@@ -174,7 +174,9 @@ List<String> buildClassPath(String appClassPath) throws IOException {
         for (String project : projects) {
           // Do not use locally compiled class files for Spark server because it should use shaded
           // dependencies.
-          if (project.equals("connect/server") || project.equals("connect/common")) continue;
+          if (project.equals("sql/connect/server") || project.equals("sql/connect/common")) {
+            continue;
+          }
           addToClassPath(cp, String.format("%s/%s/target/scala-%s/classes", sparkHome, project,
             scala));
         }
diff --git a/pom.xml b/pom.xml
index 8c45cd00ff6eb..7a52b45f99bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,12 +94,12 @@
     <module>sql/catalyst</module>
     <module>sql/core</module>
     <module>sql/hive</module>
+    <module>sql/connect/server</module>
+    <module>sql/connect/common</module>
     <module>assembly</module>
     <module>examples</module>
     <module>repl</module>
     <module>launcher</module>
-    <module>connect/server</module>
-    <module>connect/common</module>
     <module>connector/kafka-0-10-token-provider</module>
     <module>connector/kafka-0-10</module>
     <module>connector/kafka-0-10-assembly</module>
diff --git a/python/docs/source/development/testing.rst b/python/docs/source/development/testing.rst
index c2737371c9b46..e4d0407b414de 100644
--- a/python/docs/source/development/testing.rst
+++ b/python/docs/source/development/testing.rst
@@ -69,7 +69,7 @@ Running Tests for Python Client
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In order to test the changes in Protobuf definitions, for example, at
-`spark/connect/common/src/main/protobuf/spark/connect <https://github.com/apache/spark/tree/master/connect/common/src/main/protobuf/spark/connect>`_,
+`spark/sql/connect/common/src/main/protobuf/spark/connect <https://github.com/apache/spark/tree/master/sql/connect/common/src/main/protobuf/spark/connect>`_,
 you should regenerate Python Protobuf client first by running ``dev/connect-gen-protos.sh``.
 
 
diff --git a/connect/common/README.md b/sql/connect/common/README.md
similarity index 100%
rename from connect/common/README.md
rename to sql/connect/common/README.md
diff --git a/connect/common/pom.xml b/sql/connect/common/pom.xml
similarity index 99%
rename from connect/common/pom.xml
rename to sql/connect/common/pom.xml
index fd25bf954e5b8..b0f015246f4c9 100644
--- a/connect/common/pom.xml
+++ b/sql/connect/common/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-parent_2.13</artifactId>
         <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>spark-connect-common_2.13</artifactId>
diff --git a/connect/common/src/main/buf.gen.yaml b/sql/connect/common/src/main/buf.gen.yaml
similarity index 100%
rename from connect/common/src/main/buf.gen.yaml
rename to sql/connect/common/src/main/buf.gen.yaml
diff --git a/connect/common/src/main/buf.work.yaml b/sql/connect/common/src/main/buf.work.yaml
similarity index 100%
rename from connect/common/src/main/buf.work.yaml
rename to sql/connect/common/src/main/buf.work.yaml
diff --git a/connect/common/src/main/protobuf/buf.yaml b/sql/connect/common/src/main/protobuf/buf.yaml
similarity index 100%
rename from connect/common/src/main/protobuf/buf.yaml
rename to sql/connect/common/src/main/protobuf/buf.yaml
diff --git a/connect/common/src/main/protobuf/spark/connect/base.proto b/sql/connect/common/src/main/protobuf/spark/connect/base.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/base.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/base.proto
diff --git a/connect/common/src/main/protobuf/spark/connect/catalog.proto b/sql/connect/common/src/main/protobuf/spark/connect/catalog.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/catalog.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/catalog.proto
diff --git a/connect/common/src/main/protobuf/spark/connect/commands.proto b/sql/connect/common/src/main/protobuf/spark/connect/commands.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/commands.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/commands.proto
diff --git a/connect/common/src/main/protobuf/spark/connect/common.proto b/sql/connect/common/src/main/protobuf/spark/connect/common.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/common.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/common.proto
diff --git a/connect/common/src/main/protobuf/spark/connect/example_plugins.proto b/sql/connect/common/src/main/protobuf/spark/connect/example_plugins.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/example_plugins.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/example_plugins.proto
diff --git a/connect/common/src/main/protobuf/spark/connect/expressions.proto b/sql/connect/common/src/main/protobuf/spark/connect/expressions.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/expressions.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/expressions.proto
diff --git a/connect/common/src/main/protobuf/spark/connect/relations.proto b/sql/connect/common/src/main/protobuf/spark/connect/relations.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/relations.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/relations.proto
diff --git a/connect/common/src/main/protobuf/spark/connect/types.proto b/sql/connect/common/src/main/protobuf/spark/connect/types.proto
similarity index 100%
rename from connect/common/src/main/protobuf/spark/connect/types.proto
rename to sql/connect/common/src/main/protobuf/spark/connect/types.proto
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/ConnectProtoUtils.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/ConnectProtoUtils.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/ConnectProtoUtils.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/ConnectProtoUtils.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ArtifactManager.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ArtifactManager.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/ArtifactManager.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ArtifactManager.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ClassFinder.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ClassFinder.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/ClassFinder.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ClassFinder.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CloseableIterator.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectBlockingStub.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectBlockingStub.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectBlockingStub.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectBlockingStub.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectStub.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectStub.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectStub.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/CustomSparkConnectStub.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ExecutePlanResponseReattachableIterator.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ExecutePlanResponseReattachableIterator.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/ExecutePlanResponseReattachableIterator.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ExecutePlanResponseReattachableIterator.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcExceptionConverter.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcExceptionConverter.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcExceptionConverter.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcExceptionConverter.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcRetryHandler.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcRetryHandler.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcRetryHandler.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcRetryHandler.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ResponseValidator.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ResponseValidator.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/ResponseValidator.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/ResponseValidator.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetriesExceeded.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetriesExceeded.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetriesExceeded.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetriesExceeded.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetryPolicy.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetryPolicy.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetryPolicy.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/RetryPolicy.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClient.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClient.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClient.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClient.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClientParser.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClientParser.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClientParser.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectClientParser.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectStubState.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectStubState.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectStubState.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkConnectStubState.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkResult.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkResult.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkResult.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/SparkResult.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowDeserializer.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowDeserializer.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowDeserializer.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowDeserializer.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowEncoderUtils.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowEncoderUtils.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowEncoderUtils.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowEncoderUtils.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowSerializer.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowSerializer.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowSerializer.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowSerializer.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowVectorReader.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowVectorReader.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowVectorReader.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ArrowVectorReader.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ConcatenatingArrowStreamReader.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ConcatenatingArrowStreamReader.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ConcatenatingArrowStreamReader.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ConcatenatingArrowStreamReader.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ScalaCollectionUtils.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ScalaCollectionUtils.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ScalaCollectionUtils.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/arrow/ScalaCollectionUtils.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/client/package.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/package.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/client/package.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/client/package.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/Abbreviator.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/Abbreviator.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/Abbreviator.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/Abbreviator.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/DataTypeProtoConverter.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/DataTypeProtoConverter.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/DataTypeProtoConverter.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/DataTypeProtoConverter.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ForeachWriterPacket.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ForeachWriterPacket.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/ForeachWriterPacket.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ForeachWriterPacket.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/InvalidPlanInput.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/InvalidPlanInput.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/InvalidPlanInput.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/InvalidPlanInput.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/LiteralValueProtoConverter.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/LiteralValueProtoConverter.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/LiteralValueProtoConverter.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/LiteralValueProtoConverter.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoDataTypes.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoDataTypes.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoDataTypes.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoDataTypes.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoUtils.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoUtils.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoUtils.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/ProtoUtils.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/StorageLevelProtoConverter.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/StorageLevelProtoConverter.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/StorageLevelProtoConverter.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/StorageLevelProtoConverter.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/StreamingListenerPacket.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/StreamingListenerPacket.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/StreamingListenerPacket.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/StreamingListenerPacket.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfPacket.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfPacket.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfPacket.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfPacket.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfUtils.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfUtils.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfUtils.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/UdfUtils.scala
diff --git a/connect/common/src/main/scala/org/apache/spark/sql/connect/common/config/ConnectCommon.scala b/sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/config/ConnectCommon.scala
similarity index 100%
rename from connect/common/src/main/scala/org/apache/spark/sql/connect/common/config/ConnectCommon.scala
rename to sql/connect/common/src/main/scala/org/apache/spark/sql/connect/common/config/ConnectCommon.scala
diff --git a/connect/common/src/test/resources/artifact-tests/Hello.class b/sql/connect/common/src/test/resources/artifact-tests/Hello.class
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/Hello.class
rename to sql/connect/common/src/test/resources/artifact-tests/Hello.class
diff --git a/connect/common/src/test/resources/artifact-tests/crc/Hello.txt b/sql/connect/common/src/test/resources/artifact-tests/crc/Hello.txt
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/crc/Hello.txt
rename to sql/connect/common/src/test/resources/artifact-tests/crc/Hello.txt
diff --git a/connect/common/src/test/resources/artifact-tests/crc/README.md b/sql/connect/common/src/test/resources/artifact-tests/crc/README.md
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/crc/README.md
rename to sql/connect/common/src/test/resources/artifact-tests/crc/README.md
diff --git a/connect/common/src/test/resources/artifact-tests/crc/junitLargeJar.txt b/sql/connect/common/src/test/resources/artifact-tests/crc/junitLargeJar.txt
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/crc/junitLargeJar.txt
rename to sql/connect/common/src/test/resources/artifact-tests/crc/junitLargeJar.txt
diff --git a/connect/common/src/test/resources/artifact-tests/crc/smallClassFile.txt b/sql/connect/common/src/test/resources/artifact-tests/crc/smallClassFile.txt
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/crc/smallClassFile.txt
rename to sql/connect/common/src/test/resources/artifact-tests/crc/smallClassFile.txt
diff --git a/connect/common/src/test/resources/artifact-tests/crc/smallClassFileDup.txt b/sql/connect/common/src/test/resources/artifact-tests/crc/smallClassFileDup.txt
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/crc/smallClassFileDup.txt
rename to sql/connect/common/src/test/resources/artifact-tests/crc/smallClassFileDup.txt
diff --git a/connect/common/src/test/resources/artifact-tests/crc/smallJar.txt b/sql/connect/common/src/test/resources/artifact-tests/crc/smallJar.txt
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/crc/smallJar.txt
rename to sql/connect/common/src/test/resources/artifact-tests/crc/smallJar.txt
diff --git a/connect/common/src/test/resources/artifact-tests/junitLargeJar.jar b/sql/connect/common/src/test/resources/artifact-tests/junitLargeJar.jar
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/junitLargeJar.jar
rename to sql/connect/common/src/test/resources/artifact-tests/junitLargeJar.jar
diff --git a/connect/common/src/test/resources/artifact-tests/smallClassFile.class b/sql/connect/common/src/test/resources/artifact-tests/smallClassFile.class
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/smallClassFile.class
rename to sql/connect/common/src/test/resources/artifact-tests/smallClassFile.class
diff --git a/connect/common/src/test/resources/artifact-tests/smallClassFileDup.class b/sql/connect/common/src/test/resources/artifact-tests/smallClassFileDup.class
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/smallClassFileDup.class
rename to sql/connect/common/src/test/resources/artifact-tests/smallClassFileDup.class
diff --git a/connect/common/src/test/resources/artifact-tests/smallJar.jar b/sql/connect/common/src/test/resources/artifact-tests/smallJar.jar
similarity index 100%
rename from connect/common/src/test/resources/artifact-tests/smallJar.jar
rename to sql/connect/common/src/test/resources/artifact-tests/smallJar.jar
diff --git a/connect/common/src/test/resources/protobuf-tests/common.desc b/sql/connect/common/src/test/resources/protobuf-tests/common.desc
similarity index 100%
rename from connect/common/src/test/resources/protobuf-tests/common.desc
rename to sql/connect/common/src/test/resources/protobuf-tests/common.desc
diff --git a/connect/common/src/test/resources/query-tests/explain-results/alias_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/alias_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/alias_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/alias_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/alias_symbol.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/alias_symbol.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/alias_symbol.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/alias_symbol.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/apply.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/apply.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/apply.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/apply.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/as_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/as_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/as_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/as_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/as_symbol.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/as_symbol.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/as_symbol.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/as_symbol.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/between_expr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/between_expr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/between_expr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/between_expr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/coalesce.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/coalesce.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/coalesce.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/coalesce.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/col.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/col.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/col.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/col.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/colRegex.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/colRegex.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/colRegex.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/colRegex.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_add.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_add.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_add.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_add.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_alias.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_alias.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_alias.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_alias.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_and.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_and.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_and.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_and.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_apply.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_apply.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_apply.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_apply.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_as_multi.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_as_multi.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_as_multi.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_as_multi.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_as_with_metadata.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_as_with_metadata.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_as_with_metadata.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_as_with_metadata.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_asc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_asc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_asc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_asc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_first.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_first.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_first.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_first.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_last.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_last.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_last.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_asc_nulls_last.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_between.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_between.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_between.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_between.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseAND.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseAND.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_bitwiseAND.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseAND.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseOR.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseOR.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_bitwiseOR.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseOR.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseXOR.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseXOR.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_bitwiseXOR.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_bitwiseXOR.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_cast.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_cast.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_cast.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_cast.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_contains.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_contains.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_contains.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_contains.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_desc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_desc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_desc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_desc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_first.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_first.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_first.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_first.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_last.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_last.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_last.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_desc_nulls_last.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_divide.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_divide.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_divide.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_divide.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_dropFields.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_dropFields.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_dropFields.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_dropFields.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_endsWith.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_endsWith.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_endsWith.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_endsWith.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_eqNullSafe.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_eqNullSafe.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_eqNullSafe.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_eqNullSafe.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_equals.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_equals.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_equals.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_equals.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_geq.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_geq.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_geq.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_geq.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_getField.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_getField.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_getField.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_getField.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_getItem.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_getItem.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_getItem.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_getItem.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_gt.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_gt.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_gt.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_gt.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_ilike.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_ilike.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_ilike.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_ilike.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_isNaN.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_isNaN.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_isNaN.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_isNaN.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_isNotNull.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_isNotNull.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_isNotNull.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_isNotNull.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_isNull.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_isNull.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_isNull.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_isNull.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_isin.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_isin.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_isin.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_isin.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_leq.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_leq.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_leq.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_leq.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_like.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_like.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_like.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_like.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_lt.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_lt.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_lt.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_lt.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_modulo.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_modulo.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_modulo.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_modulo.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_multiply.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_multiply.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_multiply.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_multiply.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_not.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_not.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_not.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_not.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_not_equals.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_not_equals.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_not_equals.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_not_equals.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_or.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_or.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_or.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_or.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_rlike.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_rlike.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_rlike.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_rlike.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_star.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_star.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_star.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_star.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_star_with_target.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_star_with_target.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_star_with_target.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_star_with_target.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_startsWith.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_startsWith.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_startsWith.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_startsWith.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_substr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_substr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_substr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_substr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_subtract.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_subtract.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_subtract.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_subtract.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_try_cast.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_try_cast.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_try_cast.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_try_cast.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_unary_minus.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_unary_minus.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_unary_minus.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_unary_minus.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_when_otherwise.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_when_otherwise.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_when_otherwise.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_when_otherwise.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/column_withField.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/column_withField.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/column_withField.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/column_withField.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/crossJoin.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/crossJoin.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/crossJoin.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/crossJoin.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/crosstab.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/crosstab.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/crosstab.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/crosstab.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/csv_from_dataset.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/csv_from_dataset.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/csv_from_dataset.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/csv_from_dataset.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/cube_column.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/cube_column.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/cube_column.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/cube_column.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/cube_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/cube_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/cube_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/cube_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/describe.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/describe.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/describe.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/describe.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/distinct.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/distinct.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/distinct.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/distinct.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/drop.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/drop.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/drop.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/drop.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/dropDuplicates.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_array.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_array.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_array.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_array.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_seq.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_seq.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_seq.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_names_seq.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_varargs.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_varargs.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_varargs.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/dropDuplicates_varargs.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_column.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_column.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/drop_multiple_column.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_column.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_strings.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_strings.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/drop_multiple_strings.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/drop_multiple_strings.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/drop_single_column.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/drop_single_column.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/drop_single_column.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/drop_single_column.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/drop_single_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/drop_single_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/drop_single_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/drop_single_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/except.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/except.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/except.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/except.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/exceptAll.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/exceptAll.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/exceptAll.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/exceptAll.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/expression_extension.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/expression_extension.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/expression_extension.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/expression_extension.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/expression_extension_deprecated.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/expression_extension_deprecated.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/expression_extension_deprecated.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/expression_extension_deprecated.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/fill.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/fill.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/fill.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/fill.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/filter.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/filter.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/filter.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/filter.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/filter_expr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/filter_expr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/filter_expr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/filter_expr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/freqItems.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/freqItems.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/freqItems.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/freqItems.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/from_avro_with_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/from_avro_with_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/from_avro_with_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/from_avro_with_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/from_avro_without_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/from_avro_without_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/from_avro_without_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/from_avro_without_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/from_protobuf_messageClassName_descFilePath_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_abs.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_abs.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_abs.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_abs.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_acos.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_acos.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_acos.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_acos.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_acosh.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_acosh.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_acosh.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_acosh.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_add_months.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_add_months.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_add_months.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_add_months.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding_aad.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding_aad.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding_aad.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_decrypt_with_mode_padding_aad.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv_aad.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv_aad.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv_aad.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aes_encrypt_with_mode_padding_iv_aad.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_aggregate.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_aggregate.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_aggregate.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_aggregate.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_any.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_any.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_any.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_any.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_ignore_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_ignore_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_ignore_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_ignore_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_respect_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_respect_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_respect_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_any_value_with_respect_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct_rsd.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct_rsd.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct_rsd.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_approx_count_distinct_rsd.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_approx_percentile.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_approx_percentile.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_approx_percentile.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_approx_percentile.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_agg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_agg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_agg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_agg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_append.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_append.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_append.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_append.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_compact.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_compact.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_compact.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_compact.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_contains.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_contains.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_contains.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_contains.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_distinct.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_distinct.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_distinct.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_distinct.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_except.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_except.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_except.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_except.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_insert.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_insert.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_insert.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_insert.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_intersect.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_intersect.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_intersect.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_intersect.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_join.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_join.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_join.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_join.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_join_with_null_replacement.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_join_with_null_replacement.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_join_with_null_replacement.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_join_with_null_replacement.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_max.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_max.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_max.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_max.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_min.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_min.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_min.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_min.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_position.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_position.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_position.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_position.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_prepend.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_prepend.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_prepend.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_prepend.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_remove.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_remove.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_remove.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_remove.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_repeat.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_repeat.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_repeat.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_repeat.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_size.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_size.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_size.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_size.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_sort.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_sort.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_sort.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_sort.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_sort_with_comparator.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_sort_with_comparator.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_sort_with_comparator.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_sort_with_comparator.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_array_union.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_array_union.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_array_union.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_array_union.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_arrays_overlap.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_arrays_overlap.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_arrays_overlap.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_arrays_overlap.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_arrays_zip.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_arrays_zip.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_arrays_zip.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_arrays_zip.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_asc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_asc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_asc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_asc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_first.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_first.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_first.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_first.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_last.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_last.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_last.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_asc_nulls_last.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ascii.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ascii.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ascii.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ascii.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_asin.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_asin.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_asin.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_asin.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_asinh.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_asinh.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_asinh.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_asinh.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_assert_true_with_message.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_assert_true_with_message.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_assert_true_with_message.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_assert_true_with_message.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_atan.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_atan.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_atan.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_atan.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_atan2.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_atan2.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_atan2.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_atan2.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_atanh.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_atanh.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_atanh.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_atanh.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_avg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_avg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_avg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_avg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_base64.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_base64.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_base64.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_base64.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bin.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bin.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bin.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bin.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bit_and.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_and.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bit_and.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_and.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bit_count.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_count.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bit_count.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_count.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bit_get.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_get.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bit_get.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_get.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bit_length.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_length.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bit_length.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_length.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bit_or.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_or.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bit_or.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_or.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bit_xor.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_xor.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bit_xor.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bit_xor.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bit_position.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bit_position.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bit_position.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bit_position.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bucket_number.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bucket_number.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bucket_number.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_bucket_number.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_construct_agg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_construct_agg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bitmap_construct_agg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_construct_agg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_count.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_count.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bitmap_count.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_count.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_or_agg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_or_agg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bitmap_or_agg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bitmap_or_agg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bitwise_not.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bitwise_not.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bitwise_not.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bitwise_not.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bool_and.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bool_and.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bool_and.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bool_and.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bool_or.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bool_or.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bool_or.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bool_or.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bround.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bround.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bround.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bround.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_btrim.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_btrim.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_btrim.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_btrim.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_btrim_with_specified_trim_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_btrim_with_specified_trim_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_btrim_with_specified_trim_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_btrim_with_specified_trim_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_bucket.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_bucket.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_bucket.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_bucket.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_call_function.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_call_function.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_call_function.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_call_function.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_cardinality.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_cardinality.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_cardinality.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_cardinality.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ceil.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ceil.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ceil.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ceil.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ceil_scale.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ceil_scale.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ceil_scale.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ceil_scale.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ceiling.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ceiling.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ceiling.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ceiling.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ceiling_scale.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ceiling_scale.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ceiling_scale.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ceiling_scale.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_char.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_char.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_char.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_char.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_char_length.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_char_length.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_char_length.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_char_length.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_character_length.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_character_length.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_character_length.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_character_length.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_chr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_chr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_chr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_chr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_coalesce.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_coalesce.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_coalesce.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_coalesce.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_col.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_col.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_col.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_col.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_collate.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_collate.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_collate.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_collate.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_collation.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_collation.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_collation.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_collation.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_collect_list.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_collect_list.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_collect_list.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_collect_list.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_collect_set.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_collect_set.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_collect_set.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_collect_set.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_concat.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_concat.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_concat.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_concat.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_concat_ws.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_concat_ws.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_concat_ws.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_concat_ws.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_contains.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_contains.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_contains.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_contains.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_conv.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_conv.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_conv.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_conv.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_with_source_time_zone.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_with_source_time_zone.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_with_source_time_zone.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_with_source_time_zone.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_without_source_time_zone.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_without_source_time_zone.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_without_source_time_zone.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_convert_timezone_without_source_time_zone.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_corr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_corr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_corr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_corr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_cos.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_cos.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_cos.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_cos.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_cosh.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_cosh.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_cosh.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_cosh.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_cot.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_cot.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_cot.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_cot.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_count.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_count.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_count.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_count.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_countDistinct.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_countDistinct.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_countDistinct.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_countDistinct.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_count_if.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_count_if.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_count_if.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_count_if.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_count_min_sketch.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_count_min_sketch.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_count_min_sketch.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_count_min_sketch.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_count_typed.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_count_typed.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_count_typed.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_count_typed.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_covar_pop.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_covar_pop.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_covar_pop.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_covar_pop.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_covar_samp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_covar_samp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_covar_samp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_covar_samp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_crc32.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_crc32.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_crc32.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_crc32.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_csc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_csc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_csc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_csc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_cume_dist.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_cume_dist.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_cume_dist.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_cume_dist.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_curdate.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_curdate.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_curdate.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_curdate.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_current_catalog.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_current_catalog.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_current_catalog.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_current_catalog.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_current_database.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_current_database.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_current_database.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_current_database.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_current_date.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_current_date.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_current_date.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_current_date.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_current_schema.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_current_schema.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_current_schema.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_current_schema.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_current_timestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_current_timestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_current_timestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_current_timestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_current_timezone.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_current_timezone.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_current_timezone.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_current_timezone.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_current_user.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_current_user.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_current_user.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_current_user.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_date_add.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_date_add.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_date_add.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_date_add.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_date_diff.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_date_diff.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_date_diff.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_date_diff.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_date_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_date_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_date_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_date_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_date_from_unix_date.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_date_from_unix_date.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_date_from_unix_date.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_date_from_unix_date.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_date_part.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_date_part.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_date_part.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_date_part.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_date_sub.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_date_sub.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_date_sub.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_date_sub.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_date_trunc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_date_trunc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_date_trunc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_date_trunc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_dateadd.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_dateadd.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_dateadd.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_dateadd.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_datediff.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_datediff.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_datediff.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_datediff.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_datepart.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_datepart.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_datepart.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_datepart.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_day.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_day.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_day.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_day.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_dayname.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_dayname.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_dayname.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_dayname.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_dayofmonth.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_dayofmonth.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_dayofmonth.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_dayofmonth.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_dayofweek.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_dayofweek.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_dayofweek.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_dayofweek.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_dayofyear.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_dayofyear.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_dayofyear.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_dayofyear.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_days.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_days.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_days.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_days.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_decode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_decode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_decode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_decode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_degrees.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_degrees.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_degrees.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_degrees.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_dense_rank.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_dense_rank.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_dense_rank.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_dense_rank.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_desc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_desc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_desc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_desc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_first.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_first.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_first.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_first.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_last.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_last.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_last.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_desc_nulls_last.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_e.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_e.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_e.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_e.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_element_at.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_element_at.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_element_at.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_element_at.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_elt.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_elt.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_elt.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_elt.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_encode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_encode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_encode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_encode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_endswith.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_endswith.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_endswith.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_endswith.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_equal_null.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_equal_null.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_equal_null.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_equal_null.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_every.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_every.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_every.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_every.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_exists.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_exists.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_exists.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_exists.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_exp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_exp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_exp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_exp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_explode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_explode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_explode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_explode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_explode_outer.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_explode_outer.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_explode_outer.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_explode_outer.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_expm1.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_expm1.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_expm1.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_expm1.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_expr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_expr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_expr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_expr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_extract.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_extract.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_extract.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_extract.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_factorial.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_factorial.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_factorial.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_factorial.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_filter.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_filter.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_filter.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_filter.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_filter_with_pair_input.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_filter_with_pair_input.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_filter_with_pair_input.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_filter_with_pair_input.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_find_in_set.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_find_in_set.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_find_in_set.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_find_in_set.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_ignore_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_ignore_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_ignore_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_ignore_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_respect_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_respect_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_respect_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_first_value_with_respect_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_first_with_ignore_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_first_with_ignore_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_first_with_ignore_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_first_with_ignore_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_first_with_respect_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_first_with_respect_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_first_with_respect_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_first_with_respect_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_flatten.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_flatten.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_flatten.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_flatten.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_floor.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_floor.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_floor.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_floor.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_floor_scale.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_floor_scale.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_floor_scale.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_floor_scale.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_forall.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_forall.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_forall.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_forall.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_format_number.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_format_number.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_format_number.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_format_number.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_from_csv.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_from_csv.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_from_csv.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_from_csv.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_from_json.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_from_json.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_from_json.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_from_json.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_from_unixtime.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_from_unixtime.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_from_unixtime.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_from_unixtime.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_from_utc_timestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_from_utc_timestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_from_utc_timestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_from_utc_timestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_get.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_get.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_get.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_get.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_get_json_object.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_get_json_object.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_get_json_object.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_get_json_object.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_getbit.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_getbit.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_getbit.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_getbit.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_greatest.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_greatest.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_greatest.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_greatest.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_hash.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_hash.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_hash.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_hash.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_hex.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_hex.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_hex.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_hex.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_histogram_numeric.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_histogram_numeric.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_histogram_numeric.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_histogram_numeric.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_hour.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_hour.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_hour.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_hour.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_hours.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_hours.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_hours.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_hours.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_hypot.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_hypot.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_hypot.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_hypot.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ifnull.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ifnull.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ifnull.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ifnull.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ilike.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ilike.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ilike.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ilike.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ilike_with_escape.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ilike_with_escape.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ilike_with_escape.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ilike_with_escape.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_initcap.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_initcap.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_initcap.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_initcap.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_inline.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_inline.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_inline.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_inline.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_inline_outer.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_inline_outer.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_inline_outer.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_inline_outer.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_length.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_length.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_length.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_length.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_start.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_start.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_start.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_input_file_block_start.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_input_file_name.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_input_file_name.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_input_file_name.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_input_file_name.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_is_variant_null.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_is_variant_null.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_is_variant_null.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_is_variant_null.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_isnan.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_isnan.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_isnan.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_isnan.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_isnotnull.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_isnotnull.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_isnotnull.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_isnotnull.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_isnull.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_isnull.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_isnull.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_isnull.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_java_method.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_java_method.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_java_method.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_java_method.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_json_array_length.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_json_array_length.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_json_array_length.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_json_array_length.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_json_object_keys.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_json_object_keys.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_json_object_keys.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_json_object_keys.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_json_tuple.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_json_tuple.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_json_tuple.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_json_tuple.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_kurtosis.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_kurtosis.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_kurtosis.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_kurtosis.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lag.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lag.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lag.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lag.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_last_day.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_last_day.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_last_day.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_last_day.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_ignore_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_ignore_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_ignore_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_ignore_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_respect_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_respect_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_respect_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_last_value_with_respect_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_last_with_ignore_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_last_with_ignore_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_last_with_ignore_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_last_with_ignore_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_last_with_respect_nulls.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_last_with_respect_nulls.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_last_with_respect_nulls.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_last_with_respect_nulls.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lcase.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lcase.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lcase.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lcase.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lead.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lead.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lead.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lead.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_least.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_least.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_least.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_least.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_left.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_left.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_left.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_left.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_len.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_len.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_len.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_len.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_length.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_length.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_length.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_length.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_levenshtein.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_levenshtein.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_levenshtein.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_levenshtein.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_levenshtein_with_threshold.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_levenshtein_with_threshold.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_levenshtein_with_threshold.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_levenshtein_with_threshold.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_like.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_like.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_like.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_like.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_like_with_escape.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_like_with_escape.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_like_with_escape.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_like_with_escape.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lit.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lit.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lit.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lit.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lit_array.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lit_array.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lit_array.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lit_array.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ln.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ln.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ln.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ln.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_localtimestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_localtimestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_localtimestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_localtimestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_locate.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_locate.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_locate.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_locate.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_locate_with_pos.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_locate_with_pos.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_locate_with_pos.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_locate_with_pos.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_log.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_log.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_log.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_log.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_log10.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_log10.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_log10.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_log10.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_log1p.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_log1p.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_log1p.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_log1p.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_log2.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_log2.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_log2.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_log2.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_log_with_base.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_log_with_base.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_log_with_base.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_log_with_base.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lower.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lower.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lower.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lower.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lpad.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lpad.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lpad.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lpad.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_lpad_binary.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_lpad_binary.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_lpad_binary.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_lpad_binary.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ltrim.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ltrim.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ltrim.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ltrim.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ltrim_with_pattern.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ltrim_with_pattern.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ltrim_with_pattern.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ltrim_with_pattern.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_date.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_date.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_date.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_date.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins_secs.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins_secs.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins_secs.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_dt_interval_days_hours_mins_secs.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins_secs.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins_secs.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins_secs.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_interval_years_months_weeks_days_hours_mins_secs.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_with_timezone.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_with_timezone.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_with_timezone.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_with_timezone.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_without_timezone.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_without_timezone.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_without_timezone.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ltz_without_timezone.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ntz.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ntz.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ntz.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_ntz.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_with_timezone.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_with_timezone.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_with_timezone.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_with_timezone.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_without_timezone.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_without_timezone.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_without_timezone.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_timestamp_without_timezone.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years_months.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years_months.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years_months.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_make_ym_interval_years_months.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_concat.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_concat.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_concat.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_concat.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_contains_key.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_contains_key.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_contains_key.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_contains_key.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_entries.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_entries.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_entries.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_entries.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_filter.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_filter.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_filter.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_filter.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_from_arrays.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_from_arrays.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_from_arrays.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_from_arrays.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_from_entries.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_from_entries.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_from_entries.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_from_entries.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_keys.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_keys.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_keys.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_keys.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_values.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_values.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_values.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_values.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_map_zip_with.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_map_zip_with.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_map_zip_with.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_map_zip_with.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_mask.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_mask.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_mask.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_mask.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_max.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_max.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_max.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_max.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_max_by.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_max_by.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_max_by.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_max_by.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_md5.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_md5.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_md5.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_md5.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_median.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_median.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_median.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_median.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_min.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_min.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_min.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_min.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_min_by.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_min_by.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_min_by.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_min_by.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_minute.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_minute.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_minute.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_minute.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_mode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_mode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_mode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_mode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_monotonically_increasing_id.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_monotonically_increasing_id.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_monotonically_increasing_id.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_monotonically_increasing_id.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_month.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_month.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_month.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_month.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_monthname.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_monthname.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_monthname.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_monthname.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_months.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_months.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_months.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_months.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_months_between.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_months_between.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_months_between.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_months_between.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_months_between_with_roundoff.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_months_between_with_roundoff.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_months_between_with_roundoff.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_months_between_with_roundoff.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_named_struct.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_named_struct.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_named_struct.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_named_struct.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_nanvl.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_nanvl.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_nanvl.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_nanvl.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_negate.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_negate.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_negate.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_negate.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_negative.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_negative.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_negative.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_negative.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_next_day.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_next_day.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_next_day.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_next_day.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_now.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_now.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_now.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_now.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_nth_value.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_nth_value.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_nth_value.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_nth_value.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ntile.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ntile.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ntile.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ntile.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_nullif.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_nullif.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_nullif.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_nullif.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_nvl.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_nvl.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_nvl.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_nvl.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_nvl2.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_nvl2.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_nvl2.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_nvl2.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_octet_length.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_octet_length.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_octet_length.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_octet_length.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_overlay.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_overlay.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_overlay.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_overlay.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_overlay_with_len.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_overlay_with_len.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_overlay_with_len.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_overlay_with_len.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_parse_json.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_parse_json.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_parse_json.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_parse_json.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_parse_url.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_parse_url.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_parse_url.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_parse_url.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_parse_url_with_key.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_parse_url_with_key.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_parse_url_with_key.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_parse_url_with_key.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_percent_rank.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_percent_rank.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_percent_rank.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_percent_rank.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_percentile_approx.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_percentile_approx.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_percentile_approx.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_percentile_approx.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_percentile_with_frequency.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_percentile_with_frequency.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_percentile_with_frequency.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_percentile_with_frequency.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_percentile_without_frequency.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_percentile_without_frequency.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_percentile_without_frequency.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_percentile_without_frequency.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_pi.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_pi.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_pi.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_pi.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_pmod.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_pmod.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_pmod.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_pmod.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_posexplode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_posexplode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_posexplode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_posexplode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_posexplode_outer.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_posexplode_outer.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_posexplode_outer.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_posexplode_outer.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_position.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_position.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_position.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_position.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_position_with_start.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_position_with_start.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_position_with_start.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_position_with_start.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_positive.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_positive.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_positive.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_positive.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_pow.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_pow.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_pow.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_pow.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_power.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_power.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_power.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_power.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_printf.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_printf.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_printf.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_printf.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_product.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_product.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_product.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_product.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_quarter.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_quarter.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_quarter.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_quarter.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_radians.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_radians.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_radians.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_radians.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_raise_error.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_raise_error.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_raise_error.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_raise_error.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rand_with_seed.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rand_with_seed.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rand_with_seed.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rand_with_seed.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_randn_with_seed.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_randn_with_seed.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_randn_with_seed.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_randn_with_seed.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_random_with_seed.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_random_with_seed.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_random_with_seed.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_random_with_seed.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rank.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rank.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rank.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rank.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_reduce.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_reduce.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_reduce.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_reduce.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_reflect.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_reflect.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_reflect.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_reflect.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_count.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_count.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_count.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_count.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_with_regex_group_index.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_with_regex_group_index.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_with_regex_group_index.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_with_regex_group_index.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_without_regex_group_index.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_without_regex_group_index.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_without_regex_group_index.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_extract_all_without_regex_group_index.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_with_regex_group_index.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_with_regex_group_index.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_with_regex_group_index.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_with_regex_group_index.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_without_regex_group_index.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_without_regex_group_index.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_without_regex_group_index.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_instr_without_regex_group_index.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_like.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_like.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_like.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_like.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_replace.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_replace.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_replace.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_replace.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regexp_substr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_substr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regexp_substr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regexp_substr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_avgx.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_avgx.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_avgx.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_avgx.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_avgy.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_avgy.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_avgy.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_avgy.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_count.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_count.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_count.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_count.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_intercept.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_intercept.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_intercept.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_intercept.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_r2.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_r2.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_r2.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_r2.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_slope.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_slope.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_slope.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_slope.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_sxx.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_sxx.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_sxx.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_sxx.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_sxy.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_sxy.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_sxy.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_sxy.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_regr_syy.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_syy.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_regr_syy.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_regr_syy.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_replace.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_replace.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_replace.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_replace.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_replace_with_specified_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_replace_with_specified_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_replace_with_specified_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_replace_with_specified_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_reverse.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_reverse.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_reverse.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_reverse.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_right.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_right.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_right.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_right.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rint.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rint.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rint.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rint.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rlike.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rlike.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rlike.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rlike.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_round.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_round.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_round.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_round.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_row_number.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_row_number.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_row_number.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_row_number.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rpad.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rpad.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rpad.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rpad.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rpad_binary.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rpad_binary.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rpad_binary.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rpad_binary.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rtrim.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rtrim.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rtrim.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rtrim.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_rtrim_with_pattern.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_rtrim_with_pattern.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_rtrim_with_pattern.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_rtrim_with_pattern.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_csv.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_csv.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_schema_of_csv.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_csv.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json_with_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json_with_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json_with_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_json_with_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant_agg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant_agg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant_agg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_schema_of_variant_agg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sec.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sec.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sec.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sec.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_second.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_second.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_second.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_second.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sentences.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sentences.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sentences.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sentences.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sentences_with_locale.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sentences_with_locale.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sentences_with_locale.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sentences_with_locale.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sequence.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sequence.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sequence.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sequence.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_session_user.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_session_user.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_session_user.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_session_user.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_session_window.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_session_window.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_session_window.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_session_window.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sha.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sha.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sha.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sha.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sha1.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sha1.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sha1.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sha1.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sha2.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sha2.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sha2.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sha2.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_shiftleft.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_shiftleft.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_shiftleft.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_shiftleft.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_shiftright.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_shiftright.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_shiftright.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_shiftright.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_shiftrightunsigned.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_shiftrightunsigned.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_shiftrightunsigned.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_shiftrightunsigned.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sign.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sign.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sign.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sign.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_signum.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_signum.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_signum.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_signum.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sin.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sin.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sin.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sin.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sinh.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sinh.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sinh.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sinh.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_size.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_size.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_size.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_size.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_skewness.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_skewness.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_skewness.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_skewness.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_slice.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_slice.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_slice.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_slice.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_some.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_some.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_some.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_some.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sort_array.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sort_array.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sort_array.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sort_array.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_spark_partition_id.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_spark_partition_id.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_spark_partition_id.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_spark_partition_id.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_split.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_split.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_split.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_split.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_split_part.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_split_part.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_split_part.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_split_part.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_split_using_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_split_using_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_split_using_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_split_using_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit_using_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit_using_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit_using_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_split_with_limit_using_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sqrt.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sqrt.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sqrt.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sqrt.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_stack.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_stack.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_stack.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_stack.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_startswith.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_startswith.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_startswith.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_startswith.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_std.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_std.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_std.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_std.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_stddev.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_stddev.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_stddev.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_stddev.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_stddev_pop.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_stddev_pop.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_stddev_pop.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_stddev_pop.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_stddev_samp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_stddev_samp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_stddev_samp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_stddev_samp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_str_to_map.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_and_keyValue_delimiter.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_and_keyValue_delimiter.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_and_keyValue_delimiter.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_and_keyValue_delimiter.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_delimiter.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_delimiter.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_delimiter.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_str_to_map_with_pair_delimiter.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_struct.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_struct.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_struct.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_struct.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_substr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_substr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_substr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_substr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_substr_with_len.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_substr_with_len.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_substr_with_len.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_substr_with_len.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_substring.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_substring.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_substring.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_substring.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_substring_index.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_substring_index.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_substring_index.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_substring_index.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_substring_using_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_substring_using_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_substring_using_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_substring_using_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_substring_with_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_substring_with_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_substring_with_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_substring_with_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sum.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sum.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sum.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sum.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_sum_distinct.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_sum_distinct.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_sum_distinct.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_sum_distinct.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_tan.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_tan.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_tan.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_tan.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_tanh.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_tanh.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_tanh.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_tanh.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_add.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_add.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_timestamp_add.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_add.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_diff.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_diff.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_timestamp_diff.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_diff.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_micros.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_micros.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_timestamp_micros.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_micros.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_millis.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_millis.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_timestamp_millis.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_millis.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_seconds.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_seconds.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_timestamp_seconds.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_timestamp_seconds.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_binary.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_binary.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_binary.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_binary.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_binary_with_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_binary_with_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_binary_with_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_binary_with_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_char.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_char.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_char.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_char.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_csv.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_csv.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_csv.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_csv.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_date.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_date.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_date.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_date.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_date_with_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_date_with_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_date_with_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_date_with_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_json.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_json.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_json.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_json.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_number.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_number.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_number.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_number.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz_with_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz_with_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz_with_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ltz_with_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz_with_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz_with_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz_with_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_ntz_with_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_with_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_with_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_with_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_timestamp_with_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp_with_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp_with_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp_with_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_unix_timestamp_with_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_utc_timestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_utc_timestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_utc_timestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_utc_timestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_to_varchar.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_to_varchar.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_to_varchar.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_to_varchar.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_transform.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_transform.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_transform.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_transform.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_transform_keys.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_transform_keys.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_transform_keys.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_transform_keys.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_transform_values.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_transform_values.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_transform_values.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_transform_values.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_transform_with_index.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_transform_with_index.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_transform_with_index.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_transform_with_index.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_translate.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_translate.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_translate.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_translate.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_trim.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_trim.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_trim.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_trim.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_trim_with_pattern.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_trim_with_pattern.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_trim_with_pattern.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_trim_with_pattern.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_trunc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_trunc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_trunc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_trunc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_add.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_add.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_add.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_add.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding_aad.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding_aad.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding_aad.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_aes_decrypt_with_mode_padding_aad.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_avg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_avg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_avg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_avg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_divide.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_divide.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_divide.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_divide.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_array.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_array.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_array.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_array.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_map.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_map.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_map.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_element_at_map.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_multiply.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_multiply.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_multiply.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_multiply.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_parse_json.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_parse_json.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_parse_json.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_parse_json.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_reflect.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_reflect.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_reflect.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_reflect.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_subtract.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_subtract.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_subtract.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_subtract.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_sum.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_sum.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_sum.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_sum.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary_without_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary_without_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary_without_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_binary_without_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_to_number.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_number.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_to_number.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_number.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp_without_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp_without_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp_without_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_to_timestamp_without_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_url_decode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_url_decode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_url_decode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_url_decode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_try_variant_get.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_try_variant_get.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_try_variant_get.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_try_variant_get.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_typedLit.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_typedLit.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_typedLit.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_typedLit.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_typeof.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_typeof.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_typeof.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_typeof.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_ucase.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_ucase.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_ucase.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_ucase.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unbase64.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unbase64.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unbase64.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unbase64.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unhex.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unhex.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unhex.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unhex.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unix_date.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_date.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unix_date.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_date.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unix_micros.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_micros.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unix_micros.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_micros.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unix_millis.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_millis.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unix_millis.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_millis.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unix_seconds.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_seconds.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unix_seconds.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_seconds.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp_with_format.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp_with_format.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp_with_format.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_unix_timestamp_with_format.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_upper.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_upper.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_upper.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_upper.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_url_decode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_url_decode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_url_decode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_url_decode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_url_encode.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_url_encode.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_url_encode.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_url_encode.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_user.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_user.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_user.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_user.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_var_pop.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_var_pop.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_var_pop.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_var_pop.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_var_samp.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_var_samp.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_var_samp.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_var_samp.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_variance.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_variance.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_variance.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_variance.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_variant_get.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_variant_get.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_variant_get.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_variant_get.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_weekday.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_weekday.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_weekday.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_weekday.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_weekofyear.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_weekofyear.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_weekofyear.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_weekofyear.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_window.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_window.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_window.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_window.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_window_time.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_window_time.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_window_time.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_window_time.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_boolean.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_boolean.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_boolean.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_boolean.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_double.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_double.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_double.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_double.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_float.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_float.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_float.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_float.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_int.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_int.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_int.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_int.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_long.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_long.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_long.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_long.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_number.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_number.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_number.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_number.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_short.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_short.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_short.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_short.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xpath_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xpath_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xpath_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_xxhash64.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_xxhash64.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_xxhash64.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_xxhash64.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_year.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_year.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_year.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_year.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_years.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_years.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_years.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_years.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/function_zip_with.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/function_zip_with.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/function_zip_with.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/function_zip_with.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_agg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_agg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_agg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_agg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_agg_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_agg_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_agg_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_agg_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_agg_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_agg_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_agg_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_agg_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_avg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_avg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_avg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_avg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_count.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_count.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_count.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_count.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_max.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_max.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_max.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_max.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_mean.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_mean.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_mean.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_mean.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_min.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_min.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_min.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_min.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupby_sum.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupby_sum.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupby_sum.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupby_sum.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/groupingSets.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/groupingSets.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/groupingSets.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/groupingSets.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/grouping_and_grouping_id.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/grouping_and_grouping_id.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/grouping_and_grouping_id.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/grouping_and_grouping_id.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hint.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hint.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hint.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hint.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName_lgConfigK_int.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName_lgConfigK_int.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName_lgConfigK_int.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_columnName_lgConfigK_int.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK_int.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK_int.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK_int.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_sketch_agg_with_column_lgConfigK_int.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_union_agg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/intersect.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/intersect.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/intersect.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/intersect.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/intersectAll.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/intersectAll.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/intersectAll.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/intersectAll.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_condition.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_condition.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_condition.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_condition.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_inner_condition.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_condition.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_inner_condition.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_condition.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_inner_no_condition.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_no_condition.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_inner_no_condition.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_no_condition.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_array.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_array.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_array.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_array.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_seq.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_seq.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_seq.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_multiple_col_seq.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_single_col.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_single_col.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_inner_using_single_col.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_inner_using_single_col.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_array.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_array.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_array.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_array.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_seq.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_seq.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_seq.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_using_multiple_col_seq.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/join_using_single_col.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/join_using_single_col.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/join_using_single_col.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/join_using_single_col.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/json_from_dataset.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/json_from_dataset.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/json_from_dataset.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/json_from_dataset.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/limit.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/limit.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/limit.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/limit.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/melt_no_values.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/melt_no_values.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/melt_no_values.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/melt_no_values.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/melt_values.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/melt_values.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/melt_values.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/melt_values.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/offset.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/offset.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/offset.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/offset.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/orderBy_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/orderBy_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/orderBy_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/orderBy_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/orderBy_strings.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/orderBy_strings.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/orderBy_strings.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/orderBy_strings.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/pivot.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/pivot.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/pivot.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/pivot.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/pivot_without_column_values.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/pivot_without_column_values.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/pivot_without_column_values.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/pivot_without_column_values.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/range.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/range.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/range.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/range.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_csv.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_csv.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_csv.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_csv.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_jdbc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_jdbc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_jdbc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_jdbc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_partition.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_partition.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_partition.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_partition.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_predicates.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_predicates.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_predicates.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_jdbc_with_predicates.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_json.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_json.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_json.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_json.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_orc.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_orc.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_orc.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_orc.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_parquet.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_parquet.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_parquet.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_parquet.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_table.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_table.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_table.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_table.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/read_text.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/read_text.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/read_text.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/read_text.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/relation_extension.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/relation_extension.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/relation_extension.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/relation_extension.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/relation_extension_deprecated.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/relation_extension_deprecated.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/relation_extension_deprecated.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/relation_extension_deprecated.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/repartition.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/repartition.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/repartition.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/repartition.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_expressions.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_expressions.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_expressions.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_expressions.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_num_partitions_expressions.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_num_partitions_expressions.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_num_partitions_expressions.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/repartitionByRange_num_partitions_expressions.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/repartition_expressions.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/repartition_expressions.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/repartition_expressions.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/repartition_expressions.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/repartition_num_partitions_expressions.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/repartition_num_partitions_expressions.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/repartition_num_partitions_expressions.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/repartition_num_partitions_expressions.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/replace.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/replace.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/replace.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/replace.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/rollup_column.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/rollup_column.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/rollup_column.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/rollup_column.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/rollup_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/rollup_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/rollup_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/rollup_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/sampleBy.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/sampleBy.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/sampleBy.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/sampleBy.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/sample_fraction_seed.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/sample_fraction_seed.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/sample_fraction_seed.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/sample_fraction_seed.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/sample_withReplacement_fraction_seed.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/sample_withReplacement_fraction_seed.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/sample_withReplacement_fraction_seed.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/sample_withReplacement_fraction_seed.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/selectExpr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/selectExpr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/selectExpr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/selectExpr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select_collated_string.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select_collated_string.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select_collated_string.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select_collated_string.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select_strings.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select_strings.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select_strings.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select_strings.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select_typed_1-arg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_1-arg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select_typed_1-arg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_1-arg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select_typed_2-arg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_2-arg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select_typed_2-arg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_2-arg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select_typed_3-arg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_3-arg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select_typed_3-arg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_3-arg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select_typed_4-arg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_4-arg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select_typed_4-arg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_4-arg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/select_typed_5-arg.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_5-arg.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/select_typed_5-arg.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/select_typed_5-arg.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_strings.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_strings.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_strings.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/sortWithinPartitions_strings.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/sort_columns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/sort_columns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/sort_columns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/sort_columns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/sort_strings.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/sort_strings.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/sort_strings.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/sort_strings.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/streaming_table_API_with_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/streaming_table_API_with_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/streaming_table_API_with_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/streaming_table_API_with_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/summary.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/summary.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/summary.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/summary.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/table.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/table.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/table.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/table.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/table_API_with_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/table_API_with_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/table_API_with_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/table_API_with_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/test_broadcast.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/test_broadcast.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/test_broadcast.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/test_broadcast.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/to.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/to.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/to.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/to.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/toDF.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/toDF.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/toDF.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/toDF.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/toJSON.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/toJSON.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/toJSON.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/toJSON.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/to_avro_with_schema.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/to_avro_with_schema.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/to_avro_with_schema.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/to_avro_with_schema.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/to_avro_without_schema.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/to_avro_without_schema.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/to_avro_without_schema.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/to_avro_without_schema.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_descFilePath_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_options.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_options.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_options.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/to_protobuf_messageClassName_options.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/union.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/union.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/union.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/union.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/unionAll.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/unionAll.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/unionAll.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/unionAll.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/unionByName.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/unionByName.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/unionByName.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/unionByName.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/unionByName_allowMissingColumns.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/unionByName_allowMissingColumns.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/unionByName_allowMissingColumns.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/unionByName_allowMissingColumns.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/unpivot_no_values.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/unpivot_no_values.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/unpivot_no_values.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/unpivot_no_values.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/unpivot_values.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/unpivot_values.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/unpivot_values.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/unpivot_values.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/where_column.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/where_column.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/where_column.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/where_column.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/where_expr.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/where_expr.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/where_expr.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/where_expr.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/width_bucket.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/width_bucket.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/width_bucket.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/width_bucket.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/window.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/window.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/window.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/window.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_java_map.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_java_map.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_java_map.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_java_map.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_scala_map.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_scala_map.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_scala_map.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_scala_map.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_single.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_single.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_single.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/withColumnRenamed_single.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/withColumn_single.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/withColumn_single.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/withColumn_single.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/withColumn_single.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/withColumns_java_map.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/withColumns_java_map.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/withColumns_java_map.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/withColumns_java_map.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/withColumns_scala_map.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/withColumns_scala_map.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/withColumns_scala_map.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/withColumns_scala_map.explain
diff --git a/connect/common/src/test/resources/query-tests/explain-results/withMetadata.explain b/sql/connect/common/src/test/resources/query-tests/explain-results/withMetadata.explain
similarity index 100%
rename from connect/common/src/test/resources/query-tests/explain-results/withMetadata.explain
rename to sql/connect/common/src/test/resources/query-tests/explain-results/withMetadata.explain
diff --git a/connect/common/src/test/resources/query-tests/queries/alias_string.json b/sql/connect/common/src/test/resources/query-tests/queries/alias_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/alias_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/alias_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/alias_symbol.json b/sql/connect/common/src/test/resources/query-tests/queries/alias_symbol.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/alias_symbol.json
rename to sql/connect/common/src/test/resources/query-tests/queries/alias_symbol.json
diff --git a/connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/apply.json b/sql/connect/common/src/test/resources/query-tests/queries/apply.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/apply.json
rename to sql/connect/common/src/test/resources/query-tests/queries/apply.json
diff --git a/connect/common/src/test/resources/query-tests/queries/apply.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/apply.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/apply.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/apply.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/as_string.json b/sql/connect/common/src/test/resources/query-tests/queries/as_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/as_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/as_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/as_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/as_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/as_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/as_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/as_symbol.json b/sql/connect/common/src/test/resources/query-tests/queries/as_symbol.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/as_symbol.json
rename to sql/connect/common/src/test/resources/query-tests/queries/as_symbol.json
diff --git a/connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/between_expr.json b/sql/connect/common/src/test/resources/query-tests/queries/between_expr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/between_expr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/between_expr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/between_expr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/between_expr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/between_expr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/between_expr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/coalesce.json b/sql/connect/common/src/test/resources/query-tests/queries/coalesce.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/coalesce.json
rename to sql/connect/common/src/test/resources/query-tests/queries/coalesce.json
diff --git a/connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/col.json b/sql/connect/common/src/test/resources/query-tests/queries/col.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/col.json
rename to sql/connect/common/src/test/resources/query-tests/queries/col.json
diff --git a/connect/common/src/test/resources/query-tests/queries/col.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/col.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/col.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/col.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/colRegex.json b/sql/connect/common/src/test/resources/query-tests/queries/colRegex.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/colRegex.json
rename to sql/connect/common/src/test/resources/query-tests/queries/colRegex.json
diff --git a/connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_add.json b/sql/connect/common/src/test/resources/query-tests/queries/column_add.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_add.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_add.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_add.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_add.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_add.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_add.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_alias.json b/sql/connect/common/src/test/resources/query-tests/queries/column_alias.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_alias.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_alias.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_and.json b/sql/connect/common/src/test/resources/query-tests/queries/column_and.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_and.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_and.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_and.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_and.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_and.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_and.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_apply.json b/sql/connect/common/src/test/resources/query-tests/queries/column_apply.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_apply.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_apply.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_as_multi.json b/sql/connect/common/src/test/resources/query-tests/queries/column_as_multi.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_as_multi.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_as_multi.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json b/sql/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_asc.json b/sql/connect/common/src/test/resources/query-tests/queries/column_asc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_asc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_asc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json b/sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json b/sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_between.json b/sql/connect/common/src/test/resources/query-tests/queries/column_between.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_between.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_between.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_between.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_between.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_between.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_between.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json b/sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json b/sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json b/sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_cast.json b/sql/connect/common/src/test/resources/query-tests/queries/column_cast.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_cast.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_cast.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_contains.json b/sql/connect/common/src/test/resources/query-tests/queries/column_contains.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_contains.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_contains.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_desc.json b/sql/connect/common/src/test/resources/query-tests/queries/column_desc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_desc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_desc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json b/sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json b/sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_divide.json b/sql/connect/common/src/test/resources/query-tests/queries/column_divide.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_divide.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_divide.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_dropFields.json b/sql/connect/common/src/test/resources/query-tests/queries/column_dropFields.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_dropFields.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_dropFields.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_endsWith.json b/sql/connect/common/src/test/resources/query-tests/queries/column_endsWith.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_endsWith.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_endsWith.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json b/sql/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_equals.json b/sql/connect/common/src/test/resources/query-tests/queries/column_equals.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_equals.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_equals.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_geq.json b/sql/connect/common/src/test/resources/query-tests/queries/column_geq.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_geq.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_geq.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_getField.json b/sql/connect/common/src/test/resources/query-tests/queries/column_getField.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_getField.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_getField.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_getItem.json b/sql/connect/common/src/test/resources/query-tests/queries/column_getItem.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_getItem.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_getItem.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_gt.json b/sql/connect/common/src/test/resources/query-tests/queries/column_gt.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_gt.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_gt.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_ilike.json b/sql/connect/common/src/test/resources/query-tests/queries/column_ilike.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_ilike.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_ilike.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isNaN.json b/sql/connect/common/src/test/resources/query-tests/queries/column_isNaN.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isNaN.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isNaN.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isNotNull.json b/sql/connect/common/src/test/resources/query-tests/queries/column_isNotNull.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isNotNull.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isNotNull.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isNull.json b/sql/connect/common/src/test/resources/query-tests/queries/column_isNull.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isNull.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isNull.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isin.json b/sql/connect/common/src/test/resources/query-tests/queries/column_isin.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isin.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isin.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_leq.json b/sql/connect/common/src/test/resources/query-tests/queries/column_leq.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_leq.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_leq.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_like.json b/sql/connect/common/src/test/resources/query-tests/queries/column_like.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_like.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_like.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_like.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_like.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_like.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_like.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_lt.json b/sql/connect/common/src/test/resources/query-tests/queries/column_lt.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_lt.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_lt.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_modulo.json b/sql/connect/common/src/test/resources/query-tests/queries/column_modulo.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_modulo.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_modulo.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_multiply.json b/sql/connect/common/src/test/resources/query-tests/queries/column_multiply.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_multiply.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_multiply.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_not.json b/sql/connect/common/src/test/resources/query-tests/queries/column_not.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_not.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_not.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_not.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_not.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_not.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_not.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_not_equals.json b/sql/connect/common/src/test/resources/query-tests/queries/column_not_equals.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_not_equals.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_not_equals.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_or.json b/sql/connect/common/src/test/resources/query-tests/queries/column_or.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_or.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_or.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_or.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_or.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_or.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_or.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_rlike.json b/sql/connect/common/src/test/resources/query-tests/queries/column_rlike.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_rlike.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_rlike.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_star.json b/sql/connect/common/src/test/resources/query-tests/queries/column_star.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_star.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_star.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_star.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_star.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_star.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_star.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_star_with_target.json b/sql/connect/common/src/test/resources/query-tests/queries/column_star_with_target.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_star_with_target.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_star_with_target.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_startsWith.json b/sql/connect/common/src/test/resources/query-tests/queries/column_startsWith.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_startsWith.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_startsWith.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_substr.json b/sql/connect/common/src/test/resources/query-tests/queries/column_substr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_substr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_substr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_subtract.json b/sql/connect/common/src/test/resources/query-tests/queries/column_subtract.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_subtract.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_subtract.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_try_cast.json b/sql/connect/common/src/test/resources/query-tests/queries/column_try_cast.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_try_cast.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_try_cast.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_try_cast.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_try_cast.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_try_cast.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_try_cast.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_unary_minus.json b/sql/connect/common/src/test/resources/query-tests/queries/column_unary_minus.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_unary_minus.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_unary_minus.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json b/sql/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/column_withField.json b/sql/connect/common/src/test/resources/query-tests/queries/column_withField.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_withField.json
rename to sql/connect/common/src/test/resources/query-tests/queries/column_withField.json
diff --git a/connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/crossJoin.json b/sql/connect/common/src/test/resources/query-tests/queries/crossJoin.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/crossJoin.json
rename to sql/connect/common/src/test/resources/query-tests/queries/crossJoin.json
diff --git a/connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/crosstab.json b/sql/connect/common/src/test/resources/query-tests/queries/crosstab.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/crosstab.json
rename to sql/connect/common/src/test/resources/query-tests/queries/crosstab.json
diff --git a/connect/common/src/test/resources/query-tests/queries/crosstab.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/crosstab.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/crosstab.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/crosstab.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/csv_from_dataset.json b/sql/connect/common/src/test/resources/query-tests/queries/csv_from_dataset.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/csv_from_dataset.json
rename to sql/connect/common/src/test/resources/query-tests/queries/csv_from_dataset.json
diff --git a/connect/common/src/test/resources/query-tests/queries/csv_from_dataset.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/csv_from_dataset.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/csv_from_dataset.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/csv_from_dataset.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/cube_column.json b/sql/connect/common/src/test/resources/query-tests/queries/cube_column.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/cube_column.json
rename to sql/connect/common/src/test/resources/query-tests/queries/cube_column.json
diff --git a/connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/cube_string.json b/sql/connect/common/src/test/resources/query-tests/queries/cube_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/cube_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/cube_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/describe.json b/sql/connect/common/src/test/resources/query-tests/queries/describe.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/describe.json
rename to sql/connect/common/src/test/resources/query-tests/queries/describe.json
diff --git a/connect/common/src/test/resources/query-tests/queries/describe.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/describe.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/describe.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/describe.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/distinct.json b/sql/connect/common/src/test/resources/query-tests/queries/distinct.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/distinct.json
rename to sql/connect/common/src/test/resources/query-tests/queries/distinct.json
diff --git a/connect/common/src/test/resources/query-tests/queries/distinct.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/distinct.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/distinct.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/distinct.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/drop.json b/sql/connect/common/src/test/resources/query-tests/queries/drop.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop.json
rename to sql/connect/common/src/test/resources/query-tests/queries/drop.json
diff --git a/connect/common/src/test/resources/query-tests/queries/drop.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/drop.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/drop.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates.json b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates.json
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates.json
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json
diff --git a/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json b/sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json b/sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_single_column.json b/sql/connect/common/src/test/resources/query-tests/queries/drop_single_column.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_single_column.json
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_single_column.json
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_single_string.json b/sql/connect/common/src/test/resources/query-tests/queries/drop_single_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_single_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_single_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/except.json b/sql/connect/common/src/test/resources/query-tests/queries/except.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/except.json
rename to sql/connect/common/src/test/resources/query-tests/queries/except.json
diff --git a/connect/common/src/test/resources/query-tests/queries/except.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/except.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/except.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/except.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/exceptAll.json b/sql/connect/common/src/test/resources/query-tests/queries/exceptAll.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/exceptAll.json
rename to sql/connect/common/src/test/resources/query-tests/queries/exceptAll.json
diff --git a/connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/expression_extension.json b/sql/connect/common/src/test/resources/query-tests/queries/expression_extension.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/expression_extension.json
rename to sql/connect/common/src/test/resources/query-tests/queries/expression_extension.json
diff --git a/connect/common/src/test/resources/query-tests/queries/expression_extension.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/expression_extension.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/expression_extension.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/expression_extension.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.json b/sql/connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.json
rename to sql/connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.json
diff --git a/connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/expression_extension_deprecated.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/fill.json b/sql/connect/common/src/test/resources/query-tests/queries/fill.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/fill.json
rename to sql/connect/common/src/test/resources/query-tests/queries/fill.json
diff --git a/connect/common/src/test/resources/query-tests/queries/fill.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/fill.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/fill.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/fill.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/filter.json b/sql/connect/common/src/test/resources/query-tests/queries/filter.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/filter.json
rename to sql/connect/common/src/test/resources/query-tests/queries/filter.json
diff --git a/connect/common/src/test/resources/query-tests/queries/filter.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/filter.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/filter.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/filter.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/filter_expr.json b/sql/connect/common/src/test/resources/query-tests/queries/filter_expr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/filter_expr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/filter_expr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/freqItems.json b/sql/connect/common/src/test/resources/query-tests/queries/freqItems.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/freqItems.json
rename to sql/connect/common/src/test/resources/query-tests/queries/freqItems.json
diff --git a/connect/common/src/test/resources/query-tests/queries/freqItems.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/freqItems.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/freqItems.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/freqItems.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/from_avro_with_options.json b/sql/connect/common/src/test/resources/query-tests/queries/from_avro_with_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_avro_with_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/from_avro_with_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/from_avro_with_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/from_avro_with_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_avro_with_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/from_avro_with_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/from_avro_without_options.json b/sql/connect/common/src/test/resources/query-tests/queries/from_avro_without_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_avro_without_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/from_avro_without_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/from_avro_without_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/from_avro_without_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_avro_without_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/from_avro_without_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.json b/sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.json
rename to sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.json
diff --git a/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.json b/sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/from_protobuf_messageClassName_descFilePath_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_abs.json b/sql/connect/common/src/test/resources/query-tests/queries/function_abs.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_abs.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_abs.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_acos.json b/sql/connect/common/src/test/resources/query-tests/queries/function_acos.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_acos.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_acos.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_acosh.json b/sql/connect/common/src/test/resources/query-tests/queries/function_acosh.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_acosh.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_acosh.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_add_months.json b/sql/connect/common/src/test/resources/query-tests/queries/function_add_months.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_add_months.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_add_months.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_decrypt_with_mode_padding_aad.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aes_encrypt_with_mode_padding_iv_aad.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aggregate.json b/sql/connect/common/src/test/resources/query-tests/queries/function_aggregate.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aggregate.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aggregate.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_any.json b/sql/connect/common/src/test/resources/query-tests/queries/function_any.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_any.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_any.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_any.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_any.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_any.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_any.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_ignore_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_any_value_with_respect_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json b/sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json b/sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_approx_percentile.json b/sql/connect/common/src/test/resources/query-tests/queries/function_approx_percentile.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_approx_percentile.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_approx_percentile.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_approx_percentile.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_approx_percentile.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_approx_percentile.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_approx_percentile.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_agg.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_agg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_agg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_agg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_agg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_agg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_agg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_agg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_append.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_append.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_append.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_append.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_compact.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_compact.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_compact.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_compact.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_contains.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_contains.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_contains.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_contains.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_distinct.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_distinct.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_distinct.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_distinct.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_except.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_except.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_except.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_except.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_insert.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_insert.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_insert.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_insert.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_intersect.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_intersect.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_intersect.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_intersect.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_join.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_join.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_join.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_join.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_max.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_max.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_max.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_max.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_min.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_min.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_min.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_min.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_position.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_position.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_position.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_position.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_prepend.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_prepend.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_prepend.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_prepend.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_prepend.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_prepend.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_prepend.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_prepend.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_remove.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_remove.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_remove.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_remove.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_repeat.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_repeat.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_repeat.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_repeat.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_size.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_size.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_size.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_size.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_size.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_size.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_size.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_size.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_sort.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_sort.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_sort.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_sort.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_union.json b/sql/connect/common/src/test/resources/query-tests/queries/function_array_union.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_union.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_union.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json b/sql/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json b/sql/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asc.json b/sql/connect/common/src/test/resources/query-tests/queries/function_asc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json b/sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json b/sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ascii.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ascii.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ascii.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ascii.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asin.json b/sql/connect/common/src/test/resources/query-tests/queries/function_asin.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asin.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asin.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asinh.json b/sql/connect/common/src/test/resources/query-tests/queries/function_asinh.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asinh.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asinh.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json b/sql/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_atan.json b/sql/connect/common/src/test/resources/query-tests/queries/function_atan.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_atan.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_atan.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_atan2.json b/sql/connect/common/src/test/resources/query-tests/queries/function_atan2.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_atan2.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_atan2.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_atanh.json b/sql/connect/common/src/test/resources/query-tests/queries/function_atanh.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_atanh.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_atanh.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_avg.json b/sql/connect/common/src/test/resources/query-tests/queries/function_avg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_avg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_avg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_base64.json b/sql/connect/common/src/test/resources/query-tests/queries/function_base64.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_base64.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_base64.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bin.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bin.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bin.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bin.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_and.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_and.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_and.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_and.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_and.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_and.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_and.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_and.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_count.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_count.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_count.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_count.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_count.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_count.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_count.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_count.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_get.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_get.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_get.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_get.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_get.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_get.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_get.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_get.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_length.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_length.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_length.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_length.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_or.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_or.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_or.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_or.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_or.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_or.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_or.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_or.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_xor.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_xor.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_xor.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_xor.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bit_xor.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bit_xor.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bit_xor.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bit_xor.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bit_position.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_bucket_number.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_construct_agg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_count.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_count.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_count.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_count.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_count.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_count.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_count.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_count.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitmap_or_agg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bool_and.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bool_and.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bool_and.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bool_and.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bool_and.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bool_and.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bool_and.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bool_and.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bool_or.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bool_or.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bool_or.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bool_or.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bool_or.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bool_or.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bool_or.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bool_or.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bround.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bround.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bround.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bround.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_btrim.json b/sql/connect/common/src/test/resources/query-tests/queries/function_btrim.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_btrim.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_btrim.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_btrim.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_btrim.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_btrim.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_btrim.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.json b/sql/connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_btrim_with_specified_trim_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bucket.json b/sql/connect/common/src/test/resources/query-tests/queries/function_bucket.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bucket.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bucket.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_call_function.json b/sql/connect/common/src/test/resources/query-tests/queries/function_call_function.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_call_function.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_call_function.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_call_function.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_call_function.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_call_function.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_call_function.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cardinality.json b/sql/connect/common/src/test/resources/query-tests/queries/function_cardinality.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cardinality.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cardinality.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cardinality.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_cardinality.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cardinality.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cardinality.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceil.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ceil.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceil.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceil.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceiling.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ceiling.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceiling.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceiling.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceiling.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ceiling.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceiling.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceiling.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ceiling_scale.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_char.json b/sql/connect/common/src/test/resources/query-tests/queries/function_char.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_char.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_char.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_char.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_char.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_char.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_char.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_char_length.json b/sql/connect/common/src/test/resources/query-tests/queries/function_char_length.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_char_length.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_char_length.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_char_length.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_char_length.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_char_length.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_char_length.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_character_length.json b/sql/connect/common/src/test/resources/query-tests/queries/function_character_length.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_character_length.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_character_length.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_character_length.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_character_length.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_character_length.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_character_length.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_chr.json b/sql/connect/common/src/test/resources/query-tests/queries/function_chr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_chr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_chr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_chr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_chr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_chr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_chr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_coalesce.json b/sql/connect/common/src/test/resources/query-tests/queries/function_coalesce.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_coalesce.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_coalesce.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_col.json b/sql/connect/common/src/test/resources/query-tests/queries/function_col.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_col.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_col.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_col.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_col.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_col.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_col.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collate.json b/sql/connect/common/src/test/resources/query-tests/queries/function_collate.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collate.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collate.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collate.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_collate.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collate.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collate.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collation.json b/sql/connect/common/src/test/resources/query-tests/queries/function_collation.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collation.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collation.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collation.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_collation.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collation.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collation.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collect_list.json b/sql/connect/common/src/test/resources/query-tests/queries/function_collect_list.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collect_list.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collect_list.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collect_set.json b/sql/connect/common/src/test/resources/query-tests/queries/function_collect_set.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collect_set.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collect_set.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_concat.json b/sql/connect/common/src/test/resources/query-tests/queries/function_concat.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_concat.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_concat.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_concat_ws.json b/sql/connect/common/src/test/resources/query-tests/queries/function_concat_ws.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_concat_ws.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_concat_ws.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_contains.json b/sql/connect/common/src/test/resources/query-tests/queries/function_contains.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_contains.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_contains.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_contains.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_contains.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_contains.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_contains.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_conv.json b/sql/connect/common/src/test/resources/query-tests/queries/function_conv.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_conv.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_conv.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.json b/sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_with_source_time_zone.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.json b/sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_convert_timezone_without_source_time_zone.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_corr.json b/sql/connect/common/src/test/resources/query-tests/queries/function_corr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_corr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_corr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cos.json b/sql/connect/common/src/test/resources/query-tests/queries/function_cos.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cos.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cos.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cosh.json b/sql/connect/common/src/test/resources/query-tests/queries/function_cosh.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cosh.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cosh.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cot.json b/sql/connect/common/src/test/resources/query-tests/queries/function_cot.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cot.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cot.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count.json b/sql/connect/common/src/test/resources/query-tests/queries/function_count.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_count.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_countDistinct.json b/sql/connect/common/src/test/resources/query-tests/queries/function_countDistinct.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_countDistinct.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_countDistinct.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count_if.json b/sql/connect/common/src/test/resources/query-tests/queries/function_count_if.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count_if.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count_if.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count_if.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_count_if.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count_if.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count_if.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.json b/sql/connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count_min_sketch.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count_typed.json b/sql/connect/common/src/test/resources/query-tests/queries/function_count_typed.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count_typed.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count_typed.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_count_typed.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_count_typed.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_count_typed.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_count_typed.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_covar_pop.json b/sql/connect/common/src/test/resources/query-tests/queries/function_covar_pop.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_covar_pop.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_covar_pop.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_covar_samp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_covar_samp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_covar_samp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_covar_samp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_crc32.json b/sql/connect/common/src/test/resources/query-tests/queries/function_crc32.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_crc32.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_crc32.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_csc.json b/sql/connect/common/src/test/resources/query-tests/queries/function_csc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_csc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_csc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cume_dist.json b/sql/connect/common/src/test/resources/query-tests/queries/function_cume_dist.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cume_dist.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cume_dist.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_curdate.json b/sql/connect/common/src/test/resources/query-tests/queries/function_curdate.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_curdate.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_curdate.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_curdate.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_curdate.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_curdate.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_curdate.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_catalog.json b/sql/connect/common/src/test/resources/query-tests/queries/function_current_catalog.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_catalog.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_catalog.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_catalog.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_current_catalog.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_catalog.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_catalog.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_database.json b/sql/connect/common/src/test/resources/query-tests/queries/function_current_database.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_database.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_database.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_database.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_current_database.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_database.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_database.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_date.json b/sql/connect/common/src/test/resources/query-tests/queries/function_current_date.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_date.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_date.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_schema.json b/sql/connect/common/src/test/resources/query-tests/queries/function_current_schema.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_schema.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_schema.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_schema.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_current_schema.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_schema.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_schema.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_timezone.json b/sql/connect/common/src/test/resources/query-tests/queries/function_current_timezone.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_timezone.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_timezone.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_timezone.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_current_timezone.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_timezone.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_timezone.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_user.json b/sql/connect/common/src/test/resources/query-tests/queries/function_current_user.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_user.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_user.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_current_user.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_current_user.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_current_user.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_current_user.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_add.json b/sql/connect/common/src/test/resources/query-tests/queries/function_date_add.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_add.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_add.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_diff.json b/sql/connect/common/src/test/resources/query-tests/queries/function_date_diff.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_diff.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_diff.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_diff.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_date_diff.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_diff.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_diff.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_date_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.json b/sql/connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_from_unix_date.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_part.json b/sql/connect/common/src/test/resources/query-tests/queries/function_date_part.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_part.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_part.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_part.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_date_part.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_part.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_part.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_sub.json b/sql/connect/common/src/test/resources/query-tests/queries/function_date_sub.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_sub.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_sub.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_trunc.json b/sql/connect/common/src/test/resources/query-tests/queries/function_date_trunc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_trunc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_trunc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dateadd.json b/sql/connect/common/src/test/resources/query-tests/queries/function_dateadd.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dateadd.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dateadd.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dateadd.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_dateadd.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dateadd.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dateadd.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_datediff.json b/sql/connect/common/src/test/resources/query-tests/queries/function_datediff.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_datediff.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_datediff.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_datepart.json b/sql/connect/common/src/test/resources/query-tests/queries/function_datepart.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_datepart.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_datepart.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_datepart.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_datepart.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_datepart.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_datepart.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_day.json b/sql/connect/common/src/test/resources/query-tests/queries/function_day.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_day.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_day.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_day.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_day.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_day.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_day.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayname.json b/sql/connect/common/src/test/resources/query-tests/queries/function_dayname.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayname.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayname.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayname.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_dayname.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayname.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayname.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json b/sql/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayofweek.json b/sql/connect/common/src/test/resources/query-tests/queries/function_dayofweek.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayofweek.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayofweek.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayofyear.json b/sql/connect/common/src/test/resources/query-tests/queries/function_dayofyear.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayofyear.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayofyear.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_days.json b/sql/connect/common/src/test/resources/query-tests/queries/function_days.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_days.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_days.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_days.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_days.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_days.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_days.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_decode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_decode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_decode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_decode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_degrees.json b/sql/connect/common/src/test/resources/query-tests/queries/function_degrees.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_degrees.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_degrees.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dense_rank.json b/sql/connect/common/src/test/resources/query-tests/queries/function_dense_rank.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dense_rank.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dense_rank.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_desc.json b/sql/connect/common/src/test/resources/query-tests/queries/function_desc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_desc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_desc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json b/sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json b/sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_e.json b/sql/connect/common/src/test/resources/query-tests/queries/function_e.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_e.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_e.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_e.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_e.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_e.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_e.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_element_at.json b/sql/connect/common/src/test/resources/query-tests/queries/function_element_at.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_element_at.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_element_at.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_elt.json b/sql/connect/common/src/test/resources/query-tests/queries/function_elt.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_elt.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_elt.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_elt.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_elt.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_elt.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_elt.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_encode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_encode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_encode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_encode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_endswith.json b/sql/connect/common/src/test/resources/query-tests/queries/function_endswith.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_endswith.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_endswith.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_endswith.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_endswith.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_endswith.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_endswith.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_equal_null.json b/sql/connect/common/src/test/resources/query-tests/queries/function_equal_null.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_equal_null.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_equal_null.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_equal_null.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_equal_null.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_equal_null.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_equal_null.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_every.json b/sql/connect/common/src/test/resources/query-tests/queries/function_every.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_every.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_every.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_every.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_every.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_every.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_every.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_exists.json b/sql/connect/common/src/test/resources/query-tests/queries/function_exists.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_exists.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_exists.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_exp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_exp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_exp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_exp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_explode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_explode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_explode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_explode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_explode_outer.json b/sql/connect/common/src/test/resources/query-tests/queries/function_explode_outer.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_explode_outer.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_explode_outer.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_expm1.json b/sql/connect/common/src/test/resources/query-tests/queries/function_expm1.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_expm1.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_expm1.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_expr.json b/sql/connect/common/src/test/resources/query-tests/queries/function_expr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_expr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_expr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_extract.json b/sql/connect/common/src/test/resources/query-tests/queries/function_extract.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_extract.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_extract.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_extract.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_extract.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_extract.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_extract.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_factorial.json b/sql/connect/common/src/test/resources/query-tests/queries/function_factorial.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_factorial.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_factorial.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_filter.json b/sql/connect/common/src/test/resources/query-tests/queries/function_filter.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_filter.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_filter.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json b/sql/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_find_in_set.json b/sql/connect/common/src/test/resources/query-tests/queries/function_find_in_set.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_find_in_set.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_find_in_set.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_find_in_set.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_find_in_set.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_find_in_set.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_find_in_set.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_ignore_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_value_with_respect_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_with_ignore_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_first_with_respect_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_flatten.json b/sql/connect/common/src/test/resources/query-tests/queries/function_flatten.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_flatten.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_flatten.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_floor.json b/sql/connect/common/src/test/resources/query-tests/queries/function_floor.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_floor.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_floor.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_floor_scale.json b/sql/connect/common/src/test/resources/query-tests/queries/function_floor_scale.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_floor_scale.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_floor_scale.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_forall.json b/sql/connect/common/src/test/resources/query-tests/queries/function_forall.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_forall.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_forall.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_format_number.json b/sql/connect/common/src/test/resources/query-tests/queries/function_format_number.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_format_number.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_format_number.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_csv.json b/sql/connect/common/src/test/resources/query-tests/queries/function_from_csv.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_csv.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_csv.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_json.json b/sql/connect/common/src/test/resources/query-tests/queries/function_from_json.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_json.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_json.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json b/sql/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_get.json b/sql/connect/common/src/test/resources/query-tests/queries/function_get.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_get.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_get.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_get.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_get.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_get.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_get.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_get_json_object.json b/sql/connect/common/src/test/resources/query-tests/queries/function_get_json_object.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_get_json_object.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_get_json_object.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_getbit.json b/sql/connect/common/src/test/resources/query-tests/queries/function_getbit.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_getbit.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_getbit.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_getbit.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_getbit.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_getbit.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_getbit.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_greatest.json b/sql/connect/common/src/test/resources/query-tests/queries/function_greatest.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_greatest.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_greatest.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hash.json b/sql/connect/common/src/test/resources/query-tests/queries/function_hash.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hash.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hash.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hex.json b/sql/connect/common/src/test/resources/query-tests/queries/function_hex.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hex.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hex.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.json b/sql/connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_histogram_numeric.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hour.json b/sql/connect/common/src/test/resources/query-tests/queries/function_hour.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hour.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hour.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hours.json b/sql/connect/common/src/test/resources/query-tests/queries/function_hours.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hours.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hours.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hypot.json b/sql/connect/common/src/test/resources/query-tests/queries/function_hypot.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hypot.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hypot.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ifnull.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ifnull.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ifnull.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ifnull.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ifnull.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ifnull.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ifnull.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ifnull.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ilike.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ilike.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ilike.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ilike.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ilike.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ilike.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ilike.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ilike.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ilike_with_escape.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_initcap.json b/sql/connect/common/src/test/resources/query-tests/queries/function_initcap.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_initcap.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_initcap.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_inline.json b/sql/connect/common/src/test/resources/query-tests/queries/function_inline.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_inline.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_inline.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_inline_outer.json b/sql/connect/common/src/test/resources/query-tests/queries/function_inline_outer.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_inline_outer.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_inline_outer.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.json b/sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_length.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.json b/sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_input_file_block_start.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_input_file_name.json b/sql/connect/common/src/test/resources/query-tests/queries/function_input_file_name.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_input_file_name.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_input_file_name.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_is_variant_null.json b/sql/connect/common/src/test/resources/query-tests/queries/function_is_variant_null.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_is_variant_null.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_is_variant_null.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_is_variant_null.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_is_variant_null.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_is_variant_null.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_is_variant_null.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_isnan.json b/sql/connect/common/src/test/resources/query-tests/queries/function_isnan.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_isnan.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_isnan.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_isnotnull.json b/sql/connect/common/src/test/resources/query-tests/queries/function_isnotnull.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_isnotnull.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_isnotnull.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_isnotnull.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_isnotnull.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_isnotnull.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_isnotnull.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_isnull.json b/sql/connect/common/src/test/resources/query-tests/queries/function_isnull.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_isnull.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_isnull.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_java_method.json b/sql/connect/common/src/test/resources/query-tests/queries/function_java_method.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_java_method.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_java_method.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_java_method.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_java_method.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_java_method.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_java_method.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_json_array_length.json b/sql/connect/common/src/test/resources/query-tests/queries/function_json_array_length.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_json_array_length.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_json_array_length.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_json_array_length.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_json_array_length.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_json_array_length.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_json_array_length.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_json_object_keys.json b/sql/connect/common/src/test/resources/query-tests/queries/function_json_object_keys.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_json_object_keys.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_json_object_keys.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_json_object_keys.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_json_object_keys.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_json_object_keys.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_json_object_keys.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_json_tuple.json b/sql/connect/common/src/test/resources/query-tests/queries/function_json_tuple.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_json_tuple.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_json_tuple.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_kurtosis.json b/sql/connect/common/src/test/resources/query-tests/queries/function_kurtosis.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_kurtosis.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_kurtosis.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lag.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lag.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lag.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lag.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_day.json b/sql/connect/common/src/test/resources/query-tests/queries/function_last_day.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_day.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_day.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_ignore_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_value_with_respect_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_with_ignore_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.json b/sql/connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_last_with_respect_nulls.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lcase.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lcase.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lcase.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lcase.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lcase.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lcase.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lcase.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lcase.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lead.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lead.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lead.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lead.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_least.json b/sql/connect/common/src/test/resources/query-tests/queries/function_least.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_least.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_least.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_least.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_least.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_least.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_least.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_left.json b/sql/connect/common/src/test/resources/query-tests/queries/function_left.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_left.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_left.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_left.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_left.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_left.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_left.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_len.json b/sql/connect/common/src/test/resources/query-tests/queries/function_len.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_len.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_len.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_len.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_len.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_len.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_len.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_length.json b/sql/connect/common/src/test/resources/query-tests/queries/function_length.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_length.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_length.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_length.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_length.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_length.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_length.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_levenshtein.json b/sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_levenshtein.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.json b/sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_levenshtein_with_threshold.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_like.json b/sql/connect/common/src/test/resources/query-tests/queries/function_like.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_like.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_like.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_like.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_like.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_like.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_like.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_like_with_escape.json b/sql/connect/common/src/test/resources/query-tests/queries/function_like_with_escape.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_like_with_escape.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_like_with_escape.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_like_with_escape.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_like_with_escape.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_like_with_escape.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_like_with_escape.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lit.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lit.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lit.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lit.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lit_array.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lit_array.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lit_array.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lit_array.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lit_array.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lit_array.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lit_array.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lit_array.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ln.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ln.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ln.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ln.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ln.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ln.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ln.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ln.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_locate.json b/sql/connect/common/src/test/resources/query-tests/queries/function_locate.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_locate.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_locate.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json b/sql/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log.json b/sql/connect/common/src/test/resources/query-tests/queries/function_log.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_log.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log10.json b/sql/connect/common/src/test/resources/query-tests/queries/function_log10.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log10.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log10.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log1p.json b/sql/connect/common/src/test/resources/query-tests/queries/function_log1p.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log1p.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log1p.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log2.json b/sql/connect/common/src/test/resources/query-tests/queries/function_log2.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log2.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log2.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log_with_base.json b/sql/connect/common/src/test/resources/query-tests/queries/function_log_with_base.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log_with_base.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log_with_base.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lower.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lower.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lower.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lower.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lpad.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lpad.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lpad.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lpad.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json b/sql/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ltrim.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ltrim.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ltrim.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ltrim.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_date.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_date.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_date.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_date.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_dt_interval_days_hours_mins_secs.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_interval_years_months_weeks_days_hours_mins_secs.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_with_timezone.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ltz_without_timezone.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_ntz.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_with_timezone.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_timestamp_without_timezone.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.json b/sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_make_ym_interval_years_months.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_concat.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_concat.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_concat.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_concat.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_entries.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_entries.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_entries.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_entries.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_filter.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_filter.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_filter.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_filter.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_keys.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_keys.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_keys.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_keys.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_values.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_values.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_values.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_values.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json b/sql/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask.json b/sql/connect/common/src/test/resources/query-tests/queries/function_mask.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_mask.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.json b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.json b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.json b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.json b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mask_with_specific_upperChar_lowerChar_digitChar_otherChar.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_max.json b/sql/connect/common/src/test/resources/query-tests/queries/function_max.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_max.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_max.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_max.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_max.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_max.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_max.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_max_by.json b/sql/connect/common/src/test/resources/query-tests/queries/function_max_by.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_max_by.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_max_by.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_md5.json b/sql/connect/common/src/test/resources/query-tests/queries/function_md5.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_md5.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_md5.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_median.json b/sql/connect/common/src/test/resources/query-tests/queries/function_median.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_median.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_median.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_median.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_median.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_median.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_median.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_min.json b/sql/connect/common/src/test/resources/query-tests/queries/function_min.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_min.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_min.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_min.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_min.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_min.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_min.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_min_by.json b/sql/connect/common/src/test/resources/query-tests/queries/function_min_by.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_min_by.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_min_by.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_minute.json b/sql/connect/common/src/test/resources/query-tests/queries/function_minute.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_minute.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_minute.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_mode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json b/sql/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_month.json b/sql/connect/common/src/test/resources/query-tests/queries/function_month.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_month.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_month.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_month.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_month.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_month.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_month.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_monthname.json b/sql/connect/common/src/test/resources/query-tests/queries/function_monthname.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_monthname.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_monthname.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_monthname.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_monthname.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_monthname.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_monthname.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_months.json b/sql/connect/common/src/test/resources/query-tests/queries/function_months.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_months.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_months.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_months.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_months.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_months.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_months.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_months_between.json b/sql/connect/common/src/test/resources/query-tests/queries/function_months_between.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_months_between.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_months_between.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json b/sql/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_named_struct.json b/sql/connect/common/src/test/resources/query-tests/queries/function_named_struct.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_named_struct.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_named_struct.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_named_struct.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_named_struct.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_named_struct.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_named_struct.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nanvl.json b/sql/connect/common/src/test/resources/query-tests/queries/function_nanvl.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nanvl.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nanvl.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_negate.json b/sql/connect/common/src/test/resources/query-tests/queries/function_negate.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_negate.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_negate.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_negative.json b/sql/connect/common/src/test/resources/query-tests/queries/function_negative.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_negative.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_negative.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_negative.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_negative.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_negative.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_negative.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_next_day.json b/sql/connect/common/src/test/resources/query-tests/queries/function_next_day.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_next_day.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_next_day.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_now.json b/sql/connect/common/src/test/resources/query-tests/queries/function_now.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_now.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_now.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_now.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_now.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_now.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_now.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nth_value.json b/sql/connect/common/src/test/resources/query-tests/queries/function_nth_value.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nth_value.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nth_value.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ntile.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ntile.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ntile.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ntile.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nullif.json b/sql/connect/common/src/test/resources/query-tests/queries/function_nullif.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nullif.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nullif.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nullif.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_nullif.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nullif.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nullif.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nvl.json b/sql/connect/common/src/test/resources/query-tests/queries/function_nvl.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nvl.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nvl.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nvl.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_nvl.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nvl.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nvl.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nvl2.json b/sql/connect/common/src/test/resources/query-tests/queries/function_nvl2.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nvl2.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nvl2.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_nvl2.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_nvl2.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_nvl2.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_nvl2.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_octet_length.json b/sql/connect/common/src/test/resources/query-tests/queries/function_octet_length.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_octet_length.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_octet_length.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_overlay.json b/sql/connect/common/src/test/resources/query-tests/queries/function_overlay.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_overlay.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_overlay.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json b/sql/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_parse_json.json b/sql/connect/common/src/test/resources/query-tests/queries/function_parse_json.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_parse_json.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_parse_json.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_parse_json.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_parse_json.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_parse_json.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_parse_json.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_parse_url.json b/sql/connect/common/src/test/resources/query-tests/queries/function_parse_url.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_parse_url.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_parse_url.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_parse_url.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_parse_url.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_parse_url.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_parse_url.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.json b/sql/connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_parse_url_with_key.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percent_rank.json b/sql/connect/common/src/test/resources/query-tests/queries/function_percent_rank.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percent_rank.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percent_rank.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json b/sql/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.json b/sql/connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percentile_with_frequency.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.json b/sql/connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_percentile_without_frequency.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_pi.json b/sql/connect/common/src/test/resources/query-tests/queries/function_pi.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_pi.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_pi.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_pi.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_pi.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_pi.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_pi.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_pmod.json b/sql/connect/common/src/test/resources/query-tests/queries/function_pmod.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_pmod.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_pmod.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_posexplode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_posexplode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_posexplode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_posexplode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json b/sql/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_position.json b/sql/connect/common/src/test/resources/query-tests/queries/function_position.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_position.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_position.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_position.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_position.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_position.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_position.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_position_with_start.json b/sql/connect/common/src/test/resources/query-tests/queries/function_position_with_start.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_position_with_start.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_position_with_start.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_position_with_start.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_position_with_start.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_position_with_start.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_position_with_start.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_positive.json b/sql/connect/common/src/test/resources/query-tests/queries/function_positive.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_positive.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_positive.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_positive.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_positive.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_positive.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_positive.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_pow.json b/sql/connect/common/src/test/resources/query-tests/queries/function_pow.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_pow.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_pow.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_power.json b/sql/connect/common/src/test/resources/query-tests/queries/function_power.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_power.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_power.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_power.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_power.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_power.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_power.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_printf.json b/sql/connect/common/src/test/resources/query-tests/queries/function_printf.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_printf.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_printf.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_printf.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_printf.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_printf.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_printf.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_product.json b/sql/connect/common/src/test/resources/query-tests/queries/function_product.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_product.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_product.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_product.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_product.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_product.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_product.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_quarter.json b/sql/connect/common/src/test/resources/query-tests/queries/function_quarter.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_quarter.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_quarter.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_radians.json b/sql/connect/common/src/test/resources/query-tests/queries/function_radians.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_radians.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_radians.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_raise_error.json b/sql/connect/common/src/test/resources/query-tests/queries/function_raise_error.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_raise_error.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_raise_error.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json b/sql/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_random_with_seed.json b/sql/connect/common/src/test/resources/query-tests/queries/function_random_with_seed.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_random_with_seed.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_random_with_seed.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_random_with_seed.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_random_with_seed.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_random_with_seed.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_random_with_seed.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rank.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rank.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rank.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rank.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_reduce.json b/sql/connect/common/src/test/resources/query-tests/queries/function_reduce.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_reduce.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_reduce.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_reduce.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_reduce.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_reduce.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_reduce.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_reflect.json b/sql/connect/common/src/test/resources/query-tests/queries/function_reflect.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_reflect.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_reflect.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_reflect.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_reflect.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_reflect.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_reflect.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_count.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_count.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_count.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_count.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_count.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_count.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_count.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_count.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_with_regex_group_index.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_extract_all_without_regex_group_index.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_with_regex_group_index.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_instr_without_regex_group_index.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_like.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_like.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_like.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_like.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_like.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_like.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_like.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_like.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_substr.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_substr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_substr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_substr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regexp_substr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regexp_substr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regexp_substr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regexp_substr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_avgx.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgx.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_avgx.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgx.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_avgx.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgx.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_avgx.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgx.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_avgy.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgy.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_avgy.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgy.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_avgy.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgy.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_avgy.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_avgy.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_count.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_count.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_count.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_count.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_count.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_count.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_count.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_count.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_intercept.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_intercept.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_intercept.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_intercept.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_intercept.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_intercept.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_intercept.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_intercept.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_r2.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_r2.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_r2.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_r2.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_r2.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_r2.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_r2.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_r2.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_slope.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_slope.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_slope.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_slope.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_slope.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_slope.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_slope.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_slope.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_sxx.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxx.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_sxx.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxx.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_sxx.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxx.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_sxx.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxx.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_sxy.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxy.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_sxy.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxy.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_sxy.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxy.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_sxy.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_sxy.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_syy.json b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_syy.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_syy.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_syy.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_regr_syy.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_regr_syy.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_regr_syy.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_regr_syy.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_replace.json b/sql/connect/common/src/test/resources/query-tests/queries/function_replace.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_replace.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_replace.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_replace.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_replace.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_replace.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_replace.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.json b/sql/connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_replace_with_specified_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_reverse.json b/sql/connect/common/src/test/resources/query-tests/queries/function_reverse.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_reverse.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_reverse.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_right.json b/sql/connect/common/src/test/resources/query-tests/queries/function_right.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_right.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_right.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_right.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_right.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_right.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_right.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rint.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rint.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rint.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rint.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rlike.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rlike.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rlike.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rlike.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rlike.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rlike.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rlike.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rlike.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_round.json b/sql/connect/common/src/test/resources/query-tests/queries/function_round.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_round.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_round.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_round.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_round.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_round.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_round.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_row_number.json b/sql/connect/common/src/test/resources/query-tests/queries/function_row_number.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_row_number.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_row_number.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rpad.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rpad.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rpad.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rpad.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rtrim.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rtrim.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rtrim.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rtrim.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json b/sql/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.json b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.json b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_schema_of_variant_agg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sec.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sec.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sec.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sec.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_second.json b/sql/connect/common/src/test/resources/query-tests/queries/function_second.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_second.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_second.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_second.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_second.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_second.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_second.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sentences.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sentences.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sentences.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sentences.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sequence.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sequence.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sequence.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sequence.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_session_user.json b/sql/connect/common/src/test/resources/query-tests/queries/function_session_user.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_session_user.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_session_user.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_session_user.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_session_user.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_session_user.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_session_user.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_session_window.json b/sql/connect/common/src/test/resources/query-tests/queries/function_session_window.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_session_window.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_session_window.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sha.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sha.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sha.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sha.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sha.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sha.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sha.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sha.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sha1.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sha1.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sha1.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sha1.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sha2.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sha2.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sha2.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sha2.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_shiftleft.json b/sql/connect/common/src/test/resources/query-tests/queries/function_shiftleft.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_shiftleft.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_shiftleft.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_shiftright.json b/sql/connect/common/src/test/resources/query-tests/queries/function_shiftright.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_shiftright.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_shiftright.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json b/sql/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sign.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sign.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sign.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sign.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sign.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sign.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sign.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sign.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_signum.json b/sql/connect/common/src/test/resources/query-tests/queries/function_signum.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_signum.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_signum.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sin.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sin.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sin.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sin.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sinh.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sinh.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sinh.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sinh.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_size.json b/sql/connect/common/src/test/resources/query-tests/queries/function_size.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_size.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_size.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_size.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_size.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_size.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_size.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_skewness.json b/sql/connect/common/src/test/resources/query-tests/queries/function_skewness.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_skewness.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_skewness.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_slice.json b/sql/connect/common/src/test/resources/query-tests/queries/function_slice.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_slice.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_slice.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_some.json b/sql/connect/common/src/test/resources/query-tests/queries/function_some.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_some.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_some.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_some.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_some.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_some.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_some.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sort_array.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sort_array.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sort_array.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sort_array.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json b/sql/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split.json b/sql/connect/common/src/test/resources/query-tests/queries/function_split.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_split.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_part.json b/sql/connect/common/src/test/resources/query-tests/queries/function_split_part.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_part.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_part.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_part.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_split_part.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_part.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_part.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_using_columns.json b/sql/connect/common/src/test/resources/query-tests/queries/function_split_using_columns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_using_columns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_using_columns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_using_columns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_split_using_columns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_using_columns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_using_columns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json b/sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.json b/sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_split_with_limit_using_columns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sqrt.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sqrt.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sqrt.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sqrt.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stack.json b/sql/connect/common/src/test/resources/query-tests/queries/function_stack.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stack.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stack.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stack.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_stack.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stack.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stack.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_startswith.json b/sql/connect/common/src/test/resources/query-tests/queries/function_startswith.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_startswith.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_startswith.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_startswith.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_startswith.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_startswith.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_startswith.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_std.json b/sql/connect/common/src/test/resources/query-tests/queries/function_std.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_std.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_std.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_std.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_std.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_std.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_std.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stddev.json b/sql/connect/common/src/test/resources/query-tests/queries/function_stddev.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stddev.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stddev.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json b/sql/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_str_to_map.json b/sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_str_to_map.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_str_to_map.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_str_to_map.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.json b/sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_and_keyValue_delimiter.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.json b/sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_str_to_map_with_pair_delimiter.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_struct.json b/sql/connect/common/src/test/resources/query-tests/queries/function_struct.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_struct.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_struct.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substr.json b/sql/connect/common/src/test/resources/query-tests/queries/function_substr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_substr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substr_with_len.json b/sql/connect/common/src/test/resources/query-tests/queries/function_substr_with_len.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substr_with_len.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substr_with_len.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substr_with_len.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_substr_with_len.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substr_with_len.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substr_with_len.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substring.json b/sql/connect/common/src/test/resources/query-tests/queries/function_substring.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substring.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substring.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substring_index.json b/sql/connect/common/src/test/resources/query-tests/queries/function_substring_index.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substring_index.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substring_index.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.json b/sql/connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_substring_using_columns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sum.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sum.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sum.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sum.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json b/sql/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_tan.json b/sql/connect/common/src/test/resources/query-tests/queries/function_tan.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_tan.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_tan.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_tanh.json b/sql/connect/common/src/test/resources/query-tests/queries/function_tanh.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_tanh.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_tanh.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_add.json b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_add.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_add.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_add.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_add.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_add.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_add.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_add.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.json b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_diff.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.json b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_micros.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.json b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_millis.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_binary.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_binary.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_binary.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_binary.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_binary.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_binary.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_binary.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_binary.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_binary_with_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_char.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_char.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_char.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_char.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_char.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_char.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_char.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_char.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_csv.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_csv.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_csv.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_csv.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_date.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_date.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_date.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_date.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_json.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_json.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_json.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_json.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_number.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_number.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_number.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_number.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_number.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_number.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_number.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_number.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ltz_with_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_ntz_with_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_unix_timestamp_with_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_varchar.json b/sql/connect/common/src/test/resources/query-tests/queries/function_to_varchar.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_varchar.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_varchar.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_to_varchar.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_to_varchar.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_to_varchar.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_to_varchar.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform.json b/sql/connect/common/src/test/resources/query-tests/queries/function_transform.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform_keys.json b/sql/connect/common/src/test/resources/query-tests/queries/function_transform_keys.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform_keys.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform_keys.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform_values.json b/sql/connect/common/src/test/resources/query-tests/queries/function_transform_values.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform_values.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform_values.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json b/sql/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_translate.json b/sql/connect/common/src/test/resources/query-tests/queries/function_translate.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_translate.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_translate.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_trim.json b/sql/connect/common/src/test/resources/query-tests/queries/function_trim.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_trim.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_trim.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json b/sql/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_trunc.json b/sql/connect/common/src/test/resources/query-tests/queries/function_trunc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_trunc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_trunc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_add.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_add.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_add.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_add.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_add.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_add.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_add.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_add.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_aes_decrypt_with_mode_padding_aad.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_avg.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_avg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_avg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_avg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_avg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_avg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_avg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_avg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_divide.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_divide.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_divide.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_divide.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_divide.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_divide.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_divide.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_divide.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_array.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_element_at_map.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_multiply.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_multiply.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_multiply.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_multiply.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_multiply.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_multiply.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_multiply.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_multiply.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_parse_json.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_parse_json.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_parse_json.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_parse_json.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_parse_json.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_parse_json.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_parse_json.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_parse_json.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_reflect.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_reflect.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_reflect.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_reflect.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_reflect.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_reflect.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_reflect.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_reflect.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_subtract.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_subtract.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_subtract.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_subtract.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_subtract.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_subtract.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_subtract.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_subtract.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_sum.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_sum.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_sum.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_sum.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_sum.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_sum.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_sum.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_sum.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_binary.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_binary.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_binary.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_binary.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_binary_without_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_number.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_number.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_number.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_number.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_number.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_number.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_number.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_number.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_to_timestamp_without_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_url_decode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_url_decode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_url_decode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_url_decode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_url_decode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_url_decode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_url_decode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_url_decode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_variant_get.json b/sql/connect/common/src/test/resources/query-tests/queries/function_try_variant_get.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_variant_get.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_variant_get.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_try_variant_get.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_try_variant_get.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_try_variant_get.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_try_variant_get.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_typedLit.json b/sql/connect/common/src/test/resources/query-tests/queries/function_typedLit.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_typedLit.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_typedLit.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_typedLit.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_typedLit.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_typedLit.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_typedLit.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_typeof.json b/sql/connect/common/src/test/resources/query-tests/queries/function_typeof.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_typeof.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_typeof.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_typeof.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_typeof.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_typeof.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_typeof.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ucase.json b/sql/connect/common/src/test/resources/query-tests/queries/function_ucase.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ucase.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ucase.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_ucase.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_ucase.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_ucase.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_ucase.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unbase64.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unbase64.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unbase64.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unbase64.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unhex.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unhex.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unhex.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unhex.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_date.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_date.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_date.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_date.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_date.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_date.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_date.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_date.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_micros.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_micros.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_micros.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_micros.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_micros.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_micros.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_micros.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_micros.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_millis.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_millis.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_millis.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_millis.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_millis.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_millis.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_millis.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_millis.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_seconds.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_seconds.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_seconds.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_seconds.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_seconds.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_seconds.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_seconds.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_seconds.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_upper.json b/sql/connect/common/src/test/resources/query-tests/queries/function_upper.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_upper.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_upper.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_url_decode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_url_decode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_url_decode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_url_decode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_url_decode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_url_decode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_url_decode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_url_decode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_url_encode.json b/sql/connect/common/src/test/resources/query-tests/queries/function_url_encode.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_url_encode.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_url_encode.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_url_encode.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_url_encode.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_url_encode.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_url_encode.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_user.json b/sql/connect/common/src/test/resources/query-tests/queries/function_user.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_user.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_user.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_user.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_user.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_user.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_user.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_var_pop.json b/sql/connect/common/src/test/resources/query-tests/queries/function_var_pop.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_var_pop.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_var_pop.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_var_samp.json b/sql/connect/common/src/test/resources/query-tests/queries/function_var_samp.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_var_samp.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_var_samp.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_variance.json b/sql/connect/common/src/test/resources/query-tests/queries/function_variance.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_variance.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_variance.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_variant_get.json b/sql/connect/common/src/test/resources/query-tests/queries/function_variant_get.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_variant_get.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_variant_get.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_variant_get.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_variant_get.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_variant_get.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_variant_get.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_weekday.json b/sql/connect/common/src/test/resources/query-tests/queries/function_weekday.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_weekday.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_weekday.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_weekday.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_weekday.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_weekday.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_weekday.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_weekofyear.json b/sql/connect/common/src/test/resources/query-tests/queries/function_weekofyear.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_weekofyear.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_weekofyear.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_window.json b/sql/connect/common/src/test/resources/query-tests/queries/function_window.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_window.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_window.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_window.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_window.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_window.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_window.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_window_time.json b/sql/connect/common/src/test/resources/query-tests/queries/function_window_time.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_window_time.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_window_time.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_boolean.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_double.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_double.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_double.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_double.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_double.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_double.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_double.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_double.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_float.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_float.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_float.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_float.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_float.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_float.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_float.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_float.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_int.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_int.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_int.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_int.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_int.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_int.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_int.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_int.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_long.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_long.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_long.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_long.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_long.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_long.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_long.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_long.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_number.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_number.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_number.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_number.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_number.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_number.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_number.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_number.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_short.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_short.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_short.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_short.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_short.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_short.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_short.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_short.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_string.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xpath_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xpath_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xpath_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xpath_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xxhash64.json b/sql/connect/common/src/test/resources/query-tests/queries/function_xxhash64.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xxhash64.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xxhash64.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_year.json b/sql/connect/common/src/test/resources/query-tests/queries/function_year.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_year.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_year.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_year.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_year.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_year.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_year.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_years.json b/sql/connect/common/src/test/resources/query-tests/queries/function_years.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_years.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_years.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_years.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_years.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_years.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_years.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/function_zip_with.json b/sql/connect/common/src/test/resources/query-tests/queries/function_zip_with.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_zip_with.json
rename to sql/connect/common/src/test/resources/query-tests/queries/function_zip_with.json
diff --git a/connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_agg.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_agg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_agg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_agg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_agg_string.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_agg_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_agg_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_agg_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_agg_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_avg.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_avg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_avg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_avg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_count.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_count.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_count.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_count.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_max.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_max.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_max.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_max.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_mean.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_mean.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_mean.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_mean.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_min.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_min.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_min.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_min.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_sum.json b/sql/connect/common/src/test/resources/query-tests/queries/groupby_sum.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_sum.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_sum.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/groupingSets.json b/sql/connect/common/src/test/resources/query-tests/queries/groupingSets.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupingSets.json
rename to sql/connect/common/src/test/resources/query-tests/queries/groupingSets.json
diff --git a/connect/common/src/test/resources/query-tests/queries/groupingSets.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/groupingSets.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/groupingSets.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/groupingSets.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.json b/sql/connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.json
rename to sql/connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.json
diff --git a/connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/grouping_and_grouping_id.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hint.json b/sql/connect/common/src/test/resources/query-tests/queries/hint.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hint.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hint.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hint.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hint.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hint.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hint.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_columnName_lgConfigK_int.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_sketch_agg_with_column_lgConfigK_int.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_columnName_allowDifferentLgConfigK_boolean.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.json b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.json
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.json
diff --git a/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/hll_union_agg_with_column_allowDifferentLgConfigK_boolean.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/intersect.json b/sql/connect/common/src/test/resources/query-tests/queries/intersect.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/intersect.json
rename to sql/connect/common/src/test/resources/query-tests/queries/intersect.json
diff --git a/connect/common/src/test/resources/query-tests/queries/intersect.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/intersect.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/intersect.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/intersect.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/intersectAll.json b/sql/connect/common/src/test/resources/query-tests/queries/intersectAll.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/intersectAll.json
rename to sql/connect/common/src/test/resources/query-tests/queries/intersectAll.json
diff --git a/connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_condition.json b/sql/connect/common/src/test/resources/query-tests/queries/join_condition.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_condition.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_condition.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_condition.json b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_condition.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_condition.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_condition.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json b/sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json b/sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/join_using_single_col.json b/sql/connect/common/src/test/resources/query-tests/queries/join_using_single_col.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_using_single_col.json
rename to sql/connect/common/src/test/resources/query-tests/queries/join_using_single_col.json
diff --git a/connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/json_from_dataset.json b/sql/connect/common/src/test/resources/query-tests/queries/json_from_dataset.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/json_from_dataset.json
rename to sql/connect/common/src/test/resources/query-tests/queries/json_from_dataset.json
diff --git a/connect/common/src/test/resources/query-tests/queries/json_from_dataset.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/json_from_dataset.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/json_from_dataset.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/json_from_dataset.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/limit.json b/sql/connect/common/src/test/resources/query-tests/queries/limit.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/limit.json
rename to sql/connect/common/src/test/resources/query-tests/queries/limit.json
diff --git a/connect/common/src/test/resources/query-tests/queries/limit.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/limit.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/limit.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/limit.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/melt_no_values.json b/sql/connect/common/src/test/resources/query-tests/queries/melt_no_values.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/melt_no_values.json
rename to sql/connect/common/src/test/resources/query-tests/queries/melt_no_values.json
diff --git a/connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/melt_values.json b/sql/connect/common/src/test/resources/query-tests/queries/melt_values.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/melt_values.json
rename to sql/connect/common/src/test/resources/query-tests/queries/melt_values.json
diff --git a/connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/offset.json b/sql/connect/common/src/test/resources/query-tests/queries/offset.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/offset.json
rename to sql/connect/common/src/test/resources/query-tests/queries/offset.json
diff --git a/connect/common/src/test/resources/query-tests/queries/offset.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/offset.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/offset.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/offset.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/orderBy_columns.json b/sql/connect/common/src/test/resources/query-tests/queries/orderBy_columns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/orderBy_columns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/orderBy_columns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/orderBy_strings.json b/sql/connect/common/src/test/resources/query-tests/queries/orderBy_strings.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/orderBy_strings.json
rename to sql/connect/common/src/test/resources/query-tests/queries/orderBy_strings.json
diff --git a/connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/pivot.json b/sql/connect/common/src/test/resources/query-tests/queries/pivot.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/pivot.json
rename to sql/connect/common/src/test/resources/query-tests/queries/pivot.json
diff --git a/connect/common/src/test/resources/query-tests/queries/pivot.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/pivot.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/pivot.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/pivot.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.json b/sql/connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.json
rename to sql/connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.json
diff --git a/connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/pivot_without_column_values.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/range.json b/sql/connect/common/src/test/resources/query-tests/queries/range.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/range.json
rename to sql/connect/common/src/test/resources/query-tests/queries/range.json
diff --git a/connect/common/src/test/resources/query-tests/queries/range.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/range.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/range.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/range.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read.json b/sql/connect/common/src/test/resources/query-tests/queries/read.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_csv.json b/sql/connect/common/src/test/resources/query-tests/queries/read_csv.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_csv.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_csv.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_jdbc.json b/sql/connect/common/src/test/resources/query-tests/queries/read_jdbc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_jdbc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_jdbc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_jdbc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_jdbc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_jdbc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_jdbc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.json b/sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_partition.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.json b/sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_jdbc_with_predicates.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_json.json b/sql/connect/common/src/test/resources/query-tests/queries/read_json.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_json.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_json.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_json.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_orc.json b/sql/connect/common/src/test/resources/query-tests/queries/read_orc.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_orc.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_orc.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_parquet.json b/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_parquet.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_parquet.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_table.json b/sql/connect/common/src/test/resources/query-tests/queries/read_table.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_table.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_table.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_table.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_table.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_table.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_table.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/read_text.json b/sql/connect/common/src/test/resources/query-tests/queries/read_text.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_text.json
rename to sql/connect/common/src/test/resources/query-tests/queries/read_text.json
diff --git a/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/read_text.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/relation_extension.json b/sql/connect/common/src/test/resources/query-tests/queries/relation_extension.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/relation_extension.json
rename to sql/connect/common/src/test/resources/query-tests/queries/relation_extension.json
diff --git a/connect/common/src/test/resources/query-tests/queries/relation_extension.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/relation_extension.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/relation_extension.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/relation_extension.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.json b/sql/connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.json
rename to sql/connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.json
diff --git a/connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/relation_extension_deprecated.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/repartition.json b/sql/connect/common/src/test/resources/query-tests/queries/repartition.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartition.json
rename to sql/connect/common/src/test/resources/query-tests/queries/repartition.json
diff --git a/connect/common/src/test/resources/query-tests/queries/repartition.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/repartition.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartition.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/repartition.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json b/sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json
rename to sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json
diff --git a/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json b/sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json
rename to sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json
diff --git a/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/repartition_expressions.json b/sql/connect/common/src/test/resources/query-tests/queries/repartition_expressions.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartition_expressions.json
rename to sql/connect/common/src/test/resources/query-tests/queries/repartition_expressions.json
diff --git a/connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json b/sql/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json
rename to sql/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json
diff --git a/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/replace.json b/sql/connect/common/src/test/resources/query-tests/queries/replace.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/replace.json
rename to sql/connect/common/src/test/resources/query-tests/queries/replace.json
diff --git a/connect/common/src/test/resources/query-tests/queries/replace.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/replace.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/replace.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/replace.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/rollup_column.json b/sql/connect/common/src/test/resources/query-tests/queries/rollup_column.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/rollup_column.json
rename to sql/connect/common/src/test/resources/query-tests/queries/rollup_column.json
diff --git a/connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/rollup_string.json b/sql/connect/common/src/test/resources/query-tests/queries/rollup_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/rollup_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/rollup_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/sampleBy.json b/sql/connect/common/src/test/resources/query-tests/queries/sampleBy.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sampleBy.json
rename to sql/connect/common/src/test/resources/query-tests/queries/sampleBy.json
diff --git a/connect/common/src/test/resources/query-tests/queries/sampleBy.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/sampleBy.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sampleBy.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/sampleBy.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json b/sql/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json
rename to sql/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json
diff --git a/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json b/sql/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json
rename to sql/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json
diff --git a/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select.json b/sql/connect/common/src/test/resources/query-tests/queries/select.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/selectExpr.json b/sql/connect/common/src/test/resources/query-tests/queries/selectExpr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/selectExpr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/selectExpr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select_collated_string.json b/sql/connect/common/src/test/resources/query-tests/queries/select_collated_string.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_collated_string.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select_collated_string.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select_collated_string.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select_collated_string.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_collated_string.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select_collated_string.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select_strings.json b/sql/connect/common/src/test/resources/query-tests/queries/select_strings.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_strings.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select_strings.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.json b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_1-arg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.json b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_2-arg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.json b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_3-arg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.json b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_4-arg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.json b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.json
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.json
diff --git a/connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/select_typed_5-arg.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json b/sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json b/sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json
rename to sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json
diff --git a/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/sort_columns.json b/sql/connect/common/src/test/resources/query-tests/queries/sort_columns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sort_columns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/sort_columns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/sort_strings.json b/sql/connect/common/src/test/resources/query-tests/queries/sort_strings.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sort_strings.json
rename to sql/connect/common/src/test/resources/query-tests/queries/sort_strings.json
diff --git a/connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.json b/sql/connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/streaming_table_API_with_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/summary.json b/sql/connect/common/src/test/resources/query-tests/queries/summary.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/summary.json
rename to sql/connect/common/src/test/resources/query-tests/queries/summary.json
diff --git a/connect/common/src/test/resources/query-tests/queries/summary.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/summary.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/summary.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/summary.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/table.json b/sql/connect/common/src/test/resources/query-tests/queries/table.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/table.json
rename to sql/connect/common/src/test/resources/query-tests/queries/table.json
diff --git a/connect/common/src/test/resources/query-tests/queries/table.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/table.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/table.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/table.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/table_API_with_options.json b/sql/connect/common/src/test/resources/query-tests/queries/table_API_with_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/table_API_with_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/table_API_with_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/table_API_with_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/table_API_with_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/table_API_with_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/table_API_with_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/test_broadcast.json b/sql/connect/common/src/test/resources/query-tests/queries/test_broadcast.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/test_broadcast.json
rename to sql/connect/common/src/test/resources/query-tests/queries/test_broadcast.json
diff --git a/connect/common/src/test/resources/query-tests/queries/test_broadcast.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/test_broadcast.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/test_broadcast.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/test_broadcast.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/to.json b/sql/connect/common/src/test/resources/query-tests/queries/to.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to.json
rename to sql/connect/common/src/test/resources/query-tests/queries/to.json
diff --git a/connect/common/src/test/resources/query-tests/queries/to.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/to.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/to.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/toDF.json b/sql/connect/common/src/test/resources/query-tests/queries/toDF.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/toDF.json
rename to sql/connect/common/src/test/resources/query-tests/queries/toDF.json
diff --git a/connect/common/src/test/resources/query-tests/queries/toDF.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/toDF.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/toDF.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/toDF.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/toJSON.json b/sql/connect/common/src/test/resources/query-tests/queries/toJSON.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/toJSON.json
rename to sql/connect/common/src/test/resources/query-tests/queries/toJSON.json
diff --git a/connect/common/src/test/resources/query-tests/queries/toJSON.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/toJSON.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/toJSON.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/toJSON.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.json b/sql/connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.json
rename to sql/connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.json
diff --git a/connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/to_avro_with_schema.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.json b/sql/connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.json
rename to sql/connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.json
diff --git a/connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/to_avro_without_schema.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.json b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.json
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.json
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.json b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.json
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.json
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.json b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_descFilePath_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.json b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.json
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.json
diff --git a/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/to_protobuf_messageClassName_options.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/union.json b/sql/connect/common/src/test/resources/query-tests/queries/union.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/union.json
rename to sql/connect/common/src/test/resources/query-tests/queries/union.json
diff --git a/connect/common/src/test/resources/query-tests/queries/union.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/union.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/union.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/union.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/unionAll.json b/sql/connect/common/src/test/resources/query-tests/queries/unionAll.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unionAll.json
rename to sql/connect/common/src/test/resources/query-tests/queries/unionAll.json
diff --git a/connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/unionByName.json b/sql/connect/common/src/test/resources/query-tests/queries/unionByName.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unionByName.json
rename to sql/connect/common/src/test/resources/query-tests/queries/unionByName.json
diff --git a/connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json b/sql/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json
rename to sql/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json
diff --git a/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json b/sql/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json
rename to sql/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json
diff --git a/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/unpivot_values.json b/sql/connect/common/src/test/resources/query-tests/queries/unpivot_values.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unpivot_values.json
rename to sql/connect/common/src/test/resources/query-tests/queries/unpivot_values.json
diff --git a/connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/where_column.json b/sql/connect/common/src/test/resources/query-tests/queries/where_column.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/where_column.json
rename to sql/connect/common/src/test/resources/query-tests/queries/where_column.json
diff --git a/connect/common/src/test/resources/query-tests/queries/where_column.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/where_column.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/where_column.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/where_column.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/where_expr.json b/sql/connect/common/src/test/resources/query-tests/queries/where_expr.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/where_expr.json
rename to sql/connect/common/src/test/resources/query-tests/queries/where_expr.json
diff --git a/connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/width_bucket.json b/sql/connect/common/src/test/resources/query-tests/queries/width_bucket.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/width_bucket.json
rename to sql/connect/common/src/test/resources/query-tests/queries/width_bucket.json
diff --git a/connect/common/src/test/resources/query-tests/queries/width_bucket.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/width_bucket.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/width_bucket.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/width_bucket.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/window.json b/sql/connect/common/src/test/resources/query-tests/queries/window.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/window.json
rename to sql/connect/common/src/test/resources/query-tests/queries/window.json
diff --git a/connect/common/src/test/resources/query-tests/queries/window.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/window.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/window.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/window.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json b/sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json b/sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json b/sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumn_single.json b/sql/connect/common/src/test/resources/query-tests/queries/withColumn_single.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumn_single.json
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumn_single.json
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json b/sql/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json b/sql/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json
diff --git a/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/queries/withMetadata.json b/sql/connect/common/src/test/resources/query-tests/queries/withMetadata.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withMetadata.json
rename to sql/connect/common/src/test/resources/query-tests/queries/withMetadata.json
diff --git a/connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin b/sql/connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin
similarity index 100%
rename from connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin
rename to sql/connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin
diff --git a/connect/common/src/test/resources/query-tests/test-data/people.csv b/sql/connect/common/src/test/resources/query-tests/test-data/people.csv
similarity index 100%
rename from connect/common/src/test/resources/query-tests/test-data/people.csv
rename to sql/connect/common/src/test/resources/query-tests/test-data/people.csv
diff --git a/connect/common/src/test/resources/query-tests/test-data/people.json b/sql/connect/common/src/test/resources/query-tests/test-data/people.json
similarity index 100%
rename from connect/common/src/test/resources/query-tests/test-data/people.json
rename to sql/connect/common/src/test/resources/query-tests/test-data/people.json
diff --git a/connect/common/src/test/resources/query-tests/test-data/people.txt b/sql/connect/common/src/test/resources/query-tests/test-data/people.txt
similarity index 100%
rename from connect/common/src/test/resources/query-tests/test-data/people.txt
rename to sql/connect/common/src/test/resources/query-tests/test-data/people.txt
diff --git a/connect/common/src/test/resources/query-tests/test-data/streaming/csv/people.csv b/sql/connect/common/src/test/resources/query-tests/test-data/streaming/csv/people.csv
similarity index 100%
rename from connect/common/src/test/resources/query-tests/test-data/streaming/csv/people.csv
rename to sql/connect/common/src/test/resources/query-tests/test-data/streaming/csv/people.csv
diff --git a/connect/common/src/test/resources/query-tests/test-data/streaming/txt/people.txt b/sql/connect/common/src/test/resources/query-tests/test-data/streaming/txt/people.txt
similarity index 100%
rename from connect/common/src/test/resources/query-tests/test-data/streaming/txt/people.txt
rename to sql/connect/common/src/test/resources/query-tests/test-data/streaming/txt/people.txt
diff --git a/connect/common/src/test/resources/query-tests/test-data/users.orc b/sql/connect/common/src/test/resources/query-tests/test-data/users.orc
similarity index 100%
rename from connect/common/src/test/resources/query-tests/test-data/users.orc
rename to sql/connect/common/src/test/resources/query-tests/test-data/users.orc
diff --git a/connect/common/src/test/resources/query-tests/test-data/users.parquet b/sql/connect/common/src/test/resources/query-tests/test-data/users.parquet
similarity index 100%
rename from connect/common/src/test/resources/query-tests/test-data/users.parquet
rename to sql/connect/common/src/test/resources/query-tests/test-data/users.parquet
diff --git a/connect/common/src/test/scala/org/apache/spark/sql/TestUDFs.scala b/sql/connect/common/src/test/scala/org/apache/spark/sql/TestUDFs.scala
similarity index 100%
rename from connect/common/src/test/scala/org/apache/spark/sql/TestUDFs.scala
rename to sql/connect/common/src/test/scala/org/apache/spark/sql/TestUDFs.scala
diff --git a/connect/server/README.md b/sql/connect/server/README.md
similarity index 100%
rename from connect/server/README.md
rename to sql/connect/server/README.md
diff --git a/connect/server/pom.xml b/sql/connect/server/pom.xml
similarity index 99%
rename from connect/server/pom.xml
rename to sql/connect/server/pom.xml
index ecbb22168aa1b..e77be695ab37f 100644
--- a/connect/server/pom.xml
+++ b/sql/connect/server/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.13</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-connect_2.13</artifactId>
diff --git a/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/CommandPlugin.java b/sql/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/CommandPlugin.java
similarity index 100%
rename from connect/server/src/main/java/org/apache/spark/sql/connect/plugin/CommandPlugin.java
rename to sql/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/CommandPlugin.java
diff --git a/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/ExpressionPlugin.java b/sql/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/ExpressionPlugin.java
similarity index 100%
rename from connect/server/src/main/java/org/apache/spark/sql/connect/plugin/ExpressionPlugin.java
rename to sql/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/ExpressionPlugin.java
diff --git a/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/RelationPlugin.java b/sql/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/RelationPlugin.java
similarity index 100%
rename from connect/server/src/main/java/org/apache/spark/sql/connect/plugin/RelationPlugin.java
rename to sql/connect/server/src/main/java/org/apache/spark/sql/connect/plugin/RelationPlugin.java
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/SimpleSparkConnectService.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/SimpleSparkConnectService.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/SimpleSparkConnectService.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/SimpleSparkConnectService.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/SparkConnectPlugin.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/SparkConnectPlugin.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/SparkConnectPlugin.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/SparkConnectPlugin.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/config/Connect.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/CachedStreamResponse.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/CachedStreamResponse.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/execution/CachedStreamResponse.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/CachedStreamResponse.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListener.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListener.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListener.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListener.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteGrpcResponseSender.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteGrpcResponseSender.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteGrpcResponseSender.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteGrpcResponseSender.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteResponseObserver.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteResponseObserver.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteResponseObserver.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteResponseObserver.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteThreadRunner.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteThreadRunner.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteThreadRunner.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteThreadRunner.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/SparkConnectPlanExecution.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/SparkConnectPlanExecution.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/execution/SparkConnectPlanExecution.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/execution/SparkConnectPlanExecution.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverter.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverter.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverter.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverter.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SaveModeConverter.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SaveModeConverter.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SaveModeConverter.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SaveModeConverter.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectStreamingQueryListenerHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectStreamingQueryListenerHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectStreamingQueryListenerHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectStreamingQueryListenerHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelper.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelper.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelper.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelper.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingQueryListenerHelper.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingQueryListenerHelper.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingQueryListenerHelper.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/StreamingQueryListenerHelper.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/TableSaveMethodConverter.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/TableSaveMethodConverter.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/planner/TableSaveMethodConverter.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/TableSaveMethodConverter.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistry.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistry.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistry.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistry.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteEventsManager.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteEventsManager.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteEventsManager.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteEventsManager.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/ExecuteHolder.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/LocalPropertiesCleanupInterceptor.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/LocalPropertiesCleanupInterceptor.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/LocalPropertiesCleanupInterceptor.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/LocalPropertiesCleanupInterceptor.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/LoggingInterceptor.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/LoggingInterceptor.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/LoggingInterceptor.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/LoggingInterceptor.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionEventsManager.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionEventsManager.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionEventsManager.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionEventsManager.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SessionHolder.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAddArtifactsHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAddArtifactsHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAddArtifactsHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAddArtifactsHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectAnalyzeHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectArtifactStatusesHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectArtifactStatusesHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectArtifactStatusesHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectArtifactStatusesHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectConfigHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectConfigHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectConfigHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectConfigHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutePlanHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutePlanHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutePlanHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutePlanHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutionManager.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutionManager.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutionManager.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectExecutionManager.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectFetchErrorDetailsHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectFetchErrorDetailsHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectFetchErrorDetailsHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectFetchErrorDetailsHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterceptorRegistry.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterceptorRegistry.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterceptorRegistry.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterceptorRegistry.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterruptHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterruptHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterruptHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectInterruptHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListener.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListener.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListener.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListener.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReattachExecuteHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReattachExecuteHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReattachExecuteHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReattachExecuteHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseExecuteHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseExecuteHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseExecuteHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseExecuteHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseSessionHandler.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseSessionHandler.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseSessionHandler.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectReleaseSessionHandler.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectServer.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectServer.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectServer.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectServer.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectService.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectService.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectService.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectService.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManager.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManager.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManager.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManager.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCache.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCache.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCache.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCache.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerAppStatusStore.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerAppStatusStore.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerAppStatusStore.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerAppStatusStore.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerHistoryServerPlugin.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerHistoryServerPlugin.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerHistoryServerPlugin.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerHistoryServerPlugin.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListener.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListener.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListener.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListener.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPage.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerSessionPage.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerTab.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerTab.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerTab.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/SparkConnectServerTab.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/ToolTips.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/ToolTips.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/ui/ToolTips.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/ui/ToolTips.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/ErrorUtils.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/ErrorUtils.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/utils/ErrorUtils.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/ErrorUtils.scala
diff --git a/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/MetricGenerator.scala b/sql/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/MetricGenerator.scala
similarity index 100%
rename from connect/server/src/main/scala/org/apache/spark/sql/connect/utils/MetricGenerator.scala
rename to sql/connect/server/src/main/scala/org/apache/spark/sql/connect/utils/MetricGenerator.scala
diff --git a/connect/server/src/test/resources/log4j2.properties b/sql/connect/server/src/test/resources/log4j2.properties
similarity index 100%
rename from connect/server/src/test/resources/log4j2.properties
rename to sql/connect/server/src/test/resources/log4j2.properties
diff --git a/connect/server/src/test/resources/udf b/sql/connect/server/src/test/resources/udf
similarity index 100%
rename from connect/server/src/test/resources/udf
rename to sql/connect/server/src/test/resources/udf
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/ProtoToParsedPlanTestSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ProtoToParsedPlanTestSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/ProtoToParsedPlanTestSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ProtoToParsedPlanTestSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/ResourceHelper.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ResourceHelper.scala
similarity index 84%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/ResourceHelper.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ResourceHelper.scala
index c72fd1feadf97..e98e995e9551e 100644
--- a/connect/server/src/test/scala/org/apache/spark/sql/connect/ResourceHelper.scala
+++ b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ResourceHelper.scala
@@ -23,10 +23,10 @@ import org.apache.spark.SparkFunSuite
 trait ResourceHelper extends SparkFunSuite {
 
   protected val baseResourcePath: Path = {
-    getWorkspaceFilePath("connect", "server", "src", "test", "resources").toAbsolutePath
+    getWorkspaceFilePath("sql", "connect", "server", "src", "test", "resources").toAbsolutePath
   }
 
   protected val commonResourcePath: Path = {
-    getWorkspaceFilePath("connect", "common", "src", "test", "resources").toAbsolutePath
+    getWorkspaceFilePath("sql", "connect", "common", "src", "test", "resources").toAbsolutePath
   }
 }
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectServerTest.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectServerTest.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectServerTest.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectServerTest.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectTestUtils.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectTestUtils.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectTestUtils.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/SparkConnectTestUtils.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/dsl/package.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/dsl/package.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/dsl/package.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/dsl/package.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListenerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListenerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListenerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ConnectProgressExecutionListenerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ReattachableExecuteSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ReattachableExecuteSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ReattachableExecuteSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/execution/ReattachableExecuteSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/messages/AbbreviateSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/messages/AbbreviateSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/messages/AbbreviateSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/messages/AbbreviateSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/messages/ConnectProtoMessagesSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/messages/ConnectProtoMessagesSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/messages/ConnectProtoMessagesSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/messages/ConnectProtoMessagesSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverterSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverterSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverterSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/LiteralExpressionProtoConverterSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerTestUtils.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerTestUtils.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerTestUtils.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectPlannerTestUtils.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectProtoSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectProtoSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectProtoSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectProtoSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectServiceSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectServiceSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectServiceSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectServiceSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectWithSessionExtensionSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectWithSessionExtensionSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectWithSessionExtensionSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/SparkConnectWithSessionExtensionSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelperSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelperSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelperSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/planner/StreamingForeachBatchHelperSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistrySuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistrySuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistrySuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/plugin/SparkConnectPluginRegistrySuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/AddArtifactsHandlerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/AddArtifactsHandlerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/AddArtifactsHandlerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/AddArtifactsHandlerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/ArtifactStatusesHandlerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/ArtifactStatusesHandlerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/ArtifactStatusesHandlerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/ArtifactStatusesHandlerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/ExecuteEventsManagerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/ExecuteEventsManagerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/ExecuteEventsManagerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/ExecuteEventsManagerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/FetchErrorDetailsHandlerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/FetchErrorDetailsHandlerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/FetchErrorDetailsHandlerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/FetchErrorDetailsHandlerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/InterceptorRegistrySuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/InterceptorRegistrySuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/InterceptorRegistrySuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/InterceptorRegistrySuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SessionEventsManagerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SessionEventsManagerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/SessionEventsManagerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SessionEventsManagerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListenerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListenerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListenerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectListenerBusListenerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceE2ESuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceE2ESuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceE2ESuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceE2ESuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceInternalServerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceInternalServerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceInternalServerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectServiceInternalServerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionHolderSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionHolderSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionHolderSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionHolderSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManagerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManagerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManagerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectSessionManagerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCacheSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCacheSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCacheSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/service/SparkConnectStreamingQueryCacheSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerListenerSuite.scala
diff --git a/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPageSuite.scala b/sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPageSuite.scala
similarity index 100%
rename from connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPageSuite.scala
rename to sql/connect/server/src/test/scala/org/apache/spark/sql/connect/ui/SparkConnectServerPageSuite.scala