diff --git a/SelfieCam/Features/Camera/Views/CaptureButton.swift b/SelfieCam/Features/Camera/Components/CaptureButton.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/CaptureButton.swift
rename to SelfieCam/Features/Camera/Components/CaptureButton.swift
diff --git a/SelfieCam/Features/Camera/Views/CaptureEventInteraction.swift b/SelfieCam/Features/Camera/Components/CaptureEventInteraction.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/CaptureEventInteraction.swift
rename to SelfieCam/Features/Camera/Components/CaptureEventInteraction.swift
diff --git a/SelfieCam/Features/Camera/Views/ColorPickerOverlay.swift b/SelfieCam/Features/Camera/Components/ColorPickerOverlay.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/ColorPickerOverlay.swift
rename to SelfieCam/Features/Camera/Components/ColorPickerOverlay.swift
diff --git a/SelfieCam/Features/Camera/Views/ExpandableControlsPanel.swift b/SelfieCam/Features/Camera/Components/ExpandableControlsPanel.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/ExpandableControlsPanel.swift
rename to SelfieCam/Features/Camera/Components/ExpandableControlsPanel.swift
diff --git a/SelfieCam/Features/Camera/Views/ExpandedControlItem.swift b/SelfieCam/Features/Camera/Components/ExpandedControlItem.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/ExpandedControlItem.swift
rename to SelfieCam/Features/Camera/Components/ExpandedControlItem.swift
diff --git a/SelfieCam/Features/Camera/Views/OpacitySliderOverlay.swift b/SelfieCam/Features/Camera/Components/OpacitySliderOverlay.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/OpacitySliderOverlay.swift
rename to SelfieCam/Features/Camera/Components/OpacitySliderOverlay.swift
diff --git a/SelfieCam/Features/Camera/Views/RingLightOverlay.swift b/SelfieCam/Features/Camera/Components/RingLightOverlay.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/RingLightOverlay.swift
rename to SelfieCam/Features/Camera/Components/RingLightOverlay.swift
diff --git a/SelfieCam/Features/Camera/Views/ShareButton.swift b/SelfieCam/Features/Camera/Components/ShareButton.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/ShareButton.swift
rename to SelfieCam/Features/Camera/Components/ShareButton.swift
diff --git a/SelfieCam/Features/Camera/Views/ShareSheet.swift b/SelfieCam/Features/Camera/Components/ShareSheet.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/ShareSheet.swift
rename to SelfieCam/Features/Camera/Components/ShareSheet.swift
diff --git a/SelfieCam/Features/Camera/Views/SizeSliderOverlay.swift b/SelfieCam/Features/Camera/Components/SizeSliderOverlay.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/SizeSliderOverlay.swift
rename to SelfieCam/Features/Camera/Components/SizeSliderOverlay.swift
diff --git a/SelfieCam/Features/Camera/Views/VolumeButtonObserver.swift b/SelfieCam/Features/Camera/Components/VolumeButtonObserver.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/VolumeButtonObserver.swift
rename to SelfieCam/Features/Camera/Components/VolumeButtonObserver.swift
diff --git a/SelfieCam/Features/Camera/Views/ZoomControlView.swift b/SelfieCam/Features/Camera/Components/ZoomControlView.swift
similarity index 100%
rename from SelfieCam/Features/Camera/Views/ZoomControlView.swift
rename to SelfieCam/Features/Camera/Components/ZoomControlView.swift
diff --git a/SelfieCam/Features/Camera/ContentView.swift b/SelfieCam/Features/Camera/Views/ContentView.swift
similarity index 98%
rename from SelfieCam/Features/Camera/ContentView.swift
rename to SelfieCam/Features/Camera/Views/ContentView.swift
index 5819692..d7c21d4 100644
--- a/SelfieCam/Features/Camera/ContentView.swift
+++ b/SelfieCam/Features/Camera/Views/ContentView.swift
@@ -1,9 +1,14 @@
+//
+//  ContentView.swift
+//  SelfieCam
+//
+//  Main camera view - coordinates camera session, settings, and photo capture flow.
+//
+
 import SwiftUI
 import MijickCamera
 import Bedrock
 
