diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/controller/SysAppController.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java
similarity index 96%
rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/controller/SysAppController.java
rename to kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java
index ec4077ea7..17d619119 100644
--- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/controller/SysAppController.java
+++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java
@@ -1,11 +1,11 @@
-package cn.stylefeng.roses.kernel.system.app.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.app.controller;
 
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
-import cn.stylefeng.roses.kernel.system.app.modular.service.SysAppService;
+import cn.stylefeng.roses.kernel.system.modular.app.service.SysAppService;
 import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/entity/SysApp.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java
similarity index 95%
rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/entity/SysApp.java
rename to kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java
index 4724d1728..2d4045d73 100644
--- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/entity/SysApp.java
+++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.system.app.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.app.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/mapper/SysAppMapper.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java
similarity index 62%
rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/mapper/SysAppMapper.java
rename to kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java
index 4e091738c..5841b7334 100644
--- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/mapper/SysAppMapper.java
+++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.system.app.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.app.mapper;
 
-import cn.stylefeng.roses.kernel.system.app.modular.entity.SysApp;
+import cn.stylefeng.roses.kernel.system.modular.app.entity.SysApp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/mapper/mapping/SysAppMapper.xml b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml
similarity index 73%
rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/mapper/mapping/SysAppMapper.xml
rename to kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml
index 57fc5ba27..b68e4f568 100644
--- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/mapper/mapping/SysAppMapper.xml
+++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.system.app.modular.mapper.SysAppMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.app.mapper.SysAppMapper">
 
 </mapper>
diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/service/SysAppService.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java
similarity index 94%
rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/service/SysAppService.java
rename to kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java
index d255caa94..325f65cfa 100644
--- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/service/SysAppService.java
+++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java
@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kernel.system.app.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.app.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.system.app.modular.entity.SysApp;
+import cn.stylefeng.roses.kernel.system.modular.app.entity.SysApp;
 import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/service/impl/SysAppServiceImpl.java b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java
similarity index 96%
rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/service/impl/SysAppServiceImpl.java
rename to kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java
index 523f0917f..0a0c98f9c 100644
--- a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/app/modular/service/impl/SysAppServiceImpl.java
+++ b/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.system.app.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.app.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -11,11 +11,11 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.system.AppServiceApi;
 import cn.stylefeng.roses.kernel.system.MenuServiceApi;
-import cn.stylefeng.roses.kernel.system.app.modular.entity.SysApp;
-import cn.stylefeng.roses.kernel.system.app.modular.mapper.SysAppMapper;
-import cn.stylefeng.roses.kernel.system.app.modular.service.SysAppService;
 import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.exception.enums.app.AppExceptionEnum;
+import cn.stylefeng.roses.kernel.system.modular.app.entity.SysApp;
+import cn.stylefeng.roses.kernel.system.modular.app.mapper.SysAppMapper;
+import cn.stylefeng.roses.kernel.system.modular.app.service.SysAppService;
 import cn.stylefeng.roses.kernel.system.pojo.app.SysAppRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/constants/LoginLogConstant.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java
