Namespace refactoring

NewUI/App.axaml.cs

@@ -1,8 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Mesen.GUI;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Interop;
 using Mesen.Localization;
 using Mesen.ViewModels;

NewUI/Config/AudioConfig.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class AudioConfig : BaseConfig<AudioConfig>
 	{

NewUI/Config/AudioPlayerConfig.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class AudioPlayerConfig : BaseConfig<AudioPlayerConfig>
 	{

NewUI/Config/AviRecordConfig.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class AviRecordConfig
 	{

NewUI/Config/BaseConfig.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class BaseConfig<T> : ReactiveObject where T : class
 	{

NewUI/Config/CheatCodes.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.Text;
 using System.Text.Json;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class CheatCodes
 	{

NewUI/Config/CheatWindowConfig.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class CheatWindowConfig
 	{

NewUI/Config/ConfigAttributes.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class MinMaxAttribute : Attribute
 	{

NewUI/Config/ConfigManager.cs

@@ -9,7 +9,7 @@ using System.Text.RegularExpressions;
 using System.Reflection;
 using Mesen.Interop;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public static class ConfigManager
 	{

NewUI/Config/Configuration.cs

@@ -8,7 +8,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public partial class Configuration
 	{

NewUI/Config/DbgIntegrationConfig.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class DbgIntegrationConfig
 	{

NewUI/Config/Debugger/AssemblerConfig.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Media;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class AssemblerConfig
 	{

NewUI/Config/Debugger/DebugConfig.cs

@@ -6,9 +6,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class DebugConfig
 	{

NewUI/Config/Debugger/DebugLogConfig.cs

@@ -1,6 +1,6 @@
 using Avalonia;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class DebugLogConfig
 	{

NewUI/Config/Debugger/DebuggerConfig.cs

@@ -1,9 +1,9 @@
 using Avalonia;
 using Avalonia.Media;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 using Mesen.Interop;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class DebuggerConfig
 	{

NewUI/Config/Debugger/DebuggerShortcutsConfig.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using System.Xml.Serialization;
 using System.Windows.Forms;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class DebuggerShortcutsConfig
 	{

NewUI/Config/Debugger/EventViewerConfig.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class EventViewerConfig
 	{

NewUI/Config/Debugger/HexEditorConfig.cs

@@ -10,7 +10,7 @@ using Avalonia;
 using Avalonia.Media;
 using Mesen.Interop;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class HexEditorConfig
 	{

NewUI/Config/Debugger/ProfilerConfig.cs

@@ -1,6 +1,6 @@
 using Avalonia;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class ProfilerConfig
 	{

NewUI/Config/Debugger/RegisterViewerConfig.cs

@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
 using Avalonia;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class RegisterViewerConfig
 	{

NewUI/Config/Debugger/ScriptWindowConfig.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class ScriptWindowConfig
 	{

NewUI/Config/Debugger/SpriteViewerConfig.cs

@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
 using Avalonia;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class SpriteViewerConfig
 	{

NewUI/Config/Debugger/TileViewerConfig.cs

@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 using Avalonia;
 using Mesen.Interop;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class TileViewerConfig
 	{

NewUI/Config/Debugger/TilemapViewerConfig.cs

@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
 using Avalonia;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class TilemapViewerConfig
 	{

NewUI/Config/Debugger/TraceLoggerInfo.cs

@@ -8,9 +8,9 @@ using System.Xml;
 using System.Xml.Serialization;
 using Avalonia;
 using Avalonia.Media;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class TraceLoggerInfo
 	{

NewUI/Config/EmulationConfig.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class EmulationConfig : BaseConfig<EmulationConfig>
 	{

NewUI/Config/FileAssociationHelper.cs

@@ -4,11 +4,11 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Interop;
 using Microsoft.Win32;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	class FileAssociationHelper
 	{

NewUI/Config/GameboyConfig.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class GameboyConfig : BaseConfig<GameboyConfig>
 	{

NewUI/Config/InputConfig.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class InputConfig : BaseConfig<InputConfig>
 	{

NewUI/Config/KeyPresets.cs

@@ -3,7 +3,7 @@ using Mesen.Utilities;
 using System;
 using System.Runtime.InteropServices;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class KeyPresets
 	{

NewUI/Config/MovieRecordConfig.cs

@@ -1,6 +1,6 @@
 using Mesen.Interop;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class MovieRecordConfig
 	{

NewUI/Config/NesConfig.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class NesConfig : BaseConfig<NesConfig>
 	{

NewUI/Config/NetplayConfig.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	[StructLayout(LayoutKind.Sequential)]
 	public class NetplayConfig

NewUI/Config/PreferencesConfig.cs

@@ -1,5 +1,5 @@
 using Mesen.Localization;
-using Mesen.GUI.Config.Shortcuts;
+using Mesen.Config.Shortcuts;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +13,7 @@ using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Themes.Fluent;
 using Mesen.Interop;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class PreferencesConfig : BaseConfig<PreferencesConfig>
 	{

NewUI/Config/RecentItems.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class RecentItems
 	{

NewUI/Config/Shortcuts/EmulatorShortcut.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config.Shortcuts
+namespace Mesen.Config.Shortcuts
 {
 	public enum EmulatorShortcut
 	{

NewUI/Config/Shortcuts/KeyCombination.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config.Shortcuts
+namespace Mesen.Config.Shortcuts
 {
 	public class KeyCombination
 	{

NewUI/Config/Shortcuts/ShortcutKeyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config.Shortcuts
+namespace Mesen.Config.Shortcuts
 {
 	public class ShortcutKeyInfo : ReactiveObject
 	{

NewUI/Config/SnesConfig.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class SnesConfig : BaseConfig<SnesConfig>
 	{

NewUI/Config/TimeSpanConverter.cs

@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class TimeSpanConverter : JsonConverter<TimeSpan>
 	{

NewUI/Config/VideoConfig.cs

@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Mesen.GUI.Config
+namespace Mesen.Config
 {
 	public class VideoConfig : BaseConfig<VideoConfig>
 	{

NewUI/Controls/EnumComboBox.axaml.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Localization;
 using Avalonia.Interactivity;
 

NewUI/Controls/KeyBindingButton.axaml.cs

@@ -2,9 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
-using Avalonia.Media;
 using Avalonia.Styling;
-using Mesen.GUI;
 using Mesen.Interop;
 using Mesen.Windows;
 using System;

NewUI/Controls/MultiKeyBindingButton.axaml.cs

@@ -2,10 +2,8 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
-using Avalonia.Media;
 using Avalonia.Styling;
-using Mesen.GUI;
-using Mesen.GUI.Config.Shortcuts;
+using Mesen.Config.Shortcuts;
 using Mesen.Windows;
 using System;
 

NewUI/Controls/NativeRenderer.cs

@@ -1,19 +1,12 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
-using Mesen.GUI;
 using Mesen.Interop;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mesen
 {
-   public class NativeRenderer : NativeControlHost
+	public class NativeRenderer : NativeControlHost
    {
       public NativeRenderer()
       {

NewUI/Controls/OverscanConfig.axaml.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Linq;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Localization;
 using Avalonia.Interactivity;
 using Avalonia.Data;

NewUI/Debugger/Controls/PictureViewer.cs

@@ -3,7 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 using Mesen.Utilities;
 using System;
 using System.Collections.Generic;

NewUI/Debugger/Disassembly/BaseStyleProvider.cs

@@ -1,7 +1,7 @@
 using Avalonia.Media;
 using Mesen.Debugger.Controls;
-using Mesen.GUI.Config;
-using Mesen.GUI.Debugger;
+using Mesen.Config;
+using Mesen.Debugger;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NewUI/Debugger/Disassembly/CodeHighlighting.cs

@@ -1,6 +1,6 @@
 using Avalonia.Media;
 using Mesen.Debugger.Controls;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NewUI/Debugger/HexEditorDataProvider.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using Avalonia.Media;
 using Mesen.Debugger.Controls;
-using Mesen.GUI.Config;
-using Mesen.GUI.Debugger;
+using Mesen.Config;
+using Mesen.Debugger;
 using Mesen.Interop;
 
 namespace Mesen.Debugger

NewUI/Debugger/Labels/CodeLabel.cs

@@ -1,11 +1,7 @@
-using Mesen.GUI;
-using Mesen.Interop;
+using Mesen.Interop;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Mesen.Debugger.Labels
 {

NewUI/Debugger/Labels/LabelManager.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 using Mesen.Interop;
 using System;
 using System.Collections.Generic;

NewUI/Debugger/ViewModels/BreakpointListViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 using Mesen.Interop;
 using Mesen.ViewModels;
 using ReactiveUI;

NewUI/Debugger/ViewModels/DebuggerWindowViewModel.cs

@@ -1,19 +1,11 @@
-using Dock.Model;
-using Dock.Model.Controls;
+using Dock.Model.Controls;
 using Dock.Model.Core;
 using Dock.Model.ReactiveUI.Controls;
-using Mesen.GUI;
 using Mesen.Interop;
 using Mesen.ViewModels;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
 using System.Reactive;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mesen.Debugger.ViewModels
 {

NewUI/Debugger/ViewModels/HexEditorViewModel.cs

@@ -1,5 +1,4 @@
-using Mesen.GUI;
-using Mesen.ViewModels;
+using Mesen.ViewModels;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;
@@ -13,8 +12,6 @@ namespace Mesen.Debugger.ViewModels
 {
 	public class HexEditorViewModel : ViewModelBase
 	{
-
-
 		public HexEditorViewModel()
 		{
 		}

NewUI/Debugger/ViewModels/SnesPpuViewModel.cs

@@ -1,12 +1,8 @@
-using Avalonia.Controls;
-using Mesen.GUI;
-using Mesen.Interop;
+using Mesen.Interop;
 using Mesen.ViewModels;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using System;
 using System.Reactive.Linq;
-using System.Text;
 
 namespace Mesen.Debugger.ViewModels
 {

NewUI/Debugger/Views/BreakpointListView.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Mesen.ViewModels;
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 using Mesen.Debugger.ViewModels;
 
 namespace Mesen.Debugger.Views

NewUI/Interop/ConfigApi.cs

@@ -6,8 +6,8 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using Mesen.GUI.Config;
-using Mesen.GUI.Config.Shortcuts;
+using Mesen.Config;
+using Mesen.Config.Shortcuts;
 using Mesen.Utilities;
 
 namespace Mesen.Interop

NewUI/Interop/EmuApi.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using Mesen.Localization;
-using Mesen.GUI.Config.Shortcuts;
+using Mesen.Config.Shortcuts;
 using Mesen.Utilities;
 
 namespace Mesen.Interop

NewUI/Interop/InteropBreakpoint.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Debugger;
+using Mesen.Debugger;
 using System;
 using System.Runtime.InteropServices;
 

NewUI/Interop/NetplayApi.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;

NewUI/Interop/RecordApi.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NewUI/Localization/ResourceHelper.cs

@@ -1,15 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
-using Mesen.GUI;
-using Mesen.GUI.Config;
 using Mesen.Interop;
 
 namespace Mesen.Localization

NewUI/Models/Breakpoint.cs

@@ -4,7 +4,7 @@ using ReactiveUI.Fody.Helpers;
 using System;
 using System.Text;
 
-namespace Mesen.GUI.Debugger
+namespace Mesen.Debugger
 {
 	public class Breakpoint : ReactiveObject
 	{

NewUI/Models/BreakpointManager.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace Mesen.GUI.Debugger
+namespace Mesen.Debugger
 {
 /*	public class BreakpointManager
 	{

NewUI/Program.cs

@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Utilities;
 using System;
 

NewUI/Utilities/ColorHelper.cs

@@ -1,5 +1,5 @@
 using Avalonia.Media;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NewUI/Utilities/FolderHelper.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using System;
 using System.Collections.Generic;
 using System.IO;

NewUI/Utilities/LoadRomHelper.cs

@@ -1,5 +1,4 @@
-using Mesen.GUI;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Interop;
 using System;
 using System.Collections.Generic;

NewUI/ViewModels/AudioConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/AudioPlayerViewModel.cs

@@ -1,5 +1,4 @@
-using Mesen.GUI;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Interop;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;

NewUI/ViewModels/ConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/ControllerConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/EmulationConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/GameboyConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/NesConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/NesInputConfigViewModel.cs

@@ -2,8 +2,8 @@
 
 using Avalonia;
 using Avalonia.Controls;
-using Mesen.GUI.Config;
-using Mesen.GUI.Config.Shortcuts;
+using Mesen.Config;
+using Mesen.Config.Shortcuts;
 using Mesen.Localization;
 using Mesen.Utilities;
 using Mesen.Views;

NewUI/ViewModels/PreferencesConfigViewModel.cs

@@ -1,5 +1,5 @@
-using Mesen.GUI.Config;
-using Mesen.GUI.Config.Shortcuts;
+using Mesen.Config;
+using Mesen.Config.Shortcuts;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/SnesConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/ViewModels/SnesInputConfigViewModel.cs

@@ -1,6 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Localization;
 using Mesen.Utilities;
 using Mesen.Views;

NewUI/ViewModels/VideoConfigViewModel.cs

@@ -1,4 +1,4 @@
-using Mesen.GUI.Config;
+using Mesen.Config;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;

NewUI/Views/AudioConfigView.axaml

@@ -6,7 +6,7 @@
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:l="using:Mesen.Localization"
 	xmlns:c="using:Mesen.Controls"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
 	VerticalAlignment="Stretch"
 	HorizontalAlignment="Stretch"

NewUI/Views/AudioConfigView.axaml.cs

@@ -1,9 +1,5 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Mesen.Utilities;
-using Mesen.GUI.Config;
-using Mesen.GUI;
 using Mesen.Interop;
 
 namespace Mesen.Views

NewUI/Views/AudioPlayerView.axaml

@@ -5,7 +5,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:c="using:Mesen.Controls"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	xmlns:l="using:Mesen.Localization"
 	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
 	VerticalAlignment="Stretch"

NewUI/Views/AudioPlayerView.axaml.cs

@@ -1,11 +1,8 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Mesen.Utilities;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Avalonia.Interactivity;
-using Mesen.GUI;
-using Mesen.GUI.Config.Shortcuts;
 using Avalonia.Threading;
 using Mesen.ViewModels;
 using Mesen.Interop;

NewUI/Views/ControllerConfigViewLocator.cs

@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.ViewModels;
 using System;
 using System.Collections.Generic;

NewUI/Views/EmulationConfigView.axaml

@@ -5,7 +5,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:c="using:Mesen.Controls"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	xmlns:l="using:Mesen.Localization"
 	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
 	VerticalAlignment="Stretch"

NewUI/Views/EmulationConfigView.axaml.cs

@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Mesen.Utilities;
-using Mesen.GUI.Config;
+using Mesen.Config;
 
 namespace Mesen.Views
 {

NewUI/Views/GameboyConfigView.axaml

@@ -6,7 +6,7 @@
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:c="using:Mesen.Controls"
 	xmlns:dc="using:Mesen.Debugger.Controls"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	xmlns:l="using:Mesen.Localization"
 	mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="250"
 	VerticalAlignment="Stretch"

NewUI/Views/GameboyConfigView.axaml.cs

@@ -4,7 +4,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Mesen.Utilities;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Debugger.Controls;
 using Mesen.ViewModels;
 using Mesen.Windows;

NewUI/Views/NesConfigView.axaml

@@ -7,7 +7,7 @@
 	xmlns:c="using:Mesen.Controls"
 	xmlns:v="using:Mesen.Views"
 	xmlns:dc="using:Mesen.Debugger.Controls"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	xmlns:l="using:Mesen.Localization"
 	mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="550"
 	VerticalAlignment="Stretch"

NewUI/Views/NesConfigView.axaml.cs

@@ -4,7 +4,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Mesen.Utilities;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Avalonia.Interactivity;
 using System;
 using System.Collections.Generic;

NewUI/Views/NesControllerView.axaml

@@ -6,7 +6,7 @@
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:l="using:Mesen.Localization"
 	xmlns:c="using:Mesen.Controls"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	mc:Ignorable="d" d:DesignWidth="610" d:DesignHeight="230"
 	VerticalAlignment="Stretch"
 	HorizontalAlignment="Stretch"

NewUI/Views/NesControllerView.axaml.cs

@@ -1,9 +1,5 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Mesen.Utilities;
-using Mesen.GUI.Config;
-using Mesen.GUI;
 
 namespace Mesen.Views
 {

NewUI/Views/NesInputConfigView.axaml

@@ -7,7 +7,7 @@
 	xmlns:l="using:Mesen.Localization"
 	xmlns:c="using:Mesen.Controls"
 	xmlns:v="using:Mesen.Views"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
 	VerticalAlignment="Stretch"
 	HorizontalAlignment="Stretch"

NewUI/Views/NesInputConfigView.axaml.cs

@@ -1,12 +1,5 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Mesen.Utilities;
-using Mesen.GUI.Config;
-using Mesen.GUI;
-using Mesen.ViewModels;
-using Avalonia.Interactivity;
-using Mesen.Windows;
 
 namespace Mesen.Views
 {

NewUI/Views/PreferencesConfigView.axaml

@@ -6,7 +6,7 @@
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:c="using:Mesen.Controls"
 	xmlns:v="using:Mesen.Views"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	xmlns:l="using:Mesen.Localization"
 	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
 	VerticalAlignment="Stretch"

NewUI/Views/PreferencesConfigView.axaml.cs

@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Mesen.Utilities;
-using Mesen.GUI.Config;
+using Mesen.Config;
 using Mesen.Controls;
 using Avalonia.Themes.Fluent;
 using Avalonia.Styling;

NewUI/Views/ShortcutKeysTabView.axaml

@@ -5,7 +5,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:vm="using:Mesen.ViewModels"
 	xmlns:c="using:Mesen.Controls"
-	xmlns:cfg="using:Mesen.GUI.Config"
+	xmlns:cfg="using:Mesen.Config"
 	xmlns:l="using:Mesen.Localization"
 	mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
 	VerticalAlignment="Top"

NewUI/Views/ShortcutKeysTabView.axaml.cs

@@ -2,7 +2,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Mesen.Utilities;
-using Mesen.GUI.Config;
+using Mesen.Config;
 
 namespace Mesen.Views
 {