diff --git a/src/settings-ui/Settings.UI.Controls/ModuleList.xaml b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/ModuleList.xaml
rename to src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml
diff --git a/src/settings-ui/Settings.UI.Controls/ModuleList.xaml.cs b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/ModuleList.xaml.cs
rename to src/settings-ui/Settings.UI.Controls/ModuleList/ModuleList.xaml.cs
diff --git a/src/settings-ui/Settings.UI.Controls/ModuleListItem.cs b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleListItem.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/ModuleListItem.cs
rename to src/settings-ui/Settings.UI.Controls/ModuleList/ModuleListItem.cs
diff --git a/src/settings-ui/Settings.UI.Controls/ModuleListSortOption.cs b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleListSortOption.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/ModuleListSortOption.cs
rename to src/settings-ui/Settings.UI.Controls/ModuleList/ModuleListSortOption.cs
diff --git a/src/settings-ui/Settings.UI.Controls/ModuleSettingsCard.xaml b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleSettingsCard.xaml
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/ModuleSettingsCard.xaml
rename to src/settings-ui/Settings.UI.Controls/ModuleList/ModuleSettingsCard.xaml
diff --git a/src/settings-ui/Settings.UI.Controls/ModuleSettingsCard.xaml.cs b/src/settings-ui/Settings.UI.Controls/ModuleList/ModuleSettingsCard.xaml.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/ModuleSettingsCard.xaml.cs
rename to src/settings-ui/Settings.UI.Controls/ModuleList/ModuleSettingsCard.xaml.cs
diff --git a/src/settings-ui/Settings.UI.Controls/Card.xaml b/src/settings-ui/Settings.UI.Controls/Primitives/Card.xaml
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/Card.xaml
rename to src/settings-ui/Settings.UI.Controls/Primitives/Card.xaml
diff --git a/src/settings-ui/Settings.UI.Controls/Card.xaml.cs b/src/settings-ui/Settings.UI.Controls/Primitives/Card.xaml.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/Card.xaml.cs
rename to src/settings-ui/Settings.UI.Controls/Primitives/Card.xaml.cs
diff --git a/src/settings-ui/Settings.UI.Controls/FlyoutMenuButton.cs b/src/settings-ui/Settings.UI.Controls/Primitives/FlyoutMenuButton.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/FlyoutMenuButton.cs
rename to src/settings-ui/Settings.UI.Controls/Primitives/FlyoutMenuButton.cs
diff --git a/src/settings-ui/Settings.UI.Controls/QuickAccessItem.cs b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessItem.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/QuickAccessItem.cs
rename to src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessItem.cs
diff --git a/src/settings-ui/Settings.UI.Controls/QuickAccessList.xaml b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessList.xaml
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/QuickAccessList.xaml
rename to src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessList.xaml
diff --git a/src/settings-ui/Settings.UI.Controls/QuickAccessList.xaml.cs b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessList.xaml.cs
similarity index 100%
rename from src/settings-ui/Settings.UI.Controls/QuickAccessList.xaml.cs
rename to src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessList.xaml.cs