similarity index 93%
rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/constants/LoginLogConstant.java
rename to kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java
index 221495d04..17aff093e 100644
--- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/constants/LoginLogConstant.java
+++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/constants/LoginLogConstant.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.system.loginlog.modular.constants;
+package cn.stylefeng.roses.kernel.system.modular.loginlog.constants;
 
 /**
  * 登录日志常量
diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/controller/SysLoginLogController.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java
similarity index 93%
rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/controller/SysLoginLogController.java
rename to kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java
index 07fe04a35..69417a02b 100644
--- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/controller/SysLoginLogController.java
+++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java
@@ -1,10 +1,10 @@
-package cn.stylefeng.roses.kernel.system.loginlog.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.loginlog.controller;
 
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
-import cn.stylefeng.roses.kernel.system.loginlog.modular.service.SysLoginLogService;
+import cn.stylefeng.roses.kernel.system.modular.loginlog.service.SysLoginLogService;
 import cn.stylefeng.roses.kernel.system.pojo.loginlog.SysLoginLogRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/entity/SysLoginLog.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java
similarity index 94%
rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/entity/SysLoginLog.java
rename to kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java
index a9ba172ae..98256b5b1 100644
--- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/entity/SysLoginLog.java
+++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/entity/SysLoginLog.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.system.loginlog.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.loginlog.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/mapper/SysLoginLogMapper.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java
similarity index 64%
rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/mapper/SysLoginLogMapper.java
rename to kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java
index 2e4c34c97..00a538e9f 100644
--- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/mapper/SysLoginLogMapper.java
+++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.system.loginlog.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.loginlog.mapper;
 
-import cn.stylefeng.roses.kernel.system.loginlog.modular.entity.SysLoginLog;
+import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/mapper/mapping/SysLoginLogMapper.xml b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml
similarity index 62%
rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/mapper/mapping/SysLoginLogMapper.xml
rename to kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml
index 0db4c3477..11372cf04 100644
--- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/mapper/mapping/SysLoginLogMapper.xml
+++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.system.loginlog.modular.mapper.SysLoginLogMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.loginlog.mapper.SysLoginLogMapper">
 
 </mapper>
diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/service/SysLoginLogService.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java
similarity index 89%
rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/service/SysLoginLogService.java
rename to kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java
index dae01eac1..ddbe64e3f 100644
--- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/service/SysLoginLogService.java
+++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java
@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kernel.system.loginlog.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.loginlog.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.system.loginlog.modular.entity.SysLoginLog;
+import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog;
 import cn.stylefeng.roses.kernel.system.pojo.loginlog.SysLoginLogRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/service/impl/SysLoginLogServiceImpl.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java
similarity index 94%
rename from kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/service/impl/SysLoginLogServiceImpl.java
rename to kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java
index ea32663be..9cb6ba56b 100644
--- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/loginlog/modular/service/impl/SysLoginLogServiceImpl.java
+++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.system.loginlog.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.loginlog.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -10,10 +10,10 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 import cn.stylefeng.roses.kernel.system.LoginLogServiceApi;
 import cn.stylefeng.roses.kernel.system.exception.enums.log.LogExceptionEnum;
-import cn.stylefeng.roses.kernel.system.loginlog.modular.constants.LoginLogConstant;
-import cn.stylefeng.roses.kernel.system.loginlog.modular.entity.SysLoginLog;
-import cn.stylefeng.roses.kernel.system.loginlog.modular.mapper.SysLoginLogMapper;
-import cn.stylefeng.roses.kernel.system.loginlog.modular.service.SysLoginLogService;
+import cn.stylefeng.roses.kernel.system.modular.loginlog.constants.LoginLogConstant;
+import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog;
+import cn.stylefeng.roses.kernel.system.modular.loginlog.mapper.SysLoginLogMapper;
+import cn.stylefeng.roses.kernel.system.modular.loginlog.service.SysLoginLogService;
 import cn.stylefeng.roses.kernel.system.pojo.loginlog.SysLoginLogRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/constants/MenuButtonConstant.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java
similarity index 93%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/constants/MenuButtonConstant.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java
index 579a1571e..27bff6a0b 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/constants/MenuButtonConstant.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.menu.modular.constants;
+package cn.stylefeng.roses.kernel.system.modular.menu.constants;
 
 /**
  * 系统菜单按钮常量
@@ -32,7 +32,7 @@ public interface MenuButtonConstant {
      * 默认修改按钮名称
      */
     String DEFAULT_UPDATE_BUTTON_NAME = "修改";
-    
+
     /**
      * 默认修改按钮CODE
      */
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuButtonController.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java
similarity index 95%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuButtonController.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java
index 5ebf7203e..0d1dea82d 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuButtonController.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java
@@ -1,13 +1,13 @@
-package cn.stylefeng.roses.kernel.menu.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.menu.controller;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenuButton;
-import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuButtonService;
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuButtonService;
 import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java
similarity index 96%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java
index da2723cc5..b96956b85 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java
@@ -1,13 +1,13 @@
-package cn.stylefeng.roses.kernel.menu.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.menu.controller;
 
-import cn.stylefeng.roses.kernel.menu.modular.factory.AntdMenusFactory;
-import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuService;
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
 import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode;
+import cn.stylefeng.roses.kernel.system.modular.menu.factory.AntdMenusFactory;
+import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuService;
 import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdvMenuItem;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java
