diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 0fe6ecc5a..882abb8d2 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1246,115 +1246,127 @@
           <e p="SubdirectoryModel.cs" t="Include" />
           <e p="TrackEntropyModel.cs" t="Include" />
         </e>
-        <e p="Panels" t="Include">
-          <e p="DeviceInfoPanel.xaml" t="Include" />
-          <e p="DeviceInfoPanel.xaml.cs" t="Include" />
-          <e p="FileSystemPanel.xaml" t="Include" />
-          <e p="FileSystemPanel.xaml.cs" t="Include" />
-          <e p="ImageInfoPanel.xaml" t="Include" />
-          <e p="ImageInfoPanel.xaml.cs" t="Include" />
-          <e p="MediaInfoPanel.xaml" t="Include" />
-          <e p="MediaInfoPanel.xaml.cs" t="Include" />
-          <e p="PartitionPanel.xaml" t="Include" />
-          <e p="PartitionPanel.xaml.cs" t="Include" />
-          <e p="SubdirectoryPanel.xaml" t="Include" />
-          <e p="SubdirectoryPanel.xaml.cs" t="Include" />
-        </e>
         <e p="ResourceHandler.cs" t="Include" />
-        <e p="Tabs" t="Include">
-          <e p="AtaInfoTab.xaml" t="Include" />
-          <e p="AtaInfoTab.xaml.cs" t="Include" />
-          <e p="BlurayInfoTab.xaml" t="Include" />
-          <e p="BlurayInfoTab.xaml.cs" t="Include" />
-          <e p="CompactDiscInfoTab.xaml" t="Include" />
-          <e p="CompactDiscInfoTab.xaml.cs" t="Include" />
-          <e p="DvdInfoTab.xaml" t="Include" />
-          <e p="DvdInfoTab.xaml.cs" t="Include" />
-          <e p="DvdWritableInfoTab.xaml" t="Include" />
-          <e p="DvdWritableInfoTab.xaml.cs" t="Include" />
-          <e p="PcmciaInfoTab.xaml" t="Include" />
-          <e p="PcmciaInfoTab.xaml.cs" t="Include" />
-          <e p="ScsiInfoTab.xaml" t="Include" />
-          <e p="ScsiInfoTab.xaml.cs" t="Include" />
-          <e p="SdMmcInfo.xaml" t="Include" />
-          <e p="SdMmcInfo.xaml.cs" t="Include" />
-          <e p="XboxInfoTab.xaml" t="Include" />
-          <e p="XboxInfoTab.xaml.cs" t="Include" />
-        </e>
         <e p="ViewLocator.cs" t="Include" />
         <e p="ViewModels" t="Include">
