diff --git a/src/views/prototype/PrototypeFeatureView.vue b/src/components/common/PrototypeFeatureView.vue
similarity index 100%
rename from src/views/prototype/PrototypeFeatureView.vue
rename to src/components/common/PrototypeFeatureView.vue
diff --git a/src/utils/accountProfile.test.mjs b/src/modules/account/utils/accountProfile.test.mjs
similarity index 100%
rename from src/utils/accountProfile.test.mjs
rename to src/modules/account/utils/accountProfile.test.mjs
diff --git a/src/utils/accountProfile.ts b/src/modules/account/utils/accountProfile.ts
similarity index 100%
rename from src/utils/accountProfile.ts
rename to src/modules/account/utils/accountProfile.ts
diff --git a/src/views/AccountProfileView.test.mjs b/src/modules/account/views/AccountProfileView.test.mjs
similarity index 100%
rename from src/views/AccountProfileView.test.mjs
rename to src/modules/account/views/AccountProfileView.test.mjs
diff --git a/src/views/AccountProfileView.vue b/src/modules/account/views/AccountProfileView.vue
similarity index 100%
rename from src/views/AccountProfileView.vue
rename to src/modules/account/views/AccountProfileView.vue
diff --git a/src/api/auth.ts b/src/modules/auth/api/auth.ts
similarity index 100%
rename from src/api/auth.ts
rename to src/modules/auth/api/auth.ts
diff --git a/src/stores/auth.ts b/src/modules/auth/store/auth.ts
similarity index 100%
rename from src/stores/auth.ts
rename to src/modules/auth/store/auth.ts
diff --git a/src/utils/jwt.test.mjs b/src/modules/auth/utils/jwt.test.mjs
similarity index 100%
rename from src/utils/jwt.test.mjs
rename to src/modules/auth/utils/jwt.test.mjs
diff --git a/src/utils/jwt.ts b/src/modules/auth/utils/jwt.ts
similarity index 100%
rename from src/utils/jwt.ts
rename to src/modules/auth/utils/jwt.ts
diff --git a/src/views/AuthViews.test.mjs b/src/modules/auth/views/AuthViews.test.mjs
similarity index 100%
rename from src/views/AuthViews.test.mjs
rename to src/modules/auth/views/AuthViews.test.mjs
diff --git a/src/views/LoginView.vue b/src/modules/auth/views/LoginView.vue
similarity index 100%
rename from src/views/LoginView.vue
rename to src/modules/auth/views/LoginView.vue
diff --git a/src/views/RegisterView.vue b/src/modules/auth/views/RegisterView.vue
similarity index 100%
rename from src/views/RegisterView.vue
rename to src/modules/auth/views/RegisterView.vue
diff --git a/src/views/cross-border/DomesticTruckingView.vue b/src/modules/cross-border/views/DomesticTruckingView.vue
similarity index 100%
rename from src/views/cross-border/DomesticTruckingView.vue
rename to src/modules/cross-border/views/DomesticTruckingView.vue
diff --git a/src/views/cross-border/PalletShippingView.vue b/src/modules/cross-border/views/PalletShippingView.vue
similarity index 100%
rename from src/views/cross-border/PalletShippingView.vue
rename to src/modules/cross-border/views/PalletShippingView.vue
diff --git a/src/views/cross-border/ProcurementView.vue b/src/modules/cross-border/views/ProcurementView.vue
similarity index 100%
rename from src/views/cross-border/ProcurementView.vue
rename to src/modules/cross-border/views/ProcurementView.vue
diff --git a/src/views/DashboardView.test.mjs b/src/modules/dashboard/views/DashboardView.test.mjs
similarity index 100%
rename from src/views/DashboardView.test.mjs
rename to src/modules/dashboard/views/DashboardView.test.mjs
diff --git a/src/views/DashboardView.vue b/src/modules/dashboard/views/DashboardView.vue
similarity index 100%
rename from src/views/DashboardView.vue
rename to src/modules/dashboard/views/DashboardView.vue
diff --git a/src/views/finance/PayableBillsView.vue b/src/modules/finance/views/PayableBillsView.vue
similarity index 100%
rename from src/views/finance/PayableBillsView.vue
rename to src/modules/finance/views/PayableBillsView.vue
diff --git a/src/api/firstLeg.ts b/src/modules/first-leg/api/firstLeg.ts
similarity index 100%
rename from src/api/firstLeg.ts
rename to src/modules/first-leg/api/firstLeg.ts
diff --git a/src/api/partners.ts b/src/modules/first-leg/api/partners.ts
similarity index 100%
rename from src/api/partners.ts
rename to src/modules/first-leg/api/partners.ts
diff --git a/src/components/first-leg/FirstLegOrderEditorShell.vue b/src/modules/first-leg/components/FirstLegOrderEditorShell.vue
similarity index 100%
rename from src/components/first-leg/FirstLegOrderEditorShell.vue
rename to src/modules/first-leg/components/FirstLegOrderEditorShell.vue
diff --git a/src/data/firstLegParties.ts b/src/modules/first-leg/data/firstLegParties.ts
similarity index 100%
rename from src/data/firstLegParties.ts
rename to src/modules/first-leg/data/firstLegParties.ts
diff --git a/src/data/firstLegPartySource.test.mjs b/src/modules/first-leg/data/firstLegPartySource.test.mjs
similarity index 100%
rename from src/data/firstLegPartySource.test.mjs
rename to src/modules/first-leg/data/firstLegPartySource.test.mjs
diff --git a/src/data/firstLegPartySource.ts b/src/modules/first-leg/data/firstLegPartySource.ts
similarity index 100%
rename from src/data/firstLegPartySource.ts
rename to src/modules/first-leg/data/firstLegPartySource.ts
diff --git a/src/stores/firstLegOrders.test.mjs b/src/modules/first-leg/store/firstLegOrders.test.mjs
similarity index 100%
rename from src/stores/firstLegOrders.test.mjs
rename to src/modules/first-leg/store/firstLegOrders.test.mjs
diff --git a/src/stores/firstLegOrders.ts b/src/modules/first-leg/store/firstLegOrders.ts
similarity index 100%
rename from src/stores/firstLegOrders.ts
rename to src/modules/first-leg/store/firstLegOrders.ts
diff --git a/src/types/firstLegOrder.ts b/src/modules/first-leg/types/firstLegOrder.ts
similarity index 100%
rename from src/types/firstLegOrder.ts
rename to src/modules/first-leg/types/firstLegOrder.ts
diff --git a/src/utils/firstLegOrder.test.mjs b/src/modules/first-leg/utils/firstLegOrder.test.mjs
similarity index 100%
rename from src/utils/firstLegOrder.test.mjs
rename to src/modules/first-leg/utils/firstLegOrder.test.mjs
diff --git a/src/utils/firstLegOrder.ts b/src/modules/first-leg/utils/firstLegOrder.ts
similarity index 100%
rename from src/utils/firstLegOrder.ts
rename to src/modules/first-leg/utils/firstLegOrder.ts
diff --git a/src/views/first-leg/BatchImportView.vue b/src/modules/first-leg/views/BatchImportView.vue
similarity index 100%
rename from src/views/first-leg/BatchImportView.vue
rename to src/modules/first-leg/views/BatchImportView.vue
diff --git a/src/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs
similarity index 100%
rename from src/views/FirstLegOrdersView.test.mjs
rename to src/modules/first-leg/views/FirstLegOrdersView.test.mjs
diff --git a/src/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue
similarity index 100%
rename from src/views/FirstLegOrdersView.vue
rename to src/modules/first-leg/views/FirstLegOrdersView.vue
diff --git a/src/views/first-leg/QuickOrderView.vue b/src/modules/first-leg/views/QuickOrderView.vue
similarity index 100%
rename from src/views/first-leg/QuickOrderView.vue
rename to src/modules/first-leg/views/QuickOrderView.vue
diff --git a/src/views/order-management/DeliveryOrdersView.vue b/src/modules/order-management/views/DeliveryOrdersView.vue
similarity index 100%
rename from src/views/order-management/DeliveryOrdersView.vue
rename to src/modules/order-management/views/DeliveryOrdersView.vue
diff --git a/src/views/order-management/InboundOrdersView.vue b/src/modules/order-management/views/InboundOrdersView.vue
similarity index 100%
rename from src/views/order-management/InboundOrdersView.vue
rename to src/modules/order-management/views/InboundOrdersView.vue
diff --git a/src/views/order-management/MyOrdersView.vue b/src/modules/order-management/views/MyOrdersView.vue
similarity index 100%
rename from src/views/order-management/MyOrdersView.vue
rename to src/modules/order-management/views/MyOrdersView.vue
diff --git a/src/views/overseas-warehouse/LabelingView.vue b/src/modules/overseas-warehouse/views/LabelingView.vue
similarity index 100%
rename from src/views/overseas-warehouse/LabelingView.vue
rename to src/modules/overseas-warehouse/views/LabelingView.vue
diff --git a/src/views/overseas-warehouse/ReturnInboundView.vue b/src/modules/overseas-warehouse/views/ReturnInboundView.vue
similarity index 100%
rename from src/views/overseas-warehouse/ReturnInboundView.vue
rename to src/modules/overseas-warehouse/views/ReturnInboundView.vue
diff --git a/src/views/overseas-warehouse/ReturnOutboundView.vue b/src/modules/overseas-warehouse/views/ReturnOutboundView.vue
similarity index 100%
rename from src/views/overseas-warehouse/ReturnOutboundView.vue
rename to src/modules/overseas-warehouse/views/ReturnOutboundView.vue
diff --git a/src/views/overseas-warehouse/ReturnRelabelView.vue b/src/modules/overseas-warehouse/views/ReturnRelabelView.vue
similarity index 100%
rename from src/views/overseas-warehouse/ReturnRelabelView.vue
rename to src/modules/overseas-warehouse/views/ReturnRelabelView.vue
diff --git a/src/views/ForbiddenView.vue b/src/modules/system/views/ForbiddenView.vue
similarity index 100%
rename from src/views/ForbiddenView.vue
rename to src/modules/system/views/ForbiddenView.vue
diff --git a/src/api/merchantIam.test.mjs b/src/modules/tenant-management/api/merchantIam.test.mjs
similarity index 100%
rename from src/api/merchantIam.test.mjs
rename to src/modules/tenant-management/api/merchantIam.test.mjs
diff --git a/src/api/merchantIam.ts b/src/modules/tenant-management/api/merchantIam.ts
similarity index 100%
rename from src/api/merchantIam.ts
rename to src/modules/tenant-management/api/merchantIam.ts
diff --git a/src/stores/tenantAdministration.ts b/src/modules/tenant-management/store/tenantAdministration.ts
similarity index 100%
rename from src/stores/tenantAdministration.ts
rename to src/modules/tenant-management/store/tenantAdministration.ts
diff --git a/src/utils/qualificationFile.test.mjs b/src/modules/tenant-management/utils/qualificationFile.test.mjs
similarity index 100%
rename from src/utils/qualificationFile.test.mjs
rename to src/modules/tenant-management/utils/qualificationFile.test.mjs
diff --git a/src/utils/qualificationFile.ts b/src/modules/tenant-management/utils/qualificationFile.ts
similarity index 100%
rename from src/utils/qualificationFile.ts
rename to src/modules/tenant-management/utils/qualificationFile.ts
diff --git a/src/views/CompanyProfileView.vue b/src/modules/tenant-management/views/CompanyProfileView.vue
similarity index 100%
rename from src/views/CompanyProfileView.vue
rename to src/modules/tenant-management/views/CompanyProfileView.vue
diff --git a/src/views/MembersView.vue b/src/modules/tenant-management/views/MembersView.vue
similarity index 100%
rename from src/views/MembersView.vue
rename to src/modules/tenant-management/views/MembersView.vue
diff --git a/src/views/PermissionsView.vue b/src/modules/tenant-management/views/PermissionsView.vue
similarity index 100%
rename from src/views/PermissionsView.vue
rename to src/modules/tenant-management/views/PermissionsView.vue
diff --git a/src/views/RolesView.vue b/src/modules/tenant-management/views/RolesView.vue
similarity index 100%
rename from src/views/RolesView.vue
rename to src/modules/tenant-management/views/RolesView.vue
diff --git a/src/views/TenantAdministrationViews.test.mjs b/src/modules/tenant-management/views/TenantAdministrationViews.test.mjs
similarity index 100%
rename from src/views/TenantAdministrationViews.test.mjs
rename to src/modules/tenant-management/views/TenantAdministrationViews.test.mjs