similarity index 98%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java
index 0913430f6..55f7ea4ce 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.menu.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.menu.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenuButton.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java
similarity index 95%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenuButton.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java
index 7bdf1ccae..cb8212698 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenuButton.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.menu.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.menu.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java
similarity index 96%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java
index b982682b6..c982af079 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java
@@ -1,10 +1,10 @@
-package cn.stylefeng.roses.kernel.menu.modular.factory;
+package cn.stylefeng.roses.kernel.system.modular.menu.factory;
 
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;
 import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdMenuSelectTreeNode;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdvMenuAuthorityItem;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java
similarity index 96%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java
index 87ee808a4..cc345f51a 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.menu.modular.factory;
+package cn.stylefeng.roses.kernel.system.modular.menu.factory;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -6,11 +6,11 @@ import cn.hutool.extra.spring.SpringUtil;
 import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
 import cn.stylefeng.roses.kernel.i18n.api.constants.TranslationConstants;
 import cn.stylefeng.roses.kernel.i18n.api.context.TranslationContext;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 import cn.stylefeng.roses.kernel.system.AppServiceApi;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu;
 import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenusVO;
 import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiIndexMenuTreeNode;
 
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/MenuButtonFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java
similarity index 90%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/MenuButtonFactory.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java
index 6d70cf737..54b1fb93b 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/MenuButtonFactory.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java
@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.menu.modular.factory;
+package cn.stylefeng.roses.kernel.system.modular.menu.factory;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.stylefeng.roses.kernel.menu.modular.constants.MenuButtonConstant;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenuButton;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
+import cn.stylefeng.roses.kernel.system.modular.menu.constants.MenuButtonConstant;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton;
 
 import java.util.List;
 
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/SysMenuButtonMapper.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java
similarity index 61%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/SysMenuButtonMapper.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java
index e342d69cc..dc6b686e6 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/SysMenuButtonMapper.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.menu.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.menu.mapper;
 
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/SysMenuMapper.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java
similarity index 82%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/SysMenuMapper.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java
index 10dc8d6c8..2e24385cb 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/SysMenuMapper.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.menu.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.menu.mapper;
 
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/mapping/SysMenuButtonMapper.xml b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml
similarity index 62%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/mapping/SysMenuButtonMapper.xml
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml
index e45118a86..b40bed5ab 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/mapping/SysMenuButtonMapper.xml
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.menu.modular.mapper.SysMenuButtonMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuButtonMapper">
 
 </mapper>
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/mapping/SysMenuMapper.xml b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml
similarity index 94%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/mapping/SysMenuMapper.xml
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml
index 095907e83..7f03968f0 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/mapping/SysMenuMapper.xml
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.menu.modular.mapper.SysMenuMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuMapper">
 
     <resultMap id="systemMenuAndRole" type="cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO">
         <id column="menu_id" property="menuId"/>
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuButtonService.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java
similarity index 94%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuButtonService.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java
index 5b7b77696..8850032de 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuButtonService.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java
@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kernel.menu.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.menu.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton;
 import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java
similarity index 96%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java
index 0736722b2..38182ec4c 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java
@@ -1,7 +1,7 @@
-package cn.stylefeng.roses.kernel.menu.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.menu.service;
 
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;
 import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu;
 import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdMenuSelectTreeNode;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java
similarity index 93%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java
index 2cd2aaa1a..9aa22d3ac 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.menu.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.menu.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ArrayUtil;
@@ -6,13 +6,13 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenuButton;
-import cn.stylefeng.roses.kernel.menu.modular.factory.MenuButtonFactory;
-import cn.stylefeng.roses.kernel.menu.modular.mapper.SysMenuButtonMapper;
-import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuButtonService;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.exception.enums.menu.SysMenuButtonExceptionEnum;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.menu.factory.MenuButtonFactory;
+import cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuButtonMapper;
+import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuButtonService;
 import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java
similarity index 97%
rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java
rename to kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java
index ba77ef5a0..7d2c5ed69 100644
--- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java
+++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.menu.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.menu.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -8,13 +8,6 @@ import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo;
 import cn.stylefeng.roses.kernel.db.api.DbOperatorApi;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;
-import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenuButton;
-import cn.stylefeng.roses.kernel.menu.modular.factory.AntdMenusFactory;
-import cn.stylefeng.roses.kernel.menu.modular.factory.LayuiMenusFactory;
-import cn.stylefeng.roses.kernel.menu.modular.mapper.SysMenuMapper;
-import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuButtonService;
-import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuService;
 import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant;
 import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
