diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_Core.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_Core.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_Core.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_Core.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleCandidate.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_HandleCandidate.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleCandidate.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_HandleCandidate.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleComposition.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_HandleComposition.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleComposition.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_HandleComposition.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_HandleStates.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_HandleStates.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_HandleStates.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_TriageInput.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_TriageInput.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler_TriageInput.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/InputHandler/InputHandler_TriageInput.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_Core.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_Core.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_Core.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_Core.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_KimoDataParser.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_KimoDataParser.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_KimoDataParser.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_KimoDataParser.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_PhraseEditorDelegate.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_PhraseEditorDelegate.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_PhraseEditorDelegate.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_PhraseEditorDelegate.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_UserPhraseStructure.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_UserPhraseStructure.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_UserPhraseStructure.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_UserPhraseStructure.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_Utilities.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_Utilities.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/LMMgr_Utilities.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/LangModelManager/LMMgr_Utilities.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Core.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_Core.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Core.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_Core.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Delegates.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_Delegates.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Delegates.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_Delegates.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleDisplay.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_HandleDisplay.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleDisplay.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_HandleDisplay.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleEvent.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_HandleEvent.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleEvent.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_HandleEvent.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleStates.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_HandleStates.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_HandleStates.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_HandleStates.swift
diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Menu.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_Menu.swift
similarity index 100%
rename from Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionCtl_Menu.swift
rename to Packages/vChewing_MainAssembly/Sources/MainAssembly/SessionController/SessionCtl_Menu.swift