diff --git a/src/main/java/group/goforward/battlbuilder/controllers/MerchantAdminController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/MerchantAdminController.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/controllers/MerchantAdminController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/admin/MerchantAdminController.java
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/PlatformController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/PlatformController.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/controllers/PlatformController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/admin/PlatformController.java
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/PlatformViewController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/PlatformViewController.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/controllers/PlatformViewController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/admin/PlatformViewController.java
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/BrandController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/controllers/BrandController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/BrandController.java
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/StateController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/controllers/StateController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/StateController.java
diff --git a/src/main/java/group/goforward/battlbuilder/controllers/UserController.java b/src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/controllers/UserController.java
rename to src/main/java/group/goforward/battlbuilder/controllers/api/UserController.java
diff --git a/src/main/java/group/goforward/battlbuilder/services/AdminDashboardService.java b/src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminDashboardService.java
similarity index 100%
rename from src/main/java/group/goforward/battlbuilder/services/AdminDashboardService.java
rename to src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminDashboardService.java