@@ -28,6 +21,13 @@ import cn.stylefeng.roses.kernel.system.RoleServiceApi;
 import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.exception.enums.menu.SysMenuExceptionEnum;
 import cn.stylefeng.roses.kernel.system.exception.enums.user.SysUserExceptionEnum;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenu;
+import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.menu.factory.AntdMenusFactory;
+import cn.stylefeng.roses.kernel.system.modular.menu.factory.LayuiMenusFactory;
+import cn.stylefeng.roses.kernel.system.modular.menu.mapper.SysMenuMapper;
+import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuButtonService;
+import cn.stylefeng.roses.kernel.system.modular.menu.service.SysMenuService;
 import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdMenuSelectTreeNode;
 import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuDTO;
diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/SysNoticeController.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java
similarity index 95%
rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/SysNoticeController.java
rename to kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java
index 05c743cb0..c23e05f44 100644
--- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/controller/SysNoticeController.java
+++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java
@@ -1,11 +1,11 @@
-package cn.stylefeng.roses.kernel.notice.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.notice.controller;
 
-import cn.stylefeng.roses.kernel.notice.modular.service.SysNoticeService;
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.system.modular.notice.service.SysNoticeService;
 import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/entity/SysNotice.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java
similarity index 96%
rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/entity/SysNotice.java
rename to kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java
index 0634fc401..eb24132e8 100644
--- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/entity/SysNotice.java
+++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.notice.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.notice.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import cn.stylefeng.roses.kernel.dict.api.serializer.DictValueSerializer;
diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/mapper/SysNoticeMapper.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java
similarity index 59%
rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/mapper/SysNoticeMapper.java
rename to kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java
index cb5e4f7ad..1ff1d41f4 100644
--- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/mapper/SysNoticeMapper.java
+++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.notice.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.notice.mapper;
 
-import cn.stylefeng.roses.kernel.notice.modular.entity.SysNotice;
+import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,4 +11,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysNoticeMapper extends BaseMapper<SysNotice> {
 
-}
\ No newline at end of file
+}
diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/mapper/mapping/SysNoticeMapper.xml b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml
similarity index 59%
rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/mapper/mapping/SysNoticeMapper.xml
rename to kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml
index 5173b12ca..17bc66637 100644
--- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/mapper/mapping/SysNoticeMapper.xml
+++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.stylefeng.roses.kernel.notice.modular.mapper.SysNoticeMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.notice.mapper.SysNoticeMapper">
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java
similarity index 92%
rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java
rename to kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java
index 532382c37..607424ae8 100644
--- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/SysNoticeService.java
+++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java
@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.notice.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.notice.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.notice.modular.entity.SysNotice;
 import cn.stylefeng.roses.kernel.system.NoticeServiceApi;
+import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice;
 import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java
similarity index 95%
rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java
rename to kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java
index 7d2bdf3e9..fc16a4286 100644
--- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/notice/modular/service/impl/SysNoticeServiceImpl.java
+++ b/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.notice.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.notice.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -9,12 +9,12 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
 import cn.stylefeng.roses.kernel.message.api.MessageApi;
 import cn.stylefeng.roses.kernel.message.api.enums.MessageBusinessTypeEnum;
 import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageSendRequest;
-import cn.stylefeng.roses.kernel.notice.modular.entity.SysNotice;
-import cn.stylefeng.roses.kernel.notice.modular.mapper.SysNoticeMapper;
-import cn.stylefeng.roses.kernel.notice.modular.service.SysNoticeService;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.exception.enums.notice.NoticeExceptionEnum;
+import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice;
+import cn.stylefeng.roses.kernel.system.modular.notice.mapper.SysNoticeMapper;
+import cn.stylefeng.roses.kernel.system.modular.notice.service.SysNoticeService;
 import cn.stylefeng.roses.kernel.system.pojo.notice.SysNoticeRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/cache/ResourceCache.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/ResourceCache.java
