diff --git a/server/src/main/java/com/scalar/db/server/ScalarDbServer.java b/server/src/main/java/com/scalar/db/server/ScalarDbServer.java
index 8f1c1fd4eb..8e2d5be4a4 100644
--- a/server/src/main/java/com/scalar/db/server/ScalarDbServer.java
+++ b/server/src/main/java/com/scalar/db/server/ScalarDbServer.java
@@ -3,8 +3,8 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.scalar.db.config.DatabaseConfig;
-import com.scalar.db.config.ServerConfig;
-import com.scalar.db.service.ServerModule;
+import com.scalar.db.server.config.ServerConfig;
+import com.scalar.db.server.service.ServerModule;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.protobuf.services.ProtoReflectionService;
diff --git a/server/src/main/java/com/scalar/db/config/ServerConfig.java b/server/src/main/java/com/scalar/db/server/config/ServerConfig.java
similarity index 97%
rename from server/src/main/java/com/scalar/db/config/ServerConfig.java
rename to server/src/main/java/com/scalar/db/server/config/ServerConfig.java
index 34d7fb1772..3b480c2406 100644
--- a/server/src/main/java/com/scalar/db/config/ServerConfig.java
+++ b/server/src/main/java/com/scalar/db/server/config/ServerConfig.java
@@ -1,4 +1,4 @@
-package com.scalar.db.config;
+package com.scalar.db.server.config;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/server/src/main/java/com/scalar/db/service/ServerModule.java b/server/src/main/java/com/scalar/db/server/service/ServerModule.java
similarity index 90%
rename from server/src/main/java/com/scalar/db/service/ServerModule.java
rename to server/src/main/java/com/scalar/db/server/service/ServerModule.java
index 2aaa2b1c15..f0e5b910b7 100644
--- a/server/src/main/java/com/scalar/db/service/ServerModule.java
+++ b/server/src/main/java/com/scalar/db/server/service/ServerModule.java
@@ -1,4 +1,4 @@
-package com.scalar.db.service;
+package com.scalar.db.server.service;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
@@ -9,6 +9,8 @@
 import com.scalar.db.server.DistributedStorageAdminService;
 import com.scalar.db.server.DistributedStorageService;
 import com.scalar.db.server.DistributedTransactionService;
+import com.scalar.db.service.StorageModule;
+import com.scalar.db.service.TransactionModule;
 
 public class ServerModule extends AbstractModule {
   private final Injector storageInjector;
diff --git a/server/src/test/java/com.scalar.db.server/DistributedStorageAdminServiceTest.java b/server/src/test/java/com/scalar/db/server/DistributedStorageAdminServiceTest.java
similarity index 100%
rename from server/src/test/java/com.scalar.db.server/DistributedStorageAdminServiceTest.java
rename to server/src/test/java/com/scalar/db/server/DistributedStorageAdminServiceTest.java
diff --git a/server/src/test/java/com.scalar.db.server/DistributedStorageServiceTest.java b/server/src/test/java/com/scalar/db/server/DistributedStorageServiceTest.java
similarity index 100%
rename from server/src/test/java/com.scalar.db.server/DistributedStorageServiceTest.java
rename to server/src/test/java/com/scalar/db/server/DistributedStorageServiceTest.java
diff --git a/server/src/test/java/com.scalar.db.server/DistributedTransactionServiceTest.java b/server/src/test/java/com/scalar/db/server/DistributedTransactionServiceTest.java
similarity index 100%
rename from server/src/test/java/com.scalar.db.server/DistributedTransactionServiceTest.java
rename to server/src/test/java/com/scalar/db/server/DistributedTransactionServiceTest.java