diff --git a/src/Avalonia.Dialogs/ChildFitter.cs b/src/Avalonia.Dialogs/Internal/ChildFitter.cs
similarity index 85%
rename from src/Avalonia.Dialogs/ChildFitter.cs
rename to src/Avalonia.Dialogs/Internal/ChildFitter.cs
index 4a6db62b32..10cc106d33 100644
--- a/src/Avalonia.Dialogs/ChildFitter.cs
+++ b/src/Avalonia.Dialogs/Internal/ChildFitter.cs
@@ -1,8 +1,6 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Layout;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ChildFitter : Decorator
     {
diff --git a/src/Avalonia.Dialogs/FileSizeStringConverter.cs b/src/Avalonia.Dialogs/Internal/FileSizeStringConverter.cs
similarity index 88%
rename from src/Avalonia.Dialogs/FileSizeStringConverter.cs
rename to src/Avalonia.Dialogs/Internal/FileSizeStringConverter.cs
index 144f50fd9c..0060c5e8b2 100644
--- a/src/Avalonia.Dialogs/FileSizeStringConverter.cs
+++ b/src/Avalonia.Dialogs/Internal/FileSizeStringConverter.cs
@@ -1,10 +1,8 @@
-using Avalonia.Data.Converters;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
+using Avalonia.Data.Converters;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class FileSizeStringConverter : IValueConverter
     {
diff --git a/src/Avalonia.Dialogs/InternalViewModelBase.cs b/src/Avalonia.Dialogs/Internal/InternalViewModelBase.cs
similarity index 100%
rename from src/Avalonia.Dialogs/InternalViewModelBase.cs
rename to src/Avalonia.Dialogs/Internal/InternalViewModelBase.cs
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
similarity index 93%
rename from src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
index ed594f78dc..534a25ba06 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserFilterViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserFilterViewModel.cs
@@ -1,9 +1,8 @@
 using System.Linq;
 using System.Text.RegularExpressions;
-using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserFilterViewModel : InternalViewModelBase
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserItemType.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemType.cs
similarity index 74%
rename from src/Avalonia.Dialogs/ManagedFileChooserItemType.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserItemType.cs
index 835e64a59a..aead2f19c7 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserItemType.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemType.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public enum ManagedFileChooserItemType
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
similarity index 97%
rename from src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
index eabe270a44..69a4768f2b 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserItemViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserItemViewModel.cs
@@ -1,7 +1,6 @@
 using System;
-using Avalonia.Dialogs.Internal;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserItemViewModel : InternalViewModelBase
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserNavigationItem.cs
similarity index 84%
rename from src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserNavigationItem.cs
index 350ce84c3a..6c578367fb 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserNavigationItem.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserNavigationItem.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserNavigationItem
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserSources.cs
similarity index 96%
rename from src/Avalonia.Dialogs/ManagedFileChooserSources.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserSources.cs
index a76a84ba5a..2635cbe10e 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserSources.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserSources.cs
@@ -2,13 +2,10 @@ using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Reactive.Linq;
-using System.Runtime.InteropServices;
 using Avalonia.Controls.Platform;
-using Avalonia.Threading;
 using Avalonia.Utilities;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     internal class ManagedFileChooserSources
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
similarity index 99%
rename from src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
rename to src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
index 164019d18c..31b7928d0d 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooserViewModel.cs
+++ b/src/Avalonia.Dialogs/Internal/ManagedFileChooserViewModel.cs
@@ -8,11 +8,10 @@ using System.Runtime.InteropServices;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
-using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ManagedFileChooserViewModel : InternalViewModelBase
     {
diff --git a/src/Avalonia.Dialogs/ResourceSelectorConverter.cs b/src/Avalonia.Dialogs/Internal/ResourceSelectorConverter.cs
similarity index 94%
rename from src/Avalonia.Dialogs/ResourceSelectorConverter.cs
rename to src/Avalonia.Dialogs/Internal/ResourceSelectorConverter.cs
index c8226b98e4..a492dfed3a 100644
--- a/src/Avalonia.Dialogs/ResourceSelectorConverter.cs
+++ b/src/Avalonia.Dialogs/Internal/ResourceSelectorConverter.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
 
-namespace Avalonia.Dialogs
+namespace Avalonia.Dialogs.Internal
 {
     public class ResourceSelectorConverter : ResourceDictionary, IValueConverter
     {
diff --git a/src/Avalonia.Dialogs/ManagedFileChooser.cs b/src/Avalonia.Dialogs/ManagedFileChooser.cs
index 12436680b3..915f1e9508 100644
--- a/src/Avalonia.Dialogs/ManagedFileChooser.cs
+++ b/src/Avalonia.Dialogs/ManagedFileChooser.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
+using Avalonia.Dialogs.Internal;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
diff --git a/src/Avalonia.Dialogs/ManagedStorageProvider.cs b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
index 37d2781692..2c88251cca 100644
--- a/src/Avalonia.Dialogs/ManagedStorageProvider.cs
+++ b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Dialogs.Internal;
 using Avalonia.Platform.Storage;
 using Avalonia.Platform.Storage.FileIO;
 
diff --git a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
index cca7d3d1cd..d1707d0af2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:dialogs="using:Avalonia.Dialogs">
+        xmlns:dialogs="using:Avalonia.Dialogs"
+        xmlns:internal="using:Avalonia.Dialogs.Internal">
   <Design.PreviewWith>
     <Border Padding="20" Width="800" Height="500">
       <dialogs:ManagedFileChooser/>
@@ -23,7 +24,7 @@
           <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
           <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
         </DrawingGroup>
-        <dialogs:ResourceSelectorConverter x:Key="Icons">
+        <internal:ResourceSelectorConverter x:Key="Icons">
           <DrawingGroup x:Key="Icon_Folder">
             <GeometryDrawing Geometry="M 0 0 L 16 16"/>
             <GeometryDrawing Geometry="M 0 3 C 0,1 0,1 2,1 L 5 1 C 5.5,1 6,1 6.5,1.5 L 8 3 L 14 3 C 16,3 16,3 16,5
@@ -128,11 +129,11 @@
             </GeometryDrawing>
             <GeometryDrawing Geometry="M 3.23483495705 9.76516504295 A 0.375,0.375 180 1 0 3.76516504295,9.23483495705 A 0.4375,0.4375 135 0 1 3.23483495705,9.76516504295 Z" Brush="#FF00B300"/>
           </DrawingGroup>
-        </dialogs:ResourceSelectorConverter>
+        </internal:ResourceSelectorConverter>
       </ResourceDictionary>
     </ControlTheme.Resources>
     <Setter Property="Template"
-            x:DataType="dialogs:ManagedFileChooserViewModel">
+            x:DataType="internal:ManagedFileChooserViewModel">
       <ControlTemplate>
         <DockPanel>
           <ListBox x:Name="PART_QuickLinks" DockPanel.Dock="Left" Items="{Binding QuickLinks}" SelectedIndex="{Binding QuickLinksSelectedIndex}" Focusable="False">
@@ -223,7 +224,7 @@
                 Background="Transparent"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
               <ListBox.ItemTemplate>
-                <DataTemplate x:DataType="dialogs:ManagedFileChooserItemViewModel">
+                <DataTemplate x:DataType="internal:ManagedFileChooserItemViewModel">
                   <Grid Background="Transparent">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition SharedSizeGroup="Icon" />
@@ -248,7 +249,7 @@
                       <TextBlock.Text>
                         <Binding Path="Size">
                           <Binding.Converter>
-                            <dialogs:FileSizeStringConverter/>
+                            <internal:FileSizeStringConverter/>
                           </Binding.Converter>
                         </Binding>
                       </TextBlock.Text>
diff --git a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
index f9cf162037..61dae9b445 100644
--- a/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:dialogs="using:Avalonia.Dialogs">
+                    xmlns:dialogs="using:Avalonia.Dialogs"
+                    xmlns:internal="using:Avalonia.Dialogs.Internal">
   <DrawingGroup x:Key="LevelUp">
     <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
     <GeometryDrawing Brush="#FFF6F6F6"
@@ -10,7 +11,7 @@
     <GeometryDrawing Brush="#FF00529C" Geometry="F1M8,11L5,8 2,11 2,13 4,11 4,15 6,15 6,11 8,13z" />
     <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8.0001,1.9996L7.5001,3.0006 14.0001,3.0006 14.0001,1.9996z" />
   </DrawingGroup>
-  <dialogs:ResourceSelectorConverter x:Key="Icons">
+  <internal:ResourceSelectorConverter x:Key="Icons">
     <DrawingGroup x:Key="Icon_Folder">
       <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M0,0L16,0 16,16 0,16z" />
       <GeometryDrawing Brush="#FFF6F6F6"
@@ -36,23 +37,23 @@
       <GeometryDrawing Brush="#FF424242"
                        Geometry="F1M13,7L12,7 12,8 13,8z M11,7L10,7 10,8 11,8z M2,10L14,10 14,6.5C14,6.224,13.775,6,13.5,6L2.5,6C2.224,6,2,6.224,2,6.5z M15,11L1,11 1,6.5C1,5.673,1.673,5,2.5,5L13.5,5C14.327,5,15,5.673,15,6.5z" />
     </DrawingGroup>
-  </dialogs:ResourceSelectorConverter>
+  </internal:ResourceSelectorConverter>
 
   <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooser}"
                 TargetType="dialogs:ManagedFileChooser">
     <Setter Property="Template">
-      <ControlTemplate x:DataType="dialogs:ManagedFileChooserViewModel">
+      <ControlTemplate x:DataType="internal:ManagedFileChooserViewModel">
         <DockPanel>
           <DockPanel Margin="0,0,0,5"
                      DockPanel.Dock="Top">
-            <dialogs:ChildFitter Width="{Binding ElementName=Location, Path=Bounds.Height}"
+            <internal:ChildFitter Width="{Binding ElementName=Location, Path=Bounds.Height}"
                                  DockPanel.Dock="Right">
               <Button Command="{Binding GoUp}">
                 <Image Stretch="Fill">
                   <DrawingImage Drawing="{StaticResource LevelUp}" />
                 </Image>
               </Button>
-            </dialogs:ChildFitter>
+            </internal:ChildFitter>
             <TextBox x:Name="Location"
                      Margin="0,0,5,0"
                      Text="{Binding Location}">
@@ -179,7 +180,7 @@
                       <TextBlock.Text>
                         <Binding Path="Size">
                           <Binding.Converter>
-                            <dialogs:FileSizeStringConverter />
+                            <internal:FileSizeStringConverter />
                           </Binding.Converter>
                         </Binding>
                       </TextBlock.Text>