similarity index 83%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/cache/ResourceCache.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/ResourceCache.java
index c5a964a27..9affd7343 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/cache/ResourceCache.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/ResourceCache.java
@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.resource.modular.cache;
+package cn.stylefeng.roses.kernel.system.modular.resource.cache;
 
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
-import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource;
-import cn.stylefeng.roses.kernel.resource.modular.factory.ResourceFactory;
+import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource;
+import cn.stylefeng.roses.kernel.system.modular.resource.factory.ResourceFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ApiController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java
similarity index 92%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ApiController.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java
index 35d542d7a..8c7633f48 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ApiController.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java
@@ -1,12 +1,12 @@
-package cn.stylefeng.roses.kernel.resource.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.resource.controller;
 
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
-import cn.stylefeng.roses.kernel.resource.modular.service.SysResourceService;
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService;
 import cn.stylefeng.roses.kernel.system.pojo.resource.LayuiApiResourceTreeNode;
 import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest;
 import org.springframework.validation.annotation.Validated;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java
similarity index 89%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java
index 09097b915..1584a0df8 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java
@@ -1,13 +1,13 @@
-package cn.stylefeng.roses.kernel.resource.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.resource.controller;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
-import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource;
-import cn.stylefeng.roses.kernel.resource.modular.pojo.ResourceTreeNode;
-import cn.stylefeng.roses.kernel.resource.modular.service.SysResourceService;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource;
+import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode;
+import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService;
 import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/entity/SysResource.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java
similarity index 97%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/entity/SysResource.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java
index 1a23b6ea7..203541276 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/entity/SysResource.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.resource.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.resource.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/factory/ResourceFactory.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java
similarity index 97%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/factory/ResourceFactory.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java
index f55bf3f50..3e3ee781e 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/factory/ResourceFactory.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.resource.modular.factory;
+package cn.stylefeng.roses.kernel.system.modular.resource.factory;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -6,8 +6,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.FieldMetadata;
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
-import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
+import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.Feature;
 import com.alibaba.fastjson.serializer.SerializerFeature;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/mapper/SysResourceMapper.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java
similarity index 59%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/mapper/SysResourceMapper.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java
index cbf748709..cad66d1ed 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/mapper/SysResourceMapper.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.resource.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.resource.mapper;
 
-import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource;
+import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,4 +11,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysResourceMapper extends BaseMapper<SysResource> {
 
-}
\ No newline at end of file
+}
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/mapper/mapping/SysResourceMapper.xml b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml
similarity index 58%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/mapper/mapping/SysResourceMapper.xml
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml
index 8d3bf96bf..392f2e62a 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/mapper/mapping/SysResourceMapper.xml
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.stylefeng.roses.kernel.resource.modular.mapper.SysResourceMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.resource.mapper.SysResourceMapper">
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/pojo/ResourceTreeNode.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java
similarity index 94%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/pojo/ResourceTreeNode.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java
index b99058566..277d06bc2 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/pojo/ResourceTreeNode.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.resource.modular.pojo;
+package cn.stylefeng.roses.kernel.system.modular.resource.pojo;
 
 import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode;
 import lombok.Data;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java
similarity index 90%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java
index 193cb4fb2..ac85cdeda 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java
@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.resource.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.resource.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
-import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource;
-import cn.stylefeng.roses.kernel.resource.modular.pojo.ResourceTreeNode;
+import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource;
+import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode;
 import cn.stylefeng.roses.kernel.system.pojo.resource.LayuiApiResourceTreeNode;
 import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
similarity index 96%
rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java
rename to kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
index dccdaa674..c43ab6a9b 100644
--- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java
+++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.resource.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.resource.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.auth.api.LoginUserApi;
@@ -11,18 +11,18 @@ import cn.stylefeng.roses.kernel.resource.api.ResourceReportApi;
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ReportResourceParam;
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
 import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceUrlParam;
-import cn.stylefeng.roses.kernel.resource.modular.cache.ResourceCache;
-import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource;
-import cn.stylefeng.roses.kernel.resource.modular.factory.ResourceFactory;
-import cn.stylefeng.roses.kernel.resource.modular.mapper.SysResourceMapper;
-import cn.stylefeng.roses.kernel.resource.modular.pojo.ResourceTreeNode;
-import cn.stylefeng.roses.kernel.resource.modular.service.SysResourceService;
 import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory;
 import cn.stylefeng.roses.kernel.system.ResourceServiceApi;
 import cn.stylefeng.roses.kernel.system.RoleServiceApi;
