diff --git a/.gitignore b/.gitignore
index e41a293f8..9543fc796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 */target
+target/
 bin/
 .project
 .settings/
diff --git a/pom.xml b/pom.xml
index 111ccb59b..92ba40f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
     <module>commons-hpcc</module>
     <module>wsclient</module>
     <module>dfsclient</module>
+    <module>spark-hpcc</module>
   </modules>
 
   <properties>
@@ -33,6 +34,7 @@
     <maven.compiler.version>3.8.0</maven.compiler.version>
     <maven.compiler.release>8</maven.compiler.release>
     <maven.assembly.version>3.1.1</maven.assembly.version>
+    <maven.failsafe.version>3.1.2</maven.failsafe.version>
     <sonatype.staging.version>1.6.8</sonatype.staging.version>
     <sonatype.staging.autorelease>false</sonatype.staging.autorelease>
     <maven.gpg.version>1.6</maven.gpg.version>
@@ -65,6 +67,9 @@
     <opentelemetry.bom.version>1.38.0</opentelemetry.bom.version>
     <opentelemetry.semconv.version>1.25.0-alpha</opentelemetry.semconv.version>
     <opentelemetry.instrumentation.annotations.version>2.6.0</opentelemetry.instrumentation.annotations.version>
+    <spark.runtime.version>2.4.6</spark.runtime.version>
+    <scala.binary.version>2.11</scala.binary.version>
+    <scala.version>2.11</scala.version>
   </properties>
 
   <scm>
diff --git a/spark-hpcc/DataAccess/README.md b/spark-hpcc/DataAccess/README.md
deleted file mode 100644
index f61198279..000000000
--- a/spark-hpcc/DataAccess/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Spark-HPCC/DataAccess
-Spark-based classes for HPCC Systems/ Spark interoperability
-
-HPCC Systems platform target runtime must be 7.x or newer
-
-HPCC4J wsclient, dfsclient, and commons-hpcc build dependencies must be 7.x or newer.
diff --git a/spark-hpcc/DataAccess/pom.xml b/spark-hpcc/pom.xml
similarity index 75%
rename from spark-hpcc/DataAccess/pom.xml
rename to spark-hpcc/pom.xml
index 6ff084679..1bdf4034c 100644
--- a/spark-hpcc/DataAccess/pom.xml
+++ b/spark-hpcc/pom.xml
@@ -2,67 +2,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hpccsystems</groupId>
   <artifactId>spark-hpcc</artifactId>
-  <version>9.9.0-0-SNAPSHOT</version>
+  <packaging>jar</packaging>
   <name>spark-hpcc</name>
   <description>Spark connector for reading files residing in an HPCC cluster environment</description>
-  <url>https://hpccsystems.com</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+
+  <parent>
+    <groupId>org.hpccsystems</groupId>
+    <artifactId>hpcc4j</artifactId>
+    <version>9.9.0-0-SNAPSHOT</version>
+  </parent>
+
   <properties>
-    <sonatype.staging.version>1.6.8</sonatype.staging.version>
-    <sonatype.staging.autorelease>false</sonatype.staging.autorelease>
-    <maven.surefire.version>3.1.2</maven.surefire.version>
-    <maven.failsafe.version>3.1.2</maven.failsafe.version>
-    <maven.gpg.version>1.6</maven.gpg.version>
-    <maven.gpg.skip>true</maven.gpg.skip>
-    <maven.source.version>2.2.1</maven.source.version>
-    <maven.javadoc.version>3.1.0</maven.javadoc.version>
-    <maven.compiler.version>3.8.0</maven.compiler.version>
-    <maven.compiler.release>8</maven.compiler.release>
-    <spark.runtime.version>2.4.6</spark.runtime.version>
-    <scala.binary.version>2.11</scala.binary.version>
-    <scala.version>2.11</scala.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <javadoc.excludePackageNames>net.razorvine.*:org.apache.*:org.hpccsystems.commons.*:org.hpccsystems.generated.*:org.hpccsystems.dfs.*:org.hpccsystems.ws.*:org.hpccsystems.ws.client.antlr.*</javadoc.excludePackageNames>
   </properties>
-  <scm>
-    <connection>scm:git:https://github.com/hpcc-systems/Spark-HPCC.git</connection>
-    <developerConnection>scm:git:https://github.com/hpcc-systems/Spark-HPCC.git</developerConnection>
-    <url>scm:git:https://github.com/hpcc-systems/Spark-HPCC.git</url>
-    <tag>HEAD</tag>
-  </scm>
 
-  <!-- This for deployment of snapshots -->
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-  </distributionManagement>
 
-  <!-- This is for fetching dependencies when doing SNAPSHOT builds -->
-  <repositories>
-    <repository>
-      <id>ossrh</id>
-      <name>Ossrh Snapshot Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>false</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>always</updatePolicy>
-        <checksumPolicy>warn</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
 
   <dependencies>
     <dependency>
