diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/WebApplication.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/WebApplication.java
index b6bb00b..1b54fc0 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/WebApplication.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/WebApplication.java
@@ -1,8 +1,8 @@
 package com.eshore.gringotts.web;
 
 import com.blinkfox.fenix.EnableFenix;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.service.UserService;
 import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/CheckingNeededEntity.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/CheckingNeededEntity.java
index 9206a31..3c4b0ff 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/CheckingNeededEntity.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/CheckingNeededEntity.java
@@ -1,6 +1,6 @@
 package com.eshore.gringotts.web.domain.base.entity;
 
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.EntityListeners;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/FileInfo.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/FileInfo.java
index 3cd9b05..1f48791 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/FileInfo.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/FileInfo.java
@@ -1,6 +1,6 @@
 package com.eshore.gringotts.web.domain.base.entity;
 
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import com.eshore.gringotts.web.domain.entity.DataFile;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.databind.DeserializationContext;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/SimpleEntity.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/SimpleEntity.java
index 239af7a..285a159 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/SimpleEntity.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/entity/SimpleEntity.java
@@ -1,6 +1,6 @@
 package com.eshore.gringotts.web.domain.base.entity;
 
-import com.eshore.gringotts.web.domain.user.entity.User;
+import com.eshore.gringotts.web.domain.entity.User;
 import java.time.LocalDateTime;
 import javax.persistence.ConstraintMode;
 import javax.persistence.EntityListeners;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java