+import cn.stylefeng.roses.kernel.system.modular.resource.cache.ResourceCache;
+import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource;
+import cn.stylefeng.roses.kernel.system.modular.resource.factory.ResourceFactory;
+import cn.stylefeng.roses.kernel.system.modular.resource.mapper.SysResourceMapper;
+import cn.stylefeng.roses.kernel.system.modular.resource.pojo.ResourceTreeNode;
+import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService;
 import cn.stylefeng.roses.kernel.system.pojo.resource.LayuiApiResourceTreeNode;
 import cn.stylefeng.roses.kernel.system.pojo.resource.ResourceRequest;
 import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleResourceDTO;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/controller/SysRoleController.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java
similarity index 95%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/controller/SysRoleController.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java
index 78bcd412e..5352970d2 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/controller/SysRoleController.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java
@@ -1,13 +1,13 @@
-package cn.stylefeng.roses.kernel.role.modular.controller;
+package cn.stylefeng.roses.kernel.system.modular.role.controller;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
-import cn.stylefeng.roses.kernel.role.modular.service.SysRoleResourceService;
-import cn.stylefeng.roses.kernel.role.modular.service.SysRoleService;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleResourceService;
+import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleService;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRole.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java
similarity index 96%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRole.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java
index bb74d7e67..104a5654e 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRole.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.role.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.role.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleDataScope.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java
similarity index 93%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleDataScope.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java
index ae6caeae3..752685953 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleDataScope.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.role.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.role.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleMenu.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java
similarity index 93%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleMenu.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java
index ec5b3faa9..8d783c3f7 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleMenu.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.role.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.role.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleMenuButton.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java
similarity index 93%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleMenuButton.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java
index d6b1e0824..a1bc391e9 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleMenuButton.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.role.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.role.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleResource.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java
similarity index 92%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleResource.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java
index 993605318..e20d78f2d 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/entity/SysRoleResource.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.role.modular.entity;
+package cn.stylefeng.roses.kernel.system.modular.role.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleDataScopeMapper.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java
similarity index 62%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleDataScopeMapper.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java
index 664777e4a..bacc81519 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleDataScopeMapper.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.role.mapper;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleDataScope;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleDataScope;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMapper.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java
similarity index 61%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMapper.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java
index 73cb31655..fac73e25b 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMapper.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.role.mapper;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRole;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMenuButtonMapper.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java
similarity index 62%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMenuButtonMapper.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java
index be79a289b..3dbf1084d 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMenuButtonMapper.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.role.mapper;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenuButton;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMenuMapper.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java
similarity index 61%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMenuMapper.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java
index 65dd208b0..1613039af 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleMenuMapper.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.role.mapper;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleMenu;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenu;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleResourceMapper.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java
similarity index 62%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleResourceMapper.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java
index bfd870410..89f8a15e0 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/SysRoleResourceMapper.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.mapper;
+package cn.stylefeng.roses.kernel.system.modular.role.mapper;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleResource;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleDataScopeMapper.xml b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml
similarity index 61%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleDataScopeMapper.xml
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml
index aaff8f4dd..4c2584d10 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleDataScopeMapper.xml
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleDataScopeMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleDataScopeMapper">
 
 </mapper>
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMapper.xml b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml
similarity index 64%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMapper.xml
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml
index 31bf0afdd..db7f3b4f0 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMapper.xml
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMapper">
 
 </mapper>
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMenuButtonMapper.xml b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml
similarity index 83%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMenuButtonMapper.xml
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml
index 841756302..665df5dd2 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMenuButtonMapper.xml
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleMenuButtonMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMenuButtonMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.stylefeng.roses.kernel.role.modular.entity.SysRoleMenuButton">
+    <resultMap id="BaseResultMap" type="cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenuButton">
         <id column="role_button_id" property="roleButtonId"/>
         <result column="role_id" property="roleId"/>
         <result column="button_id" property="buttonId"/>
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMenuMapper.xml b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml
similarity index 63%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMenuMapper.xml
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml
index a474e9ddf..021076249 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleMenuMapper.xml
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleMenuMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMenuMapper">
 
 </mapper>
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleResourceMapper.xml b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml
similarity index 62%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleResourceMapper.xml
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml
index 1a5371135..c65451d83 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/mapper/mapping/SysRoleResourceMapper.xml
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleResourceMapper">
+<mapper namespace="cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleResourceMapper">
 
 </mapper>
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleDataScopeService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java
similarity index 93%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleDataScopeService.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java
index fc284d681..31d5e2a9d 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleDataScopeService.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.role.service;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleDataScope;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleDataScope;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleDataScopeRequest;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleMenuButtonService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java
similarity index 62%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleMenuButtonService.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java
index 3d346b9d5..db958525f 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleMenuButtonService.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.role.service;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenuButton;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleMenuService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java
similarity index 61%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleMenuService.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java
index 224ae2e38..23f76221e 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleMenuService.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.role.service;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleMenu;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenu;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleResourceService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java
similarity index 87%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleResourceService.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java
index 2de187aca..f68ebcbbb 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleResourceService.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java
@@ -1,6 +1,6 @@
-package cn.stylefeng.roses.kernel.role.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.role.service;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleResource;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleResource;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleService.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java
similarity index 95%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleService.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java
index cf9f09fd6..094628e25 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/SysRoleService.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java
@@ -1,9 +1,9 @@
-package cn.stylefeng.roses.kernel.role.modular.service;
+package cn.stylefeng.roses.kernel.system.modular.role.service;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRole;
 import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.system.RoleServiceApi;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRole;
 import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleDataScopeServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java
