diff --git a/app/server/src/main/java/com/appsmith/server/controllers/PageController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
similarity index 100%
rename from app/server/src/main/java/com/appsmith/server/controllers/PageController.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/PageController.java
diff --git a/app/server/src/main/java/com/appsmith/server/repositories/PageRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/PageRepository.java
similarity index 100%
rename from app/server/src/main/java/com/appsmith/server/repositories/PageRepository.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/PageRepository.java
diff --git a/app/server/src/main/java/com/appsmith/server/services/PageService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageService.java
similarity index 100%
rename from app/server/src/main/java/com/appsmith/server/services/PageService.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageService.java
diff --git a/app/server/src/main/java/com/appsmith/server/services/PageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
similarity index 100%
rename from app/server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
rename to app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
diff --git a/app/server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
similarity index 100%
rename from app/server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
rename to app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
diff --git a/app/server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
similarity index 100%
rename from app/server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
rename to app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
diff --git a/app/server/src/test/java/com/appsmith/server/services/PageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
similarity index 100%
rename from app/server/src/test/java/com/appsmith/server/services/PageServiceTest.java
rename to app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java