index 8e747e8..4385ea4 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/CheckingService.java
@@ -1,6 +1,6 @@
 package com.eshore.gringotts.web.domain.base.service;
 
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
 import org.eclipse.collections.api.map.ImmutableMap;
 
 /**
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/LogicDeleteService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/LogicDeleteService.java
index 6cfce9b..39e855d 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/LogicDeleteService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/LogicDeleteService.java
@@ -4,7 +4,7 @@ import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.service.UserService;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.criteria.CriteriaBuilder;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/SimpleServiceSupport.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/SimpleServiceSupport.java
index 7c8f5f3..c1df68a 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/SimpleServiceSupport.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/base/service/SimpleServiceSupport.java
@@ -10,8 +10,8 @@ import com.eshore.gringotts.web.domain.base.entity.IdOnlyEntity_;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity_;
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.service.UserService;
 import java.util.Optional;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/controller/AuthenticationController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/AuthenticationController.java
similarity index 93%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/controller/AuthenticationController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/AuthenticationController.java
index 300204a..110bb89 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/controller/AuthenticationController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/AuthenticationController.java
@@ -1,14 +1,14 @@
-package com.eshore.gringotts.web.domain.authentication.controller;
+package com.eshore.gringotts.web.domain.controller;
 
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
-import com.eshore.gringotts.web.domain.authentication.service.AuthenticationService;
 import com.eshore.gringotts.web.domain.base.controller.SimpleControllerSupport;
 import com.eshore.gringotts.web.domain.base.entity.FileInfo;
 import com.eshore.gringotts.web.domain.base.entity.SimpleListItem;
 import com.eshore.gringotts.web.domain.base.entity.SimpleSaveItem;
-import com.eshore.gringotts.web.domain.resource.service.DataResourceService;
-import com.eshore.gringotts.web.domain.upload.service.DataFileService;
+import com.eshore.gringotts.web.domain.entity.Authentication;
+import com.eshore.gringotts.web.domain.service.AuthenticationService;
+import com.eshore.gringotts.web.domain.service.DataFileService;
+import com.eshore.gringotts.web.domain.service.DataResourceService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.LocalDateTime;
 import lombok.Data;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckOrderController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/CheckOrderController.java
similarity index 94%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckOrderController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/CheckOrderController.java
index f1ff745..9b224a3 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/controller/CheckOrderController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/CheckOrderController.java
@@ -1,10 +1,10 @@
-package com.eshore.gringotts.web.domain.check.controller;
+package com.eshore.gringotts.web.domain.controller;
 
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
 import com.eshore.gringotts.web.domain.base.controller.ListController;
 import com.eshore.gringotts.web.domain.base.controller.query.Query;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
-import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.service.CheckOrderService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/controller/ConfirmationController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/ConfirmationController.java
similarity index 92%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/controller/ConfirmationController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/ConfirmationController.java
index 36f13ad..0333603 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/controller/ConfirmationController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/ConfirmationController.java
@@ -1,14 +1,14 @@
-package com.eshore.gringotts.web.domain.confirmation.controller;
+package com.eshore.gringotts.web.domain.controller;
 
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
 import com.eshore.gringotts.web.domain.base.controller.SimpleControllerSupport;
 import com.eshore.gringotts.web.domain.base.entity.FileInfo;
 import com.eshore.gringotts.web.domain.base.entity.SimpleListItem;
 import com.eshore.gringotts.web.domain.base.entity.SimpleSaveItem;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
-import com.eshore.gringotts.web.domain.confirmation.service.ConfirmationService;
-import com.eshore.gringotts.web.domain.resource.service.DataResourceService;
-import com.eshore.gringotts.web.domain.upload.service.DataFileService;
+import com.eshore.gringotts.web.domain.entity.Confirmation;
+import com.eshore.gringotts.web.domain.service.ConfirmationService;
+import com.eshore.gringotts.web.domain.service.DataFileService;
+import com.eshore.gringotts.web.domain.service.DataResourceService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.LocalDateTime;
 import lombok.Data;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/controller/DataFileController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataFileController.java
similarity index 98%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/controller/DataFileController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataFileController.java
index f941784..eaf3067 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/controller/DataFileController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataFileController.java
@@ -1,11 +1,11 @@
-package com.eshore.gringotts.web.domain.upload.controller;
+package com.eshore.gringotts.web.domain.controller;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.eshore.gringotts.web.configuration.UploadConfiguration;
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
-import com.eshore.gringotts.web.domain.upload.service.DataFileService;
+import com.eshore.gringotts.web.domain.service.DataFileService;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataResourceController.java
similarity index 89%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataResourceController.java
index f0909cb..b1bc27e 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataResourceController.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.controller;
+package com.eshore.gringotts.web.domain.controller;
 
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -7,23 +7,23 @@ import com.eshore.gringotts.web.domain.base.controller.SimpleControllerSupport;
 import com.eshore.gringotts.web.domain.base.entity.FileInfo;
 import com.eshore.gringotts.web.domain.base.entity.SimpleListItem;
 import com.eshore.gringotts.web.domain.base.entity.SimpleSaveItem;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
-import com.eshore.gringotts.web.domain.resource.entity.DataResource;
-import com.eshore.gringotts.web.domain.resource.entity.format.CsvResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.format.JsonLineResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.format.JsonResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.format.LineResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.format.NoneResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.format.ResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.type.ApiResourceType;
-import com.eshore.gringotts.web.domain.resource.entity.type.DatabaseResourceType;
-import com.eshore.gringotts.web.domain.resource.entity.type.FileResourceType;
-import com.eshore.gringotts.web.domain.resource.entity.type.FtpResourceType;
-import com.eshore.gringotts.web.domain.resource.entity.type.HDFSResourceType;
-import com.eshore.gringotts.web.domain.resource.entity.type.ResourceType;
-import com.eshore.gringotts.web.domain.resource.service.DataResourceService;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
-import com.eshore.gringotts.web.domain.upload.service.DataFileService;
+import com.eshore.gringotts.web.domain.entity.Confirmation;
+import com.eshore.gringotts.web.domain.entity.DataFile;
+import com.eshore.gringotts.web.domain.entity.DataResource;
+import com.eshore.gringotts.web.domain.entity.format.CsvResourceFormat;
+import com.eshore.gringotts.web.domain.entity.format.JsonLineResourceFormat;
+import com.eshore.gringotts.web.domain.entity.format.JsonResourceFormat;
+import com.eshore.gringotts.web.domain.entity.format.LineResourceFormat;
+import com.eshore.gringotts.web.domain.entity.format.NoneResourceFormat;
+import com.eshore.gringotts.web.domain.entity.format.ResourceFormat;
+import com.eshore.gringotts.web.domain.entity.type.ApiResourceType;
+import com.eshore.gringotts.web.domain.entity.type.DatabaseResourceType;
+import com.eshore.gringotts.web.domain.entity.type.FileResourceType;
+import com.eshore.gringotts.web.domain.entity.type.FtpResourceType;
+import com.eshore.gringotts.web.domain.entity.type.HDFSResourceType;
+import com.eshore.gringotts.web.domain.entity.type.ResourceType;
+import com.eshore.gringotts.web.domain.service.DataFileService;
+import com.eshore.gringotts.web.domain.service.DataResourceService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.time.LocalDateTime;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/controller/UserController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/UserController.java
similarity index 89%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/controller/UserController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/UserController.java
index fb41909..3aa5026 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/controller/UserController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/UserController.java
@@ -1,11 +1,9 @@
-package com.eshore.gringotts.web.domain.user.controller;
+package com.eshore.gringotts.web.domain.controller;
 
-import cn.dev33.satoken.stp.SaTokenInfo;
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.service.UserService;
 import lombok.Data;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/controller/UserManagementController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/UserManagementController.java
similarity index 96%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/controller/UserManagementController.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/UserManagementController.java
index c661631..5023478 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/controller/UserManagementController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/UserManagementController.java
@@ -1,10 +1,10 @@
-package com.eshore.gringotts.web.domain.user.controller;
+package com.eshore.gringotts.web.domain.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.eshore.gringotts.web.configuration.amis.AmisListResponse;
 import com.eshore.gringotts.web.configuration.amis.AmisResponse;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.service.UserService;
 import java.time.LocalDateTime;
 import lombok.Data;
 import org.slf4j.Logger;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/entity/Authentication.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/Authentication.java
similarity index 93%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/entity/Authentication.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/Authentication.java
index 7707463..8e55da3 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/entity/Authentication.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/Authentication.java
@@ -1,10 +1,8 @@
-package com.eshore.gringotts.web.domain.authentication.entity;
+package com.eshore.gringotts.web.domain.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
-import com.eshore.gringotts.web.domain.resource.entity.DataResource;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
 import java.time.LocalDateTime;
 import java.util.Set;
 import javax.persistence.CascadeType;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/CheckOrder.java
similarity index 96%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/CheckOrder.java
index d57eba1..cc18d38 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/entity/CheckOrder.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/CheckOrder.java
@@ -1,8 +1,7 @@
-package com.eshore.gringotts.web.domain.check.entity;
+package com.eshore.gringotts.web.domain.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
-import com.eshore.gringotts.web.domain.user.entity.User;
 import javax.persistence.Column;
 import javax.persistence.ConstraintMode;
 import javax.persistence.Entity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/entity/Confirmation.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/Confirmation.java
similarity index 92%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/entity/Confirmation.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/Confirmation.java
index 5eb643d..9c7d5c1 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/entity/Confirmation.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/Confirmation.java
@@ -1,10 +1,8 @@
-package com.eshore.gringotts.web.domain.confirmation.entity;
+package com.eshore.gringotts.web.domain.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
-import com.eshore.gringotts.web.domain.resource.entity.DataResource;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.ConstraintMode;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/entity/DataFile.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/DataFile.java
similarity index 94%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/entity/DataFile.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/DataFile.java
index 78af640..1729e4d 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/entity/DataFile.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/DataFile.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.upload.entity;
+package com.eshore.gringotts.web.domain.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/DataResource.java
similarity index 87%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/DataResource.java
index 8575f97..1902cfc 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/DataResource.java
@@ -1,12 +1,9 @@
-package com.eshore.gringotts.web.domain.resource.entity;
+package com.eshore.gringotts.web.domain.entity;
 
 import com.eshore.gringotts.core.Constants;
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteEntity;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
-import com.eshore.gringotts.web.domain.resource.entity.format.ResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.type.ResourceType;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import com.eshore.gringotts.web.domain.entity.format.ResourceFormat;
+import com.eshore.gringotts.web.domain.entity.type.ResourceType;
 import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/entity/User.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/User.java
similarity index 98%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/entity/User.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/User.java
index f0f65c0..a19ee6f 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/entity/User.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/User.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.user.entity;
+package com.eshore.gringotts.web.domain.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/CsvResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/CsvResourceFormat.java
similarity index 93%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/CsvResourceFormat.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/CsvResourceFormat.java
index 2b61679..0a8ef63 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/CsvResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/CsvResourceFormat.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.format;
+package com.eshore.gringotts.web.domain.entity.format;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonLineResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonLineResourceFormat.java
similarity index 93%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonLineResourceFormat.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonLineResourceFormat.java
index 99065b5..bf57e10 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonLineResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonLineResourceFormat.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.format;
+package com.eshore.gringotts.web.domain.entity.format;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonResourceFormat.java
similarity index 93%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonResourceFormat.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonResourceFormat.java
index c9ce622..18207f2 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/JsonResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonResourceFormat.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.format;
+package com.eshore.gringotts.web.domain.entity.format;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/LineResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/LineResourceFormat.java
similarity index 92%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/LineResourceFormat.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/LineResourceFormat.java
index 454a2df..46a8e55 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/LineResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/LineResourceFormat.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.format;
+package com.eshore.gringotts.web.domain.entity.format;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/NoneResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/NoneResourceFormat.java
similarity index 92%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/NoneResourceFormat.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/NoneResourceFormat.java
index b134137..c26eed2 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/NoneResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/NoneResourceFormat.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.format;
+package com.eshore.gringotts.web.domain.entity.format;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/ResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/ResourceFormat.java
similarity index 94%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/ResourceFormat.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/ResourceFormat.java
index c1fda43..a23643d 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/format/ResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/ResourceFormat.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.format;
+package com.eshore.gringotts.web.domain.entity.format;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
@@ -27,6 +27,8 @@ import org.hibernate.annotations.Where;
 @SQLDelete(sql = "update " + Constants.TABLE_PREFIX + "resource_format" + " set deleted = true where id = ?")
 @Where(clause = LogicDeleteIdOnlyEntity.LOGIC_DELETE_CLAUSE)
 public abstract class ResourceFormat extends LogicDeleteIdOnlyEntity {
+    public abstract Type getFormatType();
+
     public enum Type {
         NONE,
         LINE,
@@ -34,6 +36,4 @@ public abstract class ResourceFormat extends LogicDeleteIdOnlyEntity {
         JSON_LINE,
         CSV,
     }
-
-    public abstract Type getFormatType();
 }
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ApiResourceType.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/ApiResourceType.java
similarity index 94%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ApiResourceType.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/ApiResourceType.java
index 8efc41e..5f5e21c 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ApiResourceType.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/ApiResourceType.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.type;
+package com.eshore.gringotts.web.domain.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/DatabaseResourceType.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/DatabaseResourceType.java
similarity index 95%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/DatabaseResourceType.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/DatabaseResourceType.java
index 1f0fbb0..ac9d328 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/DatabaseResourceType.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/DatabaseResourceType.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.type;
+package com.eshore.gringotts.web.domain.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FileResourceType.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/FileResourceType.java
similarity index 90%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FileResourceType.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/FileResourceType.java
index 3572657..cf8d266 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FileResourceType.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/FileResourceType.java
@@ -1,8 +1,8 @@
-package com.eshore.gringotts.web.domain.resource.entity.type;
+package com.eshore.gringotts.web.domain.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import com.eshore.gringotts.web.domain.entity.DataFile;
 import javax.persistence.ConstraintMode;
 import javax.persistence.Entity;
 import javax.persistence.ForeignKey;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FtpResourceType.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/FtpResourceType.java
similarity index 94%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FtpResourceType.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/FtpResourceType.java
index 560dfcc..0661bba 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/FtpResourceType.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/FtpResourceType.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.type;
+package com.eshore.gringotts.web.domain.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/HDFSResourceType.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/HDFSResourceType.java
similarity index 91%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/HDFSResourceType.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/HDFSResourceType.java
index eee7c42..781c7af 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/HDFSResourceType.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/HDFSResourceType.java
@@ -1,8 +1,8 @@
-package com.eshore.gringotts.web.domain.resource.entity.type;
+package com.eshore.gringotts.web.domain.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import com.eshore.gringotts.web.domain.entity.DataFile;
 import javax.persistence.ConstraintMode;
 import javax.persistence.Entity;
 import javax.persistence.ForeignKey;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ResourceType.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/ResourceType.java
similarity index 94%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ResourceType.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/ResourceType.java
index 485436c..26774ab 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/type/ResourceType.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/type/ResourceType.java
@@ -1,4 +1,4 @@
-package com.eshore.gringotts.web.domain.resource.entity.type;
+package com.eshore.gringotts.web.domain.entity.type;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.LogicDeleteIdOnlyEntity;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/repository/AuthenticationRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/AuthenticationRepository.java
similarity index 88%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/repository/AuthenticationRepository.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/AuthenticationRepository.java
index 8feea13..8bb7004 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/repository/AuthenticationRepository.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/AuthenticationRepository.java
@@ -1,7 +1,7 @@
-package com.eshore.gringotts.web.domain.authentication.repository;
+package com.eshore.gringotts.web.domain.repository;
 
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
+import com.eshore.gringotts.web.domain.entity.Authentication;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Sort;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/repository/CheckOrderRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/CheckOrderRepository.java
similarity index 89%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/repository/CheckOrderRepository.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/CheckOrderRepository.java
index 3b4ec35..87d345d 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/repository/CheckOrderRepository.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/CheckOrderRepository.java
@@ -1,8 +1,8 @@
-package com.eshore.gringotts.web.domain.check.repository;
+package com.eshore.gringotts.web.domain.repository;
 
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
-import com.eshore.gringotts.web.domain.user.entity.User;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.entity.User;
 import java.util.List;
 import java.util.Optional;
 import javax.transaction.Transactional;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/repository/ConfirmationRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ConfirmationRepository.java
similarity index 89%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/repository/ConfirmationRepository.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ConfirmationRepository.java
index 270c573..813464d 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/repository/ConfirmationRepository.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ConfirmationRepository.java
@@ -1,7 +1,7 @@
-package com.eshore.gringotts.web.domain.confirmation.repository;
+package com.eshore.gringotts.web.domain.repository;
 
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
+import com.eshore.gringotts.web.domain.entity.Confirmation;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Sort;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/repository/DataFileRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/DataFileRepository.java
similarity index 64%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/repository/DataFileRepository.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/DataFileRepository.java
index ff73657..43e4905 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/repository/DataFileRepository.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/DataFileRepository.java
@@ -1,7 +1,7 @@
-package com.eshore.gringotts.web.domain.upload.repository;
+package com.eshore.gringotts.web.domain.repository;
 
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
+import com.eshore.gringotts.web.domain.entity.DataFile;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/DataResourceRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/DataResourceRepository.java
similarity index 90%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/DataResourceRepository.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/DataResourceRepository.java
index 3b0d0f1..7871f0f 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/DataResourceRepository.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/DataResourceRepository.java
@@ -1,7 +1,7 @@
-package com.eshore.gringotts.web.domain.resource.repository;
+package com.eshore.gringotts.web.domain.repository;
 
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.resource.entity.DataResource;
+import com.eshore.gringotts.web.domain.entity.DataResource;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Sort;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ResourceFormatRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ResourceFormatRepository.java
new file mode 100644
index 0000000..e61f51e
--- /dev/null
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ResourceFormatRepository.java
@@ -0,0 +1,9 @@
+package com.eshore.gringotts.web.domain.repository;
+
+import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
+import com.eshore.gringotts.web.domain.entity.format.ResourceFormat;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ResourceFormatRepository extends SimpleRepository<ResourceFormat, Long> {
+}
\ No newline at end of file
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ResourceTypeRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ResourceTypeRepository.java
new file mode 100644
index 0000000..9ed1bd6
--- /dev/null
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/ResourceTypeRepository.java
@@ -0,0 +1,9 @@
+package com.eshore.gringotts.web.domain.repository;
+
+import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
+import com.eshore.gringotts.web.domain.entity.type.ResourceType;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ResourceTypeRepository extends SimpleRepository<ResourceType, Long> {
+}
\ No newline at end of file
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/repository/UserRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/UserRepository.java
similarity index 86%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/repository/UserRepository.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/UserRepository.java
index 54659d0..7760c91 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/repository/UserRepository.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/repository/UserRepository.java
@@ -1,7 +1,7 @@
-package com.eshore.gringotts.web.domain.user.repository;
+package com.eshore.gringotts.web.domain.repository;
 
 import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.user.entity.User;
+import com.eshore.gringotts.web.domain.entity.User;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.EntityGraph;
@@ -21,6 +21,7 @@ public interface UserRepository extends SimpleRepository<User, Long> {
     List<User> findAll();
 
     Boolean existsByUsername(String username);
+
     @EntityGraph(value = "user.detail", type = EntityGraph.EntityGraphType.FETCH)
     Optional<User> findByUsername(String username);
 }
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/ResourceFormatRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/ResourceFormatRepository.java
deleted file mode 100644
index 29c12d1..0000000
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/ResourceFormatRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.eshore.gringotts.web.domain.resource.repository;
-
-import com.blinkfox.fenix.jpa.FenixJpaRepository;
-import com.blinkfox.fenix.specification.FenixJpaSpecificationExecutor;
-import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.resource.entity.format.ResourceFormat;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ResourceFormatRepository extends SimpleRepository<ResourceFormat, Long> {
-}
\ No newline at end of file
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/ResourceTypeRepository.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/ResourceTypeRepository.java
deleted file mode 100644
index da52d13..0000000
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/repository/ResourceTypeRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.eshore.gringotts.web.domain.resource.repository;
-
-import com.blinkfox.fenix.jpa.FenixJpaRepository;
-import com.blinkfox.fenix.specification.FenixJpaSpecificationExecutor;
-import com.eshore.gringotts.web.domain.base.repository.SimpleRepository;
-import com.eshore.gringotts.web.domain.resource.entity.type.ResourceType;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ResourceTypeRepository extends SimpleRepository<ResourceType, Long> {
-}
\ No newline at end of file
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/service/AuthenticationService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/AuthenticationService.java
similarity index 89%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/service/AuthenticationService.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/AuthenticationService.java
index 85a588e..6a4daa4 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/authentication/service/AuthenticationService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/AuthenticationService.java
@@ -1,18 +1,16 @@
-package com.eshore.gringotts.web.domain.authentication.service;
+package com.eshore.gringotts.web.domain.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication_;
-import com.eshore.gringotts.web.domain.authentication.repository.AuthenticationRepository;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.base.service.CheckingService;
 import com.eshore.gringotts.web.domain.base.service.LogicDeleteService;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder_;
-import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.Authentication;
+import com.eshore.gringotts.web.domain.entity.Authentication_;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.entity.CheckOrder_;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.repository.AuthenticationRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import javax.persistence.EntityManager;
@@ -34,7 +32,7 @@ import org.springframework.stereotype.Service;
  * @date 2024-12-02
  */
 @Slf4j
