diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp
index 2862f78..b831362 100644
--- a/usrc/service/app_core.cpp
+++ b/usrc/service/app_core.cpp
@@ -1,16 +1,18 @@
 #include "app_core.hpp"
+
 #include <stddef.h>
 #include <stdio.h>
 
 #include "remote_controler_event_processer.hpp"
-#include "service/front_end_controler.hpp"
 #include "service/pump_ctrl_service.hpp"
 #include "service/remote_controler.hpp"
 #include "service/remote_controler_state_sync_service.hpp"
 #include "valve_state_ctrl_service.hpp"
 //
-#include "service/page/page.hpp"
 #include "ucomponents/zcan/zcan.hpp"
+//
+#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/page/page.hpp"
 
 #define TAG "main"
 using namespace iflytop;
@@ -174,7 +176,7 @@ void AppCore::test() {
   while (true) {
     // 扫描到 0x50 说明EEPROM在线
     uint8_t tx  = 0x10;
-    uint8_t rx = 0;
+    uint8_t rx  = 0;
     bool    suc = FrontEndControler::ins()->echo(tx, &rx);
     ZLOGI(TAG, "echo suc:%d tx:%x rx:%x", suc, tx, rx);
     osDelay(100);
@@ -263,6 +265,5 @@ void AppCore::initialize() {
 
   test();
 
-
   while (true) osDelay(30);
 }
diff --git a/usrc/service/remote_controler_event_processer.cpp b/usrc/service/remote_controler_event_processer.cpp
index 427c47e..b518289 100644
--- a/usrc/service/remote_controler_event_processer.cpp
+++ b/usrc/service/remote_controler_event_processer.cpp
@@ -1,9 +1,13 @@
 #include "remote_controler_event_processer.hpp"
 
 #include "pump_ctrl_service.hpp"
-#include "service/front_end_controler.hpp"
 #include "service/remote_controler.hpp"
 
+//
+#include "uicontroler/front_end_controler.hpp"
+#include "uicontroler/page/page.hpp"
+//
+
 using namespace iflytop;
 #define TAG "RemoteControlerEventProcesser"
 static const char* zhex2str(uint8_t* data, size_t len) {
diff --git a/usrc/service/front_end_controler.cpp b/usrc/uicontroler/front_end_controler.cpp
similarity index 99%
rename from usrc/service/front_end_controler.cpp
rename to usrc/uicontroler/front_end_controler.cpp
index d9ec91d..fab5e9c 100644
--- a/usrc/service/front_end_controler.cpp
+++ b/usrc/uicontroler/front_end_controler.cpp
@@ -143,9 +143,6 @@ void FrontEndControler::startSchedule() {
   });
 }
 
-// GVAR_triET
-// GVAR_triBId
-// GVAR_triPageId
 
 void FrontEndControler::processScreenRxPacket(uint8_t* data, size_t len) {
   // 判断包是否合法
diff --git a/usrc/service/front_end_controler.hpp b/usrc/uicontroler/front_end_controler.hpp
similarity index 100%
rename from usrc/service/front_end_controler.hpp
rename to usrc/uicontroler/front_end_controler.hpp
diff --git a/usrc/service/page/Page_login.cpp b/usrc/uicontroler/page/Page_login.cpp
similarity index 100%
rename from usrc/service/page/Page_login.cpp
rename to usrc/uicontroler/page/Page_login.cpp
diff --git a/usrc/service/page/Page_login.hpp b/usrc/uicontroler/page/Page_login.hpp
similarity index 100%
rename from usrc/service/page/Page_login.hpp
rename to usrc/uicontroler/page/Page_login.hpp
diff --git a/usrc/service/page/Page_main.cpp b/usrc/uicontroler/page/Page_main.cpp
similarity index 100%
rename from usrc/service/page/Page_main.cpp
rename to usrc/uicontroler/page/Page_main.cpp
diff --git a/usrc/service/page/Page_main.hpp b/usrc/uicontroler/page/Page_main.hpp
similarity index 100%
rename from usrc/service/page/Page_main.hpp
rename to usrc/uicontroler/page/Page_main.hpp
diff --git a/usrc/service/page/Page_menu.cpp b/usrc/uicontroler/page/Page_menu.cpp
similarity index 100%
rename from usrc/service/page/Page_menu.cpp
rename to usrc/uicontroler/page/Page_menu.cpp
diff --git a/usrc/service/page/Page_menu.hpp b/usrc/uicontroler/page/Page_menu.hpp
similarity index 100%
rename from usrc/service/page/Page_menu.hpp
rename to usrc/uicontroler/page/Page_menu.hpp
diff --git a/usrc/service/page/keyboard/Page_keybAcidCh.cpp b/usrc/uicontroler/page/keyboard/Page_keybAcidCh.cpp
similarity index 100%
rename from usrc/service/page/keyboard/Page_keybAcidCh.cpp
rename to usrc/uicontroler/page/keyboard/Page_keybAcidCh.cpp
diff --git a/usrc/service/page/keyboard/Page_keybAcidCh.hpp b/usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp
similarity index 100%
rename from usrc/service/page/keyboard/Page_keybAcidCh.hpp
rename to usrc/uicontroler/page/keyboard/Page_keybAcidCh.hpp
diff --git a/usrc/service/page/page.hpp b/usrc/uicontroler/page/page.hpp
similarity index 100%
rename from usrc/service/page/page.hpp
rename to usrc/uicontroler/page/page.hpp
diff --git a/usrc/service/page/page_processer.hpp b/usrc/uicontroler/page/page_processer.hpp
similarity index 97%
rename from usrc/service/page/page_processer.hpp
rename to usrc/uicontroler/page/page_processer.hpp
index 3aae729..8303535 100644
--- a/usrc/service/page/page_processer.hpp
+++ b/usrc/uicontroler/page/page_processer.hpp
@@ -2,7 +2,7 @@
 
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
-#include "service\front_end_controler.hpp"
+#include "uicontroler/front_end_controler.hpp"
 #include "utils/page_bak_router.hpp"
 #include "config/config.hpp"
 #include "ui/ui.h"
diff --git a/usrc/service/page/submenu/Page_changePasswd.cpp b/usrc/uicontroler/page/submenu/Page_changePasswd.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_changePasswd.cpp
rename to usrc/uicontroler/page/submenu/Page_changePasswd.cpp
diff --git a/usrc/service/page/submenu/Page_changePasswd.hpp b/usrc/uicontroler/page/submenu/Page_changePasswd.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_changePasswd.hpp
rename to usrc/uicontroler/page/submenu/Page_changePasswd.hpp
diff --git a/usrc/service/page/submenu/Page_muAcidType.cpp b/usrc/uicontroler/page/submenu/Page_muAcidType.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muAcidType.cpp
rename to usrc/uicontroler/page/submenu/Page_muAcidType.cpp
diff --git a/usrc/service/page/submenu/Page_muAcidType.hpp b/usrc/uicontroler/page/submenu/Page_muAcidType.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muAcidType.hpp
rename to usrc/uicontroler/page/submenu/Page_muAcidType.hpp
diff --git a/usrc/service/page/submenu/Page_muAudit.cpp b/usrc/uicontroler/page/submenu/Page_muAudit.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muAudit.cpp
rename to usrc/uicontroler/page/submenu/Page_muAudit.cpp
diff --git a/usrc/service/page/submenu/Page_muAudit.hpp b/usrc/uicontroler/page/submenu/Page_muAudit.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muAudit.hpp
rename to usrc/uicontroler/page/submenu/Page_muAudit.hpp
diff --git a/usrc/service/page/submenu/Page_muBleHandSett.cpp b/usrc/uicontroler/page/submenu/Page_muBleHandSett.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muBleHandSett.cpp
rename to usrc/uicontroler/page/submenu/Page_muBleHandSett.cpp
diff --git a/usrc/service/page/submenu/Page_muBleHandSett.hpp b/usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muBleHandSett.hpp
rename to usrc/uicontroler/page/submenu/Page_muBleHandSett.hpp
diff --git a/usrc/service/page/submenu/Page_muDeviceInfo.cpp b/usrc/uicontroler/page/submenu/Page_muDeviceInfo.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muDeviceInfo.cpp
rename to usrc/uicontroler/page/submenu/Page_muDeviceInfo.cpp
diff --git a/usrc/service/page/submenu/Page_muDeviceInfo.hpp b/usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muDeviceInfo.hpp
rename to usrc/uicontroler/page/submenu/Page_muDeviceInfo.hpp
diff --git a/usrc/service/page/submenu/Page_muInterval.cpp b/usrc/uicontroler/page/submenu/Page_muInterval.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muInterval.cpp
rename to usrc/uicontroler/page/submenu/Page_muInterval.cpp
diff --git a/usrc/service/page/submenu/Page_muInterval.hpp b/usrc/uicontroler/page/submenu/Page_muInterval.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muInterval.hpp
rename to usrc/uicontroler/page/submenu/Page_muInterval.hpp
diff --git a/usrc/service/page/submenu/Page_muMotorSett.cpp b/usrc/uicontroler/page/submenu/Page_muMotorSett.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muMotorSett.cpp
rename to usrc/uicontroler/page/submenu/Page_muMotorSett.cpp
diff --git a/usrc/service/page/submenu/Page_muMotorSett.hpp b/usrc/uicontroler/page/submenu/Page_muMotorSett.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muMotorSett.hpp
rename to usrc/uicontroler/page/submenu/Page_muMotorSett.hpp
diff --git a/usrc/service/page/submenu/Page_muPumpSett.cpp b/usrc/uicontroler/page/submenu/Page_muPumpSett.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muPumpSett.cpp
rename to usrc/uicontroler/page/submenu/Page_muPumpSett.cpp
diff --git a/usrc/service/page/submenu/Page_muPumpSett.hpp b/usrc/uicontroler/page/submenu/Page_muPumpSett.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muPumpSett.hpp
rename to usrc/uicontroler/page/submenu/Page_muPumpSett.hpp
diff --git a/usrc/service/page/submenu/Page_muPumpTest.cpp b/usrc/uicontroler/page/submenu/Page_muPumpTest.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muPumpTest.cpp
rename to usrc/uicontroler/page/submenu/Page_muPumpTest.cpp
diff --git a/usrc/service/page/submenu/Page_muPumpTest.hpp b/usrc/uicontroler/page/submenu/Page_muPumpTest.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muPumpTest.hpp
rename to usrc/uicontroler/page/submenu/Page_muPumpTest.hpp
diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/uicontroler/page/submenu/Page_muSettings.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muSettings.cpp
rename to usrc/uicontroler/page/submenu/Page_muSettings.cpp
diff --git a/usrc/service/page/submenu/Page_muSettings.hpp b/usrc/uicontroler/page/submenu/Page_muSettings.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muSettings.hpp
rename to usrc/uicontroler/page/submenu/Page_muSettings.hpp
diff --git a/usrc/service/page/submenu/Page_muUsrMgr.cpp b/usrc/uicontroler/page/submenu/Page_muUsrMgr.cpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muUsrMgr.cpp
rename to usrc/uicontroler/page/submenu/Page_muUsrMgr.cpp
diff --git a/usrc/service/page/submenu/Page_muUsrMgr.hpp b/usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp
similarity index 100%
rename from usrc/service/page/submenu/Page_muUsrMgr.hpp
rename to usrc/uicontroler/page/submenu/Page_muUsrMgr.hpp
diff --git a/usrc/service/page/utils/page_bak_router.cpp b/usrc/uicontroler/page/utils/page_bak_router.cpp
similarity index 100%
rename from usrc/service/page/utils/page_bak_router.cpp
rename to usrc/uicontroler/page/utils/page_bak_router.cpp
diff --git a/usrc/service/page/utils/page_bak_router.hpp b/usrc/uicontroler/page/utils/page_bak_router.hpp
similarity index 76%
rename from usrc/service/page/utils/page_bak_router.hpp
rename to usrc/uicontroler/page/utils/page_bak_router.hpp
index bdfa0a3..620be9c 100644
--- a/usrc/service/page/utils/page_bak_router.hpp
+++ b/usrc/uicontroler/page/utils/page_bak_router.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
-#include "service\front_end_controler.hpp"
+#include "uicontroler/front_end_controler.hpp"
 #include "config/config.hpp"
 namespace iflytop {
 int getBakPage(int nowPage);
diff --git a/usrc/service/tjc/tjc.hpp b/usrc/uicontroler/tjc/tjc.hpp
similarity index 100%
rename from usrc/service/tjc/tjc.hpp
rename to usrc/uicontroler/tjc/tjc.hpp
diff --git a/usrc/service/tjc/tjc_constant.cpp b/usrc/uicontroler/tjc/tjc_constant.cpp
similarity index 100%
rename from usrc/service/tjc/tjc_constant.cpp
rename to usrc/uicontroler/tjc/tjc_constant.cpp
diff --git a/usrc/service/tjc/tjc_constant.hpp b/usrc/uicontroler/tjc/tjc_constant.hpp
similarity index 85%
rename from usrc/service/tjc/tjc_constant.hpp
rename to usrc/uicontroler/tjc/tjc_constant.hpp
index 1142482..50598a8 100644
--- a/usrc/service/tjc/tjc_constant.hpp
+++ b/usrc/uicontroler/tjc/tjc_constant.hpp
@@ -120,9 +120,6 @@ typedef enum {
   k_input_confirm_event  = 2,
 } usr_event_type_t;
 
-#define GVAR_triET     "triET"
-#define GVAR_triBId    "triBId"
-#define GVAR_triPageId "triPageId"
 
 const char* pt2str(uint8_t type);
 const char* uimarco2str(uint8_t pid, uint8_t bid);
@@ -130,22 +127,4 @@ const char* pageName(uint8_t page);
 
 #define UI_UUID(pgid, obid) ((pg_##pgid << 8) + ob_##pgid##_##obid)
 
-/***********************************************************************************************************************
- *                                                   PublicPageName                                                    *
- ***********************************************************************************************************************/
-
-/**
- * @brief
- *
- * Page:
- *        "alert"
- * Var:
- *        alert.frompage
- *        alert.info
- *
- *
- *
- *
- */
-
 }  // namespace tjc