-          <e p="AboutDialogViewModel.cs" t="Include" />
-          <e p="AtaInfoViewModel.cs" t="Include" />
-          <e p="BlurayInfoViewModel.cs" t="Include" />
-          <e p="CompactDiscInfoViewModel.cs" t="Include" />
-          <e p="ConsoleWindowViewModel.cs" t="Include" />
-          <e p="DecodeMediaTagsViewModel.cs" t="Include" />
-          <e p="DeviceInfoViewModel.cs" t="Include" />
-          <e p="DvdInfoViewModel.cs" t="Include" />
-          <e p="DvdWritableInfoViewModel.cs" t="Include" />
-          <e p="EncodingsDialogViewModel.cs" t="Include" />
-          <e p="FileSystemViewModel.cs" t="Include" />
-          <e p="ImageChecksumViewModel.cs" t="Include" />
-          <e p="ImageConvertViewModel.cs" t="Include" />
-          <e p="ImageEntropyViewModel.cs" t="Include" />
-          <e p="ImageInfoViewModel.cs" t="Include" />
-          <e p="ImageSidecarViewModel.cs" t="Include" />
-          <e p="ImageVerifyViewModel.cs" t="Include" />
-          <e p="LicenseDialogViewModel.cs" t="Include" />
-          <e p="MainWindowViewModel.cs" t="Include" />
-          <e p="MediaDumpViewModel.cs" t="Include" />
-          <e p="MediaInfoViewModel.cs" t="Include" />
-          <e p="MediaScanViewModel.cs" t="Include" />
-          <e p="PartitionViewModel.cs" t="Include" />
-          <e p="PcmciaInfoViewModel.cs" t="Include" />
-          <e p="PluginsDialogViewModel.cs" t="Include" />
-          <e p="ScsiInfoViewModel.cs" t="Include" />
-          <e p="SdMmcInfoViewModel.cs" t="Include" />
-          <e p="SettingsDialogViewModel.cs" t="Include" />
-          <e p="SplashWindowViewModel.cs" t="Include" />
-          <e p="StatisticsDialogViewModel.cs" t="Include" />
-          <e p="SubdirectoryViewModel.cs" t="Include" />
+          <e p="Dialogs" t="Include">
+            <e p="AboutDialogViewModel.cs" t="Include" />
+            <e p="ConsoleWindowViewModel.cs" t="Include" />
+            <e p="EncodingsDialogViewModel.cs" t="Include" />
+            <e p="LicenseDialogViewModel.cs" t="Include" />
+            <e p="PluginsDialogViewModel.cs" t="Include" />
+            <e p="SettingsDialogViewModel.cs" t="Include" />
+            <e p="StatisticsDialogViewModel.cs" t="Include" />
+          </e>
+          <e p="Panels" t="Include">
+            <e p="DeviceInfoViewModel.cs" t="Include" />
+            <e p="FileSystemViewModel.cs" t="Include" />
+            <e p="ImageInfoViewModel.cs" t="Include" />
+            <e p="MediaInfoViewModel.cs" t="Include" />
+            <e p="PartitionViewModel.cs" t="Include" />
+            <e p="SubdirectoryViewModel.cs" t="Include" />
+          </e>
+          <e p="Tabs" t="Include">
+            <e p="AtaInfoViewModel.cs" t="Include" />
+            <e p="BlurayInfoViewModel.cs" t="Include" />
+            <e p="CompactDiscInfoViewModel.cs" t="Include" />
+            <e p="DvdInfoViewModel.cs" t="Include" />
+            <e p="DvdWritableInfoViewModel.cs" t="Include" />
+            <e p="PcmciaInfoViewModel.cs" t="Include" />
+            <e p="ScsiInfoViewModel.cs" t="Include" />
+            <e p="SdMmcInfoViewModel.cs" t="Include" />
+            <e p="XboxInfoViewModel.cs" t="Include" />
+          </e>
           <e p="ViewModelBase.cs" t="Include" />
-          <e p="ViewSectorViewModel.cs" t="Include" />
-          <e p="XboxInfoViewModel.cs" t="Include" />
+          <e p="Windows" t="Include">
+            <e p="DecodeMediaTagsViewModel.cs" t="Include" />
+            <e p="ImageChecksumViewModel.cs" t="Include" />
+            <e p="ImageConvertViewModel.cs" t="Include" />
+            <e p="ImageEntropyViewModel.cs" t="Include" />
+            <e p="ImageSidecarViewModel.cs" t="Include" />
+            <e p="ImageVerifyViewModel.cs" t="Include" />
+            <e p="MainWindowViewModel.cs" t="Include" />
+            <e p="MediaDumpViewModel.cs" t="Include" />
+            <e p="MediaScanViewModel.cs" t="Include" />
+            <e p="SplashWindowViewModel.cs" t="Include" />
+            <e p="ViewSectorViewModel.cs" t="Include" />
+          </e>
         </e>
         <e p="Views" t="Include">