-@Service("com.eshore.gringotts.web.domain.authentication.service.AuthenticationService")
+@Service("com.eshore.gringotts.web.domain.service.AuthenticationService")
 public class AuthenticationService extends LogicDeleteService<Authentication> implements CheckingService {
     private final AuthenticationRepository authenticationRepository;
     private final UserService userService;
@@ -94,7 +92,7 @@ public class AuthenticationService extends LogicDeleteService<Authentication> im
                 StrUtil.format("数据资源「{}」的授权申请", authentication.getTarget().getName()),
                 CheckOrder.Type.AUTHENTICATION,
                 mapper.writeValueAsString(Maps.immutable.of("authenticationId", authentication.getId())),
-                "com.eshore.gringotts.web.domain.authentication.service.AuthenticationService",
+                "com.eshore.gringotts.web.domain.service.AuthenticationService",
                 authentication.getCreatedUser()
         ));
         CheckOrder order = checkOrderService.detailOrThrow(orderId);
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/service/CheckOrderService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/CheckOrderService.java
similarity index 89%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/service/CheckOrderService.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/CheckOrderService.java
index ebc09bf..e6e66e6 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/check/service/CheckOrderService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/CheckOrderService.java
@@ -1,14 +1,13 @@
-package com.eshore.gringotts.web.domain.check.service;
+package com.eshore.gringotts.web.domain.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.domain.base.service.CheckingService;
 import com.eshore.gringotts.web.domain.base.service.SimpleServiceSupport;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder_;
-import com.eshore.gringotts.web.domain.check.repository.CheckOrderRepository;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.entity.CheckOrder_;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.repository.CheckOrderRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/ConfirmationService.java
similarity index 87%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/ConfirmationService.java
index 8e6848b..267dbfb 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/confirmation/service/ConfirmationService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/ConfirmationService.java
@@ -1,18 +1,16 @@
-package com.eshore.gringotts.web.domain.confirmation.service;
+package com.eshore.gringotts.web.domain.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.base.service.CheckingService;
 import com.eshore.gringotts.web.domain.base.service.SimpleServiceSupport;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder_;
-import com.eshore.gringotts.web.domain.check.service.CheckOrderService;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation_;
-import com.eshore.gringotts.web.domain.confirmation.repository.ConfirmationRepository;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.entity.CheckOrder_;
+import com.eshore.gringotts.web.domain.entity.Confirmation;
+import com.eshore.gringotts.web.domain.entity.Confirmation_;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.repository.ConfirmationRepository;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -35,7 +33,7 @@ import org.springframework.stereotype.Service;
  * @date 2024-11-26
  */
 @Slf4j
-@Service("com.eshore.gringotts.web.domain.confirmation.service.ConfirmationService")
+@Service("com.eshore.gringotts.web.domain.service.ConfirmationService")
 public class ConfirmationService extends SimpleServiceSupport<Confirmation> implements CheckingService {
     private final ConfirmationRepository confirmationRepository;
     private final CheckOrderService checkOrderService;
@@ -90,7 +88,7 @@ public class ConfirmationService extends SimpleServiceSupport<Confirmation> impl
                 StrUtil.format("数据资源「{}」的确权申请", confirmation.getTarget().getName()),
                 CheckOrder.Type.CONFIRMATION,
                 mapper.writeValueAsString(Maps.immutable.of("confirmationId", confirmation.getId())),
-                "com.eshore.gringotts.web.domain.confirmation.service.ConfirmationService",
+                "com.eshore.gringotts.web.domain.service.ConfirmationService",
                 User.Role.CHECKER
         ));
         CheckOrder order = checkOrderService.detailOrThrow(orderId);
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/service/DataFileService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/DataFileService.java
similarity index 84%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/service/DataFileService.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/DataFileService.java
index 3ea4b4c..5b37b8e 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/upload/service/DataFileService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/DataFileService.java
@@ -1,15 +1,14 @@
-package com.eshore.gringotts.web.domain.upload.service;
+package com.eshore.gringotts.web.domain.service;
 
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication_;
 import com.eshore.gringotts.web.domain.base.service.SimpleServiceSupport;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation_;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile;
