diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java
index 32d4c06..c938f40 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java
@@ -5,6 +5,8 @@ import com.bpgroup.poc.admin.domain.base.admin.service.AdminActionLogCreateComma
 import com.bpgroup.poc.admin.domain.base.admin.service.AdminActionLogService;
 import com.bpgroup.poc.admin.domain.base.admin.service.AdminActionLogUpdateCommand;
 import com.bpgroup.poc.admin.domain.base.admin.service.AdminService;
+import com.bpgroup.poc.admin.filter.AdminActionLogCreate;
+import com.bpgroup.poc.admin.filter.AdminActionLogUpdate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java
similarity index 97%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementAppService.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java
index ea2ebf8..b7f641d 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementAppService.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.web.main.admin.management;
+package com.bpgroup.poc.admin.app.admin;
 
 import com.bpgroup.poc.admin.domain.base.admin.entity.Admin;
 import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRole;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/menu/MenuAppService.java
similarity index 97%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuAppService.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/app/menu/MenuAppService.java
index d508452..70ae30c 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuAppService.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/menu/MenuAppService.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.web.main.admin.menu;
+package com.bpgroup.poc.admin.app.menu;
 
 import com.bpgroup.poc.admin.domain.base.menu.service.*;
 import com.bpgroup.poc.admin.web.main.admin.menu.reqres.*;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/role/RoleAppService.java
similarity index 98%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleAppService.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/app/role/RoleAppService.java
index a7836b9..8fa8d26 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleAppService.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/role/RoleAppService.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.web.main.admin.role;
+package com.bpgroup.poc.admin.app.role;
 
 import com.bpgroup.poc.admin.domain.base.menu.entity.Menu;
 import com.bpgroup.poc.admin.domain.base.menu.service.MenuService;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogCreate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/AdminActionLogCreate.java
similarity index 93%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogCreate.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/filter/AdminActionLogCreate.java
index df8173b..a6ba31a 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogCreate.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/AdminActionLogCreate.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.app.admin;
+package com.bpgroup.poc.admin.filter;
 
 import lombok.AccessLevel;
 import lombok.Getter;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogUpdate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/AdminActionLogUpdate.java
similarity index 91%
rename from poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogUpdate.java
rename to poc/admin/src/main/java/com/bpgroup/poc/admin/filter/AdminActionLogUpdate.java
index d8f1fd7..4034b8b 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogUpdate.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/AdminActionLogUpdate.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.app.admin;
+package com.bpgroup.poc.admin.filter;
 
 
 import lombok.AccessLevel;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/LoggingFilter.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/LoggingFilter.java
index 259fe4f..995a6aa 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/LoggingFilter.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/filter/LoggingFilter.java
@@ -1,8 +1,6 @@
 package com.bpgroup.poc.admin.filter;
 
 import com.bpgroup.poc.admin.app.admin.AdminActionLogAppService;
-import com.bpgroup.poc.admin.app.admin.AdminActionLogCreate;
-import com.bpgroup.poc.admin.app.admin.AdminActionLogUpdate;
 import com.bpgroup.poc.admin.common.CookieHelper;
 import com.bpgroup.poc.admin.common.JwtHelper;
 import com.bpgroup.poc.admin.security.jwt.JwtTokenConstants;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementRestController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementRestController.java
index 30dbfaa..98d3b30 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementRestController.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementRestController.java
@@ -1,5 +1,6 @@
 package com.bpgroup.poc.admin.web.main.admin.management;
 
+import com.bpgroup.poc.admin.app.admin.AdminManagementAppService;
 import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminCreate;
 import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminDelete;
 import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminFind;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuRestController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuRestController.java
index 4eab77f..7928afc 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuRestController.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuRestController.java
@@ -1,5 +1,6 @@
 package com.bpgroup.poc.admin.web.main.admin.menu;
 
+import com.bpgroup.poc.admin.app.menu.MenuAppService;
 import com.bpgroup.poc.admin.web.main.admin.menu.reqres.*;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleRestController.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleRestController.java
index 903e7bd..2e84d9c 100644
--- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleRestController.java
+++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/RoleRestController.java
@@ -1,5 +1,6 @@
 package com.bpgroup.poc.admin.web.main.admin.role;
 
+import com.bpgroup.poc.admin.app.role.RoleAppService;
 import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleAddMenu;
 import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleCreate;
 import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleDelete;
diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/AdminManagementAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppServiceTest.java
similarity index 96%
rename from poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/AdminManagementAppServiceTest.java
rename to poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppServiceTest.java
index 188f6e0..3a2a029 100644
--- a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/AdminManagementAppServiceTest.java
+++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppServiceTest.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.web.main.admin;
+package com.bpgroup.poc.admin.app.admin;
 
 import com.bpgroup.poc.admin.domain.base.admin.entity.Admin;
 import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRepository;
@@ -6,7 +6,7 @@ import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRole;
 import com.bpgroup.poc.admin.domain.base.role.entity.Role;
 import com.bpgroup.poc.admin.domain.base.role.entity.RoleRepository;
 import com.bpgroup.poc.admin.env.MariaDBTestEnv;
-import com.bpgroup.poc.admin.web.main.admin.management.AdminManagementAppService;
+import com.bpgroup.poc.admin.app.admin.AdminManagementAppService;
 import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminCreate;
 import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminDelete;
 import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminUpdate;
diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/menu/MenuAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java
similarity index 97%
rename from poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/menu/MenuAppServiceTest.java
rename to poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java
index f093381..967cb6f 100644
--- a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/menu/MenuAppServiceTest.java
+++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java
@@ -1,11 +1,11 @@
-package com.bpgroup.poc.admin.web.main.menu;
+package com.bpgroup.poc.admin.app.menu;
 
 import com.bpgroup.poc.admin.domain.base.menu.entity.Menu;
 import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroup;
 import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroupRepository;
 import com.bpgroup.poc.admin.domain.base.menu.entity.MenuRepository;
 import com.bpgroup.poc.admin.env.MariaDBTestEnv;
-import com.bpgroup.poc.admin.web.main.admin.menu.MenuAppService;
+import com.bpgroup.poc.admin.app.menu.MenuAppService;
 import com.bpgroup.poc.admin.web.main.admin.menu.reqres.*;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.DisplayName;
diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/role/RoleAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java
similarity index 97%
rename from poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/role/RoleAppServiceTest.java
rename to poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java
index 188ec8f..c9799b4 100644
--- a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/role/RoleAppServiceTest.java
+++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java
@@ -1,4 +1,4 @@
-package com.bpgroup.poc.admin.web.main.role;
+package com.bpgroup.poc.admin.app.role;
 
 import com.bpgroup.poc.admin.domain.base.menu.entity.Menu;
 import com.bpgroup.poc.admin.domain.base.menu.entity.MenuRepository;
@@ -6,7 +6,7 @@ import com.bpgroup.poc.admin.domain.base.role.RoleMenuType;
 import com.bpgroup.poc.admin.domain.base.role.entity.Role;
 import com.bpgroup.poc.admin.domain.base.role.entity.RoleRepository;
 import com.bpgroup.poc.admin.env.MariaDBTestEnv;
-import com.bpgroup.poc.admin.web.main.admin.role.RoleAppService;
+import com.bpgroup.poc.admin.app.role.RoleAppService;
 import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleAddMenu;
 import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleCreate;
 import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleDelete;