diff --git a/sql/demo.sql b/sql/init.sql
similarity index 100%
rename from sql/demo.sql
rename to sql/init.sql
diff --git a/src/main/java/com/qyft/gd/device/client/TcpClient.java b/src/main/java/com/qyft/gd/device/core/client/TcpClient.java
similarity index 98%
rename from src/main/java/com/qyft/gd/device/client/TcpClient.java
rename to src/main/java/com/qyft/gd/device/core/client/TcpClient.java
index 5ad2cc6..b7d733a 100644
--- a/src/main/java/com/qyft/gd/device/client/TcpClient.java
+++ b/src/main/java/com/qyft/gd/device/core/client/TcpClient.java
@@ -1,9 +1,9 @@
-package com.qyft.gd.device.client;
+package com.qyft.gd.device.core.client;
 
 import cn.hutool.json.JSONUtil;
 import com.qyft.gd.device.common.jsonrpc.JsonRpcRequest;
 import com.qyft.gd.device.config.TcpConfig;
-import com.qyft.gd.device.handler.DeviceMessageHandler;
+import com.qyft.gd.device.core.handler.DeviceMessageHandler;
 import com.qyft.gd.device.model.bo.DeviceFeedback;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.Unpooled;
diff --git a/src/main/java/com/qyft/gd/device/event/LiquidTrayStatusChangedEvent.java b/src/main/java/com/qyft/gd/device/core/event/LiquidTrayStatusChangedEvent.java
similarity index 92%
rename from src/main/java/com/qyft/gd/device/event/LiquidTrayStatusChangedEvent.java
rename to src/main/java/com/qyft/gd/device/core/event/LiquidTrayStatusChangedEvent.java
index 5679532..fa3eac3 100644
--- a/src/main/java/com/qyft/gd/device/event/LiquidTrayStatusChangedEvent.java
+++ b/src/main/java/com/qyft/gd/device/core/event/LiquidTrayStatusChangedEvent.java
@@ -1,4 +1,4 @@
-package com.qyft.gd.device.event;
+package com.qyft.gd.device.core.event;
 
 import com.qyft.gd.device.model.bo.DeviceStatus;
 import lombok.Getter;
diff --git a/src/main/java/com/qyft/gd/device/handler/DeviceMessageHandler.java b/src/main/java/com/qyft/gd/device/core/handler/DeviceMessageHandler.java
similarity index 98%
rename from src/main/java/com/qyft/gd/device/handler/DeviceMessageHandler.java
rename to src/main/java/com/qyft/gd/device/core/handler/DeviceMessageHandler.java
index 3a3cf39..e7870f0 100644
--- a/src/main/java/com/qyft/gd/device/handler/DeviceMessageHandler.java
+++ b/src/main/java/com/qyft/gd/device/core/handler/DeviceMessageHandler.java
@@ -1,4 +1,4 @@
-package com.qyft.gd.device.handler;
+package com.qyft.gd.device.core.handler;
 
 import cn.hutool.json.JSONUtil;
 import com.qyft.gd.app.common.constant.WebSocketMessageType;
diff --git a/src/main/java/com/qyft/gd/device/Listener/LiquidTrayStatusChangedListener.java b/src/main/java/com/qyft/gd/device/core/listener/LiquidTrayStatusChangedListener.java
similarity index 91%
rename from src/main/java/com/qyft/gd/device/Listener/LiquidTrayStatusChangedListener.java
rename to src/main/java/com/qyft/gd/device/core/listener/LiquidTrayStatusChangedListener.java
index 91386c7..8dab4af 100644
--- a/src/main/java/com/qyft/gd/device/Listener/LiquidTrayStatusChangedListener.java
+++ b/src/main/java/com/qyft/gd/device/core/listener/LiquidTrayStatusChangedListener.java
@@ -1,6 +1,6 @@
-package com.qyft.gd.device.Listener;
+package com.qyft.gd.device.core.listener;
 
-import com.qyft.gd.device.event.LiquidTrayStatusChangedEvent;
+import com.qyft.gd.device.core.event.LiquidTrayStatusChangedEvent;
 import com.qyft.gd.device.model.bo.DeviceStatus;
 import com.qyft.gd.device.service.DeviceOperationalService;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java b/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java