-import com.eshore.gringotts.web.domain.upload.entity.DataFile_;
-import com.eshore.gringotts.web.domain.upload.repository.DataFileRepository;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.Authentication;
+import com.eshore.gringotts.web.domain.entity.Authentication_;
+import com.eshore.gringotts.web.domain.entity.Confirmation;
+import com.eshore.gringotts.web.domain.entity.Confirmation_;
+import com.eshore.gringotts.web.domain.entity.DataFile;
+import com.eshore.gringotts.web.domain.entity.DataFile_;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.repository.DataFileRepository;
 import com.eshore.gringotts.web.helper.EntityHelper;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/service/DataResourceService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/DataResourceService.java
similarity index 83%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/service/DataResourceService.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/DataResourceService.java
index 551aade..9ece2f9 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/service/DataResourceService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/DataResourceService.java
@@ -1,19 +1,18 @@
-package com.eshore.gringotts.web.domain.resource.service;
+package com.eshore.gringotts.web.domain.service;
 
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication;
-import com.eshore.gringotts.web.domain.authentication.entity.Authentication_;
 import com.eshore.gringotts.web.domain.base.service.SimpleServiceSupport;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
-import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation_;
-import com.eshore.gringotts.web.domain.resource.entity.DataResource;
-import com.eshore.gringotts.web.domain.resource.entity.DataResource_;
-import com.eshore.gringotts.web.domain.resource.entity.format.ResourceFormat;
-import com.eshore.gringotts.web.domain.resource.entity.type.ResourceType;
-import com.eshore.gringotts.web.domain.resource.repository.DataResourceRepository;
-import com.eshore.gringotts.web.domain.resource.repository.ResourceFormatRepository;
-import com.eshore.gringotts.web.domain.resource.repository.ResourceTypeRepository;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.service.UserService;
+import com.eshore.gringotts.web.domain.entity.Authentication;
+import com.eshore.gringotts.web.domain.entity.Authentication_;
+import com.eshore.gringotts.web.domain.entity.Confirmation;
+import com.eshore.gringotts.web.domain.entity.Confirmation_;
+import com.eshore.gringotts.web.domain.entity.DataResource;
+import com.eshore.gringotts.web.domain.entity.DataResource_;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.entity.format.ResourceFormat;
+import com.eshore.gringotts.web.domain.entity.type.ResourceType;
+import com.eshore.gringotts.web.domain.repository.DataResourceRepository;
+import com.eshore.gringotts.web.domain.repository.ResourceFormatRepository;
+import com.eshore.gringotts.web.domain.repository.ResourceTypeRepository;
 import com.eshore.gringotts.web.helper.EntityHelper;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/service/UserService.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/UserService.java
