From 9462f11de32139b5a74900e12d3d203547e793be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20=C3=87engel?= <oscngl@gmail.com>
Date: Tue, 22 Sep 2026 19:39:45 +0300
Subject: [PATCH] build: package separate runtime and CLI artifacts

---
 pom.xml                                       | 134 +++++++++++-------
 sqlcj-cli/pom.xml                             | 118 +++++++++++++++
 .../src}/main/java/dev/sqlcj/Main.java        |   0
 .../dev/sqlcj/analysis/QueryAnalyzer.java     |   0
 .../java/dev/sqlcj/analysis/QueryColumn.java  |   0
 .../java/dev/sqlcj/analysis/QueryModel.java   |   0
 .../dev/sqlcj/analysis/QueryParameter.java    |   0
 .../main/java/dev/sqlcj/cli/SqlcjCommand.java |   0
 .../sqlcj/cli/command/GenerateCommand.java    |   0
 .../dev/sqlcj/cli/command/VersionCommand.java |   0
 .../sqlcj/compiler/CompilationException.java  |   0
 .../sqlcj/compiler/DefaultSourceLoader.java   |   0
 .../main/java/dev/sqlcj/compiler/Source.java  |   0
 .../java/dev/sqlcj/compiler/SourceLoader.java |   0
 .../dev/sqlcj/compiler/SqlcjCompiler.java     |   0
 .../main/java/dev/sqlcj/config/Config.java    |   0
 .../java/dev/sqlcj/config/ConfigLoader.java   |   0
 .../dev/sqlcj/config/ConfigValidator.java     |   0
 .../sqlcj/config/ConfigurationException.java  |   0
 .../java/dev/sqlcj/config/JavaConfig.java     |   0
 .../main/java/dev/sqlcj/config/SqlConfig.java |   0
 .../dev/sqlcj/config/YamlConfigLoader.java    |   0
 .../dev/sqlcj/generator/CodeGenerator.java    |   0
 .../dev/sqlcj/generator/GeneratedFile.java    |   0
 .../sqlcj/generator/JavaCodeGenerator.java    |   0
 .../java/dev/sqlcj/generator/JavaNames.java   |   0
 .../java/dev/sqlcj/io/DefaultFileLoader.java  |   0
 .../main/java/dev/sqlcj/io/FileLoader.java    |   0
 .../dev/sqlcj/io/GeneratedFileWriter.java     |   0
 .../dev/sqlcj/parser/DefaultQueryParser.java  |   0
 .../main/java/dev/sqlcj/parser/Query.java     |   0
 .../java/dev/sqlcj/parser/QueryHeader.java    |   0
 .../java/dev/sqlcj/parser/QueryParser.java    |   0
 .../main/java/dev/sqlcj/parser/QueryType.java |   0
 .../main/java/dev/sqlcj/schema/Column.java    |   0
 .../java/dev/sqlcj/schema/ColumnType.java     |   0
 .../java/dev/sqlcj/schema/Constraint.java     |   0
 .../java/dev/sqlcj/schema/ConstraintType.java |   0
 .../main/java/dev/sqlcj/schema/Schema.java    |   0
 .../main/java/dev/sqlcj/schema/Table.java     |   0
 .../schema/parser/DefaultSchemaParser.java    |   0
 .../schema/parser/SchemaParseException.java   |   0
 .../dev/sqlcj/schema/parser/SchemaParser.java |   0
 .../main/java/dev/sqlcj/sql/ParsedSql.java    |   0
 .../dev/sqlcj/sql/SqlParameterCompiler.java   |   0
 .../java/dev/sqlcj/sql/SqlParameters.java     |   0
 .../java/dev/sqlcj/sql/SqlParseException.java |   0
 .../main/java/dev/sqlcj/sql/SqlParser.java    |   0
 .../dev/sqlcj/type/DefaultTypeResolver.java   |   0
 .../java/dev/sqlcj/type/TypeResolver.java     |   0
 .../dev/sqlcj/analysis/QueryAnalyzerTest.java |   0
 .../cli/command/GenerateCommandTest.java      |   0
 .../compiler/DefaultSourceLoaderTest.java     |   0
 .../compiler/PostgresIntegrationTest.java     |   0
 .../SqlcjCompilerIntegrationTest.java         |   0
 .../sqlcj/config/YamlConfigLoaderTest.java    |   0
 .../JavaCodeGeneratorNamingTest.java          |   0
 .../generator/JavaCodeGeneratorTest.java      |   0
 .../dev/sqlcj/generator/JavaNamesTest.java    |   0
 .../dev/sqlcj/io/GeneratedFileWriterTest.java |   0
 .../sqlcj/parser/DefaultQueryParserTest.java  |   0
 .../parser/DefaultSchemaParserTest.java       |   0
 .../sqlcj/sql/SqlParameterCompilerTest.java   |   0
 .../java/dev/sqlcj/sql/SqlParserTest.java     |   0
 sqlcj-runtime/pom.xml                         |  21 +++
 .../dev/sqlcj/runtime/JdbcQueryExecutor.java  |   0
 .../runtime/QueryExecutionException.java      |   0
 .../java/dev/sqlcj/runtime/QueryExecutor.java |   0
 .../java/dev/sqlcj/runtime/RowMapper.java     |   0
 .../sqlcj/runtime/JdbcQueryExecutorTest.java  |   0
 70 files changed, 219 insertions(+), 54 deletions(-)
 create mode 100644 sqlcj-cli/pom.xml
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/Main.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/analysis/QueryAnalyzer.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/analysis/QueryColumn.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/analysis/QueryModel.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/analysis/QueryParameter.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/cli/SqlcjCommand.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/cli/command/GenerateCommand.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/cli/command/VersionCommand.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/compiler/CompilationException.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/compiler/DefaultSourceLoader.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/compiler/Source.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/compiler/SourceLoader.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/compiler/SqlcjCompiler.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/config/Config.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/config/ConfigLoader.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/config/ConfigValidator.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/config/ConfigurationException.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/config/JavaConfig.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/config/SqlConfig.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/config/YamlConfigLoader.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/generator/CodeGenerator.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/generator/GeneratedFile.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/generator/JavaCodeGenerator.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/generator/JavaNames.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/io/DefaultFileLoader.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/io/FileLoader.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/io/GeneratedFileWriter.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/parser/DefaultQueryParser.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/parser/Query.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/parser/QueryHeader.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/parser/QueryParser.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/parser/QueryType.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/Column.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/ColumnType.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/Constraint.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/ConstraintType.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/Schema.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/Table.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/parser/DefaultSchemaParser.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/parser/SchemaParseException.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/schema/parser/SchemaParser.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/sql/ParsedSql.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/sql/SqlParameterCompiler.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/sql/SqlParameters.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/sql/SqlParseException.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/sql/SqlParser.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/type/DefaultTypeResolver.java (100%)
 rename {src => sqlcj-cli/src}/main/java/dev/sqlcj/type/TypeResolver.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/analysis/QueryAnalyzerTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/cli/command/GenerateCommandTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/compiler/DefaultSourceLoaderTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/compiler/PostgresIntegrationTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/compiler/SqlcjCompilerIntegrationTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/config/YamlConfigLoaderTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/generator/JavaCodeGeneratorNamingTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/generator/JavaCodeGeneratorTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/generator/JavaNamesTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/io/GeneratedFileWriterTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/parser/DefaultQueryParserTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/schema/parser/DefaultSchemaParserTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/sql/SqlParameterCompilerTest.java (100%)
 rename {src => sqlcj-cli/src}/test/java/dev/sqlcj/sql/SqlParserTest.java (100%)
 create mode 100644 sqlcj-runtime/pom.xml
 rename {src => sqlcj-runtime/src}/main/java/dev/sqlcj/runtime/JdbcQueryExecutor.java (100%)
 rename {src => sqlcj-runtime/src}/main/java/dev/sqlcj/runtime/QueryExecutionException.java (100%)
 rename {src => sqlcj-runtime/src}/main/java/dev/sqlcj/runtime/QueryExecutor.java (100%)
 rename {src => sqlcj-runtime/src}/main/java/dev/sqlcj/runtime/RowMapper.java (100%)
 rename {src => sqlcj-runtime/src}/test/java/dev/sqlcj/runtime/JdbcQueryExecutorTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 6939744..ae85dee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,19 +7,78 @@
     <groupId>dev.sqlcj</groupId>
     <artifactId>sqlcj</artifactId>
     <version>0.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sqlcj</name>
     <description>SQL compiler and type-safe code generator for Java</description>
 
