diff --git a/frontend/src/core/components/layout/Workbench.tsx b/frontend/src/core/components/layout/Workbench.tsx
index d27819a2b..da4fc1309 100644
--- a/frontend/src/core/components/layout/Workbench.tsx
+++ b/frontend/src/core/components/layout/Workbench.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Box } from '@mantine/core';
-import { useRainbowThemeContext } from '../shared/RainbowThemeProvider';
+import { useRainbowThemeContext } from '@app/components/shared/RainbowThemeProvider';
 import { useToolWorkflow } from '@app/contexts/ToolWorkflowContext';
 import { useFileHandler } from '@app/hooks/useFileHandler';
 import { useFileState } from '@app/contexts/FileContext';
@@ -10,14 +10,14 @@ import { useViewer } from '@app/contexts/ViewerContext';
 import { useAppConfig } from '@app/contexts/AppConfigContext';
 import './Workbench.css';
 
-import TopControls from '../shared/TopControls';
-import FileEditor from '../fileEditor/FileEditor';
-import PageEditor from '../pageEditor/PageEditor';
-import PageEditorControls from '../pageEditor/PageEditorControls';
-import Viewer from '../viewer/Viewer';
-import LandingPage from '../shared/LandingPage';
-import Footer from '../shared/Footer';
-import DismissAllErrorsButton from '../shared/DismissAllErrorsButton';
+import TopControls from '@app/components/shared/TopControls';
+import FileEditor from '@app/components/fileEditor/FileEditor';
+import PageEditor from '@app/components/pageEditor/PageEditor';
+import PageEditorControls from '@app/components/pageEditor/PageEditorControls';
+import Viewer from '@app/components/viewer/Viewer';
+import LandingPage from '@app/components/shared/LandingPage';
+import Footer from '@app/components/shared/Footer';
+import DismissAllErrorsButton from '@app/components/shared/DismissAllErrorsButton';
 
 // No props needed - component uses contexts directly
 export default function Workbench() {
diff --git a/frontend/src/core/components/shared/config/configNavSections.tsx b/frontend/src/core/components/shared/config/configNavSections.tsx
index 7f2cd94b7..845c017a2 100644
--- a/frontend/src/core/components/shared/config/configNavSections.tsx
+++ b/frontend/src/core/components/shared/config/configNavSections.tsx
@@ -12,7 +12,6 @@ import AdminLegalSection from '@app/components/shared/config/configSections/Admi
 import AdminPremiumSection from '@app/components/shared/config/configSections/AdminPremiumSection';
 import AdminFeaturesSection from '@app/components/shared/config/configSections/AdminFeaturesSection';
 import AdminEndpointsSection from '@app/components/shared/config/configSections/AdminEndpointsSection';
-import AdminPlanSection from '@app/components/shared/config/configSections/AdminPlanSection';
 import AdminAuditSection from '@app/components/shared/config/configSections/AdminAuditSection';
 import AdminUsageSection from '@app/components/shared/config/configSections/AdminUsageSection';
 
@@ -134,12 +133,6 @@ export const createConfigNavSections = (
           icon: 'star-rounded',
           component: <AdminPremiumSection />
         },
-        {
-          key: 'adminPlan',
-          label: 'Plan',
-          icon: 'receipt-long-rounded',
-          component: <AdminPlanSection />
-        },
         {
           key: 'adminAudit',
           label: 'Audit',
diff --git a/frontend/src/core/components/shared/config/configSections/AdminAuditSection.tsx b/frontend/src/core/components/shared/config/configSections/AdminAuditSection.tsx
index f03bd529a..23152bdd8 100644
--- a/frontend/src/core/components/shared/config/configSections/AdminAuditSection.tsx
+++ b/frontend/src/core/components/shared/config/configSections/AdminAuditSection.tsx
@@ -2,10 +2,10 @@ import React, { useState, useEffect } from 'react';
 import { Tabs, Loader, Alert, Stack } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import auditService, { AuditSystemStatus as AuditStatus } from '@app/services/auditService';
-import AuditSystemStatus from './audit/AuditSystemStatus';
-import AuditChartsSection from './audit/AuditChartsSection';
-import AuditEventsTable from './audit/AuditEventsTable';
-import AuditExportSection from './audit/AuditExportSection';
+import AuditSystemStatus from '@app/components/shared/config/configSections/audit/AuditSystemStatus';
+import AuditChartsSection from '@app/components/shared/config/configSections/audit/AuditChartsSection';
+import AuditEventsTable from '@app/components/shared/config/configSections/audit/AuditEventsTable';
+import AuditExportSection from '@app/components/shared/config/configSections/audit/AuditExportSection';
 
 const AdminAuditSection: React.FC = () => {
   const { t } = useTranslation();
diff --git a/frontend/src/core/components/shared/config/configSections/AdminUsageSection.tsx b/frontend/src/core/components/shared/config/configSections/AdminUsageSection.tsx
index 2ce1c4ec7..b7a0fb718 100644
--- a/frontend/src/core/components/shared/config/configSections/AdminUsageSection.tsx
+++ b/frontend/src/core/components/shared/config/configSections/AdminUsageSection.tsx
@@ -11,8 +11,8 @@ import {
 } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import usageAnalyticsService, { EndpointStatisticsResponse } from '@app/services/usageAnalyticsService';
-import UsageAnalyticsChart from './usage/UsageAnalyticsChart';
-import UsageAnalyticsTable from './usage/UsageAnalyticsTable';
+import UsageAnalyticsChart from '@app/components/shared/config/configSections/usage/UsageAnalyticsChart';
+import UsageAnalyticsTable from '@app/components/shared/config/configSections/usage/UsageAnalyticsTable';
 import LocalIcon from '@app/components/shared/LocalIcon';
 
 const AdminUsageSection: React.FC = () => {