index 2e21f63..e11712c 100644
--- a/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java
+++ b/src/main/java/com/qyft/gd/device/service/DeviceStatusService.java
@@ -1,12 +1,11 @@
 package com.qyft.gd.device.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.qyft.gd.device.event.LiquidTrayStatusChangedEvent;
+import com.qyft.gd.device.core.event.LiquidTrayStatusChangedEvent;
 import com.qyft.gd.device.model.bo.DeviceOperationalStatus;
 import com.qyft.gd.device.model.bo.DeviceStatus;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/qyft/gd/device/service/DeviceTcpCMDService.java b/src/main/java/com/qyft/gd/device/service/DeviceTcpCMDService.java
index 5330c46..35d8bb0 100644
--- a/src/main/java/com/qyft/gd/device/service/DeviceTcpCMDService.java
+++ b/src/main/java/com/qyft/gd/device/service/DeviceTcpCMDService.java
@@ -1,7 +1,7 @@
 package com.qyft.gd.device.service;
 
 import cn.hutool.json.JSONUtil;
-import com.qyft.gd.device.client.TcpClient;
+import com.qyft.gd.device.core.client.TcpClient;
 import com.qyft.gd.device.common.constant.DeviceCommands;
 import com.qyft.gd.device.common.jsonrpc.JsonRpcRequest;
 import com.qyft.gd.device.model.bo.DeviceFeedback;
diff --git a/src/main/java/com/qyft/gd/system/config/FilterConfig.java b/src/main/java/com/qyft/gd/system/config/FilterConfig.java
index f669a18..d3d6974 100644
--- a/src/main/java/com/qyft/gd/system/config/FilterConfig.java
+++ b/src/main/java/com/qyft/gd/system/config/FilterConfig.java
@@ -1,6 +1,6 @@
 package com.qyft.gd.system.config;
 
-import com.qyft.gd.system.filter.JwtAuthenticationFilter;
+import com.qyft.gd.system.core.filter.JwtAuthenticationFilter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
diff --git a/src/main/java/com/qyft/gd/system/config/MybatisPlusConfig.java b/src/main/java/com/qyft/gd/system/config/MybatisPlusConfig.java
index 516f4cf..23e964c 100644
--- a/src/main/java/com/qyft/gd/system/config/MybatisPlusConfig.java
+++ b/src/main/java/com/qyft/gd/system/config/MybatisPlusConfig.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.qyft.gd.system.core.MyMetaObjectHandler;
+import com.qyft.gd.system.core.handler.MyMetaObjectHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
diff --git a/src/main/java/com/qyft/gd/system/filter/JwtAuthenticationFilter.java b/src/main/java/com/qyft/gd/system/core/filter/JwtAuthenticationFilter.java
similarity index 97%
rename from src/main/java/com/qyft/gd/system/filter/JwtAuthenticationFilter.java
rename to src/main/java/com/qyft/gd/system/core/filter/JwtAuthenticationFilter.java
index 41398ff..58cb243 100644
--- a/src/main/java/com/qyft/gd/system/filter/JwtAuthenticationFilter.java
+++ b/src/main/java/com/qyft/gd/system/core/filter/JwtAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.qyft.gd.system.filter;
+package com.qyft.gd.system.core.filter;
 
 import com.qyft.gd.system.common.result.ResultCode;
 import com.qyft.gd.system.common.utils.JwtUtil;
diff --git a/src/main/java/com/qyft/gd/system/core/MyMetaObjectHandler.java b/src/main/java/com/qyft/gd/system/core/handler/MyMetaObjectHandler.java
similarity index 95%
rename from src/main/java/com/qyft/gd/system/core/MyMetaObjectHandler.java
rename to src/main/java/com/qyft/gd/system/core/handler/MyMetaObjectHandler.java
index 1895341..ed88e39 100644
--- a/src/main/java/com/qyft/gd/system/core/MyMetaObjectHandler.java
+++ b/src/main/java/com/qyft/gd/system/core/handler/MyMetaObjectHandler.java
@@ -1,4 +1,4 @@
-package com.qyft.gd.system.core;
+package com.qyft.gd.system.core.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;