diff --git a/src/App.jsx b/src/App.jsx
index 371db0d..cf02f80 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import Dashboard from './pages/Dashboard';
-import Settings from './pages/Settings';
-import './pages/Dashboard.css';
+import Dashboard from './pages/Dashboard/Dashboard';
+import Settings from './pages/Settings/Settings';
 
 // Main App component for the dashboard page
 export default function App() {
diff --git a/src/pages/Settings/components/FormField.jsx b/src/components/FormField.jsx
similarity index 100%
rename from src/pages/Settings/components/FormField.jsx
rename to src/components/FormField.jsx
diff --git a/src/pages/Settings/components/Notification.jsx b/src/components/Notification.jsx
similarity index 100%
rename from src/pages/Settings/components/Notification.jsx
rename to src/components/Notification.jsx
diff --git a/src/pages/Settings/components/NumberInput.jsx b/src/components/NumberInput.jsx
similarity index 100%
rename from src/pages/Settings/components/NumberInput.jsx
rename to src/components/NumberInput.jsx
diff --git a/src/pages/Settings/components/SaveButton.jsx b/src/components/SaveButton.jsx
similarity index 100%
rename from src/pages/Settings/components/SaveButton.jsx
rename to src/components/SaveButton.jsx
diff --git a/src/pages/Settings/components/SelectInput.jsx b/src/components/SelectInput.jsx
similarity index 100%
rename from src/pages/Settings/components/SelectInput.jsx
rename to src/components/SelectInput.jsx
diff --git a/src/pages/Settings/components/TextInput.jsx b/src/components/TextInput.jsx
similarity index 100%
rename from src/pages/Settings/components/TextInput.jsx
rename to src/components/TextInput.jsx
diff --git a/src/pages/Settings/components/ToggleInput.jsx b/src/components/ToggleInput.jsx
similarity index 100%
rename from src/pages/Settings/components/ToggleInput.jsx
rename to src/components/ToggleInput.jsx
diff --git a/src/pages/Dashboard.css b/src/pages/Dashboard/Dashboard.css
similarity index 100%
rename from src/pages/Dashboard.css
rename to src/pages/Dashboard/Dashboard.css
diff --git a/src/pages/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
similarity index 100%
rename from src/pages/Dashboard.jsx
rename to src/pages/Dashboard/Dashboard.jsx
diff --git a/src/pages/Settings.jsx b/src/pages/Settings/Settings.jsx
similarity index 81%
rename from src/pages/Settings.jsx
rename to src/pages/Settings/Settings.jsx
index b46fd8e..2b8f844 100644
--- a/src/pages/Settings.jsx
+++ b/src/pages/Settings/Settings.jsx
@@ -1,15 +1,15 @@
 import React, { useState } from 'react';
-import { useSettings } from './Settings/hooks/useSettings';
-import SettingsTabs from './Settings/components/SettingsTabs';
-import SaveButton from './Settings/components/SaveButton';
-import Notification from './Settings/components/Notification';
-import SiteInformationSettings from './Settings/components/SiteInformationSettings';
-import ContentReadingSettings from './Settings/components/ContentReadingSettings';
-import WritingPublishingSettings from './Settings/components/WritingPublishingSettings';
-import MediaAssetsSettings from './Settings/components/MediaAssetsSettings';
-import UsersMembershipSettings from './Settings/components/UsersMembershipSettings';
-import HelixSettings from './Settings/components/HelixSettings';
-import './Settings/styles.css';
+import { useSettings } from './hooks/useSettings';
+import SettingsTabs from './components/SettingsTabs';
+import SaveButton from '../../components/SaveButton';
+import Notification from '../../components/Notification';
+import SiteInformationSettings from './components/SiteInformationSettings';
+import ContentReadingSettings from './components/ContentReadingSettings';
+import WritingPublishingSettings from './components/WritingPublishingSettings';
+import MediaAssetsSettings from './components/MediaAssetsSettings';
+import UsersMembershipSettings from './components/UsersMembershipSettings';
+import HelixSettings from './components/HelixSettings';
+import './settings.css';
 
 /**
  * Main Settings Page Component
diff --git a/src/pages/Settings/components/ContentReadingSettings.jsx b/src/pages/Settings/components/ContentReadingSettings.jsx
index e828e9b..07bec30 100644
--- a/src/pages/Settings/components/ContentReadingSettings.jsx
+++ b/src/pages/Settings/components/ContentReadingSettings.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import SettingsSection from './SettingsSection';
-import SelectInput from './SelectInput';
-import NumberInput from './NumberInput';
-import ToggleInput from './ToggleInput';
-import TextInput from './TextInput';
+import SelectInput from '../../../components/SelectInput';
+import NumberInput from '../../../components/NumberInput';
+import ToggleInput from '../../../components/ToggleInput';
+import TextInput from '../../../components/TextInput';
 
 /**
  * Content & Reading Settings Component
diff --git a/src/pages/Settings/components/HelixSettings.jsx b/src/pages/Settings/components/HelixSettings.jsx
index 978ce94..bf5fde5 100644
--- a/src/pages/Settings/components/HelixSettings.jsx
+++ b/src/pages/Settings/components/HelixSettings.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import SettingsSection from './SettingsSection';
-import ToggleInput from './ToggleInput';
+import ToggleInput from '../../../components/ToggleInput';
 
 /**
  * Helix Specific Settings Component
diff --git a/src/pages/Settings/components/MediaAssetsSettings.jsx b/src/pages/Settings/components/MediaAssetsSettings.jsx
index 5249b16..1a093d4 100644
--- a/src/pages/Settings/components/MediaAssetsSettings.jsx
+++ b/src/pages/Settings/components/MediaAssetsSettings.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import SettingsSection from './SettingsSection';
-import NumberInput from './NumberInput';
-import ToggleInput from './ToggleInput';
+import NumberInput from '../../../components/NumberInput';
+import ToggleInput from '../../../components/ToggleInput';
 
 /**
  * Media & Assets Settings Component
diff --git a/src/pages/Settings/components/SiteInformationSettings.jsx b/src/pages/Settings/components/SiteInformationSettings.jsx
index 54f773c..acad069 100644
--- a/src/pages/Settings/components/SiteInformationSettings.jsx
+++ b/src/pages/Settings/components/SiteInformationSettings.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import SettingsSection from './SettingsSection';
-import TextInput from './TextInput';
+import TextInput from '../../../components/TextInput';
 
 /**
  * Site Information Settings Component
diff --git a/src/pages/Settings/components/UsersMembershipSettings.jsx b/src/pages/Settings/components/UsersMembershipSettings.jsx
index 6c4b45c..dc909cf 100644
--- a/src/pages/Settings/components/UsersMembershipSettings.jsx
+++ b/src/pages/Settings/components/UsersMembershipSettings.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import SettingsSection from './SettingsSection';
-import SelectInput from './SelectInput';
-import ToggleInput from './ToggleInput';
+import SelectInput from '../../../components/SelectInput';
+import ToggleInput from '../../../components/ToggleInput';
 
 /**
  * Users & Membership Settings Component
diff --git a/src/pages/Settings/components/WritingPublishingSettings.jsx b/src/pages/Settings/components/WritingPublishingSettings.jsx
index 180bf37..a74fbcd 100644
--- a/src/pages/Settings/components/WritingPublishingSettings.jsx
+++ b/src/pages/Settings/components/WritingPublishingSettings.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import SettingsSection from './SettingsSection';
-import SelectInput from './SelectInput';
-import NumberInput from './NumberInput';
-import ToggleInput from './ToggleInput';
+import SelectInput from '../../../components/SelectInput';
+import NumberInput from '../../../components/NumberInput';
+import ToggleInput from '../../../components/ToggleInput';
 
 /**
  * Writing & Publishing Settings Component
diff --git a/src/pages/Settings/styles.css b/src/pages/Settings/settings.css
similarity index 100%
rename from src/pages/Settings/styles.css
rename to src/pages/Settings/settings.css
diff --git a/src/pages/TwoFA.jsx b/src/pages/TwoFA/TwoFA.jsx
similarity index 100%
rename from src/pages/TwoFA.jsx
rename to src/pages/TwoFA/TwoFA.jsx