diff --git a/.github/workflows/plugins-tests.yml b/.github/workflows/plugins-tests.yml
index 2883e91e..b9d42291 100644
--- a/.github/workflows/plugins-tests.yml
+++ b/.github/workflows/plugins-tests.yml
@@ -45,9 +45,9 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          gradle-version: 7.4
+          gradle-version: 8.13
 
       - name: Generate certificates
         run: |
@@ -109,9 +109,9 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          gradle-version: 7.4
+          gradle-version: 8.13
 
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
index 9423717f..0f1e1ec8 100644
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -20,9 +20,9 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          gradle-version: 7.4
+          gradle-version: 8.13
 
       - name: Build
         run: ./gradlew compileTest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c202d9eb..2c363d8b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,22 +1,46 @@
-name: Initiate Release
-
-on:
-  push:
-    tags:
-      - "*"
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get the version
-        id: get_version
-        run: |
-          echo ::set-output name=version::${GITHUB_REF:10}
-          echo ::set-output name=target::${GITHUB_REF}
-      - name: Perform Release
-        run: |
-          curl -X POST https://api.github.com/repos/EventStore/TrainStation/dispatches \
-          -H 'Accept: application/vnd.github.everest-preview+json' \
-          -u ${{ secrets.GH_PAT }} \
-          --data '{"event_type": "java-grpc-client-release", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'", "version": "${{ steps.get_version.outputs.version }}", "target": "${{ steps.get_version.outputs.target }}" }}'
\ No newline at end of file
+name: Publish
+
+on:
+  push:
+    tags:
+      - 'release/*'
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: 'Perform a dry run release'
+        type: boolean
+        required: false
+        default: true
+
+jobs:
+  publish:
+    name: Publish${{ inputs.dry_run && inputs.dry_run == 'true' && ' (dry run)' || '' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v3
+        with:
+          gradle-version: 8.13
+
+      - name: Release
+        env:
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.JRELEASER_MAVENCENTRAL_PASSWORD }}
+          JRELEASER_GENERIC_TOKEN:  ${{ secrets.GH_PAT }}
+        run: |
+          if [ "${{ inputs.dry_run }}" = "true" ]; then
+            ./gradlew publish jreleaserFullRelease -S --dryrun
+          else
+            ./gradlew publish jreleaserFullRelease -S
+          fi
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
deleted file mode 100644
index 794ad528..00000000
--- a/.github/workflows/snapshot.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Initiate Snapshot Release
-
-on:
-  push:
-    branches:
-      - "trunk"
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Perform Release
-        run: |
-          curl -X POST https://api.github.com/repos/EventStore/TrainStation/dispatches \
-          -H 'Accept: application/vnd.github.everest-preview+json' \
-          -u ${{ secrets.GH_PAT }} \
-          --data '{"event_type": "java-grpc-client-release", "client_payload": { "repository": "'"$GITHUB_REPOSITORY"'", "version": "snapshot", "target": "trunk" }}'
\ No newline at end of file
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2f83aeeb..3be3d690 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -37,9 +37,9 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          gradle-version: 7.4
+          gradle-version: 8.13
 
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
@@ -78,9 +78,9 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          gradle-version: 7.4
+          gradle-version: 8.13
 
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
@@ -123,9 +123,9 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          gradle-version: 7.4
+          gradle-version: 8.13
 
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
diff --git a/build.gradle b/build.gradle
index add7563e..d37108b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,325 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Java Library project to get you started.
- * For more details take a look at the Java Libraries chapter in the Gradle
- * User Manual available at https://docs.gradle.org/6.6.1/userguide/java_library_plugin.html
- */
-allprojects {
+buildscript {
+    dependencies {
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
+        classpath 'de.undercouch:gradle-download-task:5.5.0'
+    }
+}
+
+plugins {
+    id 'java'
+    id 'com.google.protobuf' version '0.9.4'
+    id 'idea'
+    id 'maven-publish'
+    id 'signing'
+    id 'org.jreleaser' version '1.17.0'
+}
+
+def ENV = System.getenv()
+
+repositories {
+    mavenCentral()
+}
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked']
+}
+
+group = 'io.kurrent'
+version = '1.0.0-alpha.5'
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+configurations {
+    exposedRuntime {
+        canBeResolved = false
+        canBeConsumed = true
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation "org.reactivestreams:reactive-streams:${reactiveStreamsApiVersion}"
+
+    implementation "javax.annotation:javax.annotation-api:${annotationApiVersion}"
+    implementation "javax.validation:validation-api:${validationApiVersion}"
+
+    implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
+    implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}"
+    implementation 'com.google.errorprone:error_prone_annotations:2.23.0'
+    implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"
+    implementation "io.grpc:grpc-stub:${grpcVersion}"
+    implementation "io.grpc:grpc-protobuf:${grpcVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+    implementation "org.slf4j:slf4j-api:2.0.17"
+    implementation "org.bouncycastle:bcprov-jdk18on:1.80"
+    implementation "org.bouncycastle:bcpkix-jdk18on:1.80"
+
+    implementation platform("io.opentelemetry:opentelemetry-bom:${openTelemetryVersion}")
+    implementation "io.opentelemetry:opentelemetry-api"
+    implementation "io.opentelemetry.semconv:opentelemetry-semconv:${openTelemetrySemConvVersion}"
+    implementation "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${openTelemetrySemConvVersion}"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+    testImplementation "org.junit.platform:junit-platform-suite:1.10.0"
+    testImplementation 'org.junit-pioneer:junit-pioneer:1.9.1'
+    testImplementation 'io.reactivex.rxjava3:rxjava:3.1.8'
+    testImplementation "org.reactivestreams:reactive-streams-tck:${reactiveStreamsApiVersion}"
+    testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}"
+    testImplementation platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
+    testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+    testImplementation "com.github.javafaker:javafaker:1.0.2"
+    testImplementation 'org.slf4j:slf4j-simple:2.0.17'
+    testImplementation "io.opentelemetry:opentelemetry-sdk"
+    testImplementation "io.opentelemetry:opentelemetry-sdk-testing"
+    testImplementation 'io.opentelemetry:opentelemetry-exporter-logging:1.38.0'
+    testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp-trace:1.14.0'
+}
+
+tasks.withType(Test).configureEach {
+    testLogging {
+        events "PASSED", "SKIPPED", "FAILED"
+        showExceptions true
+        exceptionFormat "full"
+        showCauses true
+        showStackTraces true
+        showStandardStreams = true
+    }
+}
+
+tasks.register("generateCertificates", Exec) {
+    description = "Generates SSL certificates to start a secured ESDB server"
+    commandLine 'docker', 'compose', '--file', './configure-tls-for-tests.yml', 'up'
+}
+
+tasks.register("generateUserCertificates", Exec) {
+    description = "Generates X.509 certificates for Plugins tests"
+    commandLine 'docker', 'compose', '--file', './configure-user-certs-for-tests.yml', 'up'
+}
+
+tasks.register("startDockerCompose", Exec) {
+    description = "Starts ESDB cluster"
+    commandLine 'docker', 'compose', '--file', './docker-compose.yml', 'up', '-d'
+}
+
+tasks.register("stopDockerCompose", Exec) {
+    description = "Stop ESDB cluster"
+    commandLine 'docker', 'compose', '--file', './docker-compose.yml', 'down'
+}
+
+
+tasks.register("miscTests", Test) {
+    useJUnitPlatform {
+        include("**/MiscTests.class")
+    }
+}
+
+tasks.register("singleNodeTests", Test) {
+    useJUnitPlatform {
+        include("**/StreamsTests.class")
+        include("**/PersistentSubscriptionsTests.class")
+        include("**/TelemetryTests.class")
+    }
+}
+
+tasks.register("secureNodeTests", Test) {
+    dependsOn generateCertificates
+    environment "SECURE", "true"
+
+    useJUnitPlatform {
+        include("**/StreamsTests.class")
+        include("**/PersistentSubscriptionsTests.class")
+    }
+}
+
+tasks.register("clusterTests", Test) {
+    dependsOn startDockerCompose
+    finalizedBy stopDockerCompose
+    environment "SECURE", "true"
+    environment "CLUSTER", "true"
+
+    useJUnitPlatform {
+        include("**/StreamsTests.class")
+        include("**/PersistentSubscriptionsTests.class")
+    }
+}
+
+tasks.register("pluginsTests", Test) {
+    dependsOn generateCertificates
+    dependsOn generateUserCertificates
+
+    environment "SECURE", "true"
+
+    useJUnitPlatform {
+        include("**/PluginsTests.class")
+    }
+}
+
+tasks.register("ci", Test) {
+    useJUnitPlatform()
+}
+
+test {
+    dependsOn miscTests, singleNodeTests, secureNodeTests, clusterTests
+}
+
+protobuf {
+    protoc {
+        // The artifact spec for the Protobuf Compiler
+        artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
+    plugins {
+        // Optional: an artifact spec for a protoc plugin, with "grpc" as
+        // the identifier, which can be referred to in the "plugins"
+        // container of the "generateProtoTasks" closure.
+        grpc {
+            artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
+        }
+    }
+    generateProtoTasks {
+        ofSourceSet('main')*.plugins {
+            // Apply the "grpc" plugin whose spec is defined above, without
+            // options.  Note the braces cannot be omitted, otherwise the
+            // plugin will not be added. This is because of the implicit way
+            // NamedDomainObjectContainer binds the methods.
+            grpc {}
+        }
+    }
+}
+
+javadoc {
+    options.addStringOption('Xdoclint:none', '-quiet')
+    failOnError = false
+}
+
+tasks.register('checkVersion') {
+    doFirst {
+        def xml = new URL(
+                'https://repo.maven.apache.org/maven2/dev/aoqia/leaf/installer/maven-metadata.xml').text
+        def metadata = new groovy.xml.XmlSlurper().parseText(xml)
+        def versions = metadata.versioning.versions.version*.text();
+        if (versions.contains(version)) {
+            throw new RuntimeException("${version} has already been released!")
+        }
+    }
+}
+publish.mustRunAfter checkVersion
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'io.kurrent'
+            artifactId = 'kurrentdb-client'
+
+            from components.java
+            pom {
+                name = 'KurrentDB gRPC Java client'
+                description = 'KurrentDB gRPC Java client'
+                url = 'https://kurrent.io'
+
+                scm {
+                    connection = 'scm:git:https://github.com/kurrent-io/KurrentDB-Client-Java.git'
+                    developerConnection = 'scm:git:ssh:https://github.com/kurrent-io/KurrentDB-Client-Java.git'
+                    url = 'https://github.com/kurrent-io/KurrentDB-Client-Java'
+                }
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'ylaupa'
+                        name = 'Yorick Laupa'
+                        email = 'yorick.laupa@eventstore.com'
+                    }
+                }
+            }
+        }
+    }
     repositories {
-        mavenCentral()
+        maven {
+            name = "StagingDeploy"
+            url = layout.buildDirectory.dir('staging-deploy')
+        }
+    }
+}
+
+jreleaser {
+    project {
+        copyright = 'Kurrent, Inc'
+        description = 'Kurrent gRPC Java client'
+    }
+    signing {
+        active = 'ALWAYS'
+        armored = true
+        passphrase = ENV.JRELEASER_GPG_PASSPHRASE
+        publicKey = ENV.JRELEASER_GPG_PUBLIC_KEY
+        secretKey = ENV.JRELEASER_GPG_SECRET_KEY
+    }
+    deploy {
+        maven {
+            mavenCentral {
+                sonatype {
+                    active = 'ALWAYS'
+                    url = 'https://central.sonatype.com/api/v1/publisher'
+                    authorization = 'BEARER'
+                    username = ENV.JRELEASER_MAVENCENTRAL_USERNAME
+                    password = ENV.JRELEASER_MAVENCENTRAL_PASSWORD
+                    retryDelay = 60
+                    maxRetries = 60
+                    stagingRepository('build/staging-deploy')
+                }
+            }
+        }
+    }
+    release {
+        generic {
+            enabled = true
+            repoOwner = 'kurrent-io'
+            name = 'kurrentdb-client'
+            host = 'https://www.kurrent.io'
+            username = 'w1am'
+            sign = false
+            token = ENV.JRELEASER_GENERIC_TOKEN
+            skipRelease = true
+            skipTag = true
+        }
+        github {
+            enabled = false
+            repoOwner = 'kurrent-io'
+            name = 'KurrentDB-Client-Java'
+            host = 'github.com'
+            token = ENV.JRELEASER_GENERIC_TOKEN
+            sign = true
+            overwrite = true
+            artifacts = true
+            changelog {
+                enabled = false
+                formatted = 'ALWAYS'
+                preset = 'conventional-commits'
+            }
+        }
     }
 }
 
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 if (!JavaVersion.current().isJava8Compatible()) {
     throw new Exception("Java 8 is required to build Kurrent-Client-Java")
-}
\ No newline at end of file
+}
diff --git a/db-client-java/build.gradle b/db-client-java/build.gradle
deleted file mode 100644
index 7ff66926..00000000
--- a/db-client-java/build.gradle
+++ /dev/null
@@ -1,262 +0,0 @@
-buildscript {
-    dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
-        //classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.4.4'
-        classpath 'de.undercouch:gradle-download-task:5.5.0'
-    }
-}
-
-plugins {
-    id 'java-library'
-    id 'com.google.protobuf' version '0.9.4'
-    id 'idea'
-    id 'maven-publish'
-    id 'signing'
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked']
-}
-
-group = 'io.kurrent'
-version = '1.0.0'
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-configurations {
-    exposedRuntime {
-        canBeResolved = false
-        canBeConsumed = true
-    }
-}
-
-dependencies {
-    api "org.reactivestreams:reactive-streams:${reactiveStreamsApiVersion}"
-
-    implementation "javax.annotation:javax.annotation-api:${annotationApiVersion}"
-    implementation "javax.validation:validation-api:${validationApiVersion}"
-
-    implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
-    implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}"
-    implementation 'com.google.errorprone:error_prone_annotations:2.23.0'
-    implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"
-    implementation "io.grpc:grpc-stub:${grpcVersion}"
-    implementation "io.grpc:grpc-protobuf:${grpcVersion}"
-    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-    implementation "org.slf4j:slf4j-api:2.0.17"
-    implementation "org.bouncycastle:bcprov-jdk18on:1.80"
-    implementation "org.bouncycastle:bcpkix-jdk18on:1.80"
-
-    implementation platform("io.opentelemetry:opentelemetry-bom:${openTelemetryVersion}")
-    implementation "io.opentelemetry:opentelemetry-api"
-    implementation "io.opentelemetry.semconv:opentelemetry-semconv:${openTelemetrySemConvVersion}"
-    implementation "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${openTelemetrySemConvVersion}"
-
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
-    testImplementation "org.junit.platform:junit-platform-suite:1.10.0"
-    testImplementation 'org.junit-pioneer:junit-pioneer:1.9.1'
-    testImplementation 'io.reactivex.rxjava3:rxjava:3.1.8'
-    testImplementation "org.reactivestreams:reactive-streams-tck:${reactiveStreamsApiVersion}"
-    testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}"
-    testImplementation platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
-    testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
-    testImplementation "com.github.javafaker:javafaker:1.0.2"
-    testImplementation 'org.slf4j:slf4j-simple:2.0.17'
-    testImplementation "io.opentelemetry:opentelemetry-sdk"
-    testImplementation "io.opentelemetry:opentelemetry-sdk-testing"
-    testImplementation 'io.opentelemetry:opentelemetry-exporter-logging:1.38.0'
-    testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp-trace:1.14.0'
-}
-
-tasks.withType(Test).configureEach {
-    testLogging {
-        events "PASSED", "SKIPPED", "FAILED"
-        showExceptions true
-        exceptionFormat "full"
-        showCauses true
-        showStackTraces true
-        showStandardStreams = true
-    }
-}
-
-tasks.register("generateCertificates", Exec) {
-    description = "Generates SSL certificates to start a secured ESDB server"
-    commandLine 'docker', 'compose', '--file', '../configure-tls-for-tests.yml', 'up'
-}
-
-tasks.register("generateUserCertificates", Exec) {
-    description = "Generates X.509 certificates for Plugins tests"
-    commandLine 'docker', 'compose', '--file', '../configure-user-certs-for-tests.yml', 'up'
-}
-
-tasks.register("startDockerCompose", Exec) {
-    description = "Starts ESDB cluster"
-    commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'up', '-d'
-}
-
-tasks.register("stopDockerCompose", Exec) {
-    description = "Stop ESDB cluster"
-    commandLine 'docker', 'compose', '--file', '../docker-compose.yml', 'down'
-}
-
-
-tasks.register("miscTests", Test) {
-    useJUnitPlatform {
-        include("**/MiscTests.class")
-    }
-}
-
-tasks.register("singleNodeTests", Test) {
-    useJUnitPlatform {
-        include("**/StreamsTests.class")
-        include("**/PersistentSubscriptionsTests.class")
-        include("**/TelemetryTests.class")
-    }
-}
-
-tasks.register("secureNodeTests", Test) {
-    dependsOn generateCertificates
-    environment "SECURE", "true"
-
-    useJUnitPlatform {
-        include("**/StreamsTests.class")
-        include("**/PersistentSubscriptionsTests.class")
-    }
-}
-
-tasks.register("clusterTests", Test) {
-    dependsOn startDockerCompose
-    finalizedBy stopDockerCompose
-    environment "SECURE", "true"
-    environment "CLUSTER", "true"
-
-    useJUnitPlatform {
-        include("**/StreamsTests.class")
-        include("**/PersistentSubscriptionsTests.class")
-    }
-}
-
-tasks.register("pluginsTests", Test) {
-    dependsOn generateCertificates
-    dependsOn generateUserCertificates
-
-    environment "SECURE", "true"
-
-    useJUnitPlatform {
-        include("**/PluginsTests.class")
-    }
-}
-
-tasks.register("ci", Test) {
-    useJUnitPlatform()
-}
-
-test {
-    dependsOn miscTests, singleNodeTests, secureNodeTests, clusterTests
-}
-
-protobuf {
-    protoc {
-        // The artifact spec for the Protobuf Compiler
-        artifact = "com.google.protobuf:protoc:${protocVersion}"
-    }
-    plugins {
-        // Optional: an artifact spec for a protoc plugin, with "grpc" as
-        // the identifier, which can be referred to in the "plugins"
-        // container of the "generateProtoTasks" closure.
-        grpc {
-            artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
-        }
-    }
-    generateProtoTasks {
-        ofSourceSet('main')*.plugins {
-            // Apply the "grpc" plugin whose spec is defined above, without
-            // options.  Note the braces cannot be omitted, otherwise the
-            // plugin will not be added. This is because of the implicit way
-            // NamedDomainObjectContainer binds the methods.
-            grpc {}
-        }
-    }
-}
-
-def isSnapshot = project.version.toString().endsWith("-SNAPSHOT")
-def publishLogin = project.hasProperty("ossrhUsername") ? project.getProperties().get("ossrhUsername") : ""
-def publishPassword = project.hasProperty("ossrhPassword") ? project.getProperties().get("ossrhPassword") : ""
-
-javadoc {
-    options.addStringOption('Xdoclint:none', '-quiet')
-    failOnError = false
-}
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId = 'kurrentdb-client'
-
-            from components.java
-            pom {
-                name = 'KurrentDB Client Java'
-                // packaging 'jar'
-                // optionally artifactId can be defined here
-                description = 'KurrentDB gRPC Java client'
-                url = 'https://kurrent.io'
-
-                scm {
-                    connection = 'https://github.com/EventStore/KurrentDB-Client-Java.git'
-                    developerConnection = 'https://github.com/EventStore/KurrentDB-Client-Java.git'
-                    url = 'https://github.com/EventStore/KurrentDB-Client-Java'
-                }
-
-                licenses {
-                    license {
-                        name = 'The Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id = 'ylaupa'
-                        name = 'Yorick Laupa'
-                        email = 'yorick.laupa@eventstore.com'
-                    }
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            def releaseUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-            def snapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots'
-            def finalUrl = isSnapshot ? snapshotUrl : releaseUrl
-
-            name = 'Sonatype'
-            url = finalUrl
-            credentials {
-                username = publishLogin
-                password = publishPassword
-            }
-        }
-    }
-}
-
-signing {
-    useGpgCmd()
-    sign configurations.archives
-    sign publishing.publications.mavenJava
-}
-
-tasks.withType(Sign) {
-    onlyIf {
-        gradle.taskGraph.hasTask(":db-client-java:publish")
-    }
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
diff --git a/gradle.properties b/gradle.properties
index 2f5f4ae4..ca37c6da 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,3 @@
-group=io.kurrent
-version=1.0-SNAPSHOT
-
 # Dependencies
 grpcVersion=1.71.0
 protocVersion=4.28.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c0..41d9927a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fce..f407850a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c..1b6c7873 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/settings.gradle b/settings.gradle
index 6c704471..64741809 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,5 +7,4 @@
  * in the user manual at https://docs.gradle.org/6.6.1/userguide/multi_project_builds.html
  */
 
-rootProject.name = 'kurrent-db-client'
-include 'db-client-java'
+rootProject.name = 'kurrentdb-client'
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjection.java b/src/main/java/io/kurrent/dbclient/AbortProjection.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbortProjection.java
rename to src/main/java/io/kurrent/dbclient/AbortProjection.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java b/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java
rename to src/main/java/io/kurrent/dbclient/AbortProjectionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java
rename to src/main/java/io/kurrent/dbclient/AbstractCreatePersistentSubscription.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java
rename to src/main/java/io/kurrent/dbclient/AbstractDeletePersistentSubscription.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java b/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java
rename to src/main/java/io/kurrent/dbclient/AbstractPersistentSubscriptionSettingsBuilder.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRead.java b/src/main/java/io/kurrent/dbclient/AbstractRead.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractRead.java
rename to src/main/java/io/kurrent/dbclient/AbstractRead.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java
rename to src/main/java/io/kurrent/dbclient/AbstractRegularSubscription.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java
rename to src/main/java/io/kurrent/dbclient/AbstractSubscribePersistentSubscription.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java b/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java
rename to src/main/java/io/kurrent/dbclient/AbstractUpdatePersistentSubscription.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Acl.java b/src/main/java/io/kurrent/dbclient/Acl.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Acl.java
rename to src/main/java/io/kurrent/dbclient/Acl.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Acls.java b/src/main/java/io/kurrent/dbclient/Acls.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Acls.java
rename to src/main/java/io/kurrent/dbclient/Acls.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AppendToStream.java b/src/main/java/io/kurrent/dbclient/AppendToStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AppendToStream.java
rename to src/main/java/io/kurrent/dbclient/AppendToStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java b/src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java
rename to src/main/java/io/kurrent/dbclient/AppendToStreamOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Checkpointer.java b/src/main/java/io/kurrent/dbclient/Checkpointer.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Checkpointer.java
rename to src/main/java/io/kurrent/dbclient/Checkpointer.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientCertificate.java b/src/main/java/io/kurrent/dbclient/ClientCertificate.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientCertificate.java
rename to src/main/java/io/kurrent/dbclient/ClientCertificate.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java b/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java
rename to src/main/java/io/kurrent/dbclient/ClientFeatureFlags.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java b/src/main/java/io/kurrent/dbclient/ClientTelemetry.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetry.java
rename to src/main/java/io/kurrent/dbclient/ClientTelemetry.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java
rename to src/main/java/io/kurrent/dbclient/ClientTelemetryAttributes.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java
rename to src/main/java/io/kurrent/dbclient/ClientTelemetryConstants.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java b/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java
rename to src/main/java/io/kurrent/dbclient/ClientTelemetryTags.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java b/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClusterDiscovery.java
rename to src/main/java/io/kurrent/dbclient/ClusterDiscovery.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ClusterInfo.java b/src/main/java/io/kurrent/dbclient/ClusterInfo.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ClusterInfo.java
rename to src/main/java/io/kurrent/dbclient/ClusterInfo.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java b/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionMetadata.java
rename to src/main/java/io/kurrent/dbclient/ConnectionMetadata.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionService.java b/src/main/java/io/kurrent/dbclient/ConnectionService.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionService.java
rename to src/main/java/io/kurrent/dbclient/ConnectionService.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java b/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java
rename to src/main/java/io/kurrent/dbclient/ConnectionSettingsBuilder.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java b/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java
rename to src/main/java/io/kurrent/dbclient/ConnectionShutdownException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionState.java b/src/main/java/io/kurrent/dbclient/ConnectionState.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionState.java
rename to src/main/java/io/kurrent/dbclient/ConnectionState.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java b/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java
rename to src/main/java/io/kurrent/dbclient/ConnectionStringParsingException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Consts.java b/src/main/java/io/kurrent/dbclient/Consts.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Consts.java
rename to src/main/java/io/kurrent/dbclient/Consts.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ContentType.java b/src/main/java/io/kurrent/dbclient/ContentType.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ContentType.java
rename to src/main/java/io/kurrent/dbclient/ContentType.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreateChannel.java b/src/main/java/io/kurrent/dbclient/CreateChannel.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CreateChannel.java
rename to src/main/java/io/kurrent/dbclient/CreateChannel.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java
rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAll.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java
rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToAllOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java
rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java b/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java
rename to src/main/java/io/kurrent/dbclient/CreatePersistentSubscriptionToStreamOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjection.java b/src/main/java/io/kurrent/dbclient/CreateProjection.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CreateProjection.java
rename to src/main/java/io/kurrent/dbclient/CreateProjection.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java b/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java
rename to src/main/java/io/kurrent/dbclient/CreateProjectionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/CustomAclCodec.java b/src/main/java/io/kurrent/dbclient/CustomAclCodec.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/CustomAclCodec.java
rename to src/main/java/io/kurrent/dbclient/CustomAclCodec.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java b/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java
rename to src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java
rename to src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToAll.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java
rename to src/main/java/io/kurrent/dbclient/DeletePersistentSubscriptionToStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjection.java b/src/main/java/io/kurrent/dbclient/DeleteProjection.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjection.java
rename to src/main/java/io/kurrent/dbclient/DeleteProjection.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java b/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java
rename to src/main/java/io/kurrent/dbclient/DeleteProjectionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteResult.java b/src/main/java/io/kurrent/dbclient/DeleteResult.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteResult.java
rename to src/main/java/io/kurrent/dbclient/DeleteResult.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStream.java b/src/main/java/io/kurrent/dbclient/DeleteStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteStream.java
rename to src/main/java/io/kurrent/dbclient/DeleteStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java b/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java
rename to src/main/java/io/kurrent/dbclient/DeleteStreamOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Direction.java b/src/main/java/io/kurrent/dbclient/Direction.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Direction.java
rename to src/main/java/io/kurrent/dbclient/Direction.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjection.java b/src/main/java/io/kurrent/dbclient/DisableProjection.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DisableProjection.java
rename to src/main/java/io/kurrent/dbclient/DisableProjection.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java b/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java
rename to src/main/java/io/kurrent/dbclient/DisableProjectionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Discovery.java b/src/main/java/io/kurrent/dbclient/Discovery.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Discovery.java
rename to src/main/java/io/kurrent/dbclient/Discovery.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjection.java b/src/main/java/io/kurrent/dbclient/EnableProjection.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/EnableProjection.java
rename to src/main/java/io/kurrent/dbclient/EnableProjection.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java b/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java
rename to src/main/java/io/kurrent/dbclient/EnableProjectionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventData.java b/src/main/java/io/kurrent/dbclient/EventData.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/EventData.java
rename to src/main/java/io/kurrent/dbclient/EventData.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventDataBuilder.java b/src/main/java/io/kurrent/dbclient/EventDataBuilder.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/EventDataBuilder.java
rename to src/main/java/io/kurrent/dbclient/EventDataBuilder.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventFilter.java b/src/main/java/io/kurrent/dbclient/EventFilter.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/EventFilter.java
rename to src/main/java/io/kurrent/dbclient/EventFilter.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/EventTypeFilter.java b/src/main/java/io/kurrent/dbclient/EventTypeFilter.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/EventTypeFilter.java
rename to src/main/java/io/kurrent/dbclient/EventTypeFilter.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/FeatureFlags.java b/src/main/java/io/kurrent/dbclient/FeatureFlags.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/FeatureFlags.java
rename to src/main/java/io/kurrent/dbclient/FeatureFlags.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java b/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java
rename to src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfo.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java b/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java
rename to src/main/java/io/kurrent/dbclient/GetPersistentSubscriptionInfoOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResult.java b/src/main/java/io/kurrent/dbclient/GetProjectionResult.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResult.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionResult.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionResultOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionState.java b/src/main/java/io/kurrent/dbclient/GetProjectionState.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionState.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionState.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionStateOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionStatistics.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionStatisticsOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatus.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionStatus.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java b/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java
rename to src/main/java/io/kurrent/dbclient/GetProjectionStatusOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GossipClient.java b/src/main/java/io/kurrent/dbclient/GossipClient.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GossipClient.java
rename to src/main/java/io/kurrent/dbclient/GossipClient.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GrpcClient.java b/src/main/java/io/kurrent/dbclient/GrpcClient.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GrpcClient.java
rename to src/main/java/io/kurrent/dbclient/GrpcClient.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/GrpcUtils.java b/src/main/java/io/kurrent/dbclient/GrpcUtils.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/GrpcUtils.java
rename to src/main/java/io/kurrent/dbclient/GrpcUtils.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/HttpUtils.java b/src/main/java/io/kurrent/dbclient/HttpUtils.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/HttpUtils.java
rename to src/main/java/io/kurrent/dbclient/HttpUtils.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClient.java b/src/main/java/io/kurrent/dbclient/KurrentDBClient.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClient.java
rename to src/main/java/io/kurrent/dbclient/KurrentDBClient.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java b/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java
rename to src/main/java/io/kurrent/dbclient/KurrentDBClientBase.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java b/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java
rename to src/main/java/io/kurrent/dbclient/KurrentDBClientSettings.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java b/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java
rename to src/main/java/io/kurrent/dbclient/KurrentDBConnectionString.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java b/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java
rename to src/main/java/io/kurrent/dbclient/KurrentDBPersistentSubscriptionsClient.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java b/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java
rename to src/main/java/io/kurrent/dbclient/KurrentDBProjectionManagementClient.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java b/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java
rename to src/main/java/io/kurrent/dbclient/ListPersistentSubscriptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java b/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java
rename to src/main/java/io/kurrent/dbclient/ListPersistentSubscriptionsOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListProjections.java b/src/main/java/io/kurrent/dbclient/ListProjections.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ListProjections.java
rename to src/main/java/io/kurrent/dbclient/ListProjections.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java b/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java
rename to src/main/java/io/kurrent/dbclient/ListProjectionsOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java b/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ListProjectionsResult.java
rename to src/main/java/io/kurrent/dbclient/ListProjectionsResult.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Msg.java b/src/main/java/io/kurrent/dbclient/Msg.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Msg.java
rename to src/main/java/io/kurrent/dbclient/Msg.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NackAction.java b/src/main/java/io/kurrent/dbclient/NackAction.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/NackAction.java
rename to src/main/java/io/kurrent/dbclient/NackAction.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java b/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java
rename to src/main/java/io/kurrent/dbclient/NamedConsumerStrategy.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java b/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java
rename to src/main/java/io/kurrent/dbclient/NoClusterNodeFoundException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NodePreference.java b/src/main/java/io/kurrent/dbclient/NodePreference.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/NodePreference.java
rename to src/main/java/io/kurrent/dbclient/NodePreference.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NodeSelector.java b/src/main/java/io/kurrent/dbclient/NodeSelector.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/NodeSelector.java
rename to src/main/java/io/kurrent/dbclient/NodeSelector.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/NotLeaderException.java b/src/main/java/io/kurrent/dbclient/NotLeaderException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/NotLeaderException.java
rename to src/main/java/io/kurrent/dbclient/NotLeaderException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OperationKind.java b/src/main/java/io/kurrent/dbclient/OperationKind.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/OperationKind.java
rename to src/main/java/io/kurrent/dbclient/OperationKind.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsBase.java b/src/main/java/io/kurrent/dbclient/OptionsBase.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsBase.java
rename to src/main/java/io/kurrent/dbclient/OptionsBase.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java b/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java
rename to src/main/java/io/kurrent/dbclient/OptionsWithBackPressure.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java
rename to src/main/java/io/kurrent/dbclient/OptionsWithPositionAndResolveLinkTosBase.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java
rename to src/main/java/io/kurrent/dbclient/OptionsWithResolveLinkTosBase.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java
rename to src/main/java/io/kurrent/dbclient/OptionsWithStartRevisionAndResolveLinkTosBase.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java b/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java
rename to src/main/java/io/kurrent/dbclient/OptionsWithStreamStateBase.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscription.java b/src/main/java/io/kurrent/dbclient/PersistentSubscription.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscription.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscription.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionConnectionInfo.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionInfo.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionListener.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionSettings.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionStats.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllInfo.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllSettings.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToAllStats.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamInfo.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamSettings.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java b/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java
rename to src/main/java/io/kurrent/dbclient/PersistentSubscriptionToStreamStats.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Position.java b/src/main/java/io/kurrent/dbclient/Position.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Position.java
rename to src/main/java/io/kurrent/dbclient/Position.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java b/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java
rename to src/main/java/io/kurrent/dbclient/PrefixFilterExpression.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ProjectionDetails.java b/src/main/java/io/kurrent/dbclient/ProjectionDetails.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ProjectionDetails.java
rename to src/main/java/io/kurrent/dbclient/ProjectionDetails.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadAll.java b/src/main/java/io/kurrent/dbclient/ReadAll.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadAll.java
rename to src/main/java/io/kurrent/dbclient/ReadAll.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadAllOptions.java b/src/main/java/io/kurrent/dbclient/ReadAllOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadAllOptions.java
rename to src/main/java/io/kurrent/dbclient/ReadAllOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadMessage.java b/src/main/java/io/kurrent/dbclient/ReadMessage.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadMessage.java
rename to src/main/java/io/kurrent/dbclient/ReadMessage.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java b/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadResponseObserver.java
rename to src/main/java/io/kurrent/dbclient/ReadResponseObserver.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadResult.java b/src/main/java/io/kurrent/dbclient/ReadResult.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadResult.java
rename to src/main/java/io/kurrent/dbclient/ReadResult.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadStream.java b/src/main/java/io/kurrent/dbclient/ReadStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadStream.java
rename to src/main/java/io/kurrent/dbclient/ReadStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java b/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java
rename to src/main/java/io/kurrent/dbclient/ReadStreamConsumer.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java b/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadStreamOptions.java
rename to src/main/java/io/kurrent/dbclient/ReadStreamOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReadSubscriber.java b/src/main/java/io/kurrent/dbclient/ReadSubscriber.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReadSubscriber.java
rename to src/main/java/io/kurrent/dbclient/ReadSubscriber.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RecordedEvent.java b/src/main/java/io/kurrent/dbclient/RecordedEvent.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RecordedEvent.java
rename to src/main/java/io/kurrent/dbclient/RecordedEvent.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java b/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RegularFilterExpression.java
rename to src/main/java/io/kurrent/dbclient/RegularFilterExpression.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java b/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java
rename to src/main/java/io/kurrent/dbclient/ReplayParkedMessages.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java b/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java
rename to src/main/java/io/kurrent/dbclient/ReplayParkedMessagesOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjection.java b/src/main/java/io/kurrent/dbclient/ResetProjection.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ResetProjection.java
rename to src/main/java/io/kurrent/dbclient/ResetProjection.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java b/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java
rename to src/main/java/io/kurrent/dbclient/ResetProjectionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResolvedEvent.java b/src/main/java/io/kurrent/dbclient/ResolvedEvent.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ResolvedEvent.java
rename to src/main/java/io/kurrent/dbclient/ResolvedEvent.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java b/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java
rename to src/main/java/io/kurrent/dbclient/ResourceNotFoundException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java b/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java
rename to src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystem.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java b/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java
rename to src/main/java/io/kurrent/dbclient/RestartPersistentSubscriptionSubsystemOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java b/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java
rename to src/main/java/io/kurrent/dbclient/RestartProjectionSubsystem.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java b/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java
rename to src/main/java/io/kurrent/dbclient/RestartProjectionSubsystemOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java b/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RevisionOrPosition.java
rename to src/main/java/io/kurrent/dbclient/RevisionOrPosition.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/RunWorkItem.java b/src/main/java/io/kurrent/dbclient/RunWorkItem.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/RunWorkItem.java
rename to src/main/java/io/kurrent/dbclient/RunWorkItem.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ServerFeatures.java b/src/main/java/io/kurrent/dbclient/ServerFeatures.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ServerFeatures.java
rename to src/main/java/io/kurrent/dbclient/ServerFeatures.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ServerInfo.java b/src/main/java/io/kurrent/dbclient/ServerInfo.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ServerInfo.java
rename to src/main/java/io/kurrent/dbclient/ServerInfo.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ServerVersion.java b/src/main/java/io/kurrent/dbclient/ServerVersion.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ServerVersion.java
rename to src/main/java/io/kurrent/dbclient/ServerVersion.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Shutdown.java b/src/main/java/io/kurrent/dbclient/Shutdown.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Shutdown.java
rename to src/main/java/io/kurrent/dbclient/Shutdown.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java b/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java
rename to src/main/java/io/kurrent/dbclient/SingleNodeDiscovery.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamAcl.java b/src/main/java/io/kurrent/dbclient/StreamAcl.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamAcl.java
rename to src/main/java/io/kurrent/dbclient/StreamAcl.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamConsumer.java b/src/main/java/io/kurrent/dbclient/StreamConsumer.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamConsumer.java
rename to src/main/java/io/kurrent/dbclient/StreamConsumer.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamDeletedException.java b/src/main/java/io/kurrent/dbclient/StreamDeletedException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamDeletedException.java
rename to src/main/java/io/kurrent/dbclient/StreamDeletedException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamFilter.java b/src/main/java/io/kurrent/dbclient/StreamFilter.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamFilter.java
rename to src/main/java/io/kurrent/dbclient/StreamFilter.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamMetadata.java b/src/main/java/io/kurrent/dbclient/StreamMetadata.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamMetadata.java
rename to src/main/java/io/kurrent/dbclient/StreamMetadata.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java b/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamNotFoundException.java
rename to src/main/java/io/kurrent/dbclient/StreamNotFoundException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamPosition.java b/src/main/java/io/kurrent/dbclient/StreamPosition.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamPosition.java
rename to src/main/java/io/kurrent/dbclient/StreamPosition.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/StreamState.java b/src/main/java/io/kurrent/dbclient/StreamState.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/StreamState.java
rename to src/main/java/io/kurrent/dbclient/StreamState.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java b/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java
rename to src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java
rename to src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToAll.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java
rename to src/main/java/io/kurrent/dbclient/SubscribePersistentSubscriptionToStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAll.java b/src/main/java/io/kurrent/dbclient/SubscribeToAll.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAll.java
rename to src/main/java/io/kurrent/dbclient/SubscribeToAll.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java b/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java
rename to src/main/java/io/kurrent/dbclient/SubscribeToAllOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStream.java b/src/main/java/io/kurrent/dbclient/SubscribeToStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStream.java
rename to src/main/java/io/kurrent/dbclient/SubscribeToStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java b/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java
rename to src/main/java/io/kurrent/dbclient/SubscribeToStreamOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Subscription.java b/src/main/java/io/kurrent/dbclient/Subscription.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Subscription.java
rename to src/main/java/io/kurrent/dbclient/Subscription.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java b/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilter.java
rename to src/main/java/io/kurrent/dbclient/SubscriptionFilter.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java b/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java
rename to src/main/java/io/kurrent/dbclient/SubscriptionFilterBuilder.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionListener.java b/src/main/java/io/kurrent/dbclient/SubscriptionListener.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionListener.java
rename to src/main/java/io/kurrent/dbclient/SubscriptionListener.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java b/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java
rename to src/main/java/io/kurrent/dbclient/SubscriptionStreamConsumer.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java b/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java
rename to src/main/java/io/kurrent/dbclient/SubscriptionTracingCallback.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java b/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java
rename to src/main/java/io/kurrent/dbclient/SystemMetadataKeys.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java b/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SystemStreamAcl.java
rename to src/main/java/io/kurrent/dbclient/SystemStreamAcl.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/SystemStreams.java b/src/main/java/io/kurrent/dbclient/SystemStreams.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/SystemStreams.java
rename to src/main/java/io/kurrent/dbclient/SystemStreams.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java b/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java
rename to src/main/java/io/kurrent/dbclient/ThrowingBiFunction.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/ThrowingFunction.java b/src/main/java/io/kurrent/dbclient/ThrowingFunction.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/ThrowingFunction.java
rename to src/main/java/io/kurrent/dbclient/ThrowingFunction.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/Tuple.java b/src/main/java/io/kurrent/dbclient/Tuple.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/Tuple.java
rename to src/main/java/io/kurrent/dbclient/Tuple.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java b/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java
rename to src/main/java/io/kurrent/dbclient/UnsupportedFeatureException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java
rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAll.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java
rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToAllOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java
rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStream.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java b/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java
rename to src/main/java/io/kurrent/dbclient/UpdatePersistentSubscriptionToStreamOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjection.java b/src/main/java/io/kurrent/dbclient/UpdateProjection.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjection.java
rename to src/main/java/io/kurrent/dbclient/UpdateProjection.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java b/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java
rename to src/main/java/io/kurrent/dbclient/UpdateProjectionOptions.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UserCredentials.java b/src/main/java/io/kurrent/dbclient/UserCredentials.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UserCredentials.java
rename to src/main/java/io/kurrent/dbclient/UserCredentials.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/UserStreamAcl.java b/src/main/java/io/kurrent/dbclient/UserStreamAcl.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/UserStreamAcl.java
rename to src/main/java/io/kurrent/dbclient/UserStreamAcl.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WorkItem.java b/src/main/java/io/kurrent/dbclient/WorkItem.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/WorkItem.java
rename to src/main/java/io/kurrent/dbclient/WorkItem.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WorkItemArgs.java b/src/main/java/io/kurrent/dbclient/WorkItemArgs.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/WorkItemArgs.java
rename to src/main/java/io/kurrent/dbclient/WorkItemArgs.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WriteResult.java b/src/main/java/io/kurrent/dbclient/WriteResult.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/WriteResult.java
rename to src/main/java/io/kurrent/dbclient/WriteResult.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java b/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java
rename to src/main/java/io/kurrent/dbclient/WrongExpectedVersionException.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java
rename to src/main/java/io/kurrent/dbclient/resolution/DeferredNodeResolution.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java
rename to src/main/java/io/kurrent/dbclient/resolution/DeprecatedNodeResolution.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java
rename to src/main/java/io/kurrent/dbclient/resolution/FixedSeedsNodeResolution.java
diff --git a/db-client-java/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java b/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java
similarity index 100%
rename from db-client-java/src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java
rename to src/main/java/io/kurrent/dbclient/resolution/NodeResolution.java
diff --git a/db-client-java/src/main/proto/code.proto b/src/main/proto/code.proto
similarity index 100%
rename from db-client-java/src/main/proto/code.proto
rename to src/main/proto/code.proto
diff --git a/db-client-java/src/main/proto/gossip.proto b/src/main/proto/gossip.proto
similarity index 100%
rename from db-client-java/src/main/proto/gossip.proto
rename to src/main/proto/gossip.proto
diff --git a/db-client-java/src/main/proto/persistent.proto b/src/main/proto/persistent.proto
similarity index 100%
rename from db-client-java/src/main/proto/persistent.proto
rename to src/main/proto/persistent.proto
diff --git a/db-client-java/src/main/proto/projectionmanagement.proto b/src/main/proto/projectionmanagement.proto
similarity index 100%
rename from db-client-java/src/main/proto/projectionmanagement.proto
rename to src/main/proto/projectionmanagement.proto
diff --git a/db-client-java/src/main/proto/serverfeatures.proto b/src/main/proto/serverfeatures.proto
similarity index 100%
rename from db-client-java/src/main/proto/serverfeatures.proto
rename to src/main/proto/serverfeatures.proto
diff --git a/db-client-java/src/main/proto/shared.proto b/src/main/proto/shared.proto
similarity index 100%
rename from db-client-java/src/main/proto/shared.proto
rename to src/main/proto/shared.proto
diff --git a/db-client-java/src/main/proto/status.proto b/src/main/proto/status.proto
similarity index 100%
rename from db-client-java/src/main/proto/status.proto
rename to src/main/proto/status.proto
diff --git a/db-client-java/src/main/proto/streams.proto b/src/main/proto/streams.proto
similarity index 100%
rename from db-client-java/src/main/proto/streams.proto
rename to src/main/proto/streams.proto
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Action.java b/src/test/java/io/kurrent/dbclient/Action.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/Action.java
rename to src/test/java/io/kurrent/dbclient/Action.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/BazEvent.java b/src/test/java/io/kurrent/dbclient/BazEvent.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/BazEvent.java
rename to src/test/java/io/kurrent/dbclient/BazEvent.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/ClientTracker.java b/src/test/java/io/kurrent/dbclient/ClientTracker.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/ClientTracker.java
rename to src/test/java/io/kurrent/dbclient/ClientTracker.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/ConnectionAware.java b/src/test/java/io/kurrent/dbclient/ConnectionAware.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/ConnectionAware.java
rename to src/test/java/io/kurrent/dbclient/ConnectionAware.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Database.java b/src/test/java/io/kurrent/dbclient/Database.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/Database.java
rename to src/test/java/io/kurrent/dbclient/Database.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java b/src/test/java/io/kurrent/dbclient/DatabaseFactory.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/DatabaseFactory.java
rename to src/test/java/io/kurrent/dbclient/DatabaseFactory.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Exceptions.java b/src/test/java/io/kurrent/dbclient/Exceptions.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/Exceptions.java
rename to src/test/java/io/kurrent/dbclient/Exceptions.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/Foo.java b/src/test/java/io/kurrent/dbclient/Foo.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/Foo.java
rename to src/test/java/io/kurrent/dbclient/Foo.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/MiscTests.java b/src/test/java/io/kurrent/dbclient/MiscTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/MiscTests.java
rename to src/test/java/io/kurrent/dbclient/MiscTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java b/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java
rename to src/test/java/io/kurrent/dbclient/PersistentSubscriptionsTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/PluginsTests.java b/src/test/java/io/kurrent/dbclient/PluginsTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/PluginsTests.java
rename to src/test/java/io/kurrent/dbclient/PluginsTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/StreamsTests.java b/src/test/java/io/kurrent/dbclient/StreamsTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/StreamsTests.java
rename to src/test/java/io/kurrent/dbclient/StreamsTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/TelemetryTests.java b/src/test/java/io/kurrent/dbclient/TelemetryTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/TelemetryTests.java
rename to src/test/java/io/kurrent/dbclient/TelemetryTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java b/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java
similarity index 96%
rename from db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java
rename to src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java
index 69f84d11..91249a17 100644
--- a/db-client-java/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java
+++ b/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java
@@ -79,7 +79,7 @@ public DockerContainerDatabase(Builder builder) {
 
         if (builder.secure) {
             verifyCertificatesExist();
-            String certsDir = Paths.get(System.getProperty("user.dir"), "..", "certs").toAbsolutePath().toString();
+            String certsDir = Paths.get(System.getProperty("user.dir"), "certs").toAbsolutePath().toString();
 
             withEnv("EVENTSTORE_CERTIFICATE_FILE", "/etc/eventstore/certs/node/node.crt");
             withEnv("EVENTSTORE_CERTIFICATE_PRIVATE_KEY_FILE", "/etc/eventstore/certs/node/node.key");
@@ -154,7 +154,7 @@ private static void verifyCertificatesExist() {
         };
 
         for (String[] strings : files) {
-            File file = Paths.get(currentDir, "..", "certs", strings[0], strings[1]).toAbsolutePath().toFile();
+            File file = Paths.get(currentDir, "certs", strings[0], strings[1]).toAbsolutePath().toFile();
 
             if (!file.exists())
                 throw new RuntimeException(new FileNotFoundException(file.getAbsolutePath()));
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java b/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java
rename to src/test/java/io/kurrent/dbclient/databases/ExternallyCreatedCluster.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java b/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/EventDataTests.java
rename to src/test/java/io/kurrent/dbclient/misc/EventDataTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java b/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java
rename to src/test/java/io/kurrent/dbclient/misc/ExpectedRevisionTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java b/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java
rename to src/test/java/io/kurrent/dbclient/misc/NodeSelectorTest.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java b/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java
rename to src/test/java/io/kurrent/dbclient/misc/OfflineMetadataTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java b/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java
rename to src/test/java/io/kurrent/dbclient/misc/ParseInvalidConnectionStringTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java b/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java
rename to src/test/java/io/kurrent/dbclient/misc/ParseValidConnectionStringTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/PositionTests.java b/src/test/java/io/kurrent/dbclient/misc/PositionTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/PositionTests.java
rename to src/test/java/io/kurrent/dbclient/misc/PositionTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java b/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java
rename to src/test/java/io/kurrent/dbclient/misc/ServerVersionTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java
rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/CreatePersistentSubscriptionTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java
rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/DeletePersistentSubscriptionToStreamTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java
rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionManagementTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java
rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/PersistentSubscriptionToAllWithFilterTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java
rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/SubscribePersistentSubscriptionToStreamTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java b/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java
rename to src/test/java/io/kurrent/dbclient/persistentsubscriptions/UpdatePersistentSubscriptionToStreamTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java b/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java
similarity index 96%
rename from db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java
rename to src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java
index 43438973..bb70dcfe 100644
--- a/db-client-java/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java
+++ b/src/test/java/io/kurrent/dbclient/plugins/ClientCertificateAuthenticationTests.java
@@ -30,7 +30,7 @@ static String userKey(String user) {
     }
 
     static String buildCertPath(String user, String extension) {
-        String certsPath = Paths.get(System.getProperty("user.dir"), "..", "certs").toAbsolutePath().toString();
+        String certsPath = Paths.get(System.getProperty("user.dir"), "certs").toAbsolutePath().toString();
         return String.format("%s/user-%s/user-%s.%s", certsPath, user, user, extension);
     }
 }
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/TestEvent.java b/src/test/java/io/kurrent/dbclient/samples/TestEvent.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/TestEvent.java
rename to src/test/java/io/kurrent/dbclient/samples/TestEvent.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java b/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java
rename to src/test/java/io/kurrent/dbclient/samples/appending_events/AppendingEvents.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java b/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java
rename to src/test/java/io/kurrent/dbclient/samples/authentication/UserCertificate.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java b/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java
rename to src/test/java/io/kurrent/dbclient/samples/opentelemetry/Instrumentation.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java b/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java
rename to src/test/java/io/kurrent/dbclient/samples/persistent_subscriptions/PersistentSubscriptions.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java b/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java
rename to src/test/java/io/kurrent/dbclient/samples/projection_management/ProjectionManagement.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java b/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java
rename to src/test/java/io/kurrent/dbclient/samples/quick_start/QuickStart.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java b/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java
rename to src/test/java/io/kurrent/dbclient/samples/reading_events/ReadingEvents.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java b/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java
rename to src/test/java/io/kurrent/dbclient/samples/server_side_filtering/ServerSideFiltering.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java b/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java
rename to src/test/java/io/kurrent/dbclient/samples/subscribing_to_stream/SubscribingToStream.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/AppendTests.java b/src/test/java/io/kurrent/dbclient/streams/AppendTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/AppendTests.java
rename to src/test/java/io/kurrent/dbclient/streams/AppendTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java b/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java
rename to src/test/java/io/kurrent/dbclient/streams/ClientLifecycleTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java b/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java
rename to src/test/java/io/kurrent/dbclient/streams/DeadlineTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java b/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/DeleteTests.java
rename to src/test/java/io/kurrent/dbclient/streams/DeleteTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java b/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java
rename to src/test/java/io/kurrent/dbclient/streams/InterceptorTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java b/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/MetadataTests.java
rename to src/test/java/io/kurrent/dbclient/streams/MetadataTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java b/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java
rename to src/test/java/io/kurrent/dbclient/streams/ReadStreamTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java b/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java
rename to src/test/java/io/kurrent/dbclient/streams/SubscriptionTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java b/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java
rename to src/test/java/io/kurrent/dbclient/telemetry/PersistentSubscriptionsTracingInstrumentationTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java b/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java
rename to src/test/java/io/kurrent/dbclient/telemetry/SpanProcessorSpy.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java b/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java
rename to src/test/java/io/kurrent/dbclient/telemetry/StreamsTracingInstrumentationTests.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java b/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java
rename to src/test/java/io/kurrent/dbclient/telemetry/TelemetryAware.java
diff --git a/db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java b/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java
similarity index 100%
rename from db-client-java/src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java
rename to src/test/java/io/kurrent/dbclient/telemetry/TracingContextInjectionTests.java
diff --git a/db-client-java/src/test/resources/all-back-c3386-p3386.json b/src/test/resources/all-back-c3386-p3386.json
similarity index 100%
rename from db-client-java/src/test/resources/all-back-c3386-p3386.json
rename to src/test/resources/all-back-c3386-p3386.json
diff --git a/db-client-java/src/test/resources/all-back-e0-e10.json b/src/test/resources/all-back-e0-e10.json
similarity index 100%
rename from db-client-java/src/test/resources/all-back-e0-e10.json
rename to src/test/resources/all-back-e0-e10.json
diff --git a/db-client-java/src/test/resources/all-c1788-p1788.json b/src/test/resources/all-c1788-p1788.json
similarity index 100%
rename from db-client-java/src/test/resources/all-c1788-p1788.json
rename to src/test/resources/all-c1788-p1788.json
diff --git a/db-client-java/src/test/resources/all-e0-e10.json b/src/test/resources/all-e0-e10.json
similarity index 100%
rename from db-client-java/src/test/resources/all-e0-e10.json
rename to src/test/resources/all-e0-e10.json
diff --git a/db-client-java/src/test/resources/all-positions-filtered-stream194-e0-e30.json b/src/test/resources/all-positions-filtered-stream194-e0-e30.json
similarity index 100%
rename from db-client-java/src/test/resources/all-positions-filtered-stream194-e0-e30.json
rename to src/test/resources/all-positions-filtered-stream194-e0-e30.json
diff --git a/db-client-java/src/test/resources/all-versions-filtered-stream194-e0-e30.json b/src/test/resources/all-versions-filtered-stream194-e0-e30.json
similarity index 100%
rename from db-client-java/src/test/resources/all-versions-filtered-stream194-e0-e30.json
rename to src/test/resources/all-versions-filtered-stream194-e0-e30.json
diff --git a/db-client-java/src/test/resources/count-events-partitioned-projection.js b/src/test/resources/count-events-partitioned-projection.js
similarity index 100%
rename from db-client-java/src/test/resources/count-events-partitioned-projection.js
rename to src/test/resources/count-events-partitioned-projection.js
diff --git a/db-client-java/src/test/resources/count-events-projection.js b/src/test/resources/count-events-projection.js
similarity index 100%
rename from db-client-java/src/test/resources/count-events-projection.js
rename to src/test/resources/count-events-projection.js
diff --git a/db-client-java/src/test/resources/dataset20M-1800-e0-e10.json b/src/test/resources/dataset20M-1800-e0-e10.json
similarity index 100%
rename from db-client-java/src/test/resources/dataset20M-1800-e0-e10.json
rename to src/test/resources/dataset20M-1800-e0-e10.json
diff --git a/db-client-java/src/test/resources/dataset20M-1800-e1999-e1990.json b/src/test/resources/dataset20M-1800-e1999-e1990.json
similarity index 100%
rename from db-client-java/src/test/resources/dataset20M-1800-e1999-e1990.json
rename to src/test/resources/dataset20M-1800-e1999-e1990.json
diff --git a/db-client-java/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties
similarity index 100%
rename from db-client-java/src/test/resources/junit-platform.properties
rename to src/test/resources/junit-platform.properties
diff --git a/db-client-java/src/test/resources/simplelogger.properties b/src/test/resources/simplelogger.properties
similarity index 100%
rename from db-client-java/src/test/resources/simplelogger.properties
rename to src/test/resources/simplelogger.properties
diff --git a/db-client-java/src/test/resources/state-with-unknown-keynames.js b/src/test/resources/state-with-unknown-keynames.js
similarity index 100%
rename from db-client-java/src/test/resources/state-with-unknown-keynames.js
rename to src/test/resources/state-with-unknown-keynames.js