diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index 34c41d39..7ca0d2d0 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -2,8 +2,9 @@ import { AbilityConstant, ConfigurationConstant, UIAbility, Want } from '@kit.Ab
 import { hilog } from '@kit.PerformanceAnalysisKit';
 import { window, display, AppStorageV2, ColorMetrics } from '@kit.ArkUI';
 import { IBestInit } from "@ibestservices/ibest-ui-v2"
-import {ExtractDir,CheckExistDir,HilogSadboxFontDirFile} from "../pages/ExtractDir/ExtractDir"
-import {MainWindowStageInfo,InitGlobalDisplayWindowInfo,mwInfo}from '../pages/DispWinInfo/DispWinInfo'
+import {ExtractDir,CheckExistDir,HilogSadboxFontDirFile} from "../pages/extractdir/ExtractDir"
+import {MainWindowStageInfo,InitGlobalDisplayWindowInfo,mwInfo}from '../pages/displaywindowinfo/DispWinInfo'
+
 const DOMAIN = 0x0000;
 
 export default class EntryAbility extends UIAbility {
diff --git a/entry/src/main/ets/pages/DevMode/DevArkui2NativeEvent.ets b/entry/src/main/ets/pages/DevMode/DevArkui2NativeEvent.ets
deleted file mode 100644
index 61e608b1..00000000
--- a/entry/src/main/ets/pages/DevMode/DevArkui2NativeEvent.ets
+++ /dev/null
@@ -1,4 +0,0 @@
-//本ets主要位于开发模式,用来测试Arkui侧<->Narive侧双向事件通信
-//Arkui侧传入参数:事件ID,事件名.事件参数,回调
-//Narive侧接收参数:传回参数,回调执行
-//执行的异步和同步
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/EventHub/EventPage.ets b/entry/src/main/ets/pages/EventHub/EventPage.ets
deleted file mode 100644
index 3e217a8b..00000000
--- a/entry/src/main/ets/pages/EventHub/EventPage.ets
+++ /dev/null
@@ -1,38 +0,0 @@
-import { mwInfo } from '../DispWinInfo/DispWinInfo';
-import { CloseSubWindow, CreateAndShowSubWindow, SubWinInfo } from '../SubWindow/SWBase';
-import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface';
-//事件类型:页面
-export function EventPage(event:TitleButton){
-  //打开文件
-  if(event?.btnEvent.command=='Execute_OpenFile') {
-    const winInfo: SubWinInfo = new SubWinInfo(event.btnName, event.btnEvent.page, mwInfo.width * 0.5, mwInfo.height * 0.3);
-    CreateAndShowSubWindow(winInfo);
-  }
-  //窗体打开
-  if(event?.btnEvent.command=='Execute_CreateSubWindow'){
-    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.3,mwInfo.height*0.9);
-    CreateAndShowSubWindow(winInfo);
-  }else if(event?.btnEvent.command=='Execute_ExitSubWindow'){
-    CloseSubWindow();
-  } else if(event?.btnEvent.command=='Execute_CreateSubWindow_Options'){
-    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.6,mwInfo.height*0.9);
-    CreateAndShowSubWindow(winInfo);
-  } else if(event?.btnEvent.command=='Execute_NewFileWindow'){
-    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
-    CreateAndShowSubWindow(winInfo);
-  }else if(event?.btnEvent.command=='Execute_SaveAsFileWindow'){
-    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
-    CreateAndShowSubWindow(winInfo);
-  }else if(event?.btnEvent.command=='Execute_ImportFileWindow'){
-    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
-    CreateAndShowSubWindow(winInfo);
-  }else if(event?.btnEvent.command=='Execute_ExportFileWindow'){
-    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
-    CreateAndShowSubWindow(winInfo);
-  } else if(event?.btnEvent.command=='Open_NewModel'){
-    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.6,mwInfo.height*0.9);
-    CreateAndShowSubWindow(winInfo);
-  } else if(event?.btnEvent.command=='Execute_ExitSubWindow_Options'){
-    CloseSubWindow();
-  }
-}
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/EventsPages.ets b/entry/src/main/ets/pages/EventsPages.ets
new file mode 100644
index 00000000..0dea3bb6
--- /dev/null
+++ b/entry/src/main/ets/pages/EventsPages.ets
@@ -0,0 +1,12 @@
+let EventsPages: Map<string, string> = new Map<string, string>([
+  ["Page_NewFile", "pages/subpages/file/SWNewFile"],
+  ["Page_OpenFile", "pages/subpages/file/SWOpenFile"],
+  ["Page_SaveAsFile", "pages/subpages/file/SWSaveAsFile"],
+  ["Page_ImportFile", "pages/subpages/file/SWImportFile"],
+  ["Page_ExportFile", "pages/subpages/file/SWExportFile"],
+  ["Page_Options", "pages/subpages/Options"],
+]);
+
+export function GetEventsPage(key: string): string {
+  return EventsPages.get(key) || '';
+}
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets
index ddc304a9..2107014f 100644
--- a/entry/src/main/ets/pages/Index.ets
+++ b/entry/src/main/ets/pages/Index.ets
@@ -1,11 +1,11 @@
 import { hilog } from '@kit.PerformanceAnalysisKit';
 import { OverlayManager } from '@kit.ArkUI';
-import { TitleTab } from './TitleTabs/TitleTab'
-import { LeftSideTab } from './LeftSide/LeftSideTab'
-import { RightSideTab } from './RightSide/RightSideTab'
+import { TitleTab } from './titletabs/TitleTab'
+import { LeftSideTab } from './leftside/LeftSideTab'
+import { RightSideTab } from './rightside/RightSideTab'
 import { ModelViewTab } from './ModelViewTab'
-import { TitleColumnSub } from './TitleTabs/TitleColumnSub'
-import { mwInfo } from './DispWinInfo/DispWinInfo'
+import { TitleColumnSub } from './titletabs/TitleColumnSub'
+import { mwInfo } from './displaywindowinfo/DispWinInfo'
 
 const DOMAIN = 0x0000;
 