+    <modules>
+        <module>sqlcj-runtime</module>
+        <module>sqlcj-cli</module>
+    </modules>
+
     <properties>
         <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spotless.plugin.version>3.10.2</spotless.plugin.version>
         <spotless.eclipse.version>4.40</spotless.eclipse.version>
+        <spotless.java.config>${project.basedir}/config/eclipse-java-formatter.xml</spotless.java.config>
+        <picocli.version>4.7.7</picocli.version>
+        <jackson.version>3.2.1</jackson.version>
+        <jsqlparser.version>5.3</jsqlparser.version>
+        <junit.version>6.1.2</junit.version>
+        <h2.version>2.4.240</h2.version>
+        <testcontainers.version>1.21.4</testcontainers.version>
+        <postgresql.version>42.7.13</postgresql.version>
+        <commons-compress.version>1.28.0</commons-compress.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>dev.sqlcj</groupId>
+                <artifactId>sqlcj-runtime</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>info.picocli</groupId>
+                <artifactId>picocli</artifactId>
+                <version>${picocli.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>tools.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.jsqlparser</groupId>
+                <artifactId>jsqlparser</artifactId>
+                <version>${jsqlparser.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>${h2.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${testcontainers.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+                <scope>test</scope>
+            </dependency>
             <!--
                 Testcontainers pulls commons-compress 1.24.0, which carries
                 CVE-2024-25710 and CVE-2024-26308. Both are fixed in 1.26.0.
@@ -27,54 +86,42 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.28.0</version>
+                <version>${commons-compress.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>info.picocli</groupId>
-            <artifactId>picocli</artifactId>
-            <version>4.7.7</version>
-        </dependency>
-        <dependency>
-            <groupId>tools.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.jsqlparser</groupId>
-            <artifactId>jsqlparser</artifactId>
-            <version>5.3</version>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>6.1.2</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.4.240</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>1.21.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.7.13</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.4.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>3.6.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.6.3</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
@@ -84,7 +131,7 @@
                     <java>
                         <eclipse>
                             <version>${spotless.eclipse.version}</version>
-                            <file>${project.basedir}/config/eclipse-java-formatter.xml</file>
+                            <file>${spotless.java.config}</file>
                         </eclipse>
                         <removeUnusedImports/>
                         <importOrder>
@@ -105,19 +152,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>dev.sqlcj.Main</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -131,14 +165,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.5.6</version>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.6.3</version>
-                <configuration>
-                    <mainClass>dev.sqlcj.Main</mainClass>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/sqlcj-cli/pom.xml b/sqlcj-cli/pom.xml
new file mode 100644
index 0000000..8ad3834
--- /dev/null
+++ b/sqlcj-cli/pom.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>dev.sqlcj</groupId>
+        <artifactId>sqlcj</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sqlcj-cli</artifactId>
+
+    <name>sqlcj cli</name>
+    <description>SQL compiler and type-safe code generator command line tool</description>
+
+    <properties>
+        <spotless.java.config>${project.basedir}/../config/eclipse-java-formatter.xml</spotless.java.config>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>info.picocli</groupId>
+            <artifactId>picocli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>tools.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+        </dependency>
+        <!--
+            The runtime is not part of the command line tool. Tests use it to
+            compile and execute generated source.
+        -->
+        <dependency>
+            <groupId>dev.sqlcj</groupId>
+            <artifactId>sqlcj-runtime</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>dev.sqlcj.Main</mainClass>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade-cli</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <transformers>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>dev.sqlcj.Main</mainClass>
+                                    <manifestEntries>
+                                        <Implementation-Title>${project.name}</Implementation-Title>
+                                        <Implementation-Version>${project.version}</Implementation-Version>
+                                    </manifestEntries>
+                                </transformer>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>dev.sqlcj.Main</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/dev/sqlcj/Main.java b/sqlcj-cli/src/main/java/dev/sqlcj/Main.java
similarity index 100%
rename from src/main/java/dev/sqlcj/Main.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/Main.java
diff --git a/src/main/java/dev/sqlcj/analysis/QueryAnalyzer.java b/sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryAnalyzer.java
similarity index 100%
rename from src/main/java/dev/sqlcj/analysis/QueryAnalyzer.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryAnalyzer.java
diff --git a/src/main/java/dev/sqlcj/analysis/QueryColumn.java b/sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryColumn.java
similarity index 100%
rename from src/main/java/dev/sqlcj/analysis/QueryColumn.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryColumn.java
diff --git a/src/main/java/dev/sqlcj/analysis/QueryModel.java b/sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryModel.java
similarity index 100%
rename from src/main/java/dev/sqlcj/analysis/QueryModel.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryModel.java
diff --git a/src/main/java/dev/sqlcj/analysis/QueryParameter.java b/sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryParameter.java
similarity index 100%
rename from src/main/java/dev/sqlcj/analysis/QueryParameter.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/analysis/QueryParameter.java
diff --git a/src/main/java/dev/sqlcj/cli/SqlcjCommand.java b/sqlcj-cli/src/main/java/dev/sqlcj/cli/SqlcjCommand.java
similarity index 100%
rename from src/main/java/dev/sqlcj/cli/SqlcjCommand.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/cli/SqlcjCommand.java
diff --git a/src/main/java/dev/sqlcj/cli/command/GenerateCommand.java b/sqlcj-cli/src/main/java/dev/sqlcj/cli/command/GenerateCommand.java
similarity index 100%
rename from src/main/java/dev/sqlcj/cli/command/GenerateCommand.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/cli/command/GenerateCommand.java
diff --git a/src/main/java/dev/sqlcj/cli/command/VersionCommand.java b/sqlcj-cli/src/main/java/dev/sqlcj/cli/command/VersionCommand.java
similarity index 100%
rename from src/main/java/dev/sqlcj/cli/command/VersionCommand.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/cli/command/VersionCommand.java
diff --git a/src/main/java/dev/sqlcj/compiler/CompilationException.java b/sqlcj-cli/src/main/java/dev/sqlcj/compiler/CompilationException.java
similarity index 100%
rename from src/main/java/dev/sqlcj/compiler/CompilationException.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/compiler/CompilationException.java
diff --git a/src/main/java/dev/sqlcj/compiler/DefaultSourceLoader.java b/sqlcj-cli/src/main/java/dev/sqlcj/compiler/DefaultSourceLoader.java
similarity index 100%
rename from src/main/java/dev/sqlcj/compiler/DefaultSourceLoader.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/compiler/DefaultSourceLoader.java
diff --git a/src/main/java/dev/sqlcj/compiler/Source.java b/sqlcj-cli/src/main/java/dev/sqlcj/compiler/Source.java
similarity index 100%
rename from src/main/java/dev/sqlcj/compiler/Source.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/compiler/Source.java
diff --git a/src/main/java/dev/sqlcj/compiler/SourceLoader.java b/sqlcj-cli/src/main/java/dev/sqlcj/compiler/SourceLoader.java
similarity index 100%
rename from src/main/java/dev/sqlcj/compiler/SourceLoader.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/compiler/SourceLoader.java
diff --git a/src/main/java/dev/sqlcj/compiler/SqlcjCompiler.java b/sqlcj-cli/src/main/java/dev/sqlcj/compiler/SqlcjCompiler.java
similarity index 100%
rename from src/main/java/dev/sqlcj/compiler/SqlcjCompiler.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/compiler/SqlcjCompiler.java
diff --git a/src/main/java/dev/sqlcj/config/Config.java b/sqlcj-cli/src/main/java/dev/sqlcj/config/Config.java
similarity index 100%
rename from src/main/java/dev/sqlcj/config/Config.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/config/Config.java
diff --git a/src/main/java/dev/sqlcj/config/ConfigLoader.java b/sqlcj-cli/src/main/java/dev/sqlcj/config/ConfigLoader.java
similarity index 100%
rename from src/main/java/dev/sqlcj/config/ConfigLoader.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/config/ConfigLoader.java
diff --git a/src/main/java/dev/sqlcj/config/ConfigValidator.java b/sqlcj-cli/src/main/java/dev/sqlcj/config/ConfigValidator.java
similarity index 100%
rename from src/main/java/dev/sqlcj/config/ConfigValidator.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/config/ConfigValidator.java
diff --git a/src/main/java/dev/sqlcj/config/ConfigurationException.java b/sqlcj-cli/src/main/java/dev/sqlcj/config/ConfigurationException.java
similarity index 100%
rename from src/main/java/dev/sqlcj/config/ConfigurationException.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/config/ConfigurationException.java
diff --git a/src/main/java/dev/sqlcj/config/JavaConfig.java b/sqlcj-cli/src/main/java/dev/sqlcj/config/JavaConfig.java
similarity index 100%
rename from src/main/java/dev/sqlcj/config/JavaConfig.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/config/JavaConfig.java
diff --git a/src/main/java/dev/sqlcj/config/SqlConfig.java b/sqlcj-cli/src/main/java/dev/sqlcj/config/SqlConfig.java
similarity index 100%
rename from src/main/java/dev/sqlcj/config/SqlConfig.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/config/SqlConfig.java
diff --git a/src/main/java/dev/sqlcj/config/YamlConfigLoader.java b/sqlcj-cli/src/main/java/dev/sqlcj/config/YamlConfigLoader.java
similarity index 100%
rename from src/main/java/dev/sqlcj/config/YamlConfigLoader.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/config/YamlConfigLoader.java
diff --git a/src/main/java/dev/sqlcj/generator/CodeGenerator.java b/sqlcj-cli/src/main/java/dev/sqlcj/generator/CodeGenerator.java
similarity index 100%
rename from src/main/java/dev/sqlcj/generator/CodeGenerator.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/generator/CodeGenerator.java
diff --git a/src/main/java/dev/sqlcj/generator/GeneratedFile.java b/sqlcj-cli/src/main/java/dev/sqlcj/generator/GeneratedFile.java
similarity index 100%
rename from src/main/java/dev/sqlcj/generator/GeneratedFile.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/generator/GeneratedFile.java
diff --git a/src/main/java/dev/sqlcj/generator/JavaCodeGenerator.java b/sqlcj-cli/src/main/java/dev/sqlcj/generator/JavaCodeGenerator.java
similarity index 100%
rename from src/main/java/dev/sqlcj/generator/JavaCodeGenerator.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/generator/JavaCodeGenerator.java
diff --git a/src/main/java/dev/sqlcj/generator/JavaNames.java b/sqlcj-cli/src/main/java/dev/sqlcj/generator/JavaNames.java
similarity index 100%
rename from src/main/java/dev/sqlcj/generator/JavaNames.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/generator/JavaNames.java
diff --git a/src/main/java/dev/sqlcj/io/DefaultFileLoader.java b/sqlcj-cli/src/main/java/dev/sqlcj/io/DefaultFileLoader.java
similarity index 100%
rename from src/main/java/dev/sqlcj/io/DefaultFileLoader.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/io/DefaultFileLoader.java
diff --git a/src/main/java/dev/sqlcj/io/FileLoader.java b/sqlcj-cli/src/main/java/dev/sqlcj/io/FileLoader.java
similarity index 100%
rename from src/main/java/dev/sqlcj/io/FileLoader.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/io/FileLoader.java
diff --git a/src/main/java/dev/sqlcj/io/GeneratedFileWriter.java b/sqlcj-cli/src/main/java/dev/sqlcj/io/GeneratedFileWriter.java
similarity index 100%
rename from src/main/java/dev/sqlcj/io/GeneratedFileWriter.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/io/GeneratedFileWriter.java
diff --git a/src/main/java/dev/sqlcj/parser/DefaultQueryParser.java b/sqlcj-cli/src/main/java/dev/sqlcj/parser/DefaultQueryParser.java
similarity index 100%
rename from src/main/java/dev/sqlcj/parser/DefaultQueryParser.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/parser/DefaultQueryParser.java
diff --git a/src/main/java/dev/sqlcj/parser/Query.java b/sqlcj-cli/src/main/java/dev/sqlcj/parser/Query.java
similarity index 100%
rename from src/main/java/dev/sqlcj/parser/Query.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/parser/Query.java
diff --git a/src/main/java/dev/sqlcj/parser/QueryHeader.java b/sqlcj-cli/src/main/java/dev/sqlcj/parser/QueryHeader.java
similarity index 100%
rename from src/main/java/dev/sqlcj/parser/QueryHeader.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/parser/QueryHeader.java
diff --git a/src/main/java/dev/sqlcj/parser/QueryParser.java b/sqlcj-cli/src/main/java/dev/sqlcj/parser/QueryParser.java
similarity index 100%
rename from src/main/java/dev/sqlcj/parser/QueryParser.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/parser/QueryParser.java
diff --git a/src/main/java/dev/sqlcj/parser/QueryType.java b/sqlcj-cli/src/main/java/dev/sqlcj/parser/QueryType.java
similarity index 100%
rename from src/main/java/dev/sqlcj/parser/QueryType.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/parser/QueryType.java
diff --git a/src/main/java/dev/sqlcj/schema/Column.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/Column.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/Column.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/Column.java
diff --git a/src/main/java/dev/sqlcj/schema/ColumnType.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/ColumnType.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/ColumnType.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/ColumnType.java
diff --git a/src/main/java/dev/sqlcj/schema/Constraint.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/Constraint.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/Constraint.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/Constraint.java
diff --git a/src/main/java/dev/sqlcj/schema/ConstraintType.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/ConstraintType.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/ConstraintType.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/ConstraintType.java
diff --git a/src/main/java/dev/sqlcj/schema/Schema.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/Schema.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/Schema.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/Schema.java
diff --git a/src/main/java/dev/sqlcj/schema/Table.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/Table.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/Table.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/Table.java
diff --git a/src/main/java/dev/sqlcj/schema/parser/DefaultSchemaParser.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/parser/DefaultSchemaParser.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/parser/DefaultSchemaParser.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/parser/DefaultSchemaParser.java
diff --git a/src/main/java/dev/sqlcj/schema/parser/SchemaParseException.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/parser/SchemaParseException.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/parser/SchemaParseException.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/parser/SchemaParseException.java
diff --git a/src/main/java/dev/sqlcj/schema/parser/SchemaParser.java b/sqlcj-cli/src/main/java/dev/sqlcj/schema/parser/SchemaParser.java
similarity index 100%
rename from src/main/java/dev/sqlcj/schema/parser/SchemaParser.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/schema/parser/SchemaParser.java
diff --git a/src/main/java/dev/sqlcj/sql/ParsedSql.java b/sqlcj-cli/src/main/java/dev/sqlcj/sql/ParsedSql.java
similarity index 100%
rename from src/main/java/dev/sqlcj/sql/ParsedSql.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/sql/ParsedSql.java
diff --git a/src/main/java/dev/sqlcj/sql/SqlParameterCompiler.java b/sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParameterCompiler.java
similarity index 100%
rename from src/main/java/dev/sqlcj/sql/SqlParameterCompiler.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParameterCompiler.java
diff --git a/src/main/java/dev/sqlcj/sql/SqlParameters.java b/sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParameters.java
similarity index 100%
rename from src/main/java/dev/sqlcj/sql/SqlParameters.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParameters.java
diff --git a/src/main/java/dev/sqlcj/sql/SqlParseException.java b/sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParseException.java
similarity index 100%
rename from src/main/java/dev/sqlcj/sql/SqlParseException.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParseException.java
diff --git a/src/main/java/dev/sqlcj/sql/SqlParser.java b/sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParser.java
similarity index 100%
rename from src/main/java/dev/sqlcj/sql/SqlParser.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/sql/SqlParser.java
diff --git a/src/main/java/dev/sqlcj/type/DefaultTypeResolver.java b/sqlcj-cli/src/main/java/dev/sqlcj/type/DefaultTypeResolver.java
similarity index 100%
rename from src/main/java/dev/sqlcj/type/DefaultTypeResolver.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/type/DefaultTypeResolver.java
diff --git a/src/main/java/dev/sqlcj/type/TypeResolver.java b/sqlcj-cli/src/main/java/dev/sqlcj/type/TypeResolver.java
similarity index 100%
rename from src/main/java/dev/sqlcj/type/TypeResolver.java
rename to sqlcj-cli/src/main/java/dev/sqlcj/type/TypeResolver.java
diff --git a/src/test/java/dev/sqlcj/analysis/QueryAnalyzerTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/analysis/QueryAnalyzerTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/analysis/QueryAnalyzerTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/analysis/QueryAnalyzerTest.java
diff --git a/src/test/java/dev/sqlcj/cli/command/GenerateCommandTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/cli/command/GenerateCommandTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/cli/command/GenerateCommandTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/cli/command/GenerateCommandTest.java
diff --git a/src/test/java/dev/sqlcj/compiler/DefaultSourceLoaderTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/compiler/DefaultSourceLoaderTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/compiler/DefaultSourceLoaderTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/compiler/DefaultSourceLoaderTest.java
diff --git a/src/test/java/dev/sqlcj/compiler/PostgresIntegrationTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/compiler/PostgresIntegrationTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/compiler/PostgresIntegrationTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/compiler/PostgresIntegrationTest.java
diff --git a/src/test/java/dev/sqlcj/compiler/SqlcjCompilerIntegrationTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/compiler/SqlcjCompilerIntegrationTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/compiler/SqlcjCompilerIntegrationTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/compiler/SqlcjCompilerIntegrationTest.java
diff --git a/src/test/java/dev/sqlcj/config/YamlConfigLoaderTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/config/YamlConfigLoaderTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/config/YamlConfigLoaderTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/config/YamlConfigLoaderTest.java
diff --git a/src/test/java/dev/sqlcj/generator/JavaCodeGeneratorNamingTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/generator/JavaCodeGeneratorNamingTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/generator/JavaCodeGeneratorNamingTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/generator/JavaCodeGeneratorNamingTest.java
diff --git a/src/test/java/dev/sqlcj/generator/JavaCodeGeneratorTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/generator/JavaCodeGeneratorTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/generator/JavaCodeGeneratorTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/generator/JavaCodeGeneratorTest.java
diff --git a/src/test/java/dev/sqlcj/generator/JavaNamesTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/generator/JavaNamesTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/generator/JavaNamesTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/generator/JavaNamesTest.java
diff --git a/src/test/java/dev/sqlcj/io/GeneratedFileWriterTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/io/GeneratedFileWriterTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/io/GeneratedFileWriterTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/io/GeneratedFileWriterTest.java
diff --git a/src/test/java/dev/sqlcj/parser/DefaultQueryParserTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/parser/DefaultQueryParserTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/parser/DefaultQueryParserTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/parser/DefaultQueryParserTest.java
diff --git a/src/test/java/dev/sqlcj/schema/parser/DefaultSchemaParserTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/schema/parser/DefaultSchemaParserTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/schema/parser/DefaultSchemaParserTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/schema/parser/DefaultSchemaParserTest.java
diff --git a/src/test/java/dev/sqlcj/sql/SqlParameterCompilerTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/sql/SqlParameterCompilerTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/sql/SqlParameterCompilerTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/sql/SqlParameterCompilerTest.java
diff --git a/src/test/java/dev/sqlcj/sql/SqlParserTest.java b/sqlcj-cli/src/test/java/dev/sqlcj/sql/SqlParserTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/sql/SqlParserTest.java
rename to sqlcj-cli/src/test/java/dev/sqlcj/sql/SqlParserTest.java
diff --git a/sqlcj-runtime/pom.xml b/sqlcj-runtime/pom.xml
new file mode 100644
index 0000000..76cb810
--- /dev/null
+++ b/sqlcj-runtime/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>dev.sqlcj</groupId>
+        <artifactId>sqlcj</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sqlcj-runtime</artifactId>
+
+    <name>sqlcj runtime</name>
+    <description>JDBC runtime used by sqlcj generated code</description>
+
+    <properties>
+        <spotless.java.config>${project.basedir}/../config/eclipse-java-formatter.xml</spotless.java.config>
+    </properties>
+</project>
diff --git a/src/main/java/dev/sqlcj/runtime/JdbcQueryExecutor.java b/sqlcj-runtime/src/main/java/dev/sqlcj/runtime/JdbcQueryExecutor.java
similarity index 100%
rename from src/main/java/dev/sqlcj/runtime/JdbcQueryExecutor.java
rename to sqlcj-runtime/src/main/java/dev/sqlcj/runtime/JdbcQueryExecutor.java
diff --git a/src/main/java/dev/sqlcj/runtime/QueryExecutionException.java b/sqlcj-runtime/src/main/java/dev/sqlcj/runtime/QueryExecutionException.java
similarity index 100%
rename from src/main/java/dev/sqlcj/runtime/QueryExecutionException.java
rename to sqlcj-runtime/src/main/java/dev/sqlcj/runtime/QueryExecutionException.java
diff --git a/src/main/java/dev/sqlcj/runtime/QueryExecutor.java b/sqlcj-runtime/src/main/java/dev/sqlcj/runtime/QueryExecutor.java
similarity index 100%
rename from src/main/java/dev/sqlcj/runtime/QueryExecutor.java
rename to sqlcj-runtime/src/main/java/dev/sqlcj/runtime/QueryExecutor.java
diff --git a/src/main/java/dev/sqlcj/runtime/RowMapper.java b/sqlcj-runtime/src/main/java/dev/sqlcj/runtime/RowMapper.java
similarity index 100%
rename from src/main/java/dev/sqlcj/runtime/RowMapper.java
rename to sqlcj-runtime/src/main/java/dev/sqlcj/runtime/RowMapper.java
diff --git a/src/test/java/dev/sqlcj/runtime/JdbcQueryExecutorTest.java b/sqlcj-runtime/src/test/java/dev/sqlcj/runtime/JdbcQueryExecutorTest.java
similarity index 100%
rename from src/test/java/dev/sqlcj/runtime/JdbcQueryExecutorTest.java
rename to sqlcj-runtime/src/test/java/dev/sqlcj/runtime/JdbcQueryExecutorTest.java