similarity index 97%
rename from gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/service/UserService.java
rename to gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/UserService.java
index 640e344..b3e4546 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/user/service/UserService.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/service/UserService.java
@@ -1,12 +1,12 @@
-package com.eshore.gringotts.web.domain.user.service;
+package com.eshore.gringotts.web.domain.service;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
-import com.eshore.gringotts.web.domain.user.entity.User;
-import com.eshore.gringotts.web.domain.user.repository.UserRepository;
+import com.eshore.gringotts.web.domain.entity.User;
+import com.eshore.gringotts.web.domain.repository.UserRepository;
 import java.time.LocalDateTime;
 import java.util.Optional;
 import lombok.Data;
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java
index d88af5a..f640156 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/helper/EntityHelper.java
@@ -3,9 +3,9 @@ package com.eshore.gringotts.web.helper;
 import cn.hutool.core.util.ObjectUtil;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity;
 import com.eshore.gringotts.web.domain.base.entity.CheckingNeededEntity_;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder;
-import com.eshore.gringotts.web.domain.check.entity.CheckOrder_;
-import com.eshore.gringotts.web.domain.user.entity.User;
+import com.eshore.gringotts.web.domain.entity.CheckOrder;
+import com.eshore.gringotts.web.domain.entity.CheckOrder_;
+import com.eshore.gringotts.web.domain.entity.User;
 import java.util.function.Supplier;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Predicate;