Adjust namespaces.

Aaru.Gui/App.xaml.cs

@@ -1,6 +1,6 @@
 using System;
-using Aaru.Gui.ViewModels;
-using Aaru.Gui.Views;
+using Aaru.Gui.ViewModels.Windows;
+using Aaru.Gui.Views.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;

Aaru.Gui/Models/DeviceModel.cs

@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
 namespace Aaru.Gui.Models

Aaru.Gui/Models/FileSystemModel.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using Aaru.CommonTypes.Interfaces;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Panels;
 
 namespace Aaru.Gui.Models
 {

Aaru.Gui/Models/ImageModel.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using Aaru.CommonTypes.Interfaces;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
 namespace Aaru.Gui.Models

Aaru.Gui/Models/MediaModel.cs

@@ -1,4 +1,4 @@
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
 namespace Aaru.Gui.Models

Aaru.Gui/Models/PartitionModel.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using Aaru.CommonTypes;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
 namespace Aaru.Gui.Models

Aaru.Gui/ViewModels/Dialogs/AboutDialogViewModel.cs

@@ -6,11 +6,11 @@ using System.Reactive;
 using System.Reflection;
 using System.Threading.Tasks;
 using Aaru.Gui.Models;
-using Aaru.Gui.Views;
+using Aaru.Gui.Views.Dialogs;
 using Microsoft.DotNet.PlatformAbstractions;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Dialogs
 {
     public class AboutDialogViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Dialogs/ConsoleWindowViewModel.cs

@@ -6,18 +6,18 @@ using System.Reactive;
 using System.Reflection;
 using Aaru.CommonTypes.Interop;
 using Aaru.Console;
-using Aaru.Gui.Views;
+using Aaru.Gui.Views.Dialogs;
 using Avalonia.Controls;
 using ReactiveUI;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Dialogs
 {
     public class ConsoleWindowViewModel : ViewModelBase
     {
-        bool                   _debugChecked;
         readonly ConsoleWindow _view;
+        bool                   _debugChecked;
 
         public ConsoleWindowViewModel(ConsoleWindow view)
         {

Aaru.Gui/ViewModels/Dialogs/EncodingsDialogViewModel.cs

@@ -5,10 +5,10 @@ using System.Reactive;
 using System.Text;
 using System.Threading.Tasks;
 using Aaru.Gui.Models;
-using Aaru.Gui.Views;
+using Aaru.Gui.Views.Dialogs;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Dialogs
 {
     public class EncodingsDialogViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Dialogs/LicenseDialogViewModel.cs

@@ -1,10 +1,10 @@
 using System.IO;
 using System.Reactive;
 using System.Reflection;
-using Aaru.Gui.Views;
+using Aaru.Gui.Views.Dialogs;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Dialogs
 {
     public class LicenseDialogViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Dialogs/PluginsDialogViewModel.cs

@@ -4,11 +4,11 @@ using System.Reflection;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Core;
 using Aaru.Gui.Models;
-using Aaru.Gui.Views;
+using Aaru.Gui.Views.Dialogs;
 using Aaru.Partitions;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Dialogs
 {
     public class PluginsDialogViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Dialogs/SettingsDialogViewModel.cs

@@ -1,9 +1,9 @@
 using System.Reactive;
-using Aaru.Gui.Views;
+using Aaru.Gui.Views.Dialogs;
 using Aaru.Settings;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Dialogs
 {
     public class SettingsDialogViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Dialogs/StatisticsDialogViewModel.cs

@@ -4,10 +4,10 @@ using System.Reactive;
 using Aaru.Database;
 using Aaru.Database.Models;
 using Aaru.Gui.Models;
-using Aaru.Gui.Views;
+using Aaru.Gui.Views.Dialogs;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Dialogs
 {
     public class StatisticsDialogViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs

@@ -4,12 +4,13 @@ using System.IO;
 using System.Reactive;
 using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
-using Aaru.Gui.Tabs;
+using Aaru.Gui.ViewModels.Tabs;
+using Aaru.Gui.Views.Tabs;
 using Avalonia.Controls;
 using ReactiveUI;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Panels
 {
     public class DeviceInfoViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs

@@ -1,6 +1,6 @@
 using Schemas;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Panels
 {
     public class FileSystemViewModel
     {

Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs

@@ -12,8 +12,10 @@ using Aaru.Decoders.DVD;
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.Xbox;
 using Aaru.Gui.Models;
-using Aaru.Gui.Tabs;
-using Aaru.Gui.Views;
+using Aaru.Gui.ViewModels.Tabs;
+using Aaru.Gui.ViewModels.Windows;
+using Aaru.Gui.Views.Tabs;
+using Aaru.Gui.Views.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
@@ -23,7 +25,7 @@ using Schemas;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Panels
 {
     public class ImageInfoViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs

@@ -4,8 +4,10 @@ using System.IO;
 using System.Reactive;
 using System.Text;
 using Aaru.Core.Media.Info;
-using Aaru.Gui.Tabs;
-using Aaru.Gui.Views;
+using Aaru.Gui.ViewModels.Tabs;
+using Aaru.Gui.ViewModels.Windows;
+using Aaru.Gui.Views.Tabs;
+using Aaru.Gui.Views.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
@@ -14,7 +16,7 @@ using MessageBox.Avalonia;
 using MessageBox.Avalonia.Enums;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Panels
 {
     public class MediaInfoViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs

@@ -1,6 +1,6 @@
 using Aaru.CommonTypes;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Panels
 {
     public class PartitionViewModel
     {

Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs

@@ -15,7 +15,7 @@ using MessageBox.Avalonia.Enums;
 using ReactiveUI;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Panels
 {
     public class SubdirectoryViewModel
     {

Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs

@@ -5,7 +5,7 @@ using Aaru.Decoders.ATA;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class AtaInfoViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs

@@ -6,7 +6,7 @@ using Aaru.Decoders.SCSI.MMC;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class BlurayInfoViewModel
     {

Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs

@@ -8,11 +8,10 @@ using Aaru.Gui.Models;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class CompactDiscInfoViewModel : ViewModelBase
     {
-        readonly Window _view;
         readonly byte[] _atipData;
         readonly byte[] _cdTextLeadInData;
         readonly byte[] _compactDiscInformationData;
@@ -20,6 +19,7 @@ namespace Aaru.Gui.ViewModels
         readonly byte[] _rawTocData;
         readonly byte[] _sessionData;
         readonly byte[] _tocData;
+        readonly Window _view;
 
         public CompactDiscInfoViewModel(byte[] toc, byte[] atip, byte[] compactDiscInformation, byte[] session,
                                         byte[] rawToc, byte[] pma, byte[] cdTextLeadIn, TOC.CDTOC? decodedToc,

Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs

@@ -6,7 +6,7 @@ using Aaru.Decoders.DVD;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class DvdInfoViewModel
     {

Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs

@@ -6,7 +6,7 @@ using Aaru.Decoders.DVD;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class DvdWritableInfoViewModel
     {

Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs

@@ -8,14 +8,14 @@ using Aaru.Gui.Models;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class PcmciaInfoViewModel : ViewModelBase
     {
-        string          _pcmciaCisText;
-        PcmciaCisModel  _selectedCis;
         readonly Window _view;
         readonly byte[] cis;
+        string          _pcmciaCisText;
+        PcmciaCisModel  _selectedCis;
 
         internal PcmciaInfoViewModel(byte[] pcmciaCis, Window view)
         {

Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs

@@ -12,7 +12,7 @@ using Avalonia.Controls;
 using ReactiveUI;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class ScsiInfoViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs

@@ -1,6 +1,6 @@
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class SdMmcInfoViewModel
     {

Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs

@@ -6,12 +6,12 @@ using Aaru.Decoders.Xbox;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Tabs
 {
     public class XboxInfoViewModel
     {
-        Window          _view;
         readonly byte[] xboxSecuritySector;
+        Window          _view;
 
         public XboxInfoViewModel(XgdInfo xgdInfo, byte[] dmi, byte[] securitySector,
                                  SS.SecuritySector? decodedSecuritySector, Window view)

Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs

@@ -19,7 +19,7 @@ using DMI = Aaru.Decoders.Xbox.DMI;
 using Inquiry = Aaru.Decoders.SCSI.Inquiry;
 using Spare = Aaru.Decoders.DVD.Spare;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class DecodeMediaTagsViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs

@@ -12,7 +12,7 @@ using Avalonia.Threading;
 using ReactiveUI;
 using Schemas;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class ImageChecksumViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs

@@ -23,10 +23,11 @@ using Schemas;
 using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class ImageConvertViewModel : ViewModelBase
     {
+        readonly Window      _view;
         readonly IMediaImage inputFormat;
         bool                 _cicmXmlFromImageVisible;
         string               _cicmXmlText;
@@ -88,8 +89,6 @@ namespace Aaru.Gui.ViewModels
         bool                   _stopEnabled;
         bool                   _stopVisible;
         string                 _title;
-
-        readonly Window        _view;
         bool                   cancel;
         CICMMetadataType       cicmMetadata;
         List<DumpHardwareType> dumpHardware;

Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs

@@ -11,7 +11,7 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class ImageEntropyViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs

@@ -13,7 +13,7 @@ using Avalonia.Threading;
 using ReactiveUI;
 using Schemas;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class ImageSidecarViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs

@@ -12,11 +12,12 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class ImageVerifyViewModel : ViewModelBase
     {
         readonly IMediaImage _inputFormat;
+        readonly Window      _view;
         bool                 _cancel;
         bool                 _closeVisible;
         string               _imageResultText;
@@ -54,7 +55,6 @@ namespace Aaru.Gui.ViewModels
         bool                 _verifySectorsChecked;
         bool                 _verifySectorsEnabled;
         bool                 _verifySectorsVisible;
-        readonly Window _view;
 
         public ImageVerifyViewModel(IMediaImage inputFormat, Window view)
         {
@@ -305,8 +305,7 @@ namespace Aaru.Gui.ViewModels
             ProgressVisible      = true;
             Progress2Visible     = false;
 
-            VerifySectorsVisible = _inputFormat is IOpticalMediaImage ||
-                                   _inputFormat is IVerifiableSectorsImage;
+            VerifySectorsVisible = _inputFormat is IOpticalMediaImage || _inputFormat is IVerifiableSectorsImage;
 
             // TODO: Do not offer the option to use this form if the image does not support any kind of verification
             new Thread(DoWork).Start();

Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs

@@ -17,8 +17,11 @@ using Aaru.Core.Media.Info;
 using Aaru.Database;
 using Aaru.Devices;
 using Aaru.Gui.Models;
-using Aaru.Gui.Panels;
-using Aaru.Gui.Views;
+using Aaru.Gui.ViewModels.Dialogs;
+using Aaru.Gui.ViewModels.Panels;
+using Aaru.Gui.Views.Dialogs;
+using Aaru.Gui.Views.Panels;
+using Aaru.Gui.Views.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -30,7 +33,7 @@ using ReactiveUI;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class MainWindowViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs

@@ -27,7 +27,7 @@ using Schemas;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 using MediaType = Aaru.CommonTypes.MediaType;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class MediaDumpViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs

@@ -11,7 +11,7 @@ using MessageBox.Avalonia.Enums;
 using ReactiveUI;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class MediaScanViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs

@@ -6,13 +6,15 @@ using System.Threading.Tasks;
 using Aaru.Console;
 using Aaru.Core;
 using Aaru.Database;
-using Aaru.Gui.Views;
+using Aaru.Gui.ViewModels.Dialogs;
+using Aaru.Gui.Views.Dialogs;
+using Aaru.Gui.Views.Windows;
 using Aaru.Settings;
 using Avalonia.Threading;
 using Microsoft.EntityFrameworkCore;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class SplashWindowViewModel : ViewModelBase
     {

Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs

@@ -1,7 +1,7 @@
 using Aaru.CommonTypes.Interfaces;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
+namespace Aaru.Gui.ViewModels.Windows
 {
     public class ViewSectorViewModel : ViewModelBase
     {

Aaru.Gui/Views/Dialogs/AboutDialog.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.AboutDialog"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.AboutDialog"
         Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:AboutDialogViewModel />
+        <dialogs:AboutDialogViewModel />
     </Design.DataContext>
     <Border Padding="15">
         <Grid>

Aaru.Gui/Views/Dialogs/AboutDialog.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Dialogs
 {
     public class AboutDialog : Window
     {

Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.ConsoleWindow"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.Dialogs.ConsoleWindow"
         Icon="/Assets/aaru-logo.png" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:ConsoleWindowViewModel />
+        <dialogs:ConsoleWindowViewModel />
     </Design.DataContext>
     <Border Padding="15">
         <Grid>

Aaru.Gui/Views/Dialogs/ConsoleDialog.xaml.cs

@@ -3,7 +3,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Dialogs
 {
     public class ConsoleWindow : Window
     {

Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml

@@ -32,13 +32,13 @@
 // ****************************************************************************/
 -->
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.EncodingsDialog"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.EncodingsDialog"
         Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:EncodingsDialogViewModel />
+        <dialogs:EncodingsDialogViewModel />
     </Design.DataContext>
     <Border Padding="15">
         <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">

Aaru.Gui/Views/Dialogs/EncodingsDialog.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Dialogs
 {
     public class EncodingsDialog : Window
     {

Aaru.Gui/Views/Dialogs/LicenseDialog.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.LicenseDialog"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Dialogs.LicenseDialog"
         Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:LicenseDialogViewModel />
+        <dialogs:LicenseDialogViewModel />
     </Design.DataContext>
     <Border Padding="15">
         <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">

Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Dialogs
 {
     public class LicenseDialog : Window
     {

Aaru.Gui/Views/Dialogs/PluginsDialog.xaml

@@ -32,13 +32,13 @@
 // ****************************************************************************/
 -->
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.PluginsDialog"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="600" Height="450" x:Class="Aaru.Gui.Views.Dialogs.PluginsDialog"
         Icon="/Assets/aaru-logo.png" Title="{Binding Title}" Padding="10">
     <Design.DataContext>
-        <vm:PluginsDialogViewModel />
+        <dialogs:PluginsDialogViewModel />
     </Design.DataContext>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
         <Grid.RowDefinitions>

Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Dialogs
 {
     public class PluginsDialog : Window
     {

Aaru.Gui/Views/Dialogs/SettingsDialog.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="675" Height="432" x:Class="Aaru.Gui.Views.SettingsDialog"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="675" Height="432" x:Class="Aaru.Gui.Views.Dialogs.SettingsDialog"
         Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:SettingsDialogViewModel />
+        <dialogs:SettingsDialogViewModel />
     </Design.DataContext>
     <Border Padding="15">
         <Grid>

Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Dialogs
 {
     public class SettingsDialog : Window
     {

Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="550" Height="320" x:Class="Aaru.Gui.Views.StatisticsDialog"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:dialogs="clr-namespace:Aaru.Gui.ViewModels.Dialogs" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="550" Height="320" x:Class="Aaru.Gui.Views.Dialogs.StatisticsDialog"
         Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:StatisticsDialogViewModel />
+        <dialogs:StatisticsDialogViewModel />
     </Design.DataContext>
     <Border Padding="15">
         <Grid>

Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Dialogs
 {
     public class StatisticsDialog : Window
     {

Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Panels.DeviceInfoPanel">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.DeviceInfoPanel">
     <Design.DataContext>
-        <vm:DeviceInfoViewModel />
+        <panels:DeviceInfoViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <TextBlock Text="Device information" />

Aaru.Gui/Views/Panels/DeviceInfoPanel.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Panels
+namespace Aaru.Gui.Views.Panels
 {
     public class DeviceInfoPanel : UserControl
     {

Aaru.Gui/Views/Panels/FileSystemPanel.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Panels.FileSystemPanel">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.FileSystemPanel">
     <Design.DataContext>
-        <vm:FileSystemViewModel />
+        <panels:FileSystemViewModel />
     </Design.DataContext>
     <StackPanel>
         <TextBlock Text="{Binding TypeText}" />

Aaru.Gui/Views/Panels/FileSystemPanel.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Panels
+namespace Aaru.Gui.Views.Panels
 {
     public class FileSystemPanel : UserControl
     {

Aaru.Gui/Views/Panels/ImageInfoPanel.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Panels.ImageInfoPanel">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.ImageInfoPanel">
     <Design.DataContext>
-        <vm:ImageInfoViewModel />
+        <panels:ImageInfoViewModel />
     </Design.DataContext>
     <StackPanel>
         <Image Width="128" Height="128" HorizontalAlignment="Center" VerticalAlignment="Center"

Aaru.Gui/Views/Panels/ImageInfoPanel.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Panels
+namespace Aaru.Gui.Views.Panels
 {
     public class ImageInfoPanel : UserControl
     {

Aaru.Gui/Views/Panels/MediaInfoPanel.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Panels.MediaInfoPanel">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.MediaInfoPanel">
     <Design.DataContext>
-        <vm:MediaInfoViewModel />
+        <panels:MediaInfoViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <TextBlock HorizontalAlignment="Center" Text="Media information" />

Aaru.Gui/Views/Panels/MediaInfoPanel.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Panels
+namespace Aaru.Gui.Views.Panels
 {
     public class MediaInfoPanel : UserControl
     {

Aaru.Gui/Views/Panels/PartitionPanel.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Panels.PartitionPanel">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Panels.PartitionPanel">
     <Design.DataContext>
-        <vm:PartitionViewModel />
+        <panels:PartitionViewModel />
     </Design.DataContext>
     <StackPanel>
         <TextBlock Text="{Binding NameText}" /> <TextBlock Text="{Binding TypeText}" />

Aaru.Gui/Views/Panels/PartitionPanel.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Panels
+namespace Aaru.Gui.Views.Panels
 {
     public class PartitionPanel : UserControl
     {

Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml

@@ -1,10 +1,11 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Panels.SubdirectoryPanel">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:panels="clr-namespace:Aaru.Gui.ViewModels.Panels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Aaru.Gui.Views.Panels.SubdirectoryPanel">
     <Design.DataContext>
-        <vm:SubdirectoryViewModel />
+        <panels:SubdirectoryViewModel />
     </Design.DataContext>
     <DataGrid Items="{Binding Entries}" IsReadOnly="True" SelectionMode="Extended"> <!-- TODO: SelectedItems="{Binding SelectedEntries}" -->
         <DataGrid.ContextMenu>

Aaru.Gui/Views/Panels/SubdirectoryPanel.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Panels
+namespace Aaru.Gui.Views.Panels
 {
     public class SubdirectoryPanel : UserControl
     {

Aaru.Gui/Views/Tabs/AtaInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.AtaInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.AtaInfoTab">
     <Design.DataContext>
-        <vm:AtaInfoViewModel />
+        <tabs:AtaInfoViewModel />
     </Design.DataContext>
     <StackPanel>
         <TextBlock Text="{Binding AtaOrAtapiText}" />

Aaru.Gui/Views/Tabs/AtaInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class AtaInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.BlurayInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.BlurayInfoTab">
     <Design.DataContext>
-        <vm:BlurayInfoViewModel />
+        <tabs:BlurayInfoViewModel />
     </Design.DataContext>
     <StackPanel>
         <StackPanel IsVisible="{Binding !!BlurayDiscInformationText}">

Aaru.Gui/Views/Tabs/BlurayInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class BlurayInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.CompactDiscInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.CompactDiscInfoTab">
     <Design.DataContext>
-        <vm:CompactDiscInfoViewModel />
+        <tabs:CompactDiscInfoViewModel />
     </Design.DataContext>
     <TabControl>
         <TabItem IsVisible="{Binding !!CdInformationText}">

Aaru.Gui/Views/Tabs/CompactDiscInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class CompactDiscInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/DvdInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.DvdInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdInfoTab">
     <Design.DataContext>
-        <vm:DvdInfoViewModel />
+        <tabs:DvdInfoViewModel />
     </Design.DataContext>
     <StackPanel>
         <TextBlock IsVisible="{Binding !!DvdPfiText}" Text="Physical Format Information" />

Aaru.Gui/Views/Tabs/DvdInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class DvdInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.DvdWritableInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.DvdWritableInfoTab">
     <Design.DataContext>
-        <vm:DvdWritableInfoViewModel />
+        <tabs:DvdWritableInfoViewModel />
     </Design.DataContext>
     <StackPanel>
         <StackPanel Orientation="Horizontal">

Aaru.Gui/Views/Tabs/DvdWritableInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class DvdWritableInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.PcmciaInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.PcmciaInfoTab">
     <Design.DataContext>
-        <vm:PcmciaInfoViewModel />
+        <tabs:PcmciaInfoViewModel />
     </Design.DataContext>
     <StackPanel>
         <StackPanel Orientation="Horizontal">

Aaru.Gui/Views/Tabs/PcmciaInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class PcmciaInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.ScsiInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.ScsiInfoTab">
     <Design.DataContext>
-        <vm:ScsiInfoViewModel />
+        <tabs:ScsiInfoViewModel />
     </Design.DataContext>
     <TabControl>
         <TabItem IsVisible="{Binding !!InquiryData}">

Aaru.Gui/Views/Tabs/ScsiInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class ScsiInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/SdMmcInfo.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.SdMmcInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.SdMmcInfoTab">
     <Design.DataContext>
-        <vm:SdMmcInfoViewModel />
+        <tabs:SdMmcInfoViewModel />
     </Design.DataContext>
     <TabControl>
         <TabItem IsVisible="{Binding !!CidText}">

Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class SdMmcInfoTab : UserControl
     {

Aaru.Gui/Views/Tabs/XboxInfoTab.xaml

@@ -1,10 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Aaru.Gui.Tabs.XboxInfoTab">
+             xmlns:vm="clr-namespace:Aaru.Gui.ViewModels" xmlns:tabs="clr-namespace:Aaru.Gui.ViewModels.Tabs"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Aaru.Gui.Views.Tabs.XboxInfoTab">
     <Design.DataContext>
-        <vm:XboxInfoViewModel />
+        <tabs:XboxInfoViewModel />
     </Design.DataContext>
     <StackPanel>
         <StackPanel IsVisible="{Binding XboxInformationVisible}">
@@ -15,16 +15,19 @@
                 <TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxL1VideoText}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxMiddleZoneText}">
-            <TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxMiddleZoneText}" />
+                <TextBlock Text="Video layer 0 size" />
+                <TextBox IsReadOnly="True" Text="{Binding XboxMiddleZoneText}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxGameSizeText}">
                 <TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxGameSizeText}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxTotalSizeText}">
-            <TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxTotalSizeText}" />
+                <TextBlock Text="Video layer 0 size" />
+                <TextBox IsReadOnly="True" Text="{Binding XboxTotalSizeText}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" IsVisible="{Binding !!XboxRealBreakText}">
-            <TextBlock Text="Video layer 0 size" /> <TextBox IsReadOnly="True" Text="{Binding XboxRealBreakText}" />
+                <TextBlock Text="Video layer 0 size" />
+                <TextBox IsReadOnly="True" Text="{Binding XboxRealBreakText}" />
             </StackPanel>
         </StackPanel>
         <StackPanel>

Aaru.Gui/Views/Tabs/XboxInfoTab.xaml.cs

@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Tabs
+namespace Aaru.Gui.Views.Tabs
 {
     public class XboxInfoTab : UserControl
     {

Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.DecodeMediaTagsWindow"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.DecodeMediaTagsWindow"
         Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:DecodeMediaTagsViewModel />
+        <windows:DecodeMediaTagsViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal">

Aaru.Gui/Views/Windows/DecodeMediaTagsWindow.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class DecodeMediaTagsWindow : Window
     {

Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageChecksumWindow" Icon="/Assets/aaru-logo.png"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageChecksumWindow" Icon="/Assets/aaru-logo.png"
         Title="{Binding Title}">
     <Design.DataContext>
-        <vm:ImageChecksumViewModel />
+        <windows:ImageChecksumViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Vertical">

Aaru.Gui/Views/Windows/ImageChecksumWindow.xaml.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class ImageChecksumWindow : Window
     {

Aaru.Gui/Views/Windows/ImageConvertWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageConvertWindow" Icon="/Assets/aaru-logo.png"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageConvertWindow" Icon="/Assets/aaru-logo.png"
         Title="{Binding Title}">
     <Design.DataContext>
-        <vm:ImageConvertViewModel />
+        <windows:ImageConvertViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <TextBlock Text="Source image" /> <TextBox Text="{Binding SourceText}" IsReadOnly="True" />

Aaru.Gui/Views/Windows/ImageConvertWindow.xaml.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class ImageConvertWindow : Window
     {

Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageEntropyWindow" Icon="/Assets/aaru-logo.png"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageEntropyWindow" Icon="/Assets/aaru-logo.png"
         Title="{Binding Title}">
     <Design.DataContext>
-        <vm:ImageEntropyViewModel />
+        <windows:ImageEntropyViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <StackPanel IsVisible="{Binding OptionsVisible}" Orientation="Vertical">

Aaru.Gui/Views/Windows/ImageEntropyWindow.xaml.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class ImageEntropyWindow : Window
     {

Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml

@@ -32,13 +32,13 @@
 // ****************************************************************************/
 -->
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.ImageSidecarWindow"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" Width="480" Height="320" x:Class="Aaru.Gui.Views.Windows.ImageSidecarWindow"
         Icon="/Assets/aaru-logo.png" CanResize="False" Title="{Binding Title}">
     <Design.DataContext>
-        <vm:ImageSidecarViewModel />
+        <windows:ImageSidecarViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <TextBlock Text="Destination file" />

Aaru.Gui/Views/Windows/ImageSidecarWindow.xaml.cs

@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class ImageSidecarWindow : Window
     {

Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="Aaru.Gui.Views.ImageVerifyWindow" Icon="/Assets/aaru-logo.png"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.ImageVerifyWindow" Icon="/Assets/aaru-logo.png"
         Title="{Binding Title}">
     <Design.DataContext>
-        <vm:ImageVerifyViewModel />
+        <windows:ImageVerifyViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Vertical" IsVisible="{Binding OptionsVisible}">

Aaru.Gui/Views/Windows/ImageVerifyWindow.xaml.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class ImageVerifyWindow : Window
     {

Aaru.Gui/Views/Windows/MainWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:models="clr-namespace:Aaru.Gui.Models;assembly=Aaru.Gui"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="Aaru.Gui.Views.MainWindow" Icon="/Assets/aaru-logo.png" Title="Aaru.Gui">
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MainWindow" Icon="/Assets/aaru-logo.png" Title="Aaru.Gui">
     <Design.DataContext>
-        <vm:MainWindowViewModel />
+        <windows:MainWindowViewModel />
     </Design.DataContext>
     <DockPanel>
         <Menu DockPanel.Dock="Top">

Aaru.Gui/Views/Windows/MainWindow.xaml.cs

@@ -1,10 +1,10 @@
 using System;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class MainWindow : Window
     {

Aaru.Gui/Views/Windows/MediaDumpWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="Aaru.Gui.Views.MediaDumpWindow" Icon="/Assets/aaru-logo.png"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MediaDumpWindow" Icon="/Assets/aaru-logo.png"
         Title="{Binding Title}">
     <Design.DataContext>
-        <vm:MediaDumpViewModel />
+        <windows:MediaDumpViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Vertical" IsVisible="{Binding OptionsVisible}">

Aaru.Gui/Views/Windows/MediaDumpWindow.xaml.cs

@@ -1,10 +1,10 @@
 using System.ComponentModel;
-using Aaru.Gui.ViewModels;
+using Aaru.Gui.ViewModels.Windows;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views
+namespace Aaru.Gui.Views.Windows
 {
     public class MediaDumpWindow : Window
     {

Aaru.Gui/Views/Windows/MediaScanWindow.xaml

@@ -1,11 +1,11 @@
 <Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
-        d:DesignHeight="450" x:Class="Aaru.Gui.Views.MediaScanWindow" Icon="/Assets/aaru-logo.png"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:Aaru.Gui.ViewModels.Windows" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.Windows.MediaScanWindow" Icon="/Assets/aaru-logo.png"
         Title="{Binding Title}">
     <Design.DataContext>
-        <vm:MediaScanViewModel />
+        <windows:MediaScanViewModel />
     </Design.DataContext>
     <StackPanel Orientation="Vertical">
         <TabControl IsVisible="{Binding ResultsVisible}">