diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 22f4e9be1f..020fb2fff3 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -23,7 +23,7 @@ namespace ControlCatalog
         {
             new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
-                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml")
+                Source = new Uri("avares://Avalonia.Themes.Fluent/FluentDark.xaml")
             },
             DataGridFluent
         };
@@ -32,7 +32,7 @@ namespace ControlCatalog
         {
             new StyleInclude(new Uri("avares://ControlCatalog/Styles"))
             {
-                Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml")
+                Source = new Uri("avares://Avalonia.Themes.Fluent/FluentLight.xaml")
             },
             DataGridFluent
         };
diff --git a/samples/RenderDemo/App.xaml b/samples/RenderDemo/App.xaml
index 61e4d2385b..eeeaf5b0ae 100644
--- a/samples/RenderDemo/App.xaml
+++ b/samples/RenderDemo/App.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="RenderDemo.App">
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentLight.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentLight.xaml"/>
         <StyleInclude Source="avares://RenderDemo/SideBar.xaml"/>
     </Application.Styles>
 </Application>
diff --git a/samples/Sandbox/App.axaml b/samples/Sandbox/App.axaml
index 699781eb94..a351ba93e9 100644
--- a/samples/Sandbox/App.axaml
+++ b/samples/Sandbox/App.axaml
@@ -3,6 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:Class="Sandbox.App">
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentDark.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentDark.xaml"/>
     </Application.Styles>
 </Application>