similarity index 94%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleDataScopeServiceImpl.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java
index d5c95acec..acf271883 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleDataScopeServiceImpl.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java
@@ -1,12 +1,12 @@
-package cn.stylefeng.roses.kernel.role.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.role.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleDataScope;
-import cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleDataScopeMapper;
-import cn.stylefeng.roses.kernel.role.modular.service.SysRoleDataScopeService;
 import cn.stylefeng.roses.kernel.system.RoleDataScopeServiceApi;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleDataScope;
+import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleDataScopeMapper;
+import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleDataScopeService;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleDataScopeRequest;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleMenuButtonServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java
similarity index 53%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleMenuButtonServiceImpl.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java
index c1395ec5f..817e2dc29 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleMenuButtonServiceImpl.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java
@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.role.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.role.service.impl;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleMenuButton;
-import cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleMenuButtonMapper;
-import cn.stylefeng.roses.kernel.role.modular.service.SysRoleMenuButtonService;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenuButton;
+import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMenuButtonMapper;
+import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleMenuButtonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleMenuServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java
similarity index 52%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleMenuServiceImpl.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java
index 04d96a8b0..7464c836d 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleMenuServiceImpl.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java
@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.role.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.role.service.impl;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleMenu;
-import cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleMenuMapper;
-import cn.stylefeng.roses.kernel.role.modular.service.SysRoleMenuService;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleMenu;
+import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMenuMapper;
+import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleResourceServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java
similarity index 87%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleResourceServiceImpl.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java
index 45e7a1f08..40ded1b80 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleResourceServiceImpl.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java
@@ -1,8 +1,8 @@
-package cn.stylefeng.roses.kernel.role.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.role.service.impl;
 
-import cn.stylefeng.roses.kernel.role.modular.entity.SysRoleResource;
-import cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleResourceMapper;
-import cn.stylefeng.roses.kernel.role.modular.service.SysRoleResourceService;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleResource;
+import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleResourceMapper;
+import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleResourceService;
 import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleServiceImpl.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java
similarity index 98%
rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleServiceImpl.java
rename to kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java
index 63d6e932c..fd9a30b93 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/service/impl/SysRoleServiceImpl.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java
@@ -1,4 +1,4 @@
-package cn.stylefeng.roses.kernel.role.modular.service.impl;
+package cn.stylefeng.roses.kernel.system.modular.role.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -11,9 +11,6 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
-import cn.stylefeng.roses.kernel.role.modular.entity.*;
-import cn.stylefeng.roses.kernel.role.modular.mapper.SysRoleMapper;
-import cn.stylefeng.roses.kernel.role.modular.service.*;
 import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
@@ -22,6 +19,9 @@ import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
 import cn.stylefeng.roses.kernel.system.UserServiceApi;
 import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.exception.enums.role.SysRoleExceptionEnum;
+import cn.stylefeng.roses.kernel.system.modular.role.entity.*;
+import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleMapper;
+import cn.stylefeng.roses.kernel.system.modular.role.service.*;
 import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleDTO;
 import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuButtonDTO;
 import cn.stylefeng.roses.kernel.system.pojo.role.dto.SysRoleMenuDTO;