-          <e p="AboutDialog.xaml" t="Include" />
-          <e p="AboutDialog.xaml.cs" t="Include" />
-          <e p="ConsoleDialog.xaml" t="Include" />
-          <e p="ConsoleDialog.xaml.cs" t="Include" />
-          <e p="DecodeMediaTagsWindow.xaml" t="Include" />
-          <e p="DecodeMediaTagsWindow.xaml.cs" t="Include" />
-          <e p="EncodingsDialog.xaml" t="Include" />
-          <e p="EncodingsDialog.xaml.cs" t="Include" />
-          <e p="ImageChecksumWindow.xaml" t="Include" />
-          <e p="ImageChecksumWindow.xaml.cs" t="Include" />
-          <e p="ImageConvertWindow.xaml" t="Include" />
-          <e p="ImageConvertWindow.xaml.cs" t="Include" />
-          <e p="ImageEntropyWindow.xaml" t="Include" />
-          <e p="ImageEntropyWindow.xaml.cs" t="Include" />
-          <e p="ImageSidecarWindow.xaml" t="Include" />
-          <e p="ImageSidecarWindow.xaml.cs" t="Include" />
-          <e p="ImageVerifyWindow.xaml" t="Include" />
-          <e p="ImageVerifyWindow.xaml.cs" t="Include" />
-          <e p="LicenseDialog.xaml" t="Include" />
-          <e p="LicenseDialog.xaml.cs" t="Include" />
-          <e p="MainWindow.xaml" t="Include" />
-          <e p="MainWindow.xaml.cs" t="Include" />
-          <e p="MediaDumpWindow.xaml" t="Include" />
-          <e p="MediaDumpWindow.xaml.cs" t="Include" />
-          <e p="MediaScanWindow.xaml" t="Include" />
-          <e p="MediaScanWindow.xaml.cs" t="Include" />
-          <e p="PluginsDialog.xaml" t="Include" />
-          <e p="PluginsDialog.xaml.cs" t="Include" />
-          <e p="SettingsDialog.xaml" t="Include" />
-          <e p="SettingsDialog.xaml.cs" t="Include" />
-          <e p="SplashWindow.xaml" t="Include" />
-          <e p="SplashWindow.xaml.cs" t="Include" />
-          <e p="StatisticsDialog.xaml" t="Include" />
-          <e p="StatisticsDialog.xaml.cs" t="Include" />
-          <e p="ViewSectorWindow.xaml" t="Include" />
-          <e p="ViewSectorWindow.xaml.cs" t="Include" />
+          <e p="Dialogs" t="Include">
+            <e p="AboutDialog.xaml" t="Include" />
+            <e p="AboutDialog.xaml.cs" t="Include" />
+            <e p="ConsoleDialog.xaml" t="Include" />
+            <e p="ConsoleDialog.xaml.cs" t="Include" />
+            <e p="EncodingsDialog.xaml" t="Include" />
+            <e p="EncodingsDialog.xaml.cs" t="Include" />
+            <e p="LicenseDialog.xaml" t="Include" />
+            <e p="LicenseDialog.xaml.cs" t="Include" />
+            <e p="PluginsDialog.xaml" t="Include" />
+            <e p="PluginsDialog.xaml.cs" t="Include" />
+            <e p="SettingsDialog.xaml" t="Include" />
+            <e p="SettingsDialog.xaml.cs" t="Include" />
+            <e p="StatisticsDialog.xaml" t="Include" />
+            <e p="StatisticsDialog.xaml.cs" t="Include" />
+          </e>
+          <e p="Panels" t="Include">
+            <e p="DeviceInfoPanel.xaml" t="Include" />
+            <e p="DeviceInfoPanel.xaml.cs" t="Include" />
+            <e p="FileSystemPanel.xaml" t="Include" />
+            <e p="FileSystemPanel.xaml.cs" t="Include" />
+            <e p="ImageInfoPanel.xaml" t="Include" />
+            <e p="ImageInfoPanel.xaml.cs" t="Include" />
+            <e p="MediaInfoPanel.xaml" t="Include" />
+            <e p="MediaInfoPanel.xaml.cs" t="Include" />
+            <e p="PartitionPanel.xaml" t="Include" />
+            <e p="PartitionPanel.xaml.cs" t="Include" />
+            <e p="SubdirectoryPanel.xaml" t="Include" />
+            <e p="SubdirectoryPanel.xaml.cs" t="Include" />
+          </e>
+          <e p="Tabs" t="Include">
+            <e p="AtaInfoTab.xaml" t="Include" />
+            <e p="AtaInfoTab.xaml.cs" t="Include" />
+            <e p="BlurayInfoTab.xaml" t="Include" />
+            <e p="BlurayInfoTab.xaml.cs" t="Include" />
+            <e p="CompactDiscInfoTab.xaml" t="Include" />
+            <e p="CompactDiscInfoTab.xaml.cs" t="Include" />
+            <e p="DvdInfoTab.xaml" t="Include" />
+            <e p="DvdInfoTab.xaml.cs" t="Include" />
+            <e p="DvdWritableInfoTab.xaml" t="Include" />
+            <e p="DvdWritableInfoTab.xaml.cs" t="Include" />
+            <e p="PcmciaInfoTab.xaml" t="Include" />
+            <e p="PcmciaInfoTab.xaml.cs" t="Include" />
+            <e p="ScsiInfoTab.xaml" t="Include" />
+            <e p="ScsiInfoTab.xaml.cs" t="Include" />
+            <e p="SdMmcInfo.xaml" t="Include" />
+            <e p="SdMmcInfo.xaml.cs" t="Include" />
+            <e p="XboxInfoTab.xaml" t="Include" />
+            <e p="XboxInfoTab.xaml.cs" t="Include" />
+          </e>
+          <e p="Windows" t="Include">
+            <e p="DecodeMediaTagsWindow.xaml" t="Include" />
+            <e p="DecodeMediaTagsWindow.xaml.cs" t="Include" />
+            <e p="ImageChecksumWindow.xaml" t="Include" />
+            <e p="ImageChecksumWindow.xaml.cs" t="Include" />
+            <e p="ImageConvertWindow.xaml" t="Include" />
+            <e p="ImageConvertWindow.xaml.cs" t="Include" />
+            <e p="ImageEntropyWindow.xaml" t="Include" />
+            <e p="ImageEntropyWindow.xaml.cs" t="Include" />
+            <e p="ImageSidecarWindow.xaml" t="Include" />
+            <e p="ImageSidecarWindow.xaml.cs" t="Include" />
+            <e p="ImageVerifyWindow.xaml" t="Include" />
+            <e p="ImageVerifyWindow.xaml.cs" t="Include" />
+            <e p="MainWindow.xaml" t="Include" />
+            <e p="MainWindow.xaml.cs" t="Include" />
+            <e p="MediaDumpWindow.xaml" t="Include" />
+            <e p="MediaDumpWindow.xaml.cs" t="Include" />
+            <e p="MediaScanWindow.xaml" t="Include" />
+            <e p="MediaScanWindow.xaml.cs" t="Include" />
+            <e p="SplashWindow.xaml" t="Include" />
+            <e p="SplashWindow.xaml.cs" t="Include" />
+            <e p="ViewSectorWindow.xaml" t="Include" />
+            <e p="ViewSectorWindow.xaml.cs" t="Include" />
+          </e>
         </e>
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index 9600961f7..4290fa029 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -322,42 +322,18 @@
     <AvaloniaResource Update="Views\SplashWindow.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