@@ -155,66 +109,8 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
+  
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven.compiler.version}</version>
-          <configuration>
-            <release>${maven.compiler.release}</release>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>${maven.gpg.version}</version>
-          <executions>
-            <execution>
-              <id>sign-artifacts</id>
-              <phase>verify</phase>
-              <goals>
-                <goal>sign</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>${maven.source.version}</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${maven.javadoc.version}</version>
-          <executions>
-            <execution>
-              <id>attach-javadocs</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <doclint>none</doclint>
-            <excludePackageNames>${javadoc.excludePackageNames}</excludePackageNames>
-            <additionalparam>-Xdoclint:none</additionalparam>
-            <header>Copyright © 2021 HPCC Systems®. All rights reserved</header>
-            <footer>Copyright © 2021 HPCC Systems®. All rights reserved</footer>
-            <includeDependencySources>true</includeDependencySources>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/FileFilterConverter.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/FileFilterConverter.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/FileFilterConverter.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/FileFilterConverter.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/GenericRowRecordAccessor.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/GenericRowRecordAccessor.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/GenericRowRecordAccessor.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/GenericRowRecordAccessor.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/GenericRowRecordBuilder.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/GenericRowRecordBuilder.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/GenericRowRecordBuilder.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/GenericRowRecordBuilder.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/HpccFile.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/HpccFile.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/HpccFile.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/HpccFile.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/HpccFileWriter.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/HpccFileWriter.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/HpccFileWriter.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/HpccFileWriter.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/HpccRDD.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/HpccRDD.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/HpccRDD.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/HpccRDD.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/PySparkField.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/PySparkField.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/PySparkField.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/PySparkField.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/PySparkFieldConstructor.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/PySparkFieldConstructor.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/PySparkFieldConstructor.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/PySparkFieldConstructor.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/RowConstructor.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/RowConstructor.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/RowConstructor.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/RowConstructor.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/SparkSchemaTranslator.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/SparkSchemaTranslator.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/SparkSchemaTranslator.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/SparkSchemaTranslator.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/Utils.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/Utils.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/Utils.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/Utils.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/HpccOptions.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/HpccOptions.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/HpccOptions.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/HpccOptions.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/HpccRelation.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/HpccRelation.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/HpccRelation.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/HpccRelation.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/HpccRelationProvider.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/HpccRelationProvider.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/HpccRelationProvider.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/HpccRelationProvider.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/package-info.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/package-info.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/datasource/package-info.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/datasource/package-info.java
diff --git a/spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/package-info.java b/spark-hpcc/src/main/java/org/hpccsystems/spark/package-info.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/java/org/hpccsystems/spark/package-info.java
rename to spark-hpcc/src/main/java/org/hpccsystems/spark/package-info.java
diff --git a/spark-hpcc/DataAccess/src/main/javadoc/overview.html b/spark-hpcc/src/main/javadoc/overview.html
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/javadoc/overview.html
rename to spark-hpcc/src/main/javadoc/overview.html
diff --git a/spark-hpcc/DataAccess/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/spark-hpcc/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
rename to spark-hpcc/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
diff --git a/spark-hpcc/DataAccess/src/main/resources/log4j.properties b/spark-hpcc/src/main/resources/log4j.properties
similarity index 100%
rename from spark-hpcc/DataAccess/src/main/resources/log4j.properties
rename to spark-hpcc/src/main/resources/log4j.properties
diff --git a/spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/BaseIntegrationTest.java b/spark-hpcc/src/test/java/org/hpccsystems/spark/BaseIntegrationTest.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/BaseIntegrationTest.java
rename to spark-hpcc/src/test/java/org/hpccsystems/spark/BaseIntegrationTest.java
diff --git a/spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/DataframeIntegrationTest.java b/spark-hpcc/src/test/java/org/hpccsystems/spark/DataframeIntegrationTest.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/DataframeIntegrationTest.java
rename to spark-hpcc/src/test/java/org/hpccsystems/spark/DataframeIntegrationTest.java
diff --git a/spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/FileFilterTests.java b/spark-hpcc/src/test/java/org/hpccsystems/spark/FileFilterTests.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/FileFilterTests.java
rename to spark-hpcc/src/test/java/org/hpccsystems/spark/FileFilterTests.java
diff --git a/spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/HpccRelationIntegrationTest.java b/spark-hpcc/src/test/java/org/hpccsystems/spark/HpccRelationIntegrationTest.java
similarity index 100%
rename from spark-hpcc/DataAccess/src/test/java/org/hpccsystems/spark/HpccRelationIntegrationTest.java
rename to spark-hpcc/src/test/java/org/hpccsystems/spark/HpccRelationIntegrationTest.java