-
-
 struct ContentView: View {
     @State private var settings = SettingsViewModel()
     @State private var premiumManager = PremiumManager()
diff --git a/SelfieCam/Features/Paywall/ProPaywallView.swift b/SelfieCam/Features/Paywall/Views/ProPaywallView.swift
similarity index 100%
rename from SelfieCam/Features/Paywall/ProPaywallView.swift
rename to SelfieCam/Features/Paywall/Views/ProPaywallView.swift
diff --git a/SelfieCam/Features/Settings/ColorPresetButton.swift b/SelfieCam/Features/Settings/Components/ColorPresetButton.swift
similarity index 100%
rename from SelfieCam/Features/Settings/ColorPresetButton.swift
rename to SelfieCam/Features/Settings/Components/ColorPresetButton.swift
diff --git a/SelfieCam/Features/Settings/CustomColorPickerButton.swift b/SelfieCam/Features/Settings/Components/CustomColorPickerButton.swift
similarity index 100%
rename from SelfieCam/Features/Settings/CustomColorPickerButton.swift
rename to SelfieCam/Features/Settings/Components/CustomColorPickerButton.swift
diff --git a/SelfieCam/Features/Settings/SettingsViewModel+Camera.swift b/SelfieCam/Features/Settings/ViewModels/SettingsViewModel+Camera.swift
similarity index 100%
rename from SelfieCam/Features/Settings/SettingsViewModel+Camera.swift
rename to SelfieCam/Features/Settings/ViewModels/SettingsViewModel+Camera.swift
diff --git a/SelfieCam/Features/Settings/SettingsViewModel+CloudSync.swift b/SelfieCam/Features/Settings/ViewModels/SettingsViewModel+CloudSync.swift
similarity index 100%
rename from SelfieCam/Features/Settings/SettingsViewModel+CloudSync.swift
rename to SelfieCam/Features/Settings/ViewModels/SettingsViewModel+CloudSync.swift
diff --git a/SelfieCam/Features/Settings/SettingsViewModel+Premium.swift b/SelfieCam/Features/Settings/ViewModels/SettingsViewModel+Premium.swift
similarity index 100%
rename from SelfieCam/Features/Settings/SettingsViewModel+Premium.swift
rename to SelfieCam/Features/Settings/ViewModels/SettingsViewModel+Premium.swift
diff --git a/SelfieCam/Features/Settings/SettingsViewModel+RingLight.swift b/SelfieCam/Features/Settings/ViewModels/SettingsViewModel+RingLight.swift
similarity index 100%
rename from SelfieCam/Features/Settings/SettingsViewModel+RingLight.swift
rename to SelfieCam/Features/Settings/ViewModels/SettingsViewModel+RingLight.swift
diff --git a/SelfieCam/Features/Settings/SettingsViewModel.swift b/SelfieCam/Features/Settings/ViewModels/SettingsViewModel.swift
similarity index 100%
rename from SelfieCam/Features/Settings/SettingsViewModel.swift
rename to SelfieCam/Features/Settings/ViewModels/SettingsViewModel.swift
diff --git a/SelfieCam/Features/Settings/AppLicensesView.swift b/SelfieCam/Features/Settings/Views/AppLicensesView.swift
similarity index 100%
rename from SelfieCam/Features/Settings/AppLicensesView.swift
rename to SelfieCam/Features/Settings/Views/AppLicensesView.swift
diff --git a/SelfieCam/Features/Settings/SettingsView.swift b/SelfieCam/Features/Settings/Views/SettingsView.swift
similarity index 100%
rename from SelfieCam/Features/Settings/SettingsView.swift
rename to SelfieCam/Features/Settings/Views/SettingsView.swift
diff --git a/SelfieCam/Shared/Color+Extensions.swift b/SelfieCam/Shared/Extensions/Color+Extensions.swift
similarity index 100%
rename from SelfieCam/Shared/Color+Extensions.swift
rename to SelfieCam/Shared/Extensions/Color+Extensions.swift
diff --git a/SelfieCam/Shared/BrandingConfig.swift b/SelfieCam/Shared/Theme/BrandingConfig.swift
similarity index 100%
rename from SelfieCam/Shared/BrandingConfig.swift
rename to SelfieCam/Shared/Theme/BrandingConfig.swift
diff --git a/SelfieCam/Shared/DesignConstants.swift b/SelfieCam/Shared/Theme/DesignConstants.swift
similarity index 100%
rename from SelfieCam/Shared/DesignConstants.swift
rename to SelfieCam/Shared/Theme/DesignConstants.swift
diff --git a/SelfieCam/Shared/SelfieCamTheme.swift b/SelfieCam/Shared/Theme/SelfieCamTheme.swift
similarity index 100%
rename from SelfieCam/Shared/SelfieCamTheme.swift
rename to SelfieCam/Shared/Theme/SelfieCamTheme.swift