-    <Compile Update="Views\SplashWindow.xaml.cs">
-      <DependentUpon>SplashWindow.xaml</DependentUpon>
-    </Compile>
     <AvaloniaResource Update="Views\LicenseDialog.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
-    <Compile Update="Views\LicenseDialog.xaml.cs">
-      <DependentUpon>LicenseDialog.xaml</DependentUpon>
-    </Compile>
     <AvaloniaResource Update="Views\EncodingsDialog.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
-    <Compile Update="Views\EncodingsDialog.xaml.cs">
-      <DependentUpon>EncodingsDialog.xaml</DependentUpon>
-    </Compile>
     <AvaloniaResource Update="Views\PluginsDialog.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
-    <Compile Update="Views\PluginsDialog.xaml.cs">
-      <DependentUpon>PluginsDialog.xaml</DependentUpon>
-    </Compile>
     <AvaloniaResource Update="Views\ConsoleDialog.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
-    <Compile Update="Views\ConsoleDialog.xaml.cs">
-      <DependentUpon>ConsoleDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Panels\ImageInfoPanel.xaml.cs">
-      <DependentUpon>ImageInfoPanel.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Tabs\ScsiInfoTab.xaml.cs">
-      <DependentUpon>ScsiInfoTab.xaml</DependentUpon>
-    </Compile>
-    <Compile Update="Views\ViewSectorWindow.xaml.cs">
-      <DependentUpon>ViewSectorWindow.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <UpToDateCheckInput Remove="Views\MainWindow.xaml" />
diff --git a/Aaru.Gui/ViewModels/AboutDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/AboutDialogViewModel.cs
rename to Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ConsoleWindowViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ConsoleWindowViewModel.cs
rename to Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs
diff --git a/Aaru.Gui/ViewModels/EncodingsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/EncodingsDialogViewModel.cs
rename to Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs
diff --git a/Aaru.Gui/ViewModels/LicenseDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/LicenseDialogViewModel.cs
rename to Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs
diff --git a/Aaru.Gui/ViewModels/PluginsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/PluginsDialogViewModel.cs
rename to Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs
diff --git a/Aaru.Gui/ViewModels/SettingsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/SettingsDialogViewModel.cs
rename to Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs
diff --git a/Aaru.Gui/ViewModels/StatisticsDialogViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/StatisticsDialogViewModel.cs
rename to Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs
diff --git a/Aaru.Gui/ViewModels/DeviceInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/DeviceInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/FileSystemViewModel.cs b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/FileSystemViewModel.cs
rename to Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ImageInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/MediaInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/MediaInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/PartitionViewModel.cs b/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/PartitionViewModel.cs
rename to Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs
diff --git a/Aaru.Gui/ViewModels/SubdirectoryViewModel.cs b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/SubdirectoryViewModel.cs
rename to Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
diff --git a/Aaru.Gui/ViewModels/AtaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/AtaInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/BlurayInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/BlurayInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/CompactDiscInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/CompactDiscInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/DvdInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/DvdInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/DvdWritableInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/DvdWritableInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/PcmciaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/PcmciaInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ScsiInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ScsiInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/SdMmcInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/SdMmcInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/XboxInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/XboxInfoViewModel.cs
rename to Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs
diff --git a/Aaru.Gui/ViewModels/DecodeMediaTagsViewModel.cs b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/DecodeMediaTagsViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ImageChecksumViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ImageChecksumViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ImageConvertViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ImageConvertViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ImageEntropyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ImageEntropyViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ImageSidecarViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ImageSidecarViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ImageVerifyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ImageVerifyViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
diff --git a/Aaru.Gui/ViewModels/MainWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/MainWindowViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
diff --git a/Aaru.Gui/ViewModels/MediaDumpViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/MediaDumpViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
diff --git a/Aaru.Gui/ViewModels/MediaScanViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/MediaScanViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs
diff --git a/Aaru.Gui/ViewModels/SplashWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/SplashWindowViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
diff --git a/Aaru.Gui/ViewModels/ViewSectorViewModel.cs b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
similarity index 100%
rename from Aaru.Gui/ViewModels/ViewSectorViewModel.cs
rename to Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
diff --git a/Aaru.Gui/Views/AboutDialog.xaml b/Aaru.Gui/Views/Dialogs/AboutDialog.xaml
similarity index 100%
rename from Aaru.Gui/Views/AboutDialog.xaml
rename to Aaru.Gui/Views/Dialogs/AboutDialog.xaml
diff --git a/Aaru.Gui/Views/AboutDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/AboutDialog.xaml.cs
rename to Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs
diff --git a/Aaru.Gui/Views/ConsoleDialog.xaml b/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml
similarity index 100%
rename from Aaru.Gui/Views/ConsoleDialog.xaml
rename to Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml
diff --git a/Aaru.Gui/Views/ConsoleDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/ConsoleDialog.xaml.cs
rename to Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs
diff --git a/Aaru.Gui/Views/EncodingsDialog.xaml b/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml
similarity index 100%
rename from Aaru.Gui/Views/EncodingsDialog.xaml
rename to Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml
diff --git a/Aaru.Gui/Views/EncodingsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/EncodingsDialog.xaml.cs
rename to Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs
diff --git a/Aaru.Gui/Views/LicenseDialog.xaml b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
similarity index 100%
rename from Aaru.Gui/Views/LicenseDialog.xaml
rename to Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
diff --git a/Aaru.Gui/Views/LicenseDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/LicenseDialog.xaml.cs
rename to Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
diff --git a/Aaru.Gui/Views/PluginsDialog.xaml b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
similarity index 100%
rename from Aaru.Gui/Views/PluginsDialog.xaml
rename to Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
diff --git a/Aaru.Gui/Views/PluginsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/PluginsDialog.xaml.cs
rename to Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
diff --git a/Aaru.Gui/Views/SettingsDialog.xaml b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
similarity index 100%
rename from Aaru.Gui/Views/SettingsDialog.xaml
rename to Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
diff --git a/Aaru.Gui/Views/SettingsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/SettingsDialog.xaml.cs
rename to Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
diff --git a/Aaru.Gui/Views/StatisticsDialog.xaml b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
similarity index 100%
rename from Aaru.Gui/Views/StatisticsDialog.xaml
rename to Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
diff --git a/Aaru.Gui/Views/StatisticsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/StatisticsDialog.xaml.cs
rename to Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
diff --git a/Aaru.Gui/Panels/DeviceInfoPanel.xaml b/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml
similarity index 100%
rename from Aaru.Gui/Panels/DeviceInfoPanel.xaml
rename to Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml
diff --git a/Aaru.Gui/Panels/DeviceInfoPanel.xaml.cs b/Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs
similarity index 100%
rename from Aaru.Gui/Panels/DeviceInfoPanel.xaml.cs
rename to Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs
diff --git a/Aaru.Gui/Panels/FileSystemPanel.xaml b/Aaru.Gui/Views/Panels/FileSystemPanel.xaml
similarity index 100%
rename from Aaru.Gui/Panels/FileSystemPanel.xaml
rename to Aaru.Gui/Views/Panels/FileSystemPanel.xaml
diff --git a/Aaru.Gui/Panels/FileSystemPanel.xaml.cs b/Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs
similarity index 100%
rename from Aaru.Gui/Panels/FileSystemPanel.xaml.cs
rename to Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs
diff --git a/Aaru.Gui/Panels/ImageInfoPanel.xaml b/Aaru.Gui/Views/Panels/ImageInfoPanel.xaml
similarity index 100%
rename from Aaru.Gui/Panels/ImageInfoPanel.xaml
rename to Aaru.Gui/Views/Panels/ImageInfoPanel.xaml
diff --git a/Aaru.Gui/Panels/ImageInfoPanel.xaml.cs b/Aaru.Gui/Views/Panels/ImageInfoPanel.xaml.cs
similarity index 100%
rename from Aaru.Gui/Panels/ImageInfoPanel.xaml.cs
rename to Aaru.Gui/Views/Panels/ImageInfoPanel.xaml.cs
diff --git a/Aaru.Gui/Panels/MediaInfoPanel.xaml b/Aaru.Gui/Views/Panels/MediaInfoPanel.xaml
similarity index 100%
rename from Aaru.Gui/Panels/MediaInfoPanel.xaml
rename to Aaru.Gui/Views/Panels/MediaInfoPanel.xaml
diff --git a/Aaru.Gui/Panels/MediaInfoPanel.xaml.cs b/Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs
similarity index 100%
rename from Aaru.Gui/Panels/MediaInfoPanel.xaml.cs
rename to Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs
diff --git a/Aaru.Gui/Panels/PartitionPanel.xaml b/Aaru.Gui/Views/Panels/PartitionPanel.xaml
similarity index 100%
rename from Aaru.Gui/Panels/PartitionPanel.xaml
rename to Aaru.Gui/Views/Panels/PartitionPanel.xaml
diff --git a/Aaru.Gui/Panels/PartitionPanel.xaml.cs b/Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs
similarity index 100%
rename from Aaru.Gui/Panels/PartitionPanel.xaml.cs
rename to Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs
diff --git a/Aaru.Gui/Panels/SubdirectoryPanel.xaml b/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml
similarity index 100%
rename from Aaru.Gui/Panels/SubdirectoryPanel.xaml
rename to Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml
diff --git a/Aaru.Gui/Panels/SubdirectoryPanel.xaml.cs b/Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs
similarity index 100%
rename from Aaru.Gui/Panels/SubdirectoryPanel.xaml.cs
rename to Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs
diff --git a/Aaru.Gui/Tabs/AtaInfoTab.xaml b/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/AtaInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/AtaInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/AtaInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/AtaInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs
diff --git a/Aaru.Gui/Tabs/BlurayInfoTab.xaml b/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/BlurayInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/BlurayInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/BlurayInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs
diff --git a/Aaru.Gui/Tabs/CompactDiscInfoTab.xaml b/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/CompactDiscInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/CompactDiscInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/CompactDiscInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs
diff --git a/Aaru.Gui/Tabs/DvdInfoTab.xaml b/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/DvdInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/DvdInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/DvdInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/DvdInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs
diff --git a/Aaru.Gui/Tabs/DvdWritableInfoTab.xaml b/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/DvdWritableInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/DvdWritableInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/DvdWritableInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs
diff --git a/Aaru.Gui/Tabs/PcmciaInfoTab.xaml b/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/PcmciaInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/PcmciaInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/PcmciaInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs
diff --git a/Aaru.Gui/Tabs/ScsiInfoTab.xaml b/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/ScsiInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/ScsiInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/ScsiInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs
diff --git a/Aaru.Gui/Tabs/SdMmcInfo.xaml b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/SdMmcInfo.xaml
rename to Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
diff --git a/Aaru.Gui/Tabs/SdMmcInfo.xaml.cs b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/SdMmcInfo.xaml.cs
rename to Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs
diff --git a/Aaru.Gui/Tabs/XboxInfoTab.xaml b/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml
similarity index 100%
rename from Aaru.Gui/Tabs/XboxInfoTab.xaml
rename to Aaru.Gui/Views/Tabs/XboxInfoTab.xaml
diff --git a/Aaru.Gui/Tabs/XboxInfoTab.xaml.cs b/Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs
similarity index 100%
rename from Aaru.Gui/Tabs/XboxInfoTab.xaml.cs
rename to Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs
diff --git a/Aaru.Gui/Views/DecodeMediaTagsWindow.xaml b/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/DecodeMediaTagsWindow.xaml
rename to Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml
diff --git a/Aaru.Gui/Views/DecodeMediaTagsWindow.xaml.cs b/Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/DecodeMediaTagsWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs
diff --git a/Aaru.Gui/Views/ImageChecksumWindow.xaml b/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/ImageChecksumWindow.xaml
rename to Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml
diff --git a/Aaru.Gui/Views/ImageChecksumWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/ImageChecksumWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs
diff --git a/Aaru.Gui/Views/ImageConvertWindow.xaml b/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/ImageConvertWindow.xaml
rename to Aaru.Gui/Views/Windows/ImageConvertWindow.xaml
diff --git a/Aaru.Gui/Views/ImageConvertWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/ImageConvertWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs
diff --git a/Aaru.Gui/Views/ImageEntropyWindow.xaml b/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/ImageEntropyWindow.xaml
rename to Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml
diff --git a/Aaru.Gui/Views/ImageEntropyWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/ImageEntropyWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs
diff --git a/Aaru.Gui/Views/ImageSidecarWindow.xaml b/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/ImageSidecarWindow.xaml
rename to Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml
diff --git a/Aaru.Gui/Views/ImageSidecarWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/ImageSidecarWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs
diff --git a/Aaru.Gui/Views/ImageVerifyWindow.xaml b/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/ImageVerifyWindow.xaml
rename to Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml
diff --git a/Aaru.Gui/Views/ImageVerifyWindow.xaml.cs b/Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/ImageVerifyWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs
diff --git a/Aaru.Gui/Views/MainWindow.xaml b/Aaru.Gui/Views/Windows/MainWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/MainWindow.xaml
rename to Aaru.Gui/Views/Windows/MainWindow.xaml
diff --git a/Aaru.Gui/Views/MainWindow.xaml.cs b/Aaru.Gui/Views/Windows/MainWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/MainWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/MainWindow.xaml.cs
diff --git a/Aaru.Gui/Views/MediaDumpWindow.xaml b/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/MediaDumpWindow.xaml
rename to Aaru.Gui/Views/Windows/MediaDumpWindow.xaml
diff --git a/Aaru.Gui/Views/MediaDumpWindow.xaml.cs b/Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/MediaDumpWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs
diff --git a/Aaru.Gui/Views/MediaScanWindow.xaml b/Aaru.Gui/Views/Windows/MediaScanWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/MediaScanWindow.xaml
rename to Aaru.Gui/Views/Windows/MediaScanWindow.xaml
diff --git a/Aaru.Gui/Views/MediaScanWindow.xaml.cs b/Aaru.Gui/Views/Windows/MediaScanWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/MediaScanWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/MediaScanWindow.xaml.cs
diff --git a/Aaru.Gui/Views/SplashWindow.xaml b/Aaru.Gui/Views/Windows/SplashWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/SplashWindow.xaml
rename to Aaru.Gui/Views/Windows/SplashWindow.xaml
diff --git a/Aaru.Gui/Views/SplashWindow.xaml.cs b/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/SplashWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
diff --git a/Aaru.Gui/Views/ViewSectorWindow.xaml b/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml
similarity index 100%
rename from Aaru.Gui/Views/ViewSectorWindow.xaml
rename to Aaru.Gui/Views/Windows/ViewSectorWindow.xaml
diff --git a/Aaru.Gui/Views/ViewSectorWindow.xaml.cs b/Aaru.Gui/Views/Windows/ViewSectorWindow.xaml.cs
similarity index 100%
rename from Aaru.Gui/Views/ViewSectorWindow.xaml.cs
rename to Aaru.Gui/Views/Windows/ViewSectorWindow.xaml.cs