refactor: rename packages

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/auth/AuthController.java

@@ -3,7 +3,7 @@
 import com.bigtreetc.sample.micronaut.aws.lambda.base.exception.NoDataFoundException;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.AbstractRestController;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.system.StaffRepository;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.repository.StaffRepository;
 import com.nimbusds.jwt.JWTParser;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MutableHttpResponse;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryController.java

@@ -1,14 +1,14 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.AbstractRestController;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategory;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCategoryCriteria;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.CodeCategoryService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategory;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCategoryCriteria;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.CodeCategoryService;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryCsv.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryCsv.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/CodeCategoryRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/CodeCategoryRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/DeleteCodeCategoryRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/DeleteCodeCategoryRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codecategories/SearchCodeCategoryRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codecategories/SearchCodeCategoryRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeController.java

@@ -1,16 +1,16 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.AbstractRestController;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam;
-import com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codecategories.CodeCategoryCsv;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Code;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.CodeCriteria;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.CodeCategoryService;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.CodeService;
+import com.bigtreetc.sample.micronaut.aws.lambda.controller.codecategories.CodeCategoryCsv;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Code;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.CodeCriteria;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.CodeCategoryService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.CodeService;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeCsv.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeCsv.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/CodeRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/CodeRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/DeleteCodeRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/DeleteCodeRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/codes/SearchCodeRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/codes/SearchCodeRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.codes;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.codes;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/DeleteHolidayRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/DeleteHolidayRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayController.java

@@ -1,14 +1,14 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.AbstractRestController;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Holiday;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.HolidayCriteria;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.HolidayService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Holiday;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.HolidayCriteria;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.HolidayService;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayCsv.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayCsv.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/HolidayRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/HolidayRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays;
 
 import io.micronaut.core.annotation.Introspected;
 import java.time.LocalDate;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/holidays/SearchHolidayRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/holidays/SearchHolidayRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.holidays;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.holidays;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/DeleteMailTemplateRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/DeleteMailTemplateRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateController.java

@@ -1,14 +1,14 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.AbstractRestController;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplate;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.MailTemplateCriteria;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.MailTemplateService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplate;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.MailTemplateCriteria;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.MailTemplateService;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateCsv.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateCsv.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/MailTemplateRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/MailTemplateRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/mailtemplates/SearchMailTemplateRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/mailtemplates/SearchMailTemplateRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.mailtemplates;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.mailtemplates;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/DeleteRoleRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/DeleteRoleRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleController.java

@@ -1,16 +1,16 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.util.CsvUtils;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.AbstractRestController;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Role;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RoleCriteria;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.RolePermission;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.PermissionService;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.RoleService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Role;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RoleCriteria;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.RolePermission;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.PermissionService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.RoleService;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleCsv.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleCsv.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/RoleRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/RoleRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.HashMap;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/roles/SearchRoleRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/roles/SearchRoleRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.roles;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.roles;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/DeleteStaffRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/DeleteStaffRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/SearchStaffRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/SearchStaffRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffController.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs;
 
 import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isNotEmpty;
 
@@ -8,9 +8,9 @@
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.Staff;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system.StaffCriteria;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.system.StaffService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.Staff;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.StaffCriteria;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.StaffService;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffCsv.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffCsv.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/staffs/StaffRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/staffs/StaffRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.staffs;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.staffs;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/system/uploadfiles/UploadFileController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/uploadfiles/UploadFileController.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.system.uploadfiles;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.uploadfiles;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.helper.FileHelper;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.security.HasPermission;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/DeleteUserRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/DeleteUserRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.users;
 
 import io.micronaut.core.annotation.Introspected;
 import java.util.UUID;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/SearchUserRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/SearchUserRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.users;
 
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserController.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserController.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.users;
 
 import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isNotEmpty;
 
@@ -8,9 +8,9 @@
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.request.Requests;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.controller.api.response.ApiResponse;
 import com.bigtreetc.sample.micronaut.aws.lambda.base.web.swagger.PageableAsQueryParam;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.User;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.users.UserCriteria;
-import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.users.UserService;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.User;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.model.UserCriteria;
+import com.bigtreetc.sample.micronaut.aws.lambda.domain.service.UserService;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserCsv.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserCsv.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.users;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/users/UserRequest.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/controller/users/UserRequest.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.controller.users.users;
+package com.bigtreetc.sample.micronaut.aws.lambda.controller.users;
 
 import java.util.UUID;
 import javax.validation.constraints.Digits;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Code.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Code.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl;
 import io.micronaut.data.annotation.AutoPopulated;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategory.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategory.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl;
 import io.micronaut.data.annotation.AutoPopulated;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCategoryCriteria.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCategoryCriteria.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/CodeCriteria.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/CodeCriteria.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Holiday.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Holiday.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl;
 import io.micronaut.data.annotation.AutoPopulated;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/HolidayCriteria.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/HolidayCriteria.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import java.time.LocalDate;
 import java.util.List;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplate.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplate.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl;
 import io.micronaut.data.annotation.AutoPopulated;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/MailTemplateCriteria.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/MailTemplateCriteria.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Permission.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Permission.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import com.bigtreetc.sample.micronaut.aws.lambda.base.domain.model.BaseEntityImpl;
 import io.micronaut.data.annotation.AutoPopulated;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/PermissionCriteria.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/PermissionCriteria.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/system/Role.java → src/main/java/com/bigtreetc/sample/micronaut/aws/lambda/domain/model/Role.java

@@ -1,4 +1,4 @@
-package com.bigtreetc.sample.micronaut.aws.lambda.domain.model.system;
+package com.bigtreetc.sample.micronaut.aws.lambda.domain.model;
 
 import static com.bigtreetc.sample.micronaut.aws.lambda.base.util.ValidateUtils.isEquals;