diff --git a/java/Cargo.toml b/java/Cargo.toml
index ccde88c26d..01ecb23e4c 100644
--- a/java/Cargo.toml
+++ b/java/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "jabushka"
+name = "javababushka"
 version = "0.0.0"
 edition = "2021"
 license = "BSD-3-Clause"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "jabushka"
+name = "javababushka"
 crate-type = ["cdylib"]
 
 [dependencies]
diff --git a/java/jabushka/benchmarks/build.gradle b/java/benchmarks/build.gradle
similarity index 95%
rename from java/jabushka/benchmarks/build.gradle
rename to java/benchmarks/build.gradle
index b6c89b2695..8d9e500284 100644
--- a/java/jabushka/benchmarks/build.gradle
+++ b/java/benchmarks/build.gradle
@@ -29,7 +29,7 @@ java {
 
 application {
     // Define the main class for the application.
-    mainClass = 'javabushka.client.BenchmarkingApp'
+    mainClass = 'javababushka.benchmarks.BenchmarkingApp'
 }
 
 tasks.withType(Test) { 
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/AsyncClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/AsyncClient.java
similarity index 90%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/AsyncClient.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/AsyncClient.java
index da06e6b234..a688775084 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/AsyncClient.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/AsyncClient.java
@@ -1,4 +1,4 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
 import java.util.concurrent.Future;
 
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java
similarity index 96%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/BenchmarkingApp.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java
index 6f8f23f1f9..ad19929d06 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/BenchmarkingApp.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java
@@ -1,4 +1,4 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -6,11 +6,11 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javabushka.client.jedis.JedisClient;
-import javabushka.client.jedis.JedisPseudoAsyncClient;
-import javabushka.client.lettuce.LettuceAsyncClient;
-import javabushka.client.lettuce.LettuceClient;
-import javabushka.client.utils.Benchmarking;
+import javababushka.benchmarks.jedis.JedisClient;
+import javababushka.benchmarks.lettuce.LettuceAsyncClient;
+import javababushka.benchmarks.lettuce.LettuceClient;
+import javababushka.benchmarks.utils.Benchmarking;
+import javababushka.benchmarks.jedis.JedisPseudoAsyncClient;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/Client.java b/java/benchmarks/src/main/java/javababushka/benchmarks/Client.java
similarity index 66%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/Client.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/Client.java
index 91b97b56cd..16ab36847d 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/Client.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/Client.java
@@ -1,6 +1,6 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
-import javabushka.client.utils.ConnectionSettings;
+import javababushka.benchmarks.utils.ConnectionSettings;
 
 public interface Client {
   void connectToRedis();
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/SyncClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/SyncClient.java
similarity index 77%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/SyncClient.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/SyncClient.java
index f14bdce5e1..c99174af3d 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/SyncClient.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/SyncClient.java
@@ -1,4 +1,4 @@
-package javabushka.client;
+package javababushka.benchmarks;
 
 public interface SyncClient extends Client {
   void set(String key, String value);
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/jedis/JedisClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/jedis/JedisClient.java
similarity index 90%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/jedis/JedisClient.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/jedis/JedisClient.java
index 30ba659b87..214a6cae10 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/jedis/JedisClient.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/jedis/JedisClient.java
@@ -1,10 +1,10 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.jedis;
+package javababushka.benchmarks.jedis;
 
-import javabushka.client.SyncClient;
-import javabushka.client.utils.ConnectionSettings;
+import javababushka.benchmarks.SyncClient;
+import javababushka.benchmarks.utils.ConnectionSettings;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/jedis/JedisPseudoAsyncClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/jedis/JedisPseudoAsyncClient.java
similarity index 92%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/jedis/JedisPseudoAsyncClient.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/jedis/JedisPseudoAsyncClient.java
index 2f6bcd7611..598c455d1e 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/jedis/JedisPseudoAsyncClient.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/jedis/JedisPseudoAsyncClient.java
@@ -1,9 +1,9 @@
-package javabushka.client.jedis;
+package javababushka.benchmarks.jedis;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import javabushka.client.AsyncClient;
+import javababushka.benchmarks.AsyncClient;
 
 // Jedis doesn't provide async API
 // https://github.com/redis/jedis/issues/241
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceAsyncClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClient.java
similarity index 92%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceAsyncClient.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClient.java
index f93ae104d1..1b8c4ba9b7 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceAsyncClient.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceAsyncClient.java
@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisFuture;
@@ -9,8 +9,8 @@
 import io.lettuce.core.api.async.RedisAsyncCommands;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import javabushka.client.AsyncClient;
-import javabushka.client.utils.ConnectionSettings;
+import javababushka.benchmarks.AsyncClient;
+import javababushka.benchmarks.utils.ConnectionSettings;
 
 public class LettuceAsyncClient implements AsyncClient {
 
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceClient.java
similarity index 89%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceClient.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceClient.java
index 6fa237666d..e4e1830bda 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/lettuce/LettuceClient.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/lettuce/LettuceClient.java
@@ -1,13 +1,13 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisStringCommands;
-import javabushka.client.SyncClient;
-import javabushka.client.utils.ConnectionSettings;
+import javababushka.benchmarks.SyncClient;
+import javababushka.benchmarks.utils.ConnectionSettings;
 
 public class LettuceClient implements SyncClient {
 
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/Benchmarking.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java
similarity index 97%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/utils/Benchmarking.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java
index 9555bba2cc..6a2ec95755 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/Benchmarking.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java
@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -8,10 +8,10 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javabushka.client.AsyncClient;
-import javabushka.client.BenchmarkingApp;
-import javabushka.client.Client;
-import javabushka.client.SyncClient;
+import javababushka.benchmarks.AsyncClient;
+import javababushka.benchmarks.BenchmarkingApp;
+import javababushka.benchmarks.Client;
+import javababushka.benchmarks.SyncClient;
 import org.apache.commons.lang3.RandomStringUtils;
 
 public class Benchmarking {
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/ChosenAction.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/ChosenAction.java
similarity index 64%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/utils/ChosenAction.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/utils/ChosenAction.java
index 0bded99ddc..bd9f01fd90 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/ChosenAction.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/ChosenAction.java
@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 public enum ChosenAction {
   GET_NON_EXISTING,
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/ConnectionSettings.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/ConnectionSettings.java
similarity index 86%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/utils/ConnectionSettings.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/utils/ConnectionSettings.java
index 725f604ce7..2989d8b3b3 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/ConnectionSettings.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/ConnectionSettings.java
@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 public class ConnectionSettings {
   public String host;
diff --git a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/LatencyResults.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/LatencyResults.java
similarity index 93%
rename from java/jabushka/benchmarks/src/main/java/javabushka/client/utils/LatencyResults.java
rename to java/benchmarks/src/main/java/javababushka/benchmarks/utils/LatencyResults.java
index d81deaa7fe..8e2baa3a2b 100644
--- a/java/jabushka/benchmarks/src/main/java/javabushka/client/utils/LatencyResults.java
+++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/LatencyResults.java
@@ -1,4 +1,4 @@
-package javabushka.client.utils;
+package javababushka.benchmarks.utils;
 
 // Raw timing results in nanoseconds
 public class LatencyResults {
diff --git a/java/jabushka/benchmarks/src/test/java/javabushka/client/jedis/JedisClientIT.java b/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java
similarity index 92%
rename from java/jabushka/benchmarks/src/test/java/javabushka/client/jedis/JedisClientIT.java
rename to java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java
index 09a0e7ef35..ec40c00bb0 100644
--- a/java/jabushka/benchmarks/src/test/java/javabushka/client/jedis/JedisClientIT.java
+++ b/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java
@@ -1,14 +1,14 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.jedis;
+package javababushka.benchmarks.jedis;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.Map;
-import javabushka.client.utils.Benchmarking;
-import javabushka.client.utils.ChosenAction;
+import javababushka.benchmarks.utils.Benchmarking;
+import javababushka.benchmarks.utils.ChosenAction;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceAsyncClientIT.java b/java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceAsyncClientIT.java
similarity index 98%
rename from java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceAsyncClientIT.java
rename to java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceAsyncClientIT.java
index 336f1f92ec..c051c1b2a4 100644
--- a/java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceAsyncClientIT.java
+++ b/java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceAsyncClientIT.java
@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceClientIT.java b/java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceClientIT.java
similarity index 87%
rename from java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceClientIT.java
rename to java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceClientIT.java
index 5180489876..445cc5b584 100644
--- a/java/jabushka/benchmarks/src/test/java/javabushka/client/lettuce/LettuceClientIT.java
+++ b/java/benchmarks/src/test/java/javababushka/benchmarks/lettuce/LettuceClientIT.java
@@ -1,11 +1,11 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package javabushka.client.lettuce;
+package javababushka.benchmarks.lettuce;
 
 import java.util.HashMap;
-import javabushka.client.utils.Benchmarking;
-import javabushka.client.utils.ChosenAction;
+import javababushka.benchmarks.utils.Benchmarking;
+import javababushka.benchmarks.utils.ChosenAction;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/java/jabushka/build.gradle b/java/build.gradle
similarity index 100%
rename from java/jabushka/build.gradle
rename to java/build.gradle
diff --git a/java/jabushka/jabushka/build.gradle b/java/client/build.gradle
similarity index 100%
rename from java/jabushka/jabushka/build.gradle
rename to java/client/build.gradle
diff --git a/java/jabushka/gradle.properties b/java/gradle.properties
similarity index 100%
rename from java/jabushka/gradle.properties
rename to java/gradle.properties
diff --git a/java/jabushka/gradle/wrapper/gradle-wrapper.jar b/java/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from java/jabushka/gradle/wrapper/gradle-wrapper.jar
rename to java/gradle/wrapper/gradle-wrapper.jar
diff --git a/java/jabushka/gradle/wrapper/gradle-wrapper.properties b/java/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from java/jabushka/gradle/wrapper/gradle-wrapper.properties
rename to java/gradle/wrapper/gradle-wrapper.properties
diff --git a/java/jabushka/gradlew b/java/gradlew
similarity index 100%
rename from java/jabushka/gradlew
rename to java/gradlew
diff --git a/java/jabushka/gradlew.bat b/java/gradlew.bat
similarity index 100%
rename from java/jabushka/gradlew.bat
rename to java/gradlew.bat
diff --git a/java/jabushka/integTest/build.gradle b/java/integTest/build.gradle
similarity index 100%
rename from java/jabushka/integTest/build.gradle
rename to java/integTest/build.gradle
diff --git a/java/jabushka/settings.gradle b/java/jabushka/settings.gradle
deleted file mode 100644
index f549b8010a..0000000000
--- a/java/jabushka/settings.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-rootProject.name = 'babushka'
-
-include 'jabushka'
-include 'integTest'
-include 'benchmarks'
diff --git a/java/settings.gradle b/java/settings.gradle
new file mode 100644
index 0000000000..c392c65247
--- /dev/null
+++ b/java/settings.gradle
@@ -0,0 +1,5 @@
+rootProject.name = 'javababushka'
+
+include 'client'
+include 'integTest'
+include 'benchmarks'