Refactor class/folder structure of UI elements

pain
2025-04-21 10:01:27 -07:00 · 2023-05-15 15:06:39 +01:00 · 2023-05-15 15:06:39 +01:00 · dd60e78a5d
commit dd60e78a5d
parent baf70aa2e5
50 changed files with 128 additions and 154 deletions
--- a/Bloxstrap/App.xaml.cs
+++ b/Bloxstrap/App.xaml.cs
@ -13,11 +13,11 @@ using System.Windows.Threading;

 using Microsoft.Win32;

-using Bloxstrap.Dialogs;
 using Bloxstrap.Extensions;
 using Bloxstrap.Models;
 using Bloxstrap.Singletons;
-using Bloxstrap.Views;
+using Bloxstrap.UI.BootstrapperDialogs;
+using Bloxstrap.UI.Menu.Views;

 namespace Bloxstrap
 {
--- a/Bloxstrap/Bootstrapper.cs
+++ b/Bloxstrap/Bootstrapper.cs
@ -12,11 +12,11 @@ using System.Windows;

 using Microsoft.Win32;

-using Bloxstrap.Dialogs;
 using Bloxstrap.Enums;
 using Bloxstrap.Integrations;
 using Bloxstrap.Models;
 using Bloxstrap.Tools;
+using Bloxstrap.UI.BootstrapperDialogs;

 namespace Bloxstrap
 {
--- a/Bloxstrap/Extensions/BootstrapperStyleEx.cs
+++ b/Bloxstrap/Extensions/BootstrapperStyleEx.cs
@ -1,5 +1,7 @@
-using Bloxstrap.Dialogs;
-using Bloxstrap.Enums;
+using Bloxstrap.Enums;
+using Bloxstrap.UI.BootstrapperDialogs;
+using Bloxstrap.UI.BootstrapperDialogs.WinForms;
+using Bloxstrap.UI.BootstrapperDialogs.WPF.Views;

 namespace Bloxstrap.Extensions
 {
--- a/Bloxstrap/UI/BootstrapperDialogs/IBootstrapperDialog.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/IBootstrapperDialog.cs
@ -1,6 +1,6 @@
 using System.Windows.Forms;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs
 {
    public interface IBootstrapperDialog
    {
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/ByfronDialogViewModel.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/ByfronDialogViewModel.cs
@ -6,9 +6,7 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;

-using Bloxstrap.Dialogs;
-
-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels
 {
    public class ByfronDialogViewModel : FluentDialogViewModel, INotifyPropertyChanged
    {
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs
@ -5,10 +5,9 @@ using System.Windows.Media;

 using CommunityToolkit.Mvvm.Input;

-using Bloxstrap.Dialogs;
 using Bloxstrap.Extensions;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels
 {
    public class FluentDialogViewModel : INotifyPropertyChanged
    {
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/ByfronDialog.xaml
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/ByfronDialog.xaml
@ -1,9 +1,8 @@
-<Window x:Class="Bloxstrap.Dialogs.ByfronDialog"
+<Window x:Class="Bloxstrap.UI.BootstrapperDialogs.WPF.Views.ByfronDialog"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        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:local="clr-namespace:Bloxstrap.Dialogs"
        mc:Ignorable="d"
        Width="600" 
        Height="400"
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/ByfronDialog.xaml.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/ByfronDialog.xaml.cs
@ -6,9 +6,9 @@ using System.Windows.Media.Imaging;

 using Bloxstrap.Enums;
 using Bloxstrap.Extensions;
-using Bloxstrap.ViewModels;
+using Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WPF.Views
 {
    /// <summary>
    /// Interaction logic for ByfronDialog.xaml
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml
@ -1,9 +1,8 @@
-<ui:UiWindow x:Class="Bloxstrap.Dialogs.FluentDialog"
+<ui:UiWindow x:Class="Bloxstrap.UI.BootstrapperDialogs.WPF.Views.FluentDialog"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        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:local="clr-namespace:Bloxstrap.Dialogs"
        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
        mc:Ignorable="d"
        Width="420"
--- a/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml.cs
@ -2,15 +2,14 @@
 using System.Windows;
 using System.Windows.Forms;

-using Bloxstrap.Enums;
 using Bloxstrap.Extensions;
-using Bloxstrap.ViewModels;
+using Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels;

 using Wpf.Ui.Appearance;
 using Wpf.Ui.Mvvm.Contracts;
 using Wpf.Ui.Mvvm.Services;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WPF.Views
 {
    /// <summary>
    /// Interaction logic for FluentDialog.xaml
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/DialogBase.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/DialogBase.cs
@ -1,12 +1,11 @@
 using System;
 using System.Windows;
 using System.Windows.Forms;
-
 using Bloxstrap.Extensions;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
-    public class BootstrapperDialogForm : Form, IBootstrapperDialog
+    public class DialogBase : Form, IBootstrapperDialog
    {
        public Bootstrapper? Bootstrapper { get; set; }

@ -21,8 +20,8 @@ namespace Bloxstrap.Dialogs
            get => _message;
            set
            {
-                if (this.InvokeRequired)
-                    this.Invoke(() => _message = value);
+                if (InvokeRequired)
+                    Invoke(() => _message = value);
                else
                    _message = value;
            }
@ -33,8 +32,8 @@ namespace Bloxstrap.Dialogs
            get => _progressStyle;
            set
            {
-                if (this.InvokeRequired)
-                    this.Invoke(() => _progressStyle = value);
+                if (InvokeRequired)
+                    Invoke(() => _progressStyle = value);
                else
                    _progressStyle = value;
            }
@ -45,8 +44,8 @@ namespace Bloxstrap.Dialogs
            get => _progressValue;
            set
            {
-                if (this.InvokeRequired)
-                    this.Invoke(() => _progressValue = value);
+                if (InvokeRequired)
+                    Invoke(() => _progressValue = value);
                else
                    _progressValue = value;
            }
@ -57,8 +56,8 @@ namespace Bloxstrap.Dialogs
            get => _cancelEnabled;
            set
            {
-                if (this.InvokeRequired)
-                    this.Invoke(() => _cancelEnabled = value);
+                if (InvokeRequired)
+                    Invoke(() => _cancelEnabled = value);
                else
                    _cancelEnabled = value;
            }
@ -67,9 +66,9 @@ namespace Bloxstrap.Dialogs

        public void ScaleWindow()
        {
-            this.Size = this.MinimumSize = this.MaximumSize = WindowScaling.GetScaledSize(this.Size);
+            Size = MinimumSize = MaximumSize = WindowScaling.GetScaledSize(Size);

-            foreach (Control control in this.Controls)
+            foreach (Control control in Controls)
            {
                control.Size = WindowScaling.GetScaledSize(control.Size);
                control.Location = WindowScaling.GetScaledPoint(control.Location);
@ -79,25 +78,25 @@ namespace Bloxstrap.Dialogs

        public void SetupDialog()
        {
-            this.Text = App.Settings.Prop.BootstrapperTitle;
-            this.Icon = App.Settings.Prop.BootstrapperIcon.GetIcon();
+            Text = App.Settings.Prop.BootstrapperTitle;
+            Icon = App.Settings.Prop.BootstrapperIcon.GetIcon();
        }

        public void ButtonCancel_Click(object? sender, EventArgs e)
        {
            Bootstrapper?.CancelInstall();
-            this.Close();
+            Close();
        }

        #region IBootstrapperDialog Methods
-        public void ShowBootstrapper() => this.ShowDialog();
+        public void ShowBootstrapper() => ShowDialog();

        public virtual void CloseBootstrapper()
        {
-            if (this.InvokeRequired)
-                this.Invoke(CloseBootstrapper);
+            if (InvokeRequired)
+                Invoke(CloseBootstrapper);
            else
-                this.Close();
+                Close();
        }

        public virtual void ShowSuccess(string message)
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.Designer.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.Designer.cs
@ -1,6 +1,6 @@
 using System.Windows.Forms;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    partial class LegacyDialog2009
    {
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.cs
@ -1,12 +1,12 @@
 using System;
 using System.Windows.Forms;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    // windows: https://youtu.be/VpduiruysuM?t=18
    // mac: https://youtu.be/ncHhbcVDRgQ?t=63

-    public partial class LegacyDialog2009 : BootstrapperDialogForm
+    public partial class LegacyDialog2009 : DialogBase
    {
        protected override string _message 
        { 
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.resx
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.resx
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.Designer.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.Designer.cs
@ -1,6 +1,6 @@
 using System.Windows.Forms;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    partial class LegacyDialog2011
    {
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.cs
@ -3,11 +3,11 @@ using System.Windows.Forms;

 using Bloxstrap.Extensions;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    // https://youtu.be/3K9oCEMHj2s?t=35

-    public partial class LegacyDialog2011 : BootstrapperDialogForm
+    public partial class LegacyDialog2011 : DialogBase
    {
        protected override string _message 
        { 
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.resx
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.resx
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.Designer.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.Designer.cs
@ -1,6 +1,6 @@
 using System.Windows.Forms;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    partial class ProgressDialog
    {
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.cs
@ -5,11 +5,11 @@ using System.Windows.Forms;
 using Bloxstrap.Enums;
 using Bloxstrap.Extensions;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    // basically just the modern dialog

-    public partial class ProgressDialog : BootstrapperDialogForm
+    public partial class ProgressDialog : DialogBase
    {
        protected override string _message
        {
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.resx
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.resx
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.Designer.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.Designer.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    partial class VistaDialog
    {
--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.cs
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.cs
@ -3,7 +3,7 @@ using System.Windows.Forms;

 using Bloxstrap.Extensions;

-namespace Bloxstrap.Dialogs
+namespace Bloxstrap.UI.BootstrapperDialogs.WinForms
 {
    // https://youtu.be/h0_AL95Sc3o?t=48

@ -11,7 +11,7 @@ namespace Bloxstrap.Dialogs
    // since taskdialog is part of winforms, it can't really be properly used without a form
    // for example, cross-threaded calls to ui controls can't really be done outside of a form

-    public partial class VistaDialog : BootstrapperDialogForm
+    public partial class VistaDialog : DialogBase
    {
        private TaskDialogPage _dialogPage;

--- a/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.resx
+++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.resx
--- a/Bloxstrap/UI/Menu/ViewModels/AboutViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/AboutViewModel.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class AboutViewModel
    {
--- a/Bloxstrap/UI/Menu/ViewModels/AppearanceViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/AppearanceViewModel.cs
@ -9,12 +9,12 @@ using System.Windows.Media;

 using CommunityToolkit.Mvvm.Input;

-using Bloxstrap.Dialogs;
 using Bloxstrap.Enums;
 using Bloxstrap.Extensions;
-using Bloxstrap.Views;
+using Bloxstrap.UI.BootstrapperDialogs;
+using Bloxstrap.UI.Menu.Views;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class AppearanceViewModel : INotifyPropertyChanged
    {
--- a/Bloxstrap/UI/Menu/ViewModels/BehaviourViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/BehaviourViewModel.cs
@ -1,4 +1,4 @@
-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class BehaviourViewModel
    {
--- a/Bloxstrap/UI/Menu/ViewModels/FastFlagsViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/FastFlagsViewModel.cs
@ -8,7 +8,7 @@ using CommunityToolkit.Mvvm.Input;
 using Bloxstrap.Singletons;
 using System.ComponentModel;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class FastFlagsViewModel : INotifyPropertyChanged
    {
@ -21,7 +21,7 @@ namespace Bloxstrap.ViewModels

        public int FramerateLimit
        {
-            get => Int32.TryParse(App.FastFlags.GetValue("DFIntTaskSchedulerTargetFps"), out int x) ? x : 60;
+            get => int.TryParse(App.FastFlags.GetValue("DFIntTaskSchedulerTargetFps"), out int x) ? x : 60;
            set => App.FastFlags.SetValue("DFIntTaskSchedulerTargetFps", value);
        }

--- a/Bloxstrap/UI/Menu/ViewModels/GlobalViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/GlobalViewModel.cs
@ -1,7 +1,7 @@
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.Input;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public static class GlobalViewModel
    {
--- a/Bloxstrap/UI/Menu/ViewModels/InstallationViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/InstallationViewModel.cs
@ -13,7 +13,7 @@ using CommunityToolkit.Mvvm.Input;
 using Bloxstrap.Enums;
 using Bloxstrap.Models;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class InstallationViewModel : INotifyPropertyChanged
    {
@ -106,7 +106,7 @@ namespace Bloxstrap.ViewModels
                {
                    // roblox typically sets channels in all lowercase, so here we find if a case insensitive match exists
                    string? matchingChannel = Channels.Where(x => x.ToLower() == Channel.ToLower()).FirstOrDefault();
-                    Channel = String.IsNullOrEmpty(matchingChannel) ? RobloxDeployment.DefaultChannel : matchingChannel;
+                    Channel = string.IsNullOrEmpty(matchingChannel) ? RobloxDeployment.DefaultChannel : matchingChannel;
                }

                OnPropertyChanged(nameof(Channel));
--- a/Bloxstrap/UI/Menu/ViewModels/IntegrationsViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/IntegrationsViewModel.cs
@ -6,7 +6,7 @@ using CommunityToolkit.Mvvm.Input;

 using Bloxstrap.Models;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class IntegrationsViewModel : INotifyPropertyChanged
    {
--- a/Bloxstrap/UI/Menu/ViewModels/MainWindowViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/MainWindowViewModel.cs
@ -10,7 +10,7 @@ using CommunityToolkit.Mvvm.Input;
 using Wpf.Ui.Controls.Interfaces;
 using Wpf.Ui.Mvvm.Contracts;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class MainWindowViewModel
    {
@ -33,7 +33,7 @@ namespace Bloxstrap.ViewModels

        private void ConfirmSettings()
        {
-            if (String.IsNullOrEmpty(App.BaseDirectory))
+            if (string.IsNullOrEmpty(App.BaseDirectory))
            {
                App.ShowMessageBox("You must set an install location", MessageBoxImage.Error);
                return;
--- a/Bloxstrap/UI/Menu/ViewModels/ModsViewModel.cs
+++ b/Bloxstrap/UI/Menu/ViewModels/ModsViewModel.cs
@ -4,7 +4,7 @@ using System.Windows.Input;

 using CommunityToolkit.Mvvm.Input;

-namespace Bloxstrap.ViewModels
+namespace Bloxstrap.UI.Menu.ViewModels
 {
    public class ModsViewModel
    {
--- a/Bloxstrap/UI/Menu/Views/MainWindow.xaml
+++ b/Bloxstrap/UI/Menu/Views/MainWindow.xaml
@ -1,11 +1,10 @@
-<ui:UiWindow x:Class="Bloxstrap.Views.MainWindow"
+<ui:UiWindow x:Class="Bloxstrap.UI.Menu.Views.MainWindow"
             x:Name="ConfigurationWindow"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             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:pages="clr-namespace:Bloxstrap.Views.Pages"
-             xmlns:models="clr-namespace:Bloxstrap.ViewModels"
+             xmlns:pages="clr-namespace:Bloxstrap.UI.Menu.Views.Pages"
             xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
             mc:Ignorable="d"
             Title="Bloxstrap Menu" 
--- a/Bloxstrap/UI/Menu/Views/MainWindow.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/MainWindow.xaml.cs
@ -7,9 +7,9 @@ using Wpf.Ui.Mvvm.Contracts;
 using Wpf.Ui.Mvvm.Services;

 using Bloxstrap.Extensions;
-using Bloxstrap.ViewModels;
+using Bloxstrap.UI.Menu.ViewModels;

-namespace Bloxstrap.Views
+namespace Bloxstrap.UI.Menu.Views
 {
    /// <summary>
    /// Interaction logic for MainWindow.xaml
--- a/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml
@ -1,9 +1,9 @@
-<ui:UiPage x:Class="Bloxstrap.Views.Pages.AboutPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Menu.Views.Pages.AboutPage"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:models="clr-namespace:Bloxstrap.ViewModels"
+      xmlns:models="clr-namespace:Bloxstrap.UI.Menu.ViewModels"
      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
      mc:Ignorable="d" 
      d:DesignHeight="700" d:DesignWidth="800"
--- a/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml.cs
@ -1,6 +1,6 @@
-using Bloxstrap.ViewModels;
+using Bloxstrap.UI.Menu.ViewModels;

-namespace Bloxstrap.Views.Pages
+namespace Bloxstrap.UI.Menu.Views.Pages
 {
    /// <summary>
    /// Interaction logic for AboutPage.xaml
--- a/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml
@ -1,9 +1,9 @@
-<ui:UiPage x:Class="Bloxstrap.Views.Pages.AppearancePage"
+<ui:UiPage x:Class="Bloxstrap.UI.Menu.Views.Pages.AppearancePage"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Bloxstrap.Views.Pages"
+      xmlns:local="clr-namespace:Bloxstrap.UI.Menu.Views.Pages"
      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
      mc:Ignorable="d" 
      d:DesignHeight="520" d:DesignWidth="800"
--- a/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml.cs
@ -0,0 +1,16 @@
+using Bloxstrap.UI.Menu.ViewModels;
+
+namespace Bloxstrap.UI.Menu.Views.Pages
+{
+    /// <summary>
+    /// Interaction logic for AppearancePage.xaml
+    /// </summary>
+    public partial class AppearancePage
+    {
+        public AppearancePage()
+        {
+            DataContext = new AppearanceViewModel(this);
+            InitializeComponent();
+        }
+    }
+}
--- a/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml
@ -1,9 +1,8 @@
-<ui:UiPage x:Class="Bloxstrap.Views.Pages.BehaviourPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Menu.Views.Pages.BehaviourPage"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:models="clr-namespace:Bloxstrap.ViewModels"
      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
      mc:Ignorable="d" 
      d:DesignHeight="600" d:DesignWidth="800"
--- a/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml.cs
@ -1,6 +1,6 @@
-using Bloxstrap.ViewModels;
+using Bloxstrap.UI.Menu.ViewModels;

-namespace Bloxstrap.Views.Pages
+namespace Bloxstrap.UI.Menu.Views.Pages
 {
    /// <summary>
    /// Interaction logic for BehaviourPage.xaml
--- a/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml
@ -1,10 +1,9 @@
-<ui:UiPage x:Class="Bloxstrap.Views.Pages.FastFlagsPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Menu.Views.Pages.FastFlagsPage"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:Bloxstrap.Views.Pages"
-      xmlns:models="clr-namespace:Bloxstrap.ViewModels"
+      xmlns:models="clr-namespace:Bloxstrap.UI.Menu.ViewModels"
      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
      mc:Ignorable="d" 
      d:DesignHeight="1000" d:DesignWidth="800"
--- a/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml.cs
@ -1,8 +1,9 @@
-using Bloxstrap.ViewModels;
+using System;
 using System.Windows.Input;
-using System;

-namespace Bloxstrap.Views.Pages
+using Bloxstrap.UI.Menu.ViewModels;
+
+namespace Bloxstrap.UI.Menu.Views.Pages
 {
    /// <summary>
    /// Interaction logic for FastFlagsPage.xaml
--- a/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml
@ -1,9 +1,9 @@
-<ui:UiPage x:Class="Bloxstrap.Views.Pages.InstallationPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Menu.Views.Pages.InstallationPage"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:models="clr-namespace:Bloxstrap.ViewModels"
+      xmlns:models="clr-namespace:Bloxstrap.UI.Menu.ViewModels"
      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
      mc:Ignorable="d" 
      d:DesignHeight="450" d:DesignWidth="800"
--- a/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml.cs
@ -1,6 +1,6 @@
-using Bloxstrap.ViewModels;
+using Bloxstrap.UI.Menu.ViewModels;

-namespace Bloxstrap.Views.Pages
+namespace Bloxstrap.UI.Menu.Views.Pages
 {
    /// <summary>
    /// Interaction logic for InstallationPage.xaml
--- a/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml
@ -1,10 +1,9 @@
-<ui:UiPage x:Class="Bloxstrap.Views.Pages.IntegrationsPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Menu.Views.Pages.IntegrationsPage"
           x:Name="IntegrationsPageView"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:models="clr-namespace:Bloxstrap.ViewModels"
      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
      mc:Ignorable="d" 
      d:DesignHeight="1080" d:DesignWidth="800"
--- a/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml.cs
@ -1,10 +1,9 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using Bloxstrap.Models;
-using Bloxstrap.ViewModels;
+using System.Windows.Controls;

-namespace Bloxstrap.Views.Pages
+using Bloxstrap.Models;
+using Bloxstrap.UI.Menu.ViewModels;
+
+namespace Bloxstrap.UI.Menu.Views.Pages
 {
    /// <summary>
    /// Interaction logic for IntegrationsPage.xaml
--- a/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml
+++ b/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml
@ -1,9 +1,9 @@
-<ui:UiPage x:Class="Bloxstrap.Views.Pages.ModsPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Menu.Views.Pages.ModsPage"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:models="clr-namespace:Bloxstrap.ViewModels"
+      xmlns:models="clr-namespace:Bloxstrap.UI.Menu.ViewModels"
      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
      mc:Ignorable="d" 
      d:DesignHeight="800" d:DesignWidth="800"
--- a/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml.cs
+++ b/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml.cs
@ -1,10 +1,9 @@
 using System;
 using System.Windows;
-using System.Windows.Input;

-using Bloxstrap.ViewModels;
+using Bloxstrap.UI.Menu.ViewModels;

-namespace Bloxstrap.Views.Pages
+namespace Bloxstrap.UI.Menu.Views.Pages
 {
    /// <summary>
    /// Interaction logic for ModsPage.xaml
--- a/Bloxstrap/Updater.cs
+++ b/Bloxstrap/Updater.cs
@ -2,12 +2,10 @@
 using System.Diagnostics;
 using System.IO;
 using System.Windows;
-using System.Windows.Forms;
 using System.Threading;
 using System.Threading.Tasks;

-using Bloxstrap.Properties;
-using Bloxstrap.Views;
+using Bloxstrap.UI.Menu.Views;

 namespace Bloxstrap
 {
--- a/Bloxstrap/Views/Pages/AppearancePage.xaml.cs
+++ b/Bloxstrap/Views/Pages/AppearancePage.xaml.cs
@ -1,30 +0,0 @@
-using Bloxstrap.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Bloxstrap.Views.Pages
-{
-    /// <summary>
-    /// Interaction logic for AppearancePage.xaml
-    /// </summary>
-    public partial class AppearancePage
-    {
-        public AppearancePage()
-        {
-            DataContext = new AppearanceViewModel(this);
-            InitializeComponent();
-        }
-    }
-}