@@ -33,16 +33,16 @@ struct Index {
       //左边分割线
       if(dividerType==DividerType.LeftSide){
         if(mouseEvent.button==MouseButton.Left&&mouseEvent.action==MouseAction.Press){
-          this.startX = mouseEvent.screenX; // 记录起始坐标
+          this.startX = mouseEvent.windowX; // 记录起始坐标
           this.isDragging = true;
         }else if(mouseEvent.action==MouseAction.Move&&this.isDragging){
           // 计算新的宽度
-          let newWidth = this.leftSideWidth + (mouseEvent.screenX - this.startX);
+          let newWidth = this.leftSideWidth + (mouseEvent.windowX - this.startX);
           // 添加最小宽度限制
           newWidth = Math.max(newWidth, 0);
           this.leftSideWidth = newWidth;
           // 更新起始坐标，实现连续拖动
-          this.startX = mouseEvent.screenX;
+          this.startX = mouseEvent.windowX;
         }else if(mouseEvent.action==MouseAction.Release){
           this.isDragging = false;
         }
@@ -50,16 +50,16 @@ struct Index {
       else if(dividerType==DividerType.RightSide) //右分割线
       {
         if(mouseEvent.button==MouseButton.Left&&mouseEvent.action==MouseAction.Press){
-          this.startX = mouseEvent.screenX; // 记录起始坐标
+          this.startX = mouseEvent.windowX; // 记录起始坐标
           this.isDragging = true;
         }else if(mouseEvent.action==MouseAction.Move&&this.isDragging){
           // 计算新的宽度
-          let newWidth = this.rightSideWidth - (mouseEvent.screenX - this.startX);
+          let newWidth = this.rightSideWidth - (mouseEvent.windowX - this.startX);
           // 添加最小宽度限制
           newWidth = Math.max(newWidth, 0);
           this.rightSideWidth = newWidth;
           // 更新起始坐标，实现连续拖动
-          this.startX = mouseEvent.screenX;
+          this.startX = mouseEvent.windowX;
         }else if(mouseEvent.action==MouseAction.Release){
           this.isDragging = false;
         }
diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets
deleted file mode 100644
index c4a26d0c..00000000
--- a/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TitleGroup } from "./GroupInterface";
-import { TitleModel } from "./ModelInterface";
-
-export {TitleGroup,TitleModel}
-export {TitleInterface}
-//Title配置
-interface TitleInterface{
-  //Title配置ID名(唯一)
-  mId:string;
-  //基础模块
-  mFileModel:Array<Array<TitleGroup>>
-  //功能模块
-  mModels:Map<number,Array<TitleModel>>
-}
-
-
diff --git a/entry/src/main/ets/pages/ModelViewTab.ets b/entry/src/main/ets/pages/ModelViewTab.ets
index f686b7f2..c809b517 100644
--- a/entry/src/main/ets/pages/ModelViewTab.ets
+++ b/entry/src/main/ets/pages/ModelViewTab.ets
@@ -1,7 +1,7 @@
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { mwInfo } from './DispWinInfo/DispWinInfo'
+import { mwInfo } from './displaywindowinfo/DispWinInfo'
 import { AppStorageV2 } from '@kit.ArkUI';
-import {InitXCompNode,XCompInfos,XCompInfo,CurrentXCompIndex} from './EventHub/XCompMgr'
+import {InitXCompNode,XCompInfos,XCompInfo,CurrentXCompIndex} from './eventhub/XCompMgr'
 
 
 @ComponentV2
diff --git a/entry/src/main/ets/pages/NativeBridge/NativeBridge.ets b/entry/src/main/ets/pages/NativeBridge/NativeBridge.ets
deleted file mode 100644
index 8efe176e..00000000
--- a/entry/src/main/ets/pages/NativeBridge/NativeBridge.ets
+++ /dev/null
@@ -1,91 +0,0 @@
-import { BusinessError } from '@kit.BasicServicesKit';
-import { BridgeEvent, BridgeRequest, BridgeResponse } from './NativeBridgeTypes'; // 导入定义的类型
-
-/**
- * Native桥接管理器
- * 负责与Native侧进行统一的通信
- */
-class NativeBridgeManager {
-  private static instance: NativeBridgeManager;
-  private eventListeners: Map<string, Set<(event: BridgeEvent) => void>> = new Map();
-
-  // 禁止外部直接实例化
-  private constructor() {}
-
-  public static getInstance(): NativeBridgeManager {
-    if (!NativeBridgeManager.instance) {
-      NativeBridgeManager.instance = new NativeBridgeManager();
-    }
-    return NativeBridgeManager.instance;
-  }
-
-  /**
-   * 核心调用函数
-   * 通过一个函数实现对Native侧多个函数的调用和参数传递
-   * @param request 包含函数名和参数的请求对象
-   * @returns 一个Promise，用于获取Native侧的返回结果
-   */
-  async callNativeFunction(request: BridgeRequest): Promise<BridgeResponse> {
-    try {
-      // 假设Native侧暴露了名为'nativeCall'的函数
-      const result: BridgeResponse = await nativeCall(request);
-      return result;
-    } catch (error) {
-      // 将错误包装为标准的BridgeResponse
-      const typedError = error as BusinessError;
-      return {
-        success: false,
-        errorMessage: `Native call failed: ${typedError.message || 'Unknown error'}`,
-      };
-    }
-  }
-
-  /**
-   * 订阅来自Native侧的事件
-   * @param eventName 事件名称
-   * @param listener 事件回调函数
-   */
-  subscribe(eventName: string, listener: (event: BridgeEvent) => void): void {
-    if (!this.eventListeners.has(eventName)) {
-      this.eventListeners.set(eventName, new Set());
-    }
-    this.eventListeners.get(eventName)!.add(listener);
-  }
-
-  /**
-   * 取消订阅事件
-   * @param eventName 事件名称
-   * @param listener 要移除的回调函数
-   */
-  unsubscribe(eventName: string, listener: (event: BridgeEvent) => void): void {
-    const listeners = this.eventListeners.get(eventName);
-    if (listeners) {
-      listeners.delete(listener);
-      if (listeners.size === 0) {
-        this.eventListeners.delete(eventName);
-      }
-    }
-  }
-
-  /**
-   * (此方法由Native侧通过NAPI回调触发)
-   * 用于接收Native侧主动推送的事件
-   * @param event 推送的事件对象
-   */
-  handleNativeEvent(event: BridgeEvent): void {
-    const listeners = this.eventListeners.get(event.eventName);
-    if (listeners) {
-      listeners.forEach((listener) => {
-        try {
-          listener(event);
-        } catch (err) {
-          console.error(`Error in event listener for "${event.eventName}":`, err);
-        }
-      });
-    }
-  }
-}
-
-function nativeCall(request: BridgeRequest): BridgeResponse | PromiseLike<BridgeResponse> {
-  throw new Error('Function not implemented.');
-}
diff --git a/entry/src/main/ets/pages/NativeBridge/NativeBridgeTypes.ets b/entry/src/main/ets/pages/NativeBridge/NativeBridgeTypes.ets
deleted file mode 100644
index 78878a13..00000000
--- a/entry/src/main/ets/pages/NativeBridge/NativeBridgeTypes.ets
+++ /dev/null
@@ -1,18 +0,0 @@
-// 定义传递给Native的请求结构
-export interface BridgeRequest {
-  functionName: string;
-  params?: Record<string, number | string | boolean>; // 使用Record来约束参数类型
-}
-
-// 定义Native侧返回的响应结构
-export interface BridgeResponse {
-  success: boolean;
-  errorMessage?: string;
-  data?: Record<string, number | string | boolean>; // 约束返回数据类型
-}
-
-// 定义Native侧可能推送的事件结构
-export interface BridgeEvent {
-  eventName: string;
-  data?: Record<string, number | string | boolean>;
-}
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/NativeBridge/README.md b/entry/src/main/ets/pages/NativeBridge/README.md
deleted file mode 100644
index 31111647..00000000
--- a/entry/src/main/ets/pages/NativeBridge/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-NativeBridge <br>
-Native桥主要用于arkui侧和Native的交互通信问题<br>
-
-
diff --git a/entry/src/main/ets/pages/RunEnvCheck/README.md b/entry/src/main/ets/pages/RunEnvCheck/README.md
deleted file mode 100644
index 2f127d6c..00000000
--- a/entry/src/main/ets/pages/RunEnvCheck/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-该目录主要针对运行环境得检测<br>
-CheckDriver 用于检测运行设备,设备区分平板和PC <br>
-CheckDispMode 用于检测设备窗口运行模式,这里分为自由多窗.要求用户强制使用自由多窗获取更好建模体验 <br>
-同时该目录具备一个监听功能,发现用户修改模式后,实时弹出提醒.<br>
diff --git a/entry/src/main/ets/pages/RunEnvCheck/RunEnvCheck.ets b/entry/src/main/ets/pages/RunEnvCheck/RunEnvCheck.ets
deleted file mode 100644
index e69de29b..00000000
diff --git a/entry/src/main/ets/pages/CustomController/Button.ets b/entry/src/main/ets/pages/customcontroller/Button.ets
similarity index 95%
rename from entry/src/main/ets/pages/CustomController/Button.ets
rename to entry/src/main/ets/pages/customcontroller/Button.ets
index 1b2a4d4f..f8b0c24d 100644
--- a/entry/src/main/ets/pages/CustomController/Button.ets
+++ b/entry/src/main/ets/pages/customcontroller/Button.ets
@@ -1,9 +1,11 @@
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { Execute } from '../EventHub/EventBase';
-import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
-import { TitleModel } from "../LayoutInterface/Interface/ModelInterface";
-import { TitleTabData } from '../LayoutInterface/Layout/TitleTabData';
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
+import { Execute } from '../eventhub/EventBase';
+import { TitleTabData } from '../layout/TitleTabData';
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
+import {
+  TitleModel,
+  TitleButton
+} from "../interface/Interface";
 
 //按钮统一尺寸,该按钮为正方形,所以以主窗口宽为基准,长=高->正方形
 let ebWidth=mwInfo.width*0.02;
diff --git a/entry/src/main/ets/pages/CustomController/ComboBox.ets b/entry/src/main/ets/pages/customcontroller/ComboBox.ets
similarity index 93%
rename from entry/src/main/ets/pages/CustomController/ComboBox.ets
rename to entry/src/main/ets/pages/customcontroller/ComboBox.ets
index b12f79e2..073fa1e9 100644
--- a/entry/src/main/ets/pages/CustomController/ComboBox.ets
+++ b/entry/src/main/ets/pages/customcontroller/ComboBox.ets
@@ -1,5 +1,5 @@
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
-import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
+import { TitleButton } from "../interface/Interface";
 
 //按钮统一尺寸,该按钮为正方形,所以以主窗口宽为基准,长=高->正方形
 let ebWidth=mwInfo.width*0.075;
diff --git a/entry/src/main/ets/pages/CustomController/Dialog.ets b/entry/src/main/ets/pages/customcontroller/Dialog.ets
similarity index 81%
rename from entry/src/main/ets/pages/CustomController/Dialog.ets
rename to entry/src/main/ets/pages/customcontroller/Dialog.ets
index 1ac81241..6ddef96a 100644
--- a/entry/src/main/ets/pages/CustomController/Dialog.ets
+++ b/entry/src/main/ets/pages/customcontroller/Dialog.ets
@@ -1,7 +1,7 @@
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
-import { Execute } from "../EventHub/EventBase";
-import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
-import {SwitchView} from "../LayoutInterface/Layout/SwitchView"
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
+import { Execute } from "../eventhub/EventBase";
+import { TitleButton } from "../interface/Interface";
+import {SwitchView} from "../layout/SwitchView"
 
 //按钮统一尺寸,该按钮为正方形,所以以主窗口宽为基准,长=高->正方形
 let ebWidth=mwInfo.width*0.02;
diff --git a/entry/src/main/ets/pages/CustomController/Expandable.ets b/entry/src/main/ets/pages/customcontroller/Expandable.ets
similarity index 100%
rename from entry/src/main/ets/pages/CustomController/Expandable.ets
rename to entry/src/main/ets/pages/customcontroller/Expandable.ets
diff --git a/entry/src/main/ets/pages/CustomController/Menu.ets b/entry/src/main/ets/pages/customcontroller/Menu.ets
similarity index 87%
rename from entry/src/main/ets/pages/CustomController/Menu.ets
rename to entry/src/main/ets/pages/customcontroller/Menu.ets
index 14da6331..b395dd1f 100644
--- a/entry/src/main/ets/pages/CustomController/Menu.ets
+++ b/entry/src/main/ets/pages/customcontroller/Menu.ets
@@ -1,9 +1,10 @@
-import { TitleGroup } from "../LayoutInterface/Interface/GroupInterface";
-import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
-import { Execute } from "../EventHub/EventBase";
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
-import { BaseMenuData } from "../LayoutInterface/Interface/MenuInterface";
-
+import { Execute } from "../eventhub/EventBase";
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
+import { BaseMenuData } from "../interface/MenuInterface";
+import {
+  TitleGroup
+  ,TitleButton
+} from "../interface/Interface";
 
 //按钮统一尺寸,该按钮为正方形,所以以主窗口宽为基准,长=高->正方形
 let ebWidth=mwInfo.width*0.02;
diff --git a/entry/src/main/ets/pages/CustomController/README.md b/entry/src/main/ets/pages/customcontroller/README.md
similarity index 100%
rename from entry/src/main/ets/pages/CustomController/README.md
rename to entry/src/main/ets/pages/customcontroller/README.md
diff --git a/entry/src/main/ets/pages/CustomStyle/DefaultStyle.ets b/entry/src/main/ets/pages/customstyle/DefaultStyle.ets
similarity index 100%
rename from entry/src/main/ets/pages/CustomStyle/DefaultStyle.ets
rename to entry/src/main/ets/pages/customstyle/DefaultStyle.ets
diff --git a/entry/src/main/ets/pages/CustomStyle/Style.ets b/entry/src/main/ets/pages/customstyle/Style.ets
similarity index 100%
rename from entry/src/main/ets/pages/CustomStyle/Style.ets
rename to entry/src/main/ets/pages/customstyle/Style.ets
diff --git a/entry/src/main/ets/pages/DispWinInfo/DispWinInfo.ets b/entry/src/main/ets/pages/displaywindowinfo/DispWinInfo.ets
similarity index 100%
rename from entry/src/main/ets/pages/DispWinInfo/DispWinInfo.ets
rename to entry/src/main/ets/pages/displaywindowinfo/DispWinInfo.ets
diff --git a/entry/src/main/ets/pages/DispWinInfo/README.md b/entry/src/main/ets/pages/displaywindowinfo/README.md
similarity index 100%
rename from entry/src/main/ets/pages/DispWinInfo/README.md
rename to entry/src/main/ets/pages/displaywindowinfo/README.md
diff --git a/entry/src/main/ets/pages/EventHub/EventBase.ets b/entry/src/main/ets/pages/eventhub/EventBase.ets
similarity index 90%
rename from entry/src/main/ets/pages/EventHub/EventBase.ets
rename to entry/src/main/ets/pages/eventhub/EventBase.ets
index 2cbd6de5..26412e85 100644
--- a/entry/src/main/ets/pages/EventHub/EventBase.ets
+++ b/entry/src/main/ets/pages/eventhub/EventBase.ets
@@ -1,7 +1,9 @@
-import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface';
-import { EventType } from '../LayoutInterface/Interface/BaseTypeInterface'
 import {EventExecute} from './EventExecute'
 import {EventPage} from './EventPage'
+import {
+  TitleButton,
+  EventType
+} from '../interface/Interface';
 
 //执行事件
 export function Execute(event:TitleButton){
diff --git a/entry/src/main/ets/pages/EventHub/EventExecute.ets b/entry/src/main/ets/pages/eventhub/EventExecute.ets
similarity index 94%
rename from entry/src/main/ets/pages/EventHub/EventExecute.ets
rename to entry/src/main/ets/pages/eventhub/EventExecute.ets
index c430a2c7..bd91eb09 100644
--- a/entry/src/main/ets/pages/EventHub/EventExecute.ets
+++ b/entry/src/main/ets/pages/eventhub/EventExecute.ets
@@ -1,4 +1,4 @@
-import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface';
+import { TitleButton } from '../interface/Interface';
 import { CreateXCompNode } from './XCompMgr';
 import NativeOpenCAX from 'libopencax.so';
 //事件类型:纯指令
diff --git a/entry/src/main/ets/pages/eventhub/EventPage.ets b/entry/src/main/ets/pages/eventhub/EventPage.ets
new file mode 100644
index 00000000..90ba960a
--- /dev/null
+++ b/entry/src/main/ets/pages/eventhub/EventPage.ets
@@ -0,0 +1,25 @@
+import { mwInfo } from '../displaywindowinfo/DispWinInfo';
+import { CloseSubWindow, CreateAndShowSubWindow, SubWinInfo } from '../subpages/SWBase';
+import { TitleButton } from '../interface/Interface';
+//事件类型:页面
+export function EventPage(event:TitleButton){
+  if(event?.btnEvent.command=='Page_NewFile') {
+    const winInfo: SubWinInfo = new SubWinInfo(event.btnName, event.btnEvent.page, mwInfo.width * 0.4, mwInfo.height * 0.4);
+    CreateAndShowSubWindow(winInfo);
+  } else if(event?.btnEvent.command=='Page_OpenFile'){
+    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
+    CreateAndShowSubWindow(winInfo);
+  }else if(event?.btnEvent.command=='Page_SaveAsFile'){
+    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
+    CreateAndShowSubWindow(winInfo);
+  } else if(event?.btnEvent.command=='Page_ImportFile'){
+    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
+    CreateAndShowSubWindow(winInfo);
+  }else if(event?.btnEvent.command=='Page_ExportFile'){
+    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4);
+    CreateAndShowSubWindow(winInfo);
+  }else if(event?.btnEvent.command=='Page_Options'){
+    const winInfo:SubWinInfo=new SubWinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.6,mwInfo.height*0.8);
+    CreateAndShowSubWindow(winInfo);
+  }
+}
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/EventHub/XCompMgr.ets b/entry/src/main/ets/pages/eventhub/XCompMgr.ets
similarity index 100%
rename from entry/src/main/ets/pages/EventHub/XCompMgr.ets
rename to entry/src/main/ets/pages/eventhub/XCompMgr.ets
diff --git a/entry/src/main/ets/pages/ExtractDir/ExtractDir.ets b/entry/src/main/ets/pages/extractdir/ExtractDir.ets
similarity index 100%
rename from entry/src/main/ets/pages/ExtractDir/ExtractDir.ets
rename to entry/src/main/ets/pages/extractdir/ExtractDir.ets
diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/BaseTypeInterface.ets b/entry/src/main/ets/pages/interface/BaseTypeInterface.ets
similarity index 75%
rename from entry/src/main/ets/pages/LayoutInterface/Interface/BaseTypeInterface.ets
rename to entry/src/main/ets/pages/interface/BaseTypeInterface.ets
index e5e529f5..eea867f3 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Interface/BaseTypeInterface.ets
+++ b/entry/src/main/ets/pages/interface/BaseTypeInterface.ets
@@ -1,10 +1,5 @@
-
-
-export {ModelType,EventType}
-export {EventInfo}
-
 //模块类型
-enum ModelType{
+export enum ModelType{
   CAD,
   CAM,
   CAE,
@@ -12,13 +7,13 @@ enum ModelType{
 };
 
 //事件类型
-enum EventType{
+export enum EventType{
   PAGE,
   EVENT
 }
 
 //Event Interface
-interface EventInfo{
+export interface EventInfo{
   //事件唯一UID
   uid:string;
   //事件名
diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets b/entry/src/main/ets/pages/interface/ButtonInterface.ets
similarity index 69%
rename from entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets
rename to entry/src/main/ets/pages/interface/ButtonInterface.ets
index bf1bfc5a..1d1899f8 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets
+++ b/entry/src/main/ets/pages/interface/ButtonInterface.ets
@@ -1,9 +1,6 @@
 import { ModelType,EventType,EventInfo } from "./BaseTypeInterface"
 
-export {ModelType,EventType,EventInfo}
-export {TitleButton}
-
-interface TitleButton {
+export interface TitleButton {
   btnModel:Array<ModelType>
   btnName:string
   btnNamed:string
diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets b/entry/src/main/ets/pages/interface/GroupInterface.ets
similarity index 77%
rename from entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets
rename to entry/src/main/ets/pages/interface/GroupInterface.ets
index c0f7521a..7961db3c 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets
+++ b/entry/src/main/ets/pages/interface/GroupInterface.ets
@@ -1,9 +1,7 @@
 import { TitleButton } from "./ButtonInterface";
 
-export {TitleButton}
-export {TitleGroup}
 //功能组
-interface TitleGroup{
+export interface TitleGroup{
   //功能组名字
   grpName:string;
   //按钮列表
diff --git a/entry/src/main/ets/pages/interface/Interface.ets b/entry/src/main/ets/pages/interface/Interface.ets
new file mode 100644
index 00000000..09b01e04
--- /dev/null
+++ b/entry/src/main/ets/pages/interface/Interface.ets
@@ -0,0 +1,32 @@
+import { TitleGroup } from './GroupInterface';
+import { TitleModel } from './ModelInterface';
+import { TitleButton } from './ButtonInterface';
+import { BaseMenuData } from './MenuInterface';
+import {
+  ModelType,
+  EventType,
+  EventInfo
+} from './BaseTypeInterface'
+
+export {
+  TitleGroup,
+  TitleModel,
+  TitleButton,
+  BaseMenuData,
+  ModelType,
+  EventType,
+  EventInfo
+}
+export {TitleInterface}
+
+//Title配置
+interface TitleInterface{
+  //Title配置ID名(唯一)
+  mId:string;
+  //基础模块
+  mFileModel:Array<Array<TitleGroup>>
+  //功能模块
+  mModels:Map<number,Array<TitleModel>>
+}
+
+
diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets b/entry/src/main/ets/pages/interface/MenuInterface.ets
similarity index 62%
rename from entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets
rename to entry/src/main/ets/pages/interface/MenuInterface.ets
index 6a718643..637cd1fc 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets
+++ b/entry/src/main/ets/pages/interface/MenuInterface.ets
@@ -1,9 +1,6 @@
 import { TitleButton } from "./ButtonInterface"
 
-export {TitleButton}
-export {BaseMenuData}
-
-interface BaseMenuData {
+export interface BaseMenuData {
   aMenus: Array<TitleButton|Array<TitleButton>>
   aIndex:number
 }
diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets b/entry/src/main/ets/pages/interface/ModelInterface.ets
similarity index 87%
rename from entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets
rename to entry/src/main/ets/pages/interface/ModelInterface.ets
index 0e6ccc6b..b5d9a67a 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets
+++ b/entry/src/main/ets/pages/interface/ModelInterface.ets
@@ -1,10 +1,7 @@
 import { TitleButton } from "./ButtonInterface"
 import { TitleGroup } from "./GroupInterface"
 
-export {TitleButton,TitleGroup}
-export {TitleModel}
-
-interface TitleModel{
+export interface TitleModel{
   //模块名
   cmName:string
   //模块路由页面
diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/README.md b/entry/src/main/ets/pages/interface/README.md
similarity index 100%
rename from entry/src/main/ets/pages/LayoutInterface/Interface/README.md
rename to entry/src/main/ets/pages/interface/README.md
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets b/entry/src/main/ets/pages/layout/CAD.ets
similarity index 99%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets
rename to entry/src/main/ets/pages/layout/CAD.ets
index a7c7bbfc..d6320292 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets
+++ b/entry/src/main/ets/pages/layout/CAD.ets
@@ -1,13 +1,15 @@
-import { TitleModel } from "../Interface/ModelInterface";
 import { TitleDefaultBars } from './TitleDefaultBars'
-import { ModelType,EventType } from '../Interface/BaseTypeInterface'
 import { GroupActionMenu } from "./GroupAction";
-import { TitleGroup } from "../Interface/GroupInterface";
 import { MatrixModel ,DevModel} from "./MatrixModel";
 
-export {TitleCAD}
+import {
+  TitleModel,
+  ModelType,
+  EventType,
+  TitleGroup
+} from "../interface/Interface";
 
-let TitleCAD:Array<TitleModel>=[
+export let TitleCAD:Array<TitleModel>=[
   TitleDefaultBars[0],
   {cmName:'建模',cmPage:'',cmTips:'',cmEvents: [
     //数组表示非单个BtnEvent
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets b/entry/src/main/ets/pages/layout/CAE.ets
similarity index 94%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets
rename to entry/src/main/ets/pages/layout/CAE.ets
index 91ec28b1..27e37c75 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets
+++ b/entry/src/main/ets/pages/layout/CAE.ets
@@ -1,9 +1,13 @@
-import { TitleModel } from "../Interface/ModelInterface";
 import {TitleDefaultBars} from './TitleDefaultBars'
 import { GroupActionMenu } from "./GroupAction";
-import { TitleGroup } from "../Interface/GroupInterface";
 import { MatrixModel ,DevModel} from "./MatrixModel";
-import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface";
+import {
+  TitleButton,
+  ModelType,
+  EventType,
+  TitleModel,
+  TitleGroup
+} from "../interface/Interface";
 
 export let TitleCAE:Array<TitleModel>=[
   TitleDefaultBars[0],
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets b/entry/src/main/ets/pages/layout/CAM.ets
similarity index 91%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets
rename to entry/src/main/ets/pages/layout/CAM.ets
index de1e8ce2..44237c47 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets
+++ b/entry/src/main/ets/pages/layout/CAM.ets
@@ -1,9 +1,13 @@
-import { TitleModel } from "../Interface/ModelInterface";
 import {TitleDefaultBars} from './TitleDefaultBars'
 import { GroupActionMenu } from "./GroupAction";
-import { TitleGroup } from "../Interface/GroupInterface";
 import { MatrixModel,DevModel } from "./MatrixModel";
-import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface";
+import {
+  TitleButton,
+  ModelType,
+  EventType,
+  TitleGroup,
+  TitleModel
+} from "../interface/Interface";
 
 export let TitleCAM:Array<TitleModel>=[
   TitleDefaultBars[0],
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets b/entry/src/main/ets/pages/layout/DisplayMode.ets
similarity index 93%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets
rename to entry/src/main/ets/pages/layout/DisplayMode.ets
index 0e5a13ed..15bc799b 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets
+++ b/entry/src/main/ets/pages/layout/DisplayMode.ets
@@ -1,4 +1,8 @@
-import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface";
+import {
+  TitleButton ,
+  ModelType,
+  EventType
+} from "../interface/Interface";
 
 //视图选择布局数据
 export let DisplayMode:Array<TitleButton>=[
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/FileMenuData.ets b/entry/src/main/ets/pages/layout/FileMenuData.ets
similarity index 59%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/FileMenuData.ets
rename to entry/src/main/ets/pages/layout/FileMenuData.ets
index cbeaec7b..a197d978 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/FileMenuData.ets
+++ b/entry/src/main/ets/pages/layout/FileMenuData.ets
@@ -1,5 +1,4 @@
-import { TitleButton } from "../Interface/ButtonInterface";
-import { BaseMenuData } from "../Interface/MenuInterface";
+import {BaseMenuData } from "../interface/Interface";
 import { TitleTabData } from "./TitleTabData";
 
 //文件菜单数据初始化
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets b/entry/src/main/ets/pages/layout/GroupAction.ets
similarity index 85%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets
rename to entry/src/main/ets/pages/layout/GroupAction.ets
index 5eee56a6..97f53264 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets
+++ b/entry/src/main/ets/pages/layout/GroupAction.ets
@@ -1,4 +1,8 @@
-import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface";
+import {
+  TitleButton ,
+  ModelType,
+  EventType
+} from "../interface/Interface";
 //功能主的操作功能布局数据
 export let GroupActionMenu:Array<TitleButton>=[
 {btnModel:[ModelType.BASE],btnName:"增加功能",btnNamed:"",btnIcon:"",btnTips:"正三轴测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}},
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets b/entry/src/main/ets/pages/layout/LayoutSwitch.ets
similarity index 88%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets
rename to entry/src/main/ets/pages/layout/LayoutSwitch.ets
index c4b2e15f..536c11e3 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets
+++ b/entry/src/main/ets/pages/layout/LayoutSwitch.ets
@@ -1,4 +1,8 @@
-import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface";
+import {
+  TitleButton ,
+  ModelType,
+  EventType
+} from "../interface/Interface";
 
 //视图选择布局数据
 export let LayoutSwitch:Array<TitleButton>=[
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/LeftSideBar.ets b/entry/src/main/ets/pages/layout/LeftSideBar.ets
similarity index 83%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/LeftSideBar.ets
rename to entry/src/main/ets/pages/layout/LeftSideBar.ets
index 75015bdb..0de9eb58 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/LeftSideBar.ets
+++ b/entry/src/main/ets/pages/layout/LeftSideBar.ets
@@ -1,5 +1,8 @@
-import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface";
-
+import {
+  TitleButton ,
+  ModelType,
+  EventType
+} from "../interface/Interface";
 
 export let LeftSideBars:Array<TitleButton>=[
   {btnModel:[ModelType.BASE],btnName:"装配导航器",btnNamed:"",btnIcon:"left_side_assembly",btnTips:"装配导航器",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}},
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets b/entry/src/main/ets/pages/layout/MatrixModel.ets
similarity index 71%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets
rename to entry/src/main/ets/pages/layout/MatrixModel.ets
index e110284c..24e785cb 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets
+++ b/entry/src/main/ets/pages/layout/MatrixModel.ets
@@ -1,7 +1,12 @@
-import { TitleGroup } from '../Interface/GroupInterface'
-import { TitleModel } from '../Interface/ModelInterface'
 import { GroupActionMenu } from './GroupAction'
-import { ModelType,EventType } from '../Interface/BaseTypeInterface'
+import { GetEventsPage } from '../EventsPages'
+import {
+  ModelType,
+  EventType,
+  TitleGroup,
+  TitleModel
+} from '../interface/Interface'
+
 //模块矩阵布局数据
 export let MatrixModel:TitleModel= {
   cmName:'应用模块',cmPage:'',cmTips:'',cmEvents:[
@@ -20,7 +25,7 @@ export let DevModel:TitleModel= {
       {btnModel:[ModelType.BASE],btnName:'新建建模实例',btnNamed:'',btnIcon:'base_new_file',btnTips:'新建建模实例',btnEvent:{uid:'',command:'Create_New',page:'',type:EventType.EVENT,args:[]}},
       [
         {btnModel:[ModelType.BASE],btnName:'加载模型',btnNamed:'',btnIcon:'base_new_file',btnTips:'加载模型',btnEvent:{uid:'',command:'Execute_LoadModel',type:EventType.EVENT,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'选择加载模型',btnNamed:'',btnIcon:'base_new_file',btnTips:'选择加载模型',btnEvent:{uid:'',command:'Execute_OpenFile',page:'pages/SubWindow/File/SWOpenFile',type:EventType.PAGE,args:[]}},
+        {btnModel:[ModelType.BASE],btnName:'选择加载模型',btnNamed:'',btnIcon:'base_new_file',btnTips:'选择加载模型',btnEvent:{uid:'',command:'Page_OpenFile',page:GetEventsPage('Page_OpenFile'),type:EventType.PAGE,args:[]}},
       ],
       [
         {btnModel:[ModelType.BASE],btnName:'正等轴测图',btnNamed:'',btnIcon:'base_new_file',btnTips:'正等轴测图',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}},
@@ -33,15 +38,11 @@ export let DevModel:TitleModel= {
         {btnModel:[ModelType.BASE],btnName:'仰视图',btnNamed:'',btnIcon:'base_new_file',btnTips:'仰视图',btnEvent:{uid:'',command:'CMD_VIEW_BOTTOM',page:'',type:EventType.EVENT,args:[]}},
       ],
       [
-        {btnModel:[ModelType.BASE],btnName:'创建文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'创建文件',btnEvent:{uid:'',command:'Execute_NewFileWindow',page:'pages/SubWindow/File/SWNewFile',type:EventType.PAGE,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'另存为',btnNamed:'',btnIcon:'base_new_file',btnTips:'另存为',btnEvent:{uid:'',command:'Execute_SaveAsFileWindow',page:'pages/SubWindow/File/SWSaveAsFile',type:EventType.PAGE,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'导入文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'导入文件',btnEvent:{uid:'',command:'Execute_ImportFileWindow',page:'pages/SubWindow/File/SWImportFile',type:EventType.PAGE,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'导出文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'导出文件',btnEvent:{uid:'',command:'Execute_ExportFileWindow',page:'pages/SubWindow/File/SWExportFile',type:EventType.PAGE,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'创建子窗体',btnNamed:'',btnIcon:'base_new_file',btnTips:'创建子窗体',btnEvent:{uid:'',command:'Execute_CreateSubWindow',page:'pages/SubWindow/SWExtrude',type:EventType.PAGE,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'关闭子窗体',btnNamed:'',btnIcon:'base_new_file',btnTips:'关闭子窗体',btnEvent:{uid:'',command:'Execute_ExitSubWindow',page:'pages/SubWindow/SWExtrude',type:EventType.PAGE,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'首选项',btnNamed:'',btnIcon:'base_new_file',btnTips:'首选项',btnEvent:{uid:'',command:'Execute_CreateSubWindow_Options',page:'pages/SubWindow/Options',type:EventType.PAGE,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'关闭',btnNamed:'',btnIcon:'base_new_file',btnTips:'关闭',btnEvent:{uid:'',command:'Execute_ExitSubWindow_Options',page:'pages/SubWindow/Options',type:EventType.PAGE,args:[]}},
-
+        {btnModel:[ModelType.BASE],btnName:'创建文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'创建文件',btnEvent:{uid:'',command:'Page_NewFile',page:GetEventsPage('Page_NewFile'),type:EventType.PAGE,args:[]}},
+        {btnModel:[ModelType.BASE],btnName:'另存为',btnNamed:'',btnIcon:'base_new_file',btnTips:'另存为',btnEvent:{uid:'',command:'Page_SaveAsFile',page:GetEventsPage('Page_SaveAsFile'),type:EventType.PAGE,args:[]}},
+        {btnModel:[ModelType.BASE],btnName:'导入文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'导入文件',btnEvent:{uid:'',command:'Page_ImportFile',page:GetEventsPage('Page_ImportFile'),type:EventType.PAGE,args:[]}},
+        {btnModel:[ModelType.BASE],btnName:'导出文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'导出文件',btnEvent:{uid:'',command:'Page_ExportFile',page:GetEventsPage('Page_ExportFile'),type:EventType.PAGE,args:[]}},
+        {btnModel:[ModelType.BASE],btnName:'首选项',btnNamed:'',btnIcon:'base_new_file',btnTips:'首选项',btnEvent:{uid:'',command:'Page_Options',page:GetEventsPage('Page_Options'),type:EventType.PAGE,args:[]}},
       ]
     ],grpMenu:GroupActionMenu}] as Array<TitleGroup>
     ]]
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets b/entry/src/main/ets/pages/layout/MenuAction.ets
similarity index 91%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets
rename to entry/src/main/ets/pages/layout/MenuAction.ets
index 627014f0..ca9f2527 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets
+++ b/entry/src/main/ets/pages/layout/MenuAction.ets
@@ -1,4 +1,8 @@
-import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface";
+import {
+  TitleButton ,
+  ModelType,
+  EventType
+} from "../interface/Interface";
 //功能布局数据
 export let MenuAction:Array<TitleButton>=[
   {btnModel:[ModelType.BASE],btnName:'增功能',btnNamed:'',btnIcon:'',btnTips:'增功能',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}},
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/README.md b/entry/src/main/ets/pages/layout/README.md
similarity index 100%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/README.md
rename to entry/src/main/ets/pages/layout/README.md
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets b/entry/src/main/ets/pages/layout/SelectionFilter.ets
similarity index 94%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets
rename to entry/src/main/ets/pages/layout/SelectionFilter.ets
index e05138d7..fb4d8c41 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets
+++ b/entry/src/main/ets/pages/layout/SelectionFilter.ets
@@ -1,4 +1,8 @@
-import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface";
+import {
+  TitleButton,
+  ModelType,
+  EventType
+} from "../interface/Interface";
 
 //拾取器过滤布局数据
 export let SelectionFilter:Array<TitleButton>=[
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets b/entry/src/main/ets/pages/layout/SwitchView.ets
similarity index 95%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets
rename to entry/src/main/ets/pages/layout/SwitchView.ets
index fd3e3b96..519102f7 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets
+++ b/entry/src/main/ets/pages/layout/SwitchView.ets
@@ -1,4 +1,8 @@
-import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface";
+import {
+  TitleButton,
+  ModelType,
+  EventType
+} from "../interface/Interface";
 
 //视图选择布局数据
 export let SwitchView:Array<TitleButton>=[
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets b/entry/src/main/ets/pages/layout/TitleDefaultBars.ets
similarity index 71%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets
rename to entry/src/main/ets/pages/layout/TitleDefaultBars.ets
index b907d6b1..96fb8dc2 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets
+++ b/entry/src/main/ets/pages/layout/TitleDefaultBars.ets
@@ -1,8 +1,13 @@
-import { TitleButton,ModelType,EventType} from "../Interface/ButtonInterface";
-import { TitleGroup } from "../Interface/GroupInterface";
 import { DevModel, MatrixModel } from "./MatrixModel";
 import { GroupActionMenu } from "./GroupAction";
-import { TitleModel } from "../Interface/ModelInterface";
+import { GetEventsPage} from '../EventsPages'
+import {
+  TitleButton,
+  ModelType,
+  EventType,
+  TitleGroup,
+  TitleModel
+} from "../interface/Interface";
 
 //主页栏目布局数据
 export let TitleDefaultBars:Array<TitleModel>=
@@ -10,17 +15,17 @@ export let TitleDefaultBars:Array<TitleModel>=
     {cmName:'主页',cmPage:'',cmTips:'',cmEvents:
     [[[{ grpName:'文件', grpBtn:
     [
-      {btnModel:[ModelType.BASE],btnName:'新建',btnNamed:'',btnIcon:'base_new_file',btnTips:'新建',btnEvent:{uid:'',command:'Execute_NewFileWindow',page:'pages/SubWindow/File/SWNewFile',type:EventType.PAGE,args:[]}},
-      {btnModel:[ModelType.BASE],btnName:'打开',btnNamed:'',btnIcon:'base_open_file',btnTips:'打开',btnEvent:{uid:'',command:'Execute_OpenFile',page:'pages/SubWindow/File/SWOpenFile',type:EventType.PAGE,args:[]}},
+      {btnModel:[ModelType.BASE],btnName:'新建',btnNamed:'',btnIcon:'base_new_file',btnTips:'新建',btnEvent:{uid:'',command:'Page_NewFile',page:GetEventsPage('Page_NewFile'),type:EventType.PAGE,args:[]}},
+      {btnModel:[ModelType.BASE],btnName:'打开',btnNamed:'',btnIcon:'base_open_file',btnTips:'打开',btnEvent:{uid:'',command:'Page_OpenFile',page:GetEventsPage('Page_OpenFile'),type:EventType.PAGE,args:[]}},
       [
         {btnModel:[ModelType.BASE],btnName:'保存',btnNamed:'',btnIcon:'base_save_file',btnTips:'保存',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}},
-        {btnModel:[ModelType.BASE],btnName:'另存为',btnNamed:'',btnIcon:'base_saveas_file',btnTips:'另存为',btnEvent:{uid:'',command:'Execute_SaveAsFileWindow',page:'pages/SubWindow/File/SWSaveAsFile',type:EventType.EVENT,args:[]}},
+        {btnModel:[ModelType.BASE],btnName:'另存为',btnNamed:'',btnIcon:'base_saveas_file',btnTips:'另存为',btnEvent:{uid:'',command:'Page_SaveAsFile',page:GetEventsPage('Page_SaveAsFile'),type:EventType.EVENT,args:[]}},
         {btnModel:[ModelType.BASE],btnName:'保存全部',btnNamed:'',btnIcon:'base_saveall_file',btnTips:'保存全部',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}},
       ] as Array<TitleButton>,
       {btnModel:[ModelType.BASE],btnName:'关闭',btnNamed:'',btnIcon:'base_close_file',btnTips:'关闭',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}},
-      {btnModel:[ModelType.BASE],btnName:'导入',btnNamed:'',btnIcon:'base_import_file',btnTips:'导入',btnEvent:{uid:'',command:'Execute_ImportFileWindow',page:'pages/SubWindow/File/SWImportFile',type:EventType.PAGE,args:[]}},
-      {btnModel:[ModelType.BASE],btnName:'导出',btnNamed:'',btnIcon:'base_export_file',btnTips:'导出',btnEvent:{uid:'',command:'Execute_ExportFileWindow',page:'pages/SubWindow/File/SWExportFile',type:EventType.PAGE,args:[]}},
-      {btnModel:[ModelType.BASE],btnName:'选项',btnNamed:'',btnIcon:'base_properties',btnTips:'选项',btnEvent:{uid:'',command:'Execute_CreateSubWindow_Options',page:'pages/SubWindow/Options',type:EventType.PAGE,args:[]}},
+      {btnModel:[ModelType.BASE],btnName:'导入',btnNamed:'',btnIcon:'base_import_file',btnTips:'导入',btnEvent:{uid:'',command:'Page_ImportFile',page:GetEventsPage('Page_ImportFile'),type:EventType.PAGE,args:[]}},
+      {btnModel:[ModelType.BASE],btnName:'导出',btnNamed:'',btnIcon:'base_export_file',btnTips:'导出',btnEvent:{uid:'',command:'Page_ExportFile',page:GetEventsPage('Page_ExportFile'),type:EventType.PAGE,args:[]}},
+      {btnModel:[ModelType.BASE],btnName:'选项',btnNamed:'',btnIcon:'base_properties',btnTips:'选项',btnEvent:{uid:'',command:'Page_Options',page:GetEventsPage('Page_Options'),type:EventType.PAGE,args:[]}},
       {btnModel:[ModelType.BASE],btnName:'帮助',btnNamed:'',btnIcon:'base_help_file',btnTips:'帮助',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}},
     ], grpMenu:GroupActionMenu }] as Array<TitleGroup>]]},
     MatrixModel,
diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets b/entry/src/main/ets/pages/layout/TitleTabData.ets
similarity index 72%
rename from entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets
rename to entry/src/main/ets/pages/layout/TitleTabData.ets
index f3ae7022..9338c26d 100644
--- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets
+++ b/entry/src/main/ets/pages/layout/TitleTabData.ets
@@ -1,10 +1,13 @@
-import { TitleInterface } from '../Interface/Interface'
-import { TitleModel } from '../Interface/ModelInterface'
 import { TitleDefaultBars } from './TitleDefaultBars'
 import {TitleCAD} from './CAD'
 import {TitleCAM} from './CAM'
 import {TitleCAE} from './CAE'
-import { TitleGroup } from '../Interface/GroupInterface'
+
+import {
+  TitleInterface,
+  TitleGroup,
+  TitleModel
+} from '../interface/Interface'
 
 //Title栏得布局数据
 export let TitleTabData:TitleInterface= {
diff --git a/entry/src/main/ets/pages/LeftSide/LeftSideAssembly.ets b/entry/src/main/ets/pages/leftside/LeftSideAssembly.ets
similarity index 100%
rename from entry/src/main/ets/pages/LeftSide/LeftSideAssembly.ets
rename to entry/src/main/ets/pages/leftside/LeftSideAssembly.ets
diff --git a/entry/src/main/ets/pages/LeftSide/LeftSideComponent.ets b/entry/src/main/ets/pages/leftside/LeftSideComponent.ets
similarity index 100%
rename from entry/src/main/ets/pages/LeftSide/LeftSideComponent.ets
rename to entry/src/main/ets/pages/leftside/LeftSideComponent.ets
diff --git a/entry/src/main/ets/pages/LeftSide/LeftSideConstraint.ets b/entry/src/main/ets/pages/leftside/LeftSideConstraint.ets
similarity index 100%
rename from entry/src/main/ets/pages/LeftSide/LeftSideConstraint.ets
rename to entry/src/main/ets/pages/leftside/LeftSideConstraint.ets
diff --git a/entry/src/main/ets/pages/LeftSide/LeftSideTab.ets b/entry/src/main/ets/pages/leftside/LeftSideTab.ets
similarity index 93%
rename from entry/src/main/ets/pages/LeftSide/LeftSideTab.ets
rename to entry/src/main/ets/pages/leftside/LeftSideTab.ets
index bdd7df5c..429de2f4 100644
--- a/entry/src/main/ets/pages/LeftSide/LeftSideTab.ets
+++ b/entry/src/main/ets/pages/leftside/LeftSideTab.ets
@@ -1,6 +1,6 @@
-import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface';
-import {LeftSideBars} from '../LayoutInterface/Layout/LeftSideBar'
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
+import { TitleButton } from '../interface/Interface';
+import {LeftSideBars} from '../layout/LeftSideBar'
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
 import {LeftSideComponent} from './LeftSideComponent'
 @ComponentV2
 export struct LeftSideTab {
diff --git a/entry/src/main/ets/pages/RightSide/RightSideTab.ets b/entry/src/main/ets/pages/rightside/RightSideTab.ets
similarity index 87%
rename from entry/src/main/ets/pages/RightSide/RightSideTab.ets
rename to entry/src/main/ets/pages/rightside/RightSideTab.ets
index e56ffa59..24c2e42d 100644
--- a/entry/src/main/ets/pages/RightSide/RightSideTab.ets
+++ b/entry/src/main/ets/pages/rightside/RightSideTab.ets
@@ -1,6 +1,6 @@
-import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface';
-import {LeftSideBars} from '../LayoutInterface/Layout/LeftSideBar'
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
+import { TitleButton } from '../interface/Interface';
+import {LeftSideBars} from '../layout/LeftSideBar'
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
 
 @ComponentV2
 export struct RightSideTab {
diff --git a/entry/src/main/ets/pages/SubWindow/Options.ets b/entry/src/main/ets/pages/subpages/Options.ets
similarity index 93%
rename from entry/src/main/ets/pages/SubWindow/Options.ets
rename to entry/src/main/ets/pages/subpages/Options.ets
index 7f33ddf6..1403d4cb 100644
--- a/entry/src/main/ets/pages/SubWindow/Options.ets
+++ b/entry/src/main/ets/pages/subpages/Options.ets
@@ -1,6 +1,6 @@
-import { OptsBase, OptsInter } from './Opts/OptsInter';
-import { OptionsStrData } from './Opts/OptsStr';
-import { OptsSub } from './Opts/OptsSub';
+import { OptsBase, OptsInter } from './opts/OptsInter';
+import { OptionsStrData } from './opts/OptsStr';
+import { OptsSub } from './opts/OptsSub';
 
 //选项设置页面
 @Entry
diff --git a/entry/src/main/ets/pages/SubWindow/README.md b/entry/src/main/ets/pages/subpages/README.md
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/README.md
rename to entry/src/main/ets/pages/subpages/README.md
diff --git a/entry/src/main/ets/pages/SubWindow/SWBase.ets b/entry/src/main/ets/pages/subpages/SWBase.ets
similarity index 97%
rename from entry/src/main/ets/pages/SubWindow/SWBase.ets
rename to entry/src/main/ets/pages/subpages/SWBase.ets
index fb8bd567..46e0192f 100644
--- a/entry/src/main/ets/pages/SubWindow/SWBase.ets
+++ b/entry/src/main/ets/pages/subpages/SWBase.ets
@@ -1,6 +1,6 @@
 import { BusinessError } from '@kit.BasicServicesKit';
 import { window } from '@kit.ArkUI';
-import { mwsInfo } from '../DispWinInfo/DispWinInfo'
+import { mwsInfo } from '../displaywindowinfo/DispWinInfo'
 
 //窗体信息
 export class SubWinInfo{
diff --git a/entry/src/main/ets/pages/SubWindow/SWExtrude.ets b/entry/src/main/ets/pages/subpages/SWExtrude.ets
similarity index 93%
rename from entry/src/main/ets/pages/SubWindow/SWExtrude.ets
rename to entry/src/main/ets/pages/subpages/SWExtrude.ets
index be320254..301d7ebf 100644
--- a/entry/src/main/ets/pages/SubWindow/SWExtrude.ets
+++ b/entry/src/main/ets/pages/subpages/SWExtrude.ets
@@ -1,4 +1,4 @@
-import { Expandable } from '../CustomController/Expandable';
+import { Expandable } from '../customcontroller/Expandable';
 
 @Entry
 @ComponentV2
diff --git a/entry/src/main/ets/pages/SubWindow/SWLine.ets b/entry/src/main/ets/pages/subpages/SWLine.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/SWLine.ets
rename to entry/src/main/ets/pages/subpages/SWLine.ets
diff --git a/entry/src/main/ets/pages/SubWindow/File/FileInter.ets b/entry/src/main/ets/pages/subpages/file/FileInter.ets
similarity index 81%
rename from entry/src/main/ets/pages/SubWindow/File/FileInter.ets
rename to entry/src/main/ets/pages/subpages/file/FileInter.ets
index 2c6305b3..d785b5ac 100644
--- a/entry/src/main/ets/pages/SubWindow/File/FileInter.ets
+++ b/entry/src/main/ets/pages/subpages/file/FileInter.ets
@@ -1,4 +1,4 @@
-import { TitleButton } from "../../LayoutInterface/Interface/ButtonInterface";
+import { TitleButton } from "../../interface/Interface";
 
 export interface FileBase{
   //子模块TabBar头
diff --git a/entry/src/main/ets/pages/SubWindow/File/FileStr.ets b/entry/src/main/ets/pages/subpages/file/FileStr.ets
similarity index 97%
rename from entry/src/main/ets/pages/SubWindow/File/FileStr.ets
rename to entry/src/main/ets/pages/subpages/file/FileStr.ets
index 10e319f3..417b3b81 100644
--- a/entry/src/main/ets/pages/SubWindow/File/FileStr.ets
+++ b/entry/src/main/ets/pages/subpages/file/FileStr.ets
@@ -1,5 +1,9 @@
 import { FileInter } from "./FileInter";
-import { TitleButton,ModelType,EventType } from "../../LayoutInterface/Interface/ButtonInterface";
+import {
+  TitleButton,
+  ModelType,
+  EventType
+} from "../../interface/Interface";
 
 //创建模块类型
 export let CreateModelType:Array<TitleButton>=[
diff --git a/entry/src/main/ets/pages/SubWindow/File/SWExportFile.ets b/entry/src/main/ets/pages/subpages/file/SWExportFile.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/File/SWExportFile.ets
rename to entry/src/main/ets/pages/subpages/file/SWExportFile.ets
diff --git a/entry/src/main/ets/pages/SubWindow/File/SWImportFile.ets b/entry/src/main/ets/pages/subpages/file/SWImportFile.ets
similarity index 96%
rename from entry/src/main/ets/pages/SubWindow/File/SWImportFile.ets
rename to entry/src/main/ets/pages/subpages/file/SWImportFile.ets
index 437fe353..d7aeb8ec 100644
--- a/entry/src/main/ets/pages/SubWindow/File/SWImportFile.ets
+++ b/entry/src/main/ets/pages/subpages/file/SWImportFile.ets
@@ -1,6 +1,6 @@
 import { picker } from '@kit.CoreFileKit';
-import { TextComboBox } from "../../CustomController/ComboBox";
-import { mwInfo } from '../../DispWinInfo/DispWinInfo';
+import { TextComboBox } from "../../customcontroller/ComboBox";
+import { mwInfo } from '../../displaywindowinfo/DispWinInfo';
 import { DocUnitsType } from './FileStr';
 import { common } from '@kit.AbilityKit';
 
@@ -114,7 +114,7 @@ export struct SWImportFile {
           .fontWeight(FontWeight.Medium)
           .fontSize($r('sys.float.Body_L'))
           .onClick(() => {
-            let context = getContext(this) as common.Context;
+            let context = this.getUIContext().getHostContext() as common.Context;
             try {
               let  documentSelectOptions = new picker.DocumentSelectOptions();
               documentSelectOptions.selectMode = picker.DocumentSelectMode.FILE;
diff --git a/entry/src/main/ets/pages/SubWindow/File/SWNewFile.ets b/entry/src/main/ets/pages/subpages/file/SWNewFile.ets
similarity index 95%
rename from entry/src/main/ets/pages/SubWindow/File/SWNewFile.ets
rename to entry/src/main/ets/pages/subpages/file/SWNewFile.ets
index 2fefc690..0ba014a8 100644
--- a/entry/src/main/ets/pages/SubWindow/File/SWNewFile.ets
+++ b/entry/src/main/ets/pages/subpages/file/SWNewFile.ets
@@ -1,10 +1,10 @@
 import { common } from '@kit.AbilityKit';
 import { picker } from '@kit.CoreFileKit';
 import type { BusinessError } from '@kit.BasicServicesKit';
-import { TextComboBox } from "../../CustomController/ComboBox";
+import { TextComboBox } from "../../customcontroller/ComboBox";
 import { CreateModelType,DocUnitsType } from './FileStr';
-import { mwInfo,mwsInfo } from '../../DispWinInfo/DispWinInfo'
-import {CurrentTime,RndId} from '../../EventHub/EventBase'
+import { mwInfo,mwsInfo } from '../../displaywindowinfo/DispWinInfo'
+import {CurrentTime,RndId} from '../../eventhub/EventBase'
 import { window } from '@kit.ArkUI';
 
 @Entry
diff --git a/entry/src/main/ets/pages/SubWindow/File/SWOpenFile.ets b/entry/src/main/ets/pages/subpages/file/SWOpenFile.ets
similarity index 94%
rename from entry/src/main/ets/pages/SubWindow/File/SWOpenFile.ets
rename to entry/src/main/ets/pages/subpages/file/SWOpenFile.ets
index 347b9f5c..f02f644d 100644
--- a/entry/src/main/ets/pages/SubWindow/File/SWOpenFile.ets
+++ b/entry/src/main/ets/pages/subpages/file/SWOpenFile.ets
@@ -13,7 +13,7 @@ export struct SWOpenFile {
         TextInput()
         Button('选择文件')
           .onClick(() => {
-            let context = getContext(this) as common.Context;
+            let context =this.getUIContext().getHostContext() as common.Context;
             try {
               let  fileSelectOptions = new picker.DocumentSelectOptions();
               let  filePicker = new picker.DocumentViewPicker(context);
diff --git a/entry/src/main/ets/pages/SubWindow/File/SWSaveAsFile.ets b/entry/src/main/ets/pages/subpages/file/SWSaveAsFile.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/File/SWSaveAsFile.ets
rename to entry/src/main/ets/pages/subpages/file/SWSaveAsFile.ets
diff --git a/entry/src/main/ets/pages/SubWindow/Opts/OptFeature.ets b/entry/src/main/ets/pages/subpages/opts/OptFeature.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/Opts/OptFeature.ets
rename to entry/src/main/ets/pages/subpages/opts/OptFeature.ets
diff --git a/entry/src/main/ets/pages/SubWindow/Opts/OptsInter.ets b/entry/src/main/ets/pages/subpages/opts/OptsInter.ets
similarity index 81%
rename from entry/src/main/ets/pages/SubWindow/Opts/OptsInter.ets
rename to entry/src/main/ets/pages/subpages/opts/OptsInter.ets
index 2c711622..42a5f1fd 100644
--- a/entry/src/main/ets/pages/SubWindow/Opts/OptsInter.ets
+++ b/entry/src/main/ets/pages/subpages/opts/OptsInter.ets
@@ -1,4 +1,4 @@
-import { TitleButton } from "../../LayoutInterface/Interface/ButtonInterface";
+import { TitleButton } from "../../interface/Interface";
 
 export interface OptsBase{
   //子模块TabBar头
diff --git a/entry/src/main/ets/pages/SubWindow/Opts/OptsModeling.ets b/entry/src/main/ets/pages/subpages/opts/OptsModeling.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/Opts/OptsModeling.ets
rename to entry/src/main/ets/pages/subpages/opts/OptsModeling.ets
diff --git a/entry/src/main/ets/pages/SubWindow/Opts/OptsStr.ets b/entry/src/main/ets/pages/subpages/opts/OptsStr.ets
similarity index 99%
rename from entry/src/main/ets/pages/SubWindow/Opts/OptsStr.ets
rename to entry/src/main/ets/pages/subpages/opts/OptsStr.ets
index 11c0e0b1..00200718 100644
--- a/entry/src/main/ets/pages/SubWindow/Opts/OptsStr.ets
+++ b/entry/src/main/ets/pages/subpages/opts/OptsStr.ets
@@ -1,5 +1,9 @@
 import { OptsInter } from "./OptsInter";
-import { TitleButton,ModelType,EventType } from "../../LayoutInterface/Interface/ButtonInterface";
+import {
+  TitleButton,
+  ModelType,
+  EventType
+} from "../../interface/Interface";
 
 export let OptionsStrData:Array<OptsInter>=[
   {
diff --git a/entry/src/main/ets/pages/SubWindow/Opts/OptsSub.ets b/entry/src/main/ets/pages/subpages/opts/OptsSub.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/Opts/OptsSub.ets
rename to entry/src/main/ets/pages/subpages/opts/OptsSub.ets
diff --git a/entry/src/main/ets/pages/SubWindow/Opts/OptsUser.ets b/entry/src/main/ets/pages/subpages/opts/OptsUser.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/Opts/OptsUser.ets
rename to entry/src/main/ets/pages/subpages/opts/OptsUser.ets
diff --git a/entry/src/main/ets/pages/SubWindow/Opts/OptsUserLayout.ets b/entry/src/main/ets/pages/subpages/opts/OptsUserLayout.ets
similarity index 100%
rename from entry/src/main/ets/pages/SubWindow/Opts/OptsUserLayout.ets
rename to entry/src/main/ets/pages/subpages/opts/OptsUserLayout.ets
diff --git a/entry/src/main/ets/pages/TitleTabs/README.md b/entry/src/main/ets/pages/titletabs/README.md
similarity index 100%
rename from entry/src/main/ets/pages/TitleTabs/README.md
rename to entry/src/main/ets/pages/titletabs/README.md
diff --git a/entry/src/main/ets/pages/TitleTabs/TitleColumnSub.ets b/entry/src/main/ets/pages/titletabs/TitleColumnSub.ets
similarity index 77%
rename from entry/src/main/ets/pages/TitleTabs/TitleColumnSub.ets
rename to entry/src/main/ets/pages/titletabs/TitleColumnSub.ets
index 5c2c8c8d..68b27357 100644
--- a/entry/src/main/ets/pages/TitleTabs/TitleColumnSub.ets
+++ b/entry/src/main/ets/pages/titletabs/TitleColumnSub.ets
@@ -1,13 +1,13 @@
-import { TextComboBox,TextInputComboBox } from "../CustomController/ComboBox";
-import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
-import { ViewDialog } from "../CustomController/Dialog"
-import { SwitchView } from "../LayoutInterface/Layout/SwitchView";
-import {SelectionFilter} from "../LayoutInterface/Layout/SelectionFilter"
-import {DisplayMode} from "../LayoutInterface/Layout/DisplayMode"
-import { LayoutSwitch } from "../LayoutInterface/Layout/LayoutSwitch";
-import { FileMenuData } from "../LayoutInterface/Layout/FileMenuData";
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
-import { SubColumnMenu} from "../CustomController/Button";
+import { TextComboBox,TextInputComboBox } from "../customcontroller/ComboBox";
+import { TitleButton } from "../interface/Interface";
+import { ViewDialog } from "../customcontroller/Dialog"
+import { SwitchView } from "../layout/SwitchView";
+import {SelectionFilter} from "../layout/SelectionFilter"
+import {DisplayMode} from "../layout/DisplayMode"
+import { LayoutSwitch } from "../layout/LayoutSwitch";
+import { FileMenuData } from "../layout/FileMenuData";
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
+import { SubColumnMenu} from "../customcontroller/Button";
 import { fileIo } from "@kit.CoreFileKit";
 
 
diff --git a/entry/src/main/ets/pages/TitleTabs/TitleTab.ets b/entry/src/main/ets/pages/titletabs/TitleTab.ets
similarity index 89%
rename from entry/src/main/ets/pages/TitleTabs/TitleTab.ets
rename to entry/src/main/ets/pages/titletabs/TitleTab.ets
index a9f54c3e..3fa4c2c6 100644
--- a/entry/src/main/ets/pages/TitleTabs/TitleTab.ets
+++ b/entry/src/main/ets/pages/titletabs/TitleTab.ets
@@ -1,11 +1,11 @@
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import {TitleModel} from '../LayoutInterface/Interface/ModelInterface'
-import {TitleTabData} from '../LayoutInterface/Layout/TitleTabData'
-import { FileMenuData } from "../LayoutInterface/Layout/FileMenuData";
+import {TitleModel} from '../interface/ModelInterface'
+import {TitleTabData} from '../layout/TitleTabData'
+import { FileMenuData } from "../layout/FileMenuData";
 import {TitleTabContent} from './TitleTabContent'
-import { mwInfo } from '../DispWinInfo/DispWinInfo'
-import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface';
-import { BaseMenu } from '../CustomController/Menu';
+import { mwInfo } from '../displaywindowinfo/DispWinInfo'
+import { TitleButton } from '../interface/ButtonInterface';
+import { BaseMenu } from '../customcontroller/Menu';
 import {
   TabSegmentButtonV2,
   CapsuleSegmentButtonV2,
diff --git a/entry/src/main/ets/pages/TitleTabs/TitleTabContent.ets b/entry/src/main/ets/pages/titletabs/TitleTabContent.ets
similarity index 88%
rename from entry/src/main/ets/pages/TitleTabs/TitleTabContent.ets
rename to entry/src/main/ets/pages/titletabs/TitleTabContent.ets
index e1768a7e..c3455c4d 100644
--- a/entry/src/main/ets/pages/TitleTabs/TitleTabContent.ets
+++ b/entry/src/main/ets/pages/titletabs/TitleTabContent.ets
@@ -1,10 +1,11 @@
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { TitleButton} from '../LayoutInterface/Interface/ButtonInterface';
-import { TitleGroup} from '../LayoutInterface/Interface/GroupInterface';
-import {GroupTextEventMenu} from '../CustomController/Menu'
-import {EventBtn,MenuBtn} from '../CustomController/Button'
-import {TitleModel} from '../LayoutInterface/Interface/ModelInterface'
-
+import {GroupTextEventMenu} from '../customcontroller/Menu'
+import {EventBtn,MenuBtn} from '../customcontroller/Button'
+import {
+  TitleButton,
+  TitleGroup,
+  TitleModel
+} from '../interface/Interface';
 @ComponentV2
 export struct TitleTabContent {
 
diff --git a/entry/src/main/resources/base/profile/main_pages.json b/entry/src/main/resources/base/profile/main_pages.json
index 2ac74c25..ec147162 100644
--- a/entry/src/main/resources/base/profile/main_pages.json
+++ b/entry/src/main/resources/base/profile/main_pages.json
@@ -1,13 +1,13 @@
 {
   "src": [
     "pages/Index",
-    "pages/SubWindow/SWLine",
-    "pages/SubWindow/SWExtrude",
-    "pages/SubWindow/Options",
-    "pages/SubWindow/File/SWNewFile",
-    "pages/SubWindow/File/SWSaveAsFile",
-    "pages/SubWindow/File/SWImportFile",
-    "pages/SubWindow/File/SWExportFile",
-    "pages/SubWindow/File/SWOpenFile"
+    "pages/subpages/SWLine",
+    "pages/subpages/SWExtrude",
+    "pages/subpages/Options",
+    "pages/subpages/file/SWNewFile",
+    "pages/subpages/file/SWSaveAsFile",
+    "pages/subpages/file/SWImportFile",
+    "pages/subpages/file/SWExportFile",
+    "pages/subpages/file/SWOpenFile"
   ]
 }
\ No newline at end of file