diff --git a/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
new file mode 100644
index 0000000000..68dc477cbc
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/ApiCompatBaseline.txt
@@ -0,0 +1,3 @@
+Compat issues with assembly Avalonia.Themes.Fluent:
+TypesMustExist : Type 'Avalonia.Themes.Fluent.FluentTheme' does not exist in the implementation but it does exist in the contract.
+Total Issues: 1
diff --git a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
index 72f1fbf973..b710b5ef3b 100644
--- a/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
+++ b/src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <BaselineAllAPICompatError>true</BaselineAllAPICompatError>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/AutoCompleteBox.xaml
rename to src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
diff --git a/src/Avalonia.Themes.Fluent/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Button.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Button.xaml
diff --git a/src/Avalonia.Themes.Fluent/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ButtonSpinner.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
diff --git a/src/Avalonia.Themes.Fluent/Calendar.xaml b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Calendar.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
diff --git a/src/Avalonia.Themes.Fluent/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/CalendarButton.xaml
rename to src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
diff --git a/src/Avalonia.Themes.Fluent/CalendarDatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/CalendarDatePicker.xaml
rename to src/Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml
diff --git a/src/Avalonia.Themes.Fluent/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/CalendarDayButton.xaml
rename to src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
diff --git a/src/Avalonia.Themes.Fluent/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/CalendarItem.xaml
rename to src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
diff --git a/src/Avalonia.Themes.Fluent/CaptionButtons.xaml b/src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/CaptionButtons.xaml
rename to src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml
diff --git a/src/Avalonia.Themes.Fluent/Carousel.xaml b/src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Carousel.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Carousel.xaml
diff --git a/src/Avalonia.Themes.Fluent/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/CheckBox.xaml
rename to src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
diff --git a/src/Avalonia.Themes.Fluent/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ComboBox.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
diff --git a/src/Avalonia.Themes.Fluent/ComboBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ComboBoxItem.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml
diff --git a/src/Avalonia.Themes.Fluent/Common.xaml b/src/Avalonia.Themes.Fluent/Controls/Common.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Common.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Common.xaml
diff --git a/src/Avalonia.Themes.Fluent/ContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ContentControl.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ContentControl.xaml
diff --git a/src/Avalonia.Themes.Fluent/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ContextMenu.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
diff --git a/src/Avalonia.Themes.Fluent/DataValidationErrors.xaml b/src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/DataValidationErrors.xaml
rename to src/Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml
diff --git a/src/Avalonia.Themes.Fluent/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/DatePicker.xaml
rename to src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
diff --git a/src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml
rename to src/Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml
diff --git a/src/Avalonia.Themes.Fluent/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Expander.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Expander.xaml
diff --git a/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml
new file mode 100644
index 0000000000..5205fc16a6
--- /dev/null
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml
@@ -0,0 +1,62 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="Avalonia.Themes.Fluent.Controls.FluentTheme">
+  <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToolTip.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DataValidationErrors.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Button.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Carousel.xaml"/>  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CheckBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContentControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Label.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/GridSplitter.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ItemsControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Menu.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ContextMenu.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/MenuItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PathIcon.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/PopupRoot.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ProgressBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RadioButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/RepeatButton.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Separator.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Slider.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStrip.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabStripItem.xaml"/>
+  <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TabItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TextBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Expander.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TitleBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeView.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/UserControl.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Window.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/EmbeddableControlRoot.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarItem.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/Calendar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CalendarDatePicker.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NotificationCard.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/SplitView.xaml"/>
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/DatePicker.xaml"/>  
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/TimePicker.xaml"/>  
+</Styles>
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs b/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml.cs
similarity index 81%
rename from src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs
rename to src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml.cs
index 9c65a7227c..bf880f2334 100644
--- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml.cs
+++ b/src/Avalonia.Themes.Fluent/Controls/FluentTheme.xaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 
-namespace Avalonia.Themes.Fluent
+namespace Avalonia.Themes.Fluent.Controls
 {
     /// <summary>
     /// The default Avalonia theme.
diff --git a/src/Avalonia.Themes.Fluent/FocusAdorner.xaml b/src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/FocusAdorner.xaml
rename to src/Avalonia.Themes.Fluent/Controls/FocusAdorner.xaml
diff --git a/src/Avalonia.Themes.Fluent/GridSplitter.xaml b/src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/GridSplitter.xaml
rename to src/Avalonia.Themes.Fluent/Controls/GridSplitter.xaml
diff --git a/src/Avalonia.Themes.Fluent/ItemsControl.xaml b/src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ItemsControl.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ItemsControl.xaml
diff --git a/src/Avalonia.Themes.Fluent/Label.xaml b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Label.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Label.xaml
diff --git a/src/Avalonia.Themes.Fluent/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ListBox.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
diff --git a/src/Avalonia.Themes.Fluent/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ListBoxItem.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
diff --git a/src/Avalonia.Themes.Fluent/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Menu.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Menu.xaml
diff --git a/src/Avalonia.Themes.Fluent/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/MenuItem.xaml
rename to src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
diff --git a/src/Avalonia.Themes.Fluent/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/NativeMenuBar.xaml
rename to src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
diff --git a/src/Avalonia.Themes.Fluent/NotificationCard.xaml b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/NotificationCard.xaml
rename to src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
diff --git a/src/Avalonia.Themes.Fluent/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/NumericUpDown.xaml
rename to src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
diff --git a/src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/OverlayPopupHost.xaml
rename to src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
diff --git a/src/Avalonia.Themes.Fluent/PathIcon.xaml b/src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/PathIcon.xaml
rename to src/Avalonia.Themes.Fluent/Controls/PathIcon.xaml
diff --git a/src/Avalonia.Themes.Fluent/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/PopupRoot.xaml
rename to src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
diff --git a/src/Avalonia.Themes.Fluent/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ProgressBar.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
diff --git a/src/Avalonia.Themes.Fluent/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/RadioButton.xaml
rename to src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
diff --git a/src/Avalonia.Themes.Fluent/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/RepeatButton.xaml
rename to src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
diff --git a/src/Avalonia.Themes.Fluent/ScrollBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ScrollBar.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ScrollBar.xaml
diff --git a/src/Avalonia.Themes.Fluent/ScrollViewer.xaml b/src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ScrollViewer.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ScrollViewer.xaml
diff --git a/src/Avalonia.Themes.Fluent/Separator.xaml b/src/Avalonia.Themes.Fluent/Controls/Separator.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Separator.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Separator.xaml
diff --git a/src/Avalonia.Themes.Fluent/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Slider.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Slider.xaml
diff --git a/src/Avalonia.Themes.Fluent/SplitView.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/SplitView.xaml
rename to src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
diff --git a/src/Avalonia.Themes.Fluent/TabControl.xaml b/src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TabControl.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TabControl.xaml
diff --git a/src/Avalonia.Themes.Fluent/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TabItem.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
diff --git a/src/Avalonia.Themes.Fluent/TabStrip.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TabStrip.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TabStrip.xaml
diff --git a/src/Avalonia.Themes.Fluent/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TabStripItem.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TextBox.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
diff --git a/src/Avalonia.Themes.Fluent/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TimePicker.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
diff --git a/src/Avalonia.Themes.Fluent/TitleBar.xaml b/src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TitleBar.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TitleBar.xaml
diff --git a/src/Avalonia.Themes.Fluent/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ToggleButton.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
diff --git a/src/Avalonia.Themes.Fluent/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ToggleSwitch.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
diff --git a/src/Avalonia.Themes.Fluent/ToolTip.xaml b/src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/ToolTip.xaml
rename to src/Avalonia.Themes.Fluent/Controls/ToolTip.xaml
diff --git a/src/Avalonia.Themes.Fluent/TreeView.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TreeView.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TreeView.xaml
diff --git a/src/Avalonia.Themes.Fluent/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/TreeViewItem.xaml
rename to src/Avalonia.Themes.Fluent/Controls/TreeViewItem.xaml
diff --git a/src/Avalonia.Themes.Fluent/UserControl.xaml b/src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/UserControl.xaml
rename to src/Avalonia.Themes.Fluent/Controls/UserControl.xaml
diff --git a/src/Avalonia.Themes.Fluent/Window.xaml b/src/Avalonia.Themes.Fluent/Controls/Window.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/Window.xaml
rename to src/Avalonia.Themes.Fluent/Controls/Window.xaml
diff --git a/src/Avalonia.Themes.Fluent/WindowNotificationManager.xaml b/src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
similarity index 100%
rename from src/Avalonia.Themes.Fluent/WindowNotificationManager.xaml
rename to src/Avalonia.Themes.Fluent/Controls/WindowNotificationManager.xaml
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml b/src/Avalonia.Themes.Fluent/FluentDark.xaml
similarity index 86%
rename from src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
rename to src/Avalonia.Themes.Fluent/FluentDark.xaml
index 9ef92a44d5..48f3553b92 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentDark.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentDark.xaml
@@ -5,5 +5,5 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseDark.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesDark.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentTheme.xaml" />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml b/src/Avalonia.Themes.Fluent/FluentLight.xaml
similarity index 86%
rename from src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
rename to src/Avalonia.Themes.Fluent/FluentLight.xaml
index 8c92040122..565212328b 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentLight.xaml
+++ b/src/Avalonia.Themes.Fluent/FluentLight.xaml
@@ -5,5 +5,5 @@
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/Base.xaml" />  
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentBaseLight.xaml" />
   <StyleInclude Source="avares://Avalonia.Themes.Fluent/Accents/FluentControlResourcesLight.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml" />
+  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/FluentTheme.xaml" />
 </Styles>
diff --git a/src/Avalonia.Themes.Fluent/FluentTheme.xaml b/src/Avalonia.Themes.Fluent/FluentTheme.xaml
deleted file mode 100644
index 4e0e4fe862..0000000000
--- a/src/Avalonia.Themes.Fluent/FluentTheme.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="Avalonia.Themes.Fluent.FluentTheme">
-  <!-- Define ToolTip first so its styles can be overriden by other controls (e.g. TextBox) -->  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ToolTip.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/DataValidationErrors.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/FocusAdorner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Button.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CaptionButtons.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Carousel.xaml"/>  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CheckBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ComboBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ComboBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ContentControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Label.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/GridSplitter.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ItemsControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ListBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ListBoxItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Menu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ContextMenu.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/MenuItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/OverlayPopupHost.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/PathIcon.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/PopupRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ProgressBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/RadioButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/RepeatButton.xaml" />
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Separator.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Slider.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ScrollBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ScrollViewer.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabStrip.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabStripItem.xaml"/>
-  <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TabItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TextBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ToggleButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Expander.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TitleBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TreeView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TreeViewItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/UserControl.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Window.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/EmbeddableControlRoot.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarDayButton.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarItem.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/Calendar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/CalendarDatePicker.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ButtonSpinner.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/NumericUpDown.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/AutoCompleteBox.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/WindowNotificationManager.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/NotificationCard.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/NativeMenuBar.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/ToggleSwitch.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/SplitView.xaml"/>
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/DatePicker.xaml"/>  
-  <StyleInclude Source="avares://Avalonia.Themes.Fluent/TimePicker.xaml"/>  
-</Styles>