diff --git a/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx b/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx
index 438ad9e88..3480514ec 100644
--- a/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx
+++ b/web/src/app/app/(chat_experience)/chats/[chatId]/metric/[metricId]/page.tsx
@@ -1,4 +1,4 @@
-import { MetricController } from '@appControllers/MetricController';
+import { MetricController } from '@controllers/MetricController';
 import { AppAssetCheckLayout } from '@layouts/AppAssetCheckLayout';
 
 export default function Page({
diff --git a/web/src/app/app/(chat_experience)/chats/[chatId]/reasoning/[messageId]/page.tsx b/web/src/app/app/(chat_experience)/chats/[chatId]/reasoning/[messageId]/page.tsx
index cf6b24b21..92ecbf2cf 100644
--- a/web/src/app/app/(chat_experience)/chats/[chatId]/reasoning/[messageId]/page.tsx
+++ b/web/src/app/app/(chat_experience)/chats/[chatId]/reasoning/[messageId]/page.tsx
@@ -1,4 +1,4 @@
-import { ReasoningController } from '@appControllers/ReasoningController';
+import { ReasoningController } from '@controllers/ReasoningController';
 
 export default function Page({
   params: { chatId, messageId }
diff --git a/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx b/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx
index e7f937659..737ce0fe6 100644
--- a/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx
+++ b/web/src/app/app/(chat_experience)/dashboards/[dashboardId]/page.tsx
@@ -1,4 +1,4 @@
-import { DashboardController } from '@appControllers/DashboardController';
+import { DashboardController } from '@controllers/DashboardController';
 import { AppAssetCheckLayout } from '@layouts/AppAssetCheckLayout';
 
 export default function Page({ params: { dashboardId } }: { params: { dashboardId: string } }) {
diff --git a/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx b/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx
index 377f8fa1d..cdf1f7b59 100644
--- a/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx
+++ b/web/src/app/app/(chat_experience)/metrics/[metricId]/page.tsx
@@ -1,4 +1,4 @@
-import { MetricController } from '@appControllers/MetricController';
+import { MetricController } from '@controllers/MetricController';
 import { AppAssetCheckLayout } from '@layouts/AppAssetCheckLayout';
 
 export default function MetricPage({
diff --git a/web/src/app/app/terms/NewTermModal.tsx b/web/src/app/app/_components/NewTermModal.tsx
similarity index 100%
rename from web/src/app/app/terms/NewTermModal.tsx
rename to web/src/app/app/_components/NewTermModal.tsx
diff --git a/web/src/app/app/collections/[collectionId]/page.tsx b/web/src/app/app/collections/[collectionId]/page.tsx
index 5879e6673..727df786c 100644
--- a/web/src/app/app/collections/[collectionId]/page.tsx
+++ b/web/src/app/app/collections/[collectionId]/page.tsx
@@ -1,4 +1,4 @@
-import { CollectionIndividualController } from '../../_controllers/CollectionIndividualController';
+import { CollectionIndividualController } from '@controllers/CollectionIndividualController';
 
 export default function CollectionIdPage({ params }: { params: { collectionId: string } }) {
   const { collectionId } = params;
diff --git a/web/src/app/app/collections/page.tsx b/web/src/app/app/collections/page.tsx
index cea1f82e3..6f8a1a00d 100644
--- a/web/src/app/app/collections/page.tsx
+++ b/web/src/app/app/collections/page.tsx
@@ -1,4 +1,4 @@
-import { CollectionListController } from '@appControllers/CollectionListController';
+import { CollectionListController } from '@controllers/CollectionListController';
 
 export default function CollectionsPage() {
   return <CollectionListController />;
diff --git a/web/src/app/app/dashboards/page.tsx b/web/src/app/app/dashboards/page.tsx
index 418dbdf99..5799b89a5 100644
--- a/web/src/app/app/dashboards/page.tsx
+++ b/web/src/app/app/dashboards/page.tsx
@@ -1,4 +1,4 @@
-import { DashboardListController } from '../_controllers/DashboardListController';
+import { DashboardListController } from '@controllers/DashboardListController';
 
 export default function DashboardPage() {
   return <DashboardListController />;
diff --git a/web/src/app/app/layoutClient.tsx b/web/src/app/app/layoutClient.tsx
index 54604cf10..714b86e0f 100644
--- a/web/src/app/app/layoutClient.tsx
+++ b/web/src/app/app/layoutClient.tsx
@@ -2,11 +2,10 @@
 
 import { AppProviders } from '@/context/AppProviders';
 import React from 'react';
-import { AppLayout } from './_controllers/AppLayout';
+import { AppLayout } from '@/controllers/AppLayout';
 import type { BusterUserResponse } from '@/api/asset_interfaces';
 import { useSupabaseServerContext } from '@/context/Supabase/useSupabaseContext';
 import { GlobalErrorComponent } from '../../components/error';
-import { dehydrate, HydrationBoundary, QueryClient } from '@tanstack/react-query';
 
 export const AppLayoutClient = ({
   children,
diff --git a/web/src/app/app/terms/[termId]/page.tsx b/web/src/app/app/terms/[termId]/page.tsx
index d0e31e9ca..1ad608ee1 100644
--- a/web/src/app/app/terms/[termId]/page.tsx
+++ b/web/src/app/app/terms/[termId]/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { getAppSplitterLayout } from '@/components/layout';
-import { TermIndividualController } from '../../_controllers/TermIndividualController';
+import { TermIndividualController } from '@controllers/TermIndividualController';
 
 export default async function TermIdPage({ params: { termId } }: { params: { termId: string } }) {
   const termPageIdLayout = await getAppSplitterLayout('term-page', ['auto', '300px']);
diff --git a/web/src/app/app/terms/page.tsx b/web/src/app/app/terms/page.tsx
index ae39f5209..718297ec2 100644
--- a/web/src/app/app/terms/page.tsx
+++ b/web/src/app/app/terms/page.tsx
@@ -1,4 +1,4 @@
-import { TermsListController } from '../_controllers/TermsListController';
+import { TermsListController } from '@controllers/TermsListController';
 
 export default function TermsPage() {
   return <TermsListController />;
diff --git a/web/src/app/app/_controllers/AppLayout.tsx b/web/src/controllers/AppLayout.tsx
similarity index 95%
rename from web/src/app/app/_controllers/AppLayout.tsx
rename to web/src/controllers/AppLayout.tsx
index 2f71a555f..60cd1b3c3 100644
--- a/web/src/app/app/_controllers/AppLayout.tsx
+++ b/web/src/controllers/AppLayout.tsx
@@ -3,13 +3,13 @@
 import { ConfigProvider, Layout } from 'antd';
 import React, { PropsWithChildren, useMemo } from 'react';
 import { AppSidebar } from './AppSidebar';
-import { NewChatModal } from '../_components/NewChatModal';
-import { InvitePeopleModal } from '../_components/InvitePeopleModal';
+import { NewChatModal } from '@appComponents/NewChatModal';
+import { InvitePeopleModal } from '@appComponents/InvitePeopleModal';
 import { AppSplitter } from '@/components/layout';
 import { createStyles } from 'antd-style';
 import { useBusterStylesContext } from '@/context/BusterStyles/BusterStyles';
 import { useUserConfigContextSelector } from '@/context/Users';
-import { SupportModal } from '../_components/SupportModal';
+import { SupportModal } from '@appComponents/SupportModal';
 import { useAppLayoutContextSelector } from '@/context/BusterAppLayout';
 import { useMemoizedFn } from 'ahooks';
 import { ThemeConfig } from 'antd/lib';
diff --git a/web/src/app/app/_controllers/AppNoPageAccess.tsx b/web/src/controllers/AppNoPageAccess.tsx
similarity index 93%
rename from web/src/app/app/_controllers/AppNoPageAccess.tsx
rename to web/src/controllers/AppNoPageAccess.tsx
index 6ffbab175..25d63857e 100644
--- a/web/src/app/app/_controllers/AppNoPageAccess.tsx
+++ b/web/src/controllers/AppNoPageAccess.tsx
@@ -19,7 +19,7 @@ export const AppNoPageAccess: React.FC<{
   const { openInfoMessage } = useBusterNotifications();
 
   return (
-    <div className="flex h-[85vh] h-full w-full flex-col items-center justify-center space-y-6">
+    <div className="flex h-[85vh] w-full flex-col items-center justify-center space-y-6">
       <BusterLogo className="h-16 w-16" />
 
       <div className="max-w-[340px] text-center">
diff --git a/web/src/app/app/_controllers/AppPasswordAccess.tsx b/web/src/controllers/AppPasswordAccess.tsx
similarity index 100%
rename from web/src/app/app/_controllers/AppPasswordAccess.tsx
rename to web/src/controllers/AppPasswordAccess.tsx
diff --git a/web/src/app/app/_controllers/AppSidebar/AppSidebar.tsx b/web/src/controllers/AppSidebar/AppSidebar.tsx
similarity index 100%
rename from web/src/app/app/_controllers/AppSidebar/AppSidebar.tsx
rename to web/src/controllers/AppSidebar/AppSidebar.tsx
diff --git a/web/src/app/app/_controllers/AppSidebar/AppSidebarPrimary.tsx b/web/src/controllers/AppSidebar/AppSidebarPrimary.tsx
similarity index 96%
rename from web/src/app/app/_controllers/AppSidebar/AppSidebarPrimary.tsx
rename to web/src/controllers/AppSidebar/AppSidebarPrimary.tsx
index c40429565..355a1cf83 100644
--- a/web/src/app/app/_controllers/AppSidebar/AppSidebarPrimary.tsx
+++ b/web/src/controllers/AppSidebar/AppSidebarPrimary.tsx
@@ -1,16 +1,16 @@
 'use client';
 
-import React, { PropsWithChildren, useContext, useMemo } from 'react';
-import { useAppLayoutContextSelector } from '../../../../context/BusterAppLayout';
+import React, { PropsWithChildren, useMemo } from 'react';
 import { Menu } from 'antd';
 import type { MenuProps } from 'antd';
-import { AppMaterialIcons, AppTooltip } from '@/components';
+import { AppMaterialIcons } from '@/components';
 import { BusterRoutes, createBusterRoute } from '@/routes';
 import Link from 'next/link';
 import { AppMenuGroupSingle } from '@/components/menu/AppMenuGroupSingle';
 import { FavoritesDropdown } from './FavoritesDropdown';
 import { useUserConfigContextSelector } from '@/context/Users';
 import { useMemoizedFn } from 'ahooks';
+import { useAppLayoutContextSelector } from '@/context/BusterAppLayout';
 
 const items = [
   // {
diff --git a/web/src/app/app/_controllers/AppSidebar/AppSidebarSettings.tsx b/web/src/controllers/AppSidebar/AppSidebarSettings.tsx
similarity index 100%
rename from web/src/app/app/_controllers/AppSidebar/AppSidebarSettings.tsx
rename to web/src/controllers/AppSidebar/AppSidebarSettings.tsx
diff --git a/web/src/app/app/_controllers/AppSidebar/AppSidebarTopItems.tsx b/web/src/controllers/AppSidebar/AppSidebarTopItems.tsx
similarity index 100%
rename from web/src/app/app/_controllers/AppSidebar/AppSidebarTopItems.tsx
rename to web/src/controllers/AppSidebar/AppSidebarTopItems.tsx
diff --git a/web/src/app/app/_controllers/AppSidebar/AppSidebarTopSettings.tsx b/web/src/controllers/AppSidebar/AppSidebarTopSettings.tsx
similarity index 100%
rename from web/src/app/app/_controllers/AppSidebar/AppSidebarTopSettings.tsx
rename to web/src/controllers/AppSidebar/AppSidebarTopSettings.tsx
diff --git a/web/src/app/app/_controllers/AppSidebar/FavoritesDropdown.tsx b/web/src/controllers/AppSidebar/FavoritesDropdown.tsx
similarity index 100%
rename from web/src/app/app/_controllers/AppSidebar/FavoritesDropdown.tsx
rename to web/src/controllers/AppSidebar/FavoritesDropdown.tsx
diff --git a/web/src/app/app/_controllers/AppSidebar/SignOutButton.tsx b/web/src/controllers/AppSidebar/SignOutButton.tsx
similarity index 100%
rename from web/src/app/app/_controllers/AppSidebar/SignOutButton.tsx
rename to web/src/controllers/AppSidebar/SignOutButton.tsx
diff --git a/web/src/app/app/_controllers/AppSidebar/index.ts b/web/src/controllers/AppSidebar/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/AppSidebar/index.ts
rename to web/src/controllers/AppSidebar/index.ts
diff --git a/web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualContent.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx
similarity index 97%
rename from web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualContent.tsx
rename to web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx
index 45c95b82e..f9af10cf3 100644
--- a/web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualContent.tsx
+++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx
@@ -14,8 +14,8 @@ import {
   BusterCollectionListItem
 } from '@/api/asset_interfaces';
 import { Text } from '@/components';
-import { ListEmptyStateWithButton } from '../../../../components/list';
-import { AddTypeModal } from '../../_components/AddTypeModal';
+import { ListEmptyStateWithButton } from '@/components/list';
+import { AddTypeModal } from '@appComponents/AddTypeModal';
 import { ShareAssetType } from '@/api/asset_interfaces';
 import { useMemoizedFn } from 'ahooks';
 import { BusterList, BusterListColumn, BusterListRow } from '@/components/list';
diff --git a/web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualController.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualController.tsx
rename to web/src/controllers/CollectionIndividualController/CollectionIndividualController.tsx
diff --git a/web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualHeader.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx
similarity index 96%
rename from web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualHeader.tsx
rename to web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx
index df2be624e..ce03edf05 100644
--- a/web/src/app/app/_controllers/CollectionIndividualController/CollectionIndividualHeader.tsx
+++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx
@@ -4,16 +4,15 @@ import React, { useMemo } from 'react';
 import { AppContentHeader } from '@/components/layout';
 import {
   canEditCollection,
-  useBusterCollectionIndividualContextSelector,
-  useCollectionIndividual
+  useBusterCollectionIndividualContextSelector
 } from '@/context/Collections';
 import { Breadcrumb, Button, Dropdown, MenuProps } from 'antd';
 import Link from 'next/link';
 import { useAppLayoutContextSelector } from '@/context/BusterAppLayout';
 import { BusterRoutes } from '@/routes';
 import { AppMaterialIcons, EditableTitle } from '@/components';
-import { FavoriteStar } from '../../_components/Lists/FavoriteStar';
-import { ShareMenu } from '../../_components/ShareMenu';
+import { FavoriteStar } from '@appComponents/Lists/FavoriteStar';
+import { ShareMenu } from '@appComponents/ShareMenu';
 import { BusterCollection, ShareAssetType } from '@/api/asset_interfaces';
 import { Text } from '@/components';
 import { useAntToken } from '@/styles/useAntToken';
diff --git a/web/src/app/app/_controllers/CollectionIndividualController/CollectionsIndividualPopup.tsx b/web/src/controllers/CollectionIndividualController/CollectionsIndividualPopup.tsx
similarity index 100%
rename from web/src/app/app/_controllers/CollectionIndividualController/CollectionsIndividualPopup.tsx
rename to web/src/controllers/CollectionIndividualController/CollectionsIndividualPopup.tsx
diff --git a/web/src/app/app/_controllers/CollectionIndividualController/index.ts b/web/src/controllers/CollectionIndividualController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/CollectionIndividualController/index.ts
rename to web/src/controllers/CollectionIndividualController/index.ts
diff --git a/web/src/app/app/_controllers/CollectionListController/CollectionListController.tsx b/web/src/controllers/CollectionListController/CollectionListController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/CollectionListController/CollectionListController.tsx
rename to web/src/controllers/CollectionListController/CollectionListController.tsx
diff --git a/web/src/app/app/_controllers/CollectionListController/CollectionListHeader.tsx b/web/src/controllers/CollectionListController/CollectionListHeader.tsx
similarity index 100%
rename from web/src/app/app/_controllers/CollectionListController/CollectionListHeader.tsx
rename to web/src/controllers/CollectionListController/CollectionListHeader.tsx
diff --git a/web/src/app/app/_controllers/CollectionListController/CollectionListSelectedPopup.tsx b/web/src/controllers/CollectionListController/CollectionListSelectedPopup.tsx
similarity index 100%
rename from web/src/app/app/_controllers/CollectionListController/CollectionListSelectedPopup.tsx
rename to web/src/controllers/CollectionListController/CollectionListSelectedPopup.tsx
diff --git a/web/src/app/app/_controllers/CollectionListController/CollectionsListContent.tsx b/web/src/controllers/CollectionListController/CollectionsListContent.tsx
similarity index 98%
rename from web/src/app/app/_controllers/CollectionListController/CollectionsListContent.tsx
rename to web/src/controllers/CollectionListController/CollectionsListContent.tsx
index 8f4a7c171..34201c8f4 100644
--- a/web/src/app/app/_controllers/CollectionListController/CollectionsListContent.tsx
+++ b/web/src/controllers/CollectionListController/CollectionsListContent.tsx
@@ -12,7 +12,7 @@ import {
   ListEmptyStateWithButton
 } from '@/components/list';
 import { useMemoizedFn } from 'ahooks';
-import { NewCollectionModal } from '../../_components/NewCollectionModal';
+import { NewCollectionModal } from '@appComponents/NewCollectionModal';
 import { BusterCollectionListItem } from '@/api/asset_interfaces';
 import { CollectionListSelectedPopup } from './CollectionListSelectedPopup';
 
diff --git a/web/src/app/app/_controllers/CollectionListController/index.ts b/web/src/controllers/CollectionListController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/CollectionListController/index.ts
rename to web/src/controllers/CollectionListController/index.ts
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardController.tsx b/web/src/controllers/DashboardController/DashboardController.tsx
similarity index 95%
rename from web/src/app/app/_controllers/DashboardController/DashboardController.tsx
rename to web/src/controllers/DashboardController/DashboardController.tsx
index ad85dec2a..fc0b74778 100644
--- a/web/src/app/app/_controllers/DashboardController/DashboardController.tsx
+++ b/web/src/controllers/DashboardController/DashboardController.tsx
@@ -5,7 +5,7 @@ import { useBusterDashboardIndividual } from '@/context/Dashboards';
 import { FileIndeterminateLoader } from '@appComponents/FileIndeterminateLoader';
 import { DashboardFileView, useChatLayoutContextSelector } from '@layouts/ChatLayout';
 import { DashboardViewComponents } from './config';
-import { AddTypeModal } from '../../_components/AddTypeModal';
+import { AddTypeModal } from '@appComponents/AddTypeModal';
 import { useMemoizedFn } from 'ahooks';
 
 export const DashboardController: React.FC<{ dashboardId: string }> = ({ dashboardId }) => {
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentController.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentController.tsx
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentController.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentControllerContext.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentControllerContext.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentControllerContext.tsx
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardContentControllerContext.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardEmptyState.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardEmptyState.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardEmptyState.tsx
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardEmptyState.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/DashboardMetricItem.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/DashboardMetricItem.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/DashboardMetricItem.tsx
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/DashboardMetricItem.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricTitle.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricTitle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricTitle.tsx
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricTitle.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/index.ts b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/index.ts
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/index.ts
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/useDashboardMetric.ts b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/useDashboardMetric.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/useDashboardMetric.ts
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/useDashboardMetric.ts
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/helpers.ts b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/helpers.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/helpers.ts
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/helpers.ts
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/index.ts b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/index.ts
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/index.ts
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardViewDashboardController.tsx b/web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardViewDashboardController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/DashboardViewDashboardController.tsx
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardViewDashboardController.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/index.ts b/web/src/controllers/DashboardController/DashboardViewDashboardController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewDashboardController/index.ts
rename to web/src/controllers/DashboardController/DashboardViewDashboardController/index.ts
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx b/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx
rename to web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx
diff --git a/web/src/app/app/_controllers/DashboardController/DashboardViewFileController/index.ts b/web/src/controllers/DashboardController/DashboardViewFileController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/DashboardViewFileController/index.ts
rename to web/src/controllers/DashboardController/DashboardViewFileController/index.ts
diff --git a/web/src/app/app/_controllers/DashboardController/config.ts b/web/src/controllers/DashboardController/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/config.ts
rename to web/src/controllers/DashboardController/config.ts
diff --git a/web/src/app/app/_controllers/DashboardController/index.ts b/web/src/controllers/DashboardController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardController/index.ts
rename to web/src/controllers/DashboardController/index.ts
diff --git a/web/src/app/app/_controllers/DashboardListController/DashboardHeader.tsx b/web/src/controllers/DashboardListController/DashboardHeader.tsx
similarity index 96%
rename from web/src/app/app/_controllers/DashboardListController/DashboardHeader.tsx
rename to web/src/controllers/DashboardListController/DashboardHeader.tsx
index da42a2cca..ba032a52a 100644
--- a/web/src/app/app/_controllers/DashboardListController/DashboardHeader.tsx
+++ b/web/src/controllers/DashboardListController/DashboardHeader.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import React, { useMemo, useState } from 'react';
-import { AppContentHeader } from '../../../../components/layout/AppContentHeader';
+import React, { useMemo } from 'react';
+import { AppContentHeader } from '@/components/layout/AppContentHeader';
 import { Breadcrumb, Button } from 'antd';
 import Link from 'next/link';
 import { BusterRoutes, createBusterRoute } from '@/routes';
diff --git a/web/src/app/app/_controllers/DashboardListController/DashboardListContent.tsx b/web/src/controllers/DashboardListController/DashboardListContent.tsx
similarity index 92%
rename from web/src/app/app/_controllers/DashboardListController/DashboardListContent.tsx
rename to web/src/controllers/DashboardListController/DashboardListContent.tsx
index dba7f6d7f..12ab6fd7a 100644
--- a/web/src/app/app/_controllers/DashboardListController/DashboardListContent.tsx
+++ b/web/src/controllers/DashboardListController/DashboardListContent.tsx
@@ -1,18 +1,17 @@
 'use client';
 
 import React, { useMemo, useState } from 'react';
-import { AppContent } from '../../../../components/layout/AppContent';
+import { AppContent } from '@/components/layout/AppContent';
 import { useBusterDashboardContextSelector } from '@/context/Dashboards';
 import { BusterUserAvatar } from '@/components';
 import { formatDate } from '@/utils';
 import { BusterList, BusterListColumn, BusterListRow } from '@/components/list';
 import { BusterRoutes, createBusterRoute } from '@/routes';
-import { getShareStatus } from '../../_components/Lists';
-import { ListEmptyStateWithButton } from '../../../../components/list';
+import { getShareStatus } from '@appComponents/Lists';
+import { ListEmptyStateWithButton } from '@/components/list';
 import { useMemoizedFn } from 'ahooks';
 import { DashboardSelectedOptionPopup } from './DashboardSelectedPopup';
 import type { BusterDashboardListItem } from '@/api/asset_interfaces';
-import { AddTypeModal } from '../../_components/AddTypeModal';
 
 const columns: BusterListColumn[] = [
   {
diff --git a/web/src/app/app/_controllers/DashboardListController/DashboardListController.tsx b/web/src/controllers/DashboardListController/DashboardListController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardListController/DashboardListController.tsx
rename to web/src/controllers/DashboardListController/DashboardListController.tsx
diff --git a/web/src/app/app/_controllers/DashboardListController/DashboardSelectedPopup.tsx b/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx
similarity index 100%
rename from web/src/app/app/_controllers/DashboardListController/DashboardSelectedPopup.tsx
rename to web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx
diff --git a/web/src/app/app/_controllers/DashboardListController/index.ts b/web/src/controllers/DashboardListController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/DashboardListController/index.ts
rename to web/src/controllers/DashboardListController/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricController.tsx b/web/src/controllers/MetricController/MetricController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricController.tsx
rename to web/src/controllers/MetricController/MetricController.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricChartEvaluation.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricChartEvaluation.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricChartEvaluation.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricChartEvaluation.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditController.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricEditController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditController.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricEditController.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricEditControllerHeader.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/CollapseDelete.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/CollapseDelete.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/CollapseDelete.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/CollapseDelete.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/LabelAndInput.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/LabelAndInput.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/LabelAndInput.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/LabelAndInput.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/StylingLabel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/StylingLabel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/StylingLabel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/StylingLabel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/WarningIcon.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/WarningIcon.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/WarningIcon.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/WarningIcon.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/Common/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingApp.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingApp.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingApp.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingApp.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingAppSegment.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingAppSegment.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingAppSegment.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/MetricStylingAppSegment.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorStyleSegments.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorStyleSegments.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorStyleSegments.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorStyleSegments.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorsApp.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorsApp.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorsApp.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/ColorsApp.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/ColorsApp/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeCarousel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeCarousel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeCarousel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeCarousel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeColorDots.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeColorDots.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeColorDots.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeColorDots.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeList.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeList.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeList.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/ThemeList.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/interfaces.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/interfaces.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/interfaces.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/Common/interfaces.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/CustomApp.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/CustomApp.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/CustomApp.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/CustomApp.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/CustomApp/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/PaletteApp.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/PaletteApp.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/PaletteApp.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/PaletteApp.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/PaletteApp/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/SelectColorApp.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/SelectColorApp.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/SelectColorApp.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/SelectColorApp.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/StylingAppColors.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/StylingAppColors.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/StylingAppColors.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/StylingAppColors.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppColors/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarAxisSorting.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarAxisSorting.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarAxisSorting.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarAxisSorting.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarRoundnessGlobal.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarRoundnessGlobal.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarRoundnessGlobal.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditBarRoundnessGlobal.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditDotsOnLineGlobal.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditDotsOnLineGlobal.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditDotsOnLineGlobal.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditDotsOnLineGlobal.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditGridLines.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditGridLines.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditGridLines.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditGridLines.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditHideYAxis.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditHideYAxis.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditHideYAxis.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditHideYAxis.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieAppearance.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieAppearance.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieAppearance.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieAppearance.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieInnerLabel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieInnerLabel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieInnerLabel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieInnerLabel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieLabelLocation.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieLabelLocation.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieLabelLocation.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieLabelLocation.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieMinimumSlicePercentage.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieMinimumSlicePercentage.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieMinimumSlicePercentage.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieMinimumSlicePercentage.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieShowInnerLabel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieShowInnerLabel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieShowInnerLabel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditPieShowInnerLabel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditReplaceMissingValuesWithGlobal.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditReplaceMissingValuesWithGlobal.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditReplaceMissingValuesWithGlobal.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditReplaceMissingValuesWithGlobal.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditScatterDotSize.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditScatterDotSize.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditScatterDotSize.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditScatterDotSize.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowDataLabels.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowDataLabels.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowDataLabels.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowDataLabels.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowGoalLine.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowGoalLine.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowGoalLine.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowGoalLine.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowHeadline.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowHeadline.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowHeadline.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowHeadline.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLabelPieAsPercentage.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLabelPieAsPercentage.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLabelPieAsPercentage.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLabelPieAsPercentage.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLegend.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLegend.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLegend.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditShowLegend.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditSmoothLinesGlobal.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditSmoothLinesGlobal.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditSmoothLinesGlobal.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditSmoothLinesGlobal.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendline.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColorPicker.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColorPicker.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColorPicker.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColorPicker.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColumnId.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColumnId.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColumnId.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineColumnId.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineLabel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineLabel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineLabel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineLabel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineOption.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineOption.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineOption.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineOption.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineShowLine.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineShowLine.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineShowLine.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/EditTrendlineShowLine.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditTrendline/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditYAxisScaleGlobal.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditYAxisScaleGlobal.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditYAxisScaleGlobal.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/EditYAxisScaleGlobal.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStyling.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStylingNotSupported.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStylingNotSupported.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStylingNotSupported.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/StylingAppStylingNotSupported.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppStyling/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Area.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Area.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Area.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Area.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_AreaRelative.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_AreaRelative.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_AreaRelative.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_AreaRelative.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Combo.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Combo.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Combo.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Combo.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedBar.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedBar.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedBar.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedBar.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedColumn.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedColumn.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedColumn.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_GroupedColumn.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Line.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Line.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Line.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Line.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Metric.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Metric.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Metric.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Metric.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Pie.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Pie.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Pie.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Pie.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Scatter.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Scatter.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Scatter.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Scatter.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBar.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBar.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBar.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBar.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBarRelative.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBarRelative.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBarRelative.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedBarRelative.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumn.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumn.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumn.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumn.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumnRelative.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumnRelative.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumnRelative.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_StackedColumnRelative.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Table.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Table.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Table.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/ChartIcons/ChartIcon_Table.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxis.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxis.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxis.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxis.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditBarRoundness.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditBarRoundness.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditBarRoundness.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditBarRoundness.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditCurrency.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditCurrency.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditCurrency.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditCurrency.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateFormat.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateType.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateType.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateType.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDateType.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDecimals.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDecimals.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDecimals.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDecimals.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDisplayAs.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDisplayAs.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDisplayAs.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditDisplayAs.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLabelStyle.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLabelStyle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLabelStyle.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLabelStyle.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLineStyle.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLineStyle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLineStyle.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditLineStyle.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditMultiplyBy.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditMultiplyBy.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditMultiplyBy.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditMultiplyBy.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditPrefix.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditPrefix.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditPrefix.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditPrefix.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditReplaceMissingData.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditReplaceMissingData.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditReplaceMissingData.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditReplaceMissingData.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSeparator.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSeparator.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSeparator.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSeparator.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowDataLabel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowLabelAsPercentage.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowLabelAsPercentage.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowLabelAsPercentage.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditShowLabelAsPercentage.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSuffix.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSuffix.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSuffix.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditSuffix.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditTitle.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditTitle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditTitle.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/EditTitle.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/SelectAxisDropdownContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/SelectAxisDropdownContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/SelectAxisDropdownContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/SelectAxisDropdownContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/dateConfig.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/useEditAppSegmented.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/useEditAppSegmented.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/useEditAppSegmented.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnContent/useEditAppSegmented.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnPopover.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnPopover.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnPopover.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisColumnPopover.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisAvailableItemsList.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisAvailableItemsList.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisAvailableItemsList.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisAvailableItemsList.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDraggingItem.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDraggingItem.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDraggingItem.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDraggingItem.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzone.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzone.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzone.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzone.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzones.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzones.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzones.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisDropzones.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItem.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItem.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItem.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItem.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItemDragContainer.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItemDragContainer.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItemDragContainer.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/SelectAxisItemDragContainer.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisItem/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisSortableItem.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisSortableItem.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisSortableItem.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/SelectAxisSortableItem.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/interfaces.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/interfaces.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/interfaces.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/interfaces.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesExternal.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesExternal.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesExternal.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesExternal.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesInternal.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesInternal.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesInternal.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useDropzonesInternal.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useErrorZones.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useErrorZones.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useErrorZones.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisDragContainer/useErrorZones.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisEmptyState.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisEmptyState.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisEmptyState.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisEmptyState.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemAvailableContainer.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemAvailableContainer.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemAvailableContainer.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemAvailableContainer.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemContainer.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemContainer.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemContainer.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemContainer.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemLabel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemLabel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemLabel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisItemLabel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/CategoryAxisSettingContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/CategoryAxisSettingContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/CategoryAxisSettingContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/CategoryAxisSettingContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisLabelRotation.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisLabelRotation.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisLabelRotation.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisLabelRotation.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisScale.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisScale.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisScale.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditAxisScale.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditGrouping.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditGrouping.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditGrouping.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditGrouping.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisLabel.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisLabel.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisLabel.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisLabel.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisTitle.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisTitle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisTitle.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowAxisTitle.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowTooltip.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowTooltip.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowTooltip.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/EditShowTooltip.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingsButton.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingsButton.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingsButton.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/SelectAxisSettingsButton.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/TooltipAxisSettingContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/TooltipAxisSettingContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/TooltipAxisSettingContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/TooltipAxisSettingContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/XAxisSettingContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/XAxisSettingContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/XAxisSettingContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/XAxisSettingContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/Y2AxisSettingContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/Y2AxisSettingContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/Y2AxisSettingContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/Y2AxisSettingContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/YAxisSettingContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/YAxisSettingContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/YAxisSettingContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/YAxisSettingContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/SelectAxisSettingsContent/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/config.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/config.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/config.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/config.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/helper.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/helper.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/helper.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/helper.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/useSelectAxisContext.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/useSelectAxisContext.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/useSelectAxisContext.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectAxis/useSelectAxisContext.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectChartType.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectChartType.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectChartType.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectChartType.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectedChartTypeMethod.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectedChartTypeMethod.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectedChartTypeMethod.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/SelectedChartTypeMethod.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/SelectChartType/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingAppVisualize.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingAppVisualize.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingAppVisualize.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingAppVisualize.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditDerivedHeader.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditDerivedHeader.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditDerivedHeader.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditDerivedHeader.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditHeaderTitle.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditHeaderTitle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditHeaderTitle.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditHeaderTitle.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricField.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricField.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricField.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricField.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricHeaderType.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricHeaderType.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricHeaderType.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricHeaderType.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricSubHeader.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricSubHeader.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricSubHeader.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricSubHeader.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricType.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricType.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricType.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/EditMetricType.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/StylingMetric.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/StylingMetric.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/StylingMetric.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/StylingMetric.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/helpers.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/helpers.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/helpers.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/helpers.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/StylingMetric/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/StylingAppVisualize/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/config.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/config.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/MetricStylingApp/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/index.ts b/web/src/controllers/MetricController/MetricViewChart/MetricEditController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricEditController/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/MetricEditController/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChart.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricViewChart.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChart.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricViewChart.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartContent.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricViewChartContent.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartContent.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricViewChartContent.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartController.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricViewChartController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartController.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricViewChartController.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartHeader.tsx b/web/src/controllers/MetricController/MetricViewChart/MetricViewChartHeader.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/MetricViewChartHeader.tsx
rename to web/src/controllers/MetricController/MetricViewChart/MetricViewChartHeader.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewChart/index.ts b/web/src/controllers/MetricController/MetricViewChart/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewChart/index.ts
rename to web/src/controllers/MetricController/MetricViewChart/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewFile/MetricViewFile.tsx b/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewFile/MetricViewFile.tsx
rename to web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewFile/index.ts b/web/src/controllers/MetricController/MetricViewFile/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewFile/index.ts
rename to web/src/controllers/MetricController/MetricViewFile/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx b/web/src/controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx
rename to web/src/controllers/MetricController/MetricViewResults/MetricViewResultsController.tsx
diff --git a/web/src/app/app/_controllers/MetricController/MetricViewResults/index.ts b/web/src/controllers/MetricController/MetricViewResults/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/MetricViewResults/index.ts
rename to web/src/controllers/MetricController/MetricViewResults/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/config.ts b/web/src/controllers/MetricController/config.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/config.ts
rename to web/src/controllers/MetricController/config.ts
diff --git a/web/src/app/app/_controllers/MetricController/index.ts b/web/src/controllers/MetricController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/index.ts
rename to web/src/controllers/MetricController/index.ts
diff --git a/web/src/app/app/_controllers/MetricController/useMetricLayout.ts b/web/src/controllers/MetricController/useMetricLayout.ts
similarity index 100%
rename from web/src/app/app/_controllers/MetricController/useMetricLayout.ts
rename to web/src/controllers/MetricController/useMetricLayout.ts
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningController.tsx b/web/src/controllers/ReasoningController/ReasoningController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningController.tsx
rename to web/src/controllers/ReasoningController/ReasoningController.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessageContainer.tsx b/web/src/controllers/ReasoningController/ReasoningMessageContainer.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessageContainer.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessageContainer.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/BarContainer.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/BarContainer.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/BarContainer.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/BarContainer.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/LoaderDot.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/LoaderDot.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/LoaderDot.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/LoaderDot.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileButtons.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileTitle.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileTitle.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileTitle.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningFileTitle.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/ReasoningMessage_File.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/index.ts b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/index.ts
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_File/index.ts
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/index.ts b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/index.ts
rename to web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/index.ts
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/animationConfig.ts b/web/src/controllers/ReasoningController/ReasoningMessages/animationConfig.ts
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/animationConfig.ts
rename to web/src/controllers/ReasoningController/ReasoningMessages/animationConfig.ts
diff --git a/web/src/app/app/_controllers/ReasoningController/ReasoningMessages/index.ts b/web/src/controllers/ReasoningController/ReasoningMessages/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/ReasoningMessages/index.ts
rename to web/src/controllers/ReasoningController/ReasoningMessages/index.ts
diff --git a/web/src/app/app/_controllers/ReasoningController/index.ts b/web/src/controllers/ReasoningController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/ReasoningController/index.ts
rename to web/src/controllers/ReasoningController/index.ts
diff --git a/web/src/app/app/_controllers/TermIndividualController/TermDatasetSelect.tsx b/web/src/controllers/TermIndividualController/TermDatasetSelect.tsx
similarity index 100%
rename from web/src/app/app/_controllers/TermIndividualController/TermDatasetSelect.tsx
rename to web/src/controllers/TermIndividualController/TermDatasetSelect.tsx
diff --git a/web/src/app/app/_controllers/TermIndividualController/TermIndividualContent.tsx b/web/src/controllers/TermIndividualController/TermIndividualContent.tsx
similarity index 96%
rename from web/src/app/app/_controllers/TermIndividualController/TermIndividualContent.tsx
rename to web/src/controllers/TermIndividualController/TermIndividualContent.tsx
index 031d6903b..5317ef32a 100644
--- a/web/src/app/app/_controllers/TermIndividualController/TermIndividualContent.tsx
+++ b/web/src/controllers/TermIndividualController/TermIndividualContent.tsx
@@ -1,10 +1,10 @@
 'use client';
 
 import React, { useEffect, useMemo, useState } from 'react';
-import { AppContent } from '../../../../components/layout/AppContent';
+import { AppContent } from '@/components/layout/AppContent';
 import { useBusterTermsIndividualContextSelector, useBusterTermsIndividual } from '@/context/Terms';
-import { Dropdown, Input, Skeleton } from 'antd';
-import { useDebounceFn, useUnmount } from 'ahooks';
+import { Dropdown, Input } from 'antd';
+import { useDebounceFn } from 'ahooks';
 import { formatDate } from '@/utils';
 import { AppMaterialIcons, EditableTitle } from '@/components';
 import { useAntToken } from '@/styles/useAntToken';
@@ -12,7 +12,7 @@ import { AppCodeEditor } from '@/components/inputs/AppCodeEditor';
 import clamp from 'lodash/clamp';
 import { MenuProps } from 'antd/lib';
 import { ItemContainer } from '@/components/card/ItemContainer';
-import { Text, Title } from '@/components';
+import { Text } from '@/components';
 import { BusterRoutes } from '@/routes';
 import { useAppLayoutContextSelector } from '@/context/BusterAppLayout';
 
diff --git a/web/src/app/app/_controllers/TermIndividualController/TermIndividualContentSider.tsx b/web/src/controllers/TermIndividualController/TermIndividualContentSider.tsx
similarity index 100%
rename from web/src/app/app/_controllers/TermIndividualController/TermIndividualContentSider.tsx
rename to web/src/controllers/TermIndividualController/TermIndividualContentSider.tsx
diff --git a/web/src/app/app/_controllers/TermIndividualController/TermIndividualController.tsx b/web/src/controllers/TermIndividualController/TermIndividualController.tsx
similarity index 86%
rename from web/src/app/app/_controllers/TermIndividualController/TermIndividualController.tsx
rename to web/src/controllers/TermIndividualController/TermIndividualController.tsx
index 3dbdf681f..cf3b297b8 100644
--- a/web/src/app/app/_controllers/TermIndividualController/TermIndividualController.tsx
+++ b/web/src/controllers/TermIndividualController/TermIndividualController.tsx
@@ -1,10 +1,8 @@
 'use client';
 
 import React from 'react';
-import { AppContentHeader } from '../../../../components/layout/AppContentHeader';
 import { TermIndividualHeader } from './TermIndividualHeader';
-import { AppSplitter } from '@/components/layout';
-import { AppContent } from '../../../../components/layout/AppContent';
+import { AppContentHeader, AppContent, AppSplitter } from '@/components/layout';
 import { TermIndividualHeaderSider } from './TermIndividualHeaderSider';
 import { TermIndividualContentSider } from './TermIndividualContentSider';
 import { useBusterTermsListContextSelector } from '@/context/Terms';
diff --git a/web/src/app/app/_controllers/TermIndividualController/TermIndividualHeader.tsx b/web/src/controllers/TermIndividualController/TermIndividualHeader.tsx
similarity index 100%
rename from web/src/app/app/_controllers/TermIndividualController/TermIndividualHeader.tsx
rename to web/src/controllers/TermIndividualController/TermIndividualHeader.tsx
diff --git a/web/src/app/app/_controllers/TermIndividualController/TermIndividualHeaderSider.tsx b/web/src/controllers/TermIndividualController/TermIndividualHeaderSider.tsx
similarity index 100%
rename from web/src/app/app/_controllers/TermIndividualController/TermIndividualHeaderSider.tsx
rename to web/src/controllers/TermIndividualController/TermIndividualHeaderSider.tsx
diff --git a/web/src/app/app/_controllers/TermIndividualController/index.ts b/web/src/controllers/TermIndividualController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/TermIndividualController/index.ts
rename to web/src/controllers/TermIndividualController/index.ts
diff --git a/web/src/app/app/_controllers/TermsListController/TermListSelectedPopup.tsx b/web/src/controllers/TermsListController/TermListSelectedPopup.tsx
similarity index 100%
rename from web/src/app/app/_controllers/TermsListController/TermListSelectedPopup.tsx
rename to web/src/controllers/TermsListController/TermListSelectedPopup.tsx
diff --git a/web/src/app/app/_controllers/TermsListController/TermsHeader.tsx b/web/src/controllers/TermsListController/TermsHeader.tsx
similarity index 90%
rename from web/src/app/app/_controllers/TermsListController/TermsHeader.tsx
rename to web/src/controllers/TermsListController/TermsHeader.tsx
index 259a7335e..2457f58dd 100644
--- a/web/src/app/app/_controllers/TermsListController/TermsHeader.tsx
+++ b/web/src/controllers/TermsListController/TermsHeader.tsx
@@ -1,18 +1,18 @@
 'use client';
 
 import React, { useMemo } from 'react';
-import { AppContentHeader } from '../../../../components/layout/AppContentHeader';
+import { AppContentHeader } from '@/components/layout/AppContentHeader';
 import { Breadcrumb, Button } from 'antd';
 import { BreadcrumbProps } from 'antd/lib';
 import { BreadcrumbSeperator } from '@/components';
 import Link from 'next/link';
 import { BusterRoutes, createBusterRoute } from '@/routes';
 import { AppMaterialIcons, AppTooltip } from '@/components';
-import { NewTermModal } from '../../terms/NewTermModal';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useUserConfigContextSelector } from '@/context/Users';
-import { useBusterTermsIndividual, useBusterTermsListContextSelector } from '@/context/Terms';
+import { useBusterTermsIndividual } from '@/context/Terms';
 import { useMemoizedFn } from 'ahooks';
+import { NewTermModal } from '@appComponents/NewTermModal';
 
 export const TermsHeader: React.FC<{
   termId?: string;
diff --git a/web/src/app/app/_controllers/TermsListController/TermsListContent.tsx b/web/src/controllers/TermsListController/TermsListContent.tsx
similarity index 97%
rename from web/src/app/app/_controllers/TermsListController/TermsListContent.tsx
rename to web/src/controllers/TermsListController/TermsListContent.tsx
index 8ff0aaa5e..f251fb6da 100644
--- a/web/src/app/app/_controllers/TermsListController/TermsListContent.tsx
+++ b/web/src/controllers/TermsListController/TermsListContent.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useMemo, useState } from 'react';
-import { AppContent } from '../../../../components/layout/AppContent';
+import { AppContent } from '@/components/layout/AppContent';
 import { BusterUserAvatar } from '@/components';
 import { formatDate } from '@/utils';
 import {
diff --git a/web/src/app/app/_controllers/TermsListController/TermsListController.tsx b/web/src/controllers/TermsListController/TermsListController.tsx
similarity index 100%
rename from web/src/app/app/_controllers/TermsListController/TermsListController.tsx
rename to web/src/controllers/TermsListController/TermsListController.tsx
diff --git a/web/src/app/app/_controllers/TermsListController/index.ts b/web/src/controllers/TermsListController/index.ts
similarity index 100%
rename from web/src/app/app/_controllers/TermsListController/index.ts
rename to web/src/controllers/TermsListController/index.ts
diff --git a/web/src/layouts/AppAssetCheckLayout.tsx b/web/src/layouts/AppAssetCheckLayout.tsx
index ad282d1e6..ffe8afc57 100644
--- a/web/src/layouts/AppAssetCheckLayout.tsx
+++ b/web/src/layouts/AppAssetCheckLayout.tsx
@@ -6,8 +6,8 @@ import { useBusterSupabaseAuthMethods } from '@/hooks/useBusterSupabaseAuthMetho
 import { ClientSideAnonCheck } from './ClientSideAnonCheck';
 import { redirect } from 'next/navigation';
 import { BusterRoutes, createBusterRoute } from '@/routes';
-import { AppPasswordAccess } from '@/app/app/_controllers/AppPasswordAccess';
-import { AppNoPageAccess } from '@/app/app/_controllers/AppNoPageAccess';
+import { AppPasswordAccess } from '@controllers/AppPasswordAccess';
+import { AppNoPageAccess } from '@controllers/AppNoPageAccess';
 
 export type AppAssetCheckLayoutProps = {
   metricId?: string;
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 887ddcc0a..6b68f619c 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -23,7 +23,7 @@
       "@utils/*": ["./src/utils/*"],
       "@appComponents/*": ["./src/app/app/_components/*"],
       "@layouts/*": ["./src/layouts/*"],
-      "@appControllers/*": ["./src/app/app/_controllers/*"],
+      "@controllers/*": ["./src/controllers/*"],
       "@chatLayout/*": ["./src/layouts/ChatLayout/*"]
     },
     "target": "ES2017"