diff --git a/.editorconfig b/.editorconfig
index 1eaf77ae6b..76edc491ce 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -259,12 +259,12 @@ dotnet_diagnostic.CA1861.severity = none
 # Disable "Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison, but keep in mind that this might cause subtle changes in behavior, so make sure to conduct thorough testing after applying the suggestion, or if culturally sensitive comparison is not required, consider using 'StringComparison.OrdinalIgnoreCase'"
 dotnet_diagnostic.CA1862.severity = none
 
-[src/Ryujinx.HLE/HOS/Services/**.cs]
-# Disable "mark members as static" rule for services
+[src/Ryujinx/UI/ViewModels/**.cs]
+# Disable "mark members as static" rule for ViewModels
 dotnet_diagnostic.CA1822.severity = none
 
-[src/Ryujinx.Ava/UI/ViewModels/**.cs]
-# Disable "mark members as static" rule for ViewModels
+[src/Ryujinx.HLE/HOS/Services/**.cs]
+# Disable "mark members as static" rule for services
 dotnet_diagnostic.CA1822.severity = none
 
 [src/Ryujinx.Tests/Cpu/*.cs]
diff --git a/Ryujinx.sln b/Ryujinx.sln
index 48adfdf5ff..b8304164d5 100644
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -69,7 +69,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Headless.SDL2", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.FFmpeg", "src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj", "{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Ava", "src\Ryujinx.Ava\Ryujinx.Ava.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.UI.Common", "src\Ryujinx.UI.Common\Ryujinx.UI.Common.csproj", "{BA161CA0-CD65-4E6E-B644-51C8D1E542DC}"
 EndProject
diff --git a/src/Ryujinx.Ava/App.axaml b/src/Ryujinx/App.axaml
similarity index 100%
rename from src/Ryujinx.Ava/App.axaml
rename to src/Ryujinx/App.axaml
diff --git a/src/Ryujinx.Ava/App.axaml.cs b/src/Ryujinx/App.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/App.axaml.cs
rename to src/Ryujinx/App.axaml.cs
diff --git a/src/Ryujinx.Ava/AppHost.cs b/src/Ryujinx/AppHost.cs
similarity index 100%
rename from src/Ryujinx.Ava/AppHost.cs
rename to src/Ryujinx/AppHost.cs
diff --git a/src/Ryujinx.Ava/Assets/Fonts/SegoeFluentIcons.ttf b/src/Ryujinx/Assets/Fonts/SegoeFluentIcons.ttf
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Fonts/SegoeFluentIcons.ttf
rename to src/Ryujinx/Assets/Fonts/SegoeFluentIcons.ttf
diff --git a/src/Ryujinx.Ava/Assets/Icons/Controller_JoyConLeft.svg b/src/Ryujinx/Assets/Icons/Controller_JoyConLeft.svg
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Icons/Controller_JoyConLeft.svg
rename to src/Ryujinx/Assets/Icons/Controller_JoyConLeft.svg
diff --git a/src/Ryujinx.Ava/Assets/Icons/Controller_JoyConPair.svg b/src/Ryujinx/Assets/Icons/Controller_JoyConPair.svg
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Icons/Controller_JoyConPair.svg
rename to src/Ryujinx/Assets/Icons/Controller_JoyConPair.svg
diff --git a/src/Ryujinx.Ava/Assets/Icons/Controller_JoyConRight.svg b/src/Ryujinx/Assets/Icons/Controller_JoyConRight.svg
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Icons/Controller_JoyConRight.svg
rename to src/Ryujinx/Assets/Icons/Controller_JoyConRight.svg
diff --git a/src/Ryujinx.Ava/Assets/Icons/Controller_ProCon.svg b/src/Ryujinx/Assets/Icons/Controller_ProCon.svg
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Icons/Controller_ProCon.svg
rename to src/Ryujinx/Assets/Icons/Controller_ProCon.svg
diff --git a/src/Ryujinx.Ava/Assets/Locales/de_DE.json b/src/Ryujinx/Assets/Locales/de_DE.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/de_DE.json
rename to src/Ryujinx/Assets/Locales/de_DE.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/el_GR.json b/src/Ryujinx/Assets/Locales/el_GR.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/el_GR.json
rename to src/Ryujinx/Assets/Locales/el_GR.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/en_US.json
rename to src/Ryujinx/Assets/Locales/en_US.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/es_ES.json b/src/Ryujinx/Assets/Locales/es_ES.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/es_ES.json
rename to src/Ryujinx/Assets/Locales/es_ES.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/fr_FR.json b/src/Ryujinx/Assets/Locales/fr_FR.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/fr_FR.json
rename to src/Ryujinx/Assets/Locales/fr_FR.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/he_IL.json b/src/Ryujinx/Assets/Locales/he_IL.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/he_IL.json
rename to src/Ryujinx/Assets/Locales/he_IL.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/it_IT.json b/src/Ryujinx/Assets/Locales/it_IT.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/it_IT.json
rename to src/Ryujinx/Assets/Locales/it_IT.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/ja_JP.json b/src/Ryujinx/Assets/Locales/ja_JP.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/ja_JP.json
rename to src/Ryujinx/Assets/Locales/ja_JP.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/ko_KR.json b/src/Ryujinx/Assets/Locales/ko_KR.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/ko_KR.json
rename to src/Ryujinx/Assets/Locales/ko_KR.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/pl_PL.json b/src/Ryujinx/Assets/Locales/pl_PL.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/pl_PL.json
rename to src/Ryujinx/Assets/Locales/pl_PL.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/pt_BR.json b/src/Ryujinx/Assets/Locales/pt_BR.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/pt_BR.json
rename to src/Ryujinx/Assets/Locales/pt_BR.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/ru_RU.json b/src/Ryujinx/Assets/Locales/ru_RU.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/ru_RU.json
rename to src/Ryujinx/Assets/Locales/ru_RU.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/tr_TR.json b/src/Ryujinx/Assets/Locales/tr_TR.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/tr_TR.json
rename to src/Ryujinx/Assets/Locales/tr_TR.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/uk_UA.json b/src/Ryujinx/Assets/Locales/uk_UA.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/uk_UA.json
rename to src/Ryujinx/Assets/Locales/uk_UA.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/zh_CN.json
rename to src/Ryujinx/Assets/Locales/zh_CN.json
diff --git a/src/Ryujinx.Ava/Assets/Locales/zh_TW.json b/src/Ryujinx/Assets/Locales/zh_TW.json
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Locales/zh_TW.json
rename to src/Ryujinx/Assets/Locales/zh_TW.json
diff --git a/src/Ryujinx.Ava/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Styles/Styles.xaml
rename to src/Ryujinx/Assets/Styles/Styles.xaml
diff --git a/src/Ryujinx.Ava/Assets/Styles/Themes.xaml b/src/Ryujinx/Assets/Styles/Themes.xaml
similarity index 100%
rename from src/Ryujinx.Ava/Assets/Styles/Themes.xaml
rename to src/Ryujinx/Assets/Styles/Themes.xaml
diff --git a/src/Ryujinx.Ava/Common/ApplicationHelper.cs b/src/Ryujinx/Common/ApplicationHelper.cs
similarity index 100%
rename from src/Ryujinx.Ava/Common/ApplicationHelper.cs
rename to src/Ryujinx/Common/ApplicationHelper.cs
diff --git a/src/Ryujinx.Ava/Common/ApplicationSort.cs b/src/Ryujinx/Common/ApplicationSort.cs
similarity index 100%
rename from src/Ryujinx.Ava/Common/ApplicationSort.cs
rename to src/Ryujinx/Common/ApplicationSort.cs
diff --git a/src/Ryujinx.Ava/Common/KeyboardHotkeyState.cs b/src/Ryujinx/Common/KeyboardHotkeyState.cs
similarity index 100%
rename from src/Ryujinx.Ava/Common/KeyboardHotkeyState.cs
rename to src/Ryujinx/Common/KeyboardHotkeyState.cs
diff --git a/src/Ryujinx.Ava/Common/Locale/LocaleExtension.cs b/src/Ryujinx/Common/Locale/LocaleExtension.cs
similarity index 100%
rename from src/Ryujinx.Ava/Common/Locale/LocaleExtension.cs
rename to src/Ryujinx/Common/Locale/LocaleExtension.cs
diff --git a/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs b/src/Ryujinx/Common/Locale/LocaleManager.cs
similarity index 99%
rename from src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
rename to src/Ryujinx/Common/Locale/LocaleManager.cs
index b2f3e7ab95..e973fcc067 100644
--- a/src/Ryujinx.Ava/Common/Locale/LocaleManager.cs
+++ b/src/Ryujinx/Common/Locale/LocaleManager.cs
@@ -143,7 +143,7 @@ namespace Ryujinx.Ava.Common.Locale
         private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode = DefaultLanguageCode)
         {
             var localeStrings = new Dictionary<LocaleKeys, string>();
-            string languageJson = EmbeddedResources.ReadAllText($"Ryujinx.Ava/Assets/Locales/{languageCode}.json");
+            string languageJson = EmbeddedResources.ReadAllText($"Ryujinx/Assets/Locales/{languageCode}.json");
             var strings = JsonHelper.Deserialize(languageJson, CommonJsonContext.Default.StringDictionary);
 
             foreach (var item in strings)
diff --git a/src/Ryujinx.Ava/Input/AvaloniaKeyboard.cs b/src/Ryujinx/Input/AvaloniaKeyboard.cs
similarity index 100%
rename from src/Ryujinx.Ava/Input/AvaloniaKeyboard.cs
rename to src/Ryujinx/Input/AvaloniaKeyboard.cs
diff --git a/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs b/src/Ryujinx/Input/AvaloniaKeyboardDriver.cs
similarity index 100%
rename from src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
rename to src/Ryujinx/Input/AvaloniaKeyboardDriver.cs
diff --git a/src/Ryujinx.Ava/Input/AvaloniaKeyboardMappingHelper.cs b/src/Ryujinx/Input/AvaloniaKeyboardMappingHelper.cs
similarity index 100%
rename from src/Ryujinx.Ava/Input/AvaloniaKeyboardMappingHelper.cs
rename to src/Ryujinx/Input/AvaloniaKeyboardMappingHelper.cs
diff --git a/src/Ryujinx.Ava/Input/AvaloniaMouse.cs b/src/Ryujinx/Input/AvaloniaMouse.cs
similarity index 100%
rename from src/Ryujinx.Ava/Input/AvaloniaMouse.cs
rename to src/Ryujinx/Input/AvaloniaMouse.cs
diff --git a/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs b/src/Ryujinx/Input/AvaloniaMouseDriver.cs
similarity index 100%
rename from src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
rename to src/Ryujinx/Input/AvaloniaMouseDriver.cs
diff --git a/src/Ryujinx.Ava/Modules/Updater/Updater.cs b/src/Ryujinx/Modules/Updater/Updater.cs
similarity index 99%
rename from src/Ryujinx.Ava/Modules/Updater/Updater.cs
rename to src/Ryujinx/Modules/Updater/Updater.cs
index 5795f34f01..2a6b5fc20e 100644
--- a/src/Ryujinx.Ava/Modules/Updater/Updater.cs
+++ b/src/Ryujinx/Modules/Updater/Updater.cs
@@ -309,7 +309,7 @@ namespace Ryujinx.Modules
                         // Fallback if the executable could not be found.
                         if (!Path.Exists(Path.Combine(executableDirectory, ryuName)))
                         {
-                            ryuName = OperatingSystem.IsWindows() ? "Ryujinx.Ava.exe" : "Ryujinx.Ava";
+                            ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx";
                         }
 
                         ProcessStartInfo processStart = new(ryuName)
diff --git a/src/Ryujinx.Ava/Program.cs b/src/Ryujinx/Program.cs
similarity index 100%
rename from src/Ryujinx.Ava/Program.cs
rename to src/Ryujinx/Program.cs
diff --git a/src/Ryujinx.Ava/Ryujinx.Ava.csproj b/src/Ryujinx/Ryujinx.csproj
similarity index 99%
rename from src/Ryujinx.Ava/Ryujinx.Ava.csproj
rename to src/Ryujinx/Ryujinx.csproj
index 91c2744f0e..b3d312f626 100644
--- a/src/Ryujinx.Ava/Ryujinx.Ava.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -7,7 +7,6 @@
     <Version>1.0.0-dirty</Version>
     <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
     <SigningCertificate Condition=" '$(SigningCertificate)' == '' ">-</SigningCertificate>
-    <RootNamespace>Ryujinx.Ava</RootNamespace>
     <ApplicationIcon>Ryujinx.ico</ApplicationIcon>
     <TieredPGO>true</TieredPGO>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
diff --git a/src/Ryujinx.Ava/Ryujinx.ico b/src/Ryujinx/Ryujinx.ico
similarity index 100%
rename from src/Ryujinx.Ava/Ryujinx.ico
rename to src/Ryujinx/Ryujinx.ico
diff --git a/src/Ryujinx.Ava/UI/Applet/AvaHostUIHandler.cs b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/AvaHostUIHandler.cs
rename to src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
diff --git a/src/Ryujinx.Ava/UI/Applet/AvaloniaDynamicTextInputHandler.cs b/src/Ryujinx/UI/Applet/AvaloniaDynamicTextInputHandler.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/AvaloniaDynamicTextInputHandler.cs
rename to src/Ryujinx/UI/Applet/AvaloniaDynamicTextInputHandler.cs
diff --git a/src/Ryujinx.Ava/UI/Applet/AvaloniaHostUITheme.cs b/src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/AvaloniaHostUITheme.cs
rename to src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
diff --git a/src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml b/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml
rename to src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml
diff --git a/src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml.cs b/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs
similarity index 91%
rename from src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml.cs
rename to src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs
index 279af07c3a..5a98b16456 100644
--- a/src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml.cs
+++ b/src/Ryujinx/UI/Applet/ControllerAppletDialog.axaml.cs
@@ -17,10 +17,10 @@ namespace Ryujinx.Ava.UI.Applet
 {
     internal partial class ControllerAppletDialog : UserControl
     {
-        private const string ProControllerResource = "Ryujinx.Ava/Assets/Icons/Controller_ProCon.svg";
-        private const string JoyConPairResource = "Ryujinx.Ava/Assets/Icons/Controller_JoyConPair.svg";
-        private const string JoyConLeftResource = "Ryujinx.Ava/Assets/Icons/Controller_JoyConLeft.svg";
-        private const string JoyConRightResource = "Ryujinx.Ava/Assets/Icons/Controller_JoyConRight.svg";
+        private const string ProControllerResource = "Ryujinx/Assets/Icons/Controller_ProCon.svg";
+        private const string JoyConPairResource = "Ryujinx/Assets/Icons/Controller_JoyConPair.svg";
+        private const string JoyConLeftResource = "Ryujinx/Assets/Icons/Controller_JoyConLeft.svg";
+        private const string JoyConRightResource = "Ryujinx/Assets/Icons/Controller_JoyConRight.svg";
 
         public static SvgImage ProControllerImage => GetResource(ProControllerResource);
         public static SvgImage JoyconPairImage => GetResource(JoyConPairResource);
diff --git a/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml b/src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml
rename to src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs b/src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/ErrorAppletWindow.axaml.cs
rename to src/Ryujinx/UI/Applet/ErrorAppletWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml b/src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml
rename to src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml
diff --git a/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs b/src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs
rename to src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml
rename to src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/ApplicationContextMenu.axaml.cs
rename to src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml
rename to src/Ryujinx/UI/Controls/ApplicationGridView.axaml
diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/ApplicationGridView.axaml.cs
rename to src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml
rename to src/Ryujinx/UI/Controls/ApplicationListView.axaml
diff --git a/src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/ApplicationListView.axaml.cs
rename to src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml b/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml
rename to src/Ryujinx/UI/Controls/NavigationDialogHost.axaml
diff --git a/src/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs b/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs
rename to src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Controls/SliderScroll.axaml.cs b/src/Ryujinx/UI/Controls/SliderScroll.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/SliderScroll.axaml.cs
rename to src/Ryujinx/UI/Controls/SliderScroll.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Controls/UpdateWaitWindow.axaml b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/UpdateWaitWindow.axaml
rename to src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Controls/UpdateWaitWindow.axaml.cs b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Controls/UpdateWaitWindow.axaml.cs
rename to src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/ApplicationOpenedEventArgs.cs b/src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/ApplicationOpenedEventArgs.cs
rename to src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/BitmapArrayValueConverter.cs b/src/Ryujinx/UI/Helpers/BitmapArrayValueConverter.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/BitmapArrayValueConverter.cs
rename to src/Ryujinx/UI/Helpers/BitmapArrayValueConverter.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs b/src/Ryujinx/UI/Helpers/ButtonKeyAssigner.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs
rename to src/Ryujinx/UI/Helpers/ButtonKeyAssigner.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs b/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs
rename to src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/Glyph.cs b/src/Ryujinx/UI/Helpers/Glyph.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/Glyph.cs
rename to src/Ryujinx/UI/Helpers/Glyph.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/GlyphValueConverter.cs b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/GlyphValueConverter.cs
rename to src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/KeyValueConverter.cs b/src/Ryujinx/UI/Helpers/KeyValueConverter.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/KeyValueConverter.cs
rename to src/Ryujinx/UI/Helpers/KeyValueConverter.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/LocalizedNeverConverter.cs b/src/Ryujinx/UI/Helpers/LocalizedNeverConverter.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/LocalizedNeverConverter.cs
rename to src/Ryujinx/UI/Helpers/LocalizedNeverConverter.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs b/src/Ryujinx/UI/Helpers/LoggerAdapter.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs
rename to src/Ryujinx/UI/Helpers/LoggerAdapter.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/MiniCommand.cs b/src/Ryujinx/UI/Helpers/MiniCommand.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/MiniCommand.cs
rename to src/Ryujinx/UI/Helpers/MiniCommand.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/NotificationHelper.cs b/src/Ryujinx/UI/Helpers/NotificationHelper.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/NotificationHelper.cs
rename to src/Ryujinx/UI/Helpers/NotificationHelper.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/OffscreenTextBox.cs b/src/Ryujinx/UI/Helpers/OffscreenTextBox.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/OffscreenTextBox.cs
rename to src/Ryujinx/UI/Helpers/OffscreenTextBox.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/TimeZoneConverter.cs b/src/Ryujinx/UI/Helpers/TimeZoneConverter.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/TimeZoneConverter.cs
rename to src/Ryujinx/UI/Helpers/TimeZoneConverter.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/UserErrorDialog.cs b/src/Ryujinx/UI/Helpers/UserErrorDialog.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/UserErrorDialog.cs
rename to src/Ryujinx/UI/Helpers/UserErrorDialog.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/UserResult.cs b/src/Ryujinx/UI/Helpers/UserResult.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/UserResult.cs
rename to src/Ryujinx/UI/Helpers/UserResult.cs
diff --git a/src/Ryujinx.Ava/UI/Helpers/Win32NativeInterop.cs b/src/Ryujinx/UI/Helpers/Win32NativeInterop.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Helpers/Win32NativeInterop.cs
rename to src/Ryujinx/UI/Helpers/Win32NativeInterop.cs
diff --git a/src/Ryujinx.Ava/UI/Models/CheatNode.cs b/src/Ryujinx/UI/Models/CheatNode.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/CheatNode.cs
rename to src/Ryujinx/UI/Models/CheatNode.cs
diff --git a/src/Ryujinx.Ava/UI/Models/ControllerModel.cs b/src/Ryujinx/UI/Models/ControllerModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/ControllerModel.cs
rename to src/Ryujinx/UI/Models/ControllerModel.cs
diff --git a/src/Ryujinx.Ava/UI/Models/DeviceType.cs b/src/Ryujinx/UI/Models/DeviceType.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/DeviceType.cs
rename to src/Ryujinx/UI/Models/DeviceType.cs
diff --git a/src/Ryujinx.Ava/UI/Models/DownloadableContentModel.cs b/src/Ryujinx/UI/Models/DownloadableContentModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/DownloadableContentModel.cs
rename to src/Ryujinx/UI/Models/DownloadableContentModel.cs
diff --git a/src/Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs b/src/Ryujinx/UI/Models/Generic/LastPlayedSortComparer.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs
rename to src/Ryujinx/UI/Models/Generic/LastPlayedSortComparer.cs
diff --git a/src/Ryujinx.Ava/UI/Models/Generic/TimePlayedSortComparer.cs b/src/Ryujinx/UI/Models/Generic/TimePlayedSortComparer.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/Generic/TimePlayedSortComparer.cs
rename to src/Ryujinx/UI/Models/Generic/TimePlayedSortComparer.cs
diff --git a/src/Ryujinx.Ava/UI/Models/InputConfiguration.cs b/src/Ryujinx/UI/Models/InputConfiguration.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/InputConfiguration.cs
rename to src/Ryujinx/UI/Models/InputConfiguration.cs
diff --git a/src/Ryujinx.Ava/UI/Models/ModModel.cs b/src/Ryujinx/UI/Models/ModModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/ModModel.cs
rename to src/Ryujinx/UI/Models/ModModel.cs
diff --git a/src/Ryujinx.Ava/UI/Models/PlayerModel.cs b/src/Ryujinx/UI/Models/PlayerModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/PlayerModel.cs
rename to src/Ryujinx/UI/Models/PlayerModel.cs
diff --git a/src/Ryujinx.Ava/UI/Models/ProfileImageModel.cs b/src/Ryujinx/UI/Models/ProfileImageModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/ProfileImageModel.cs
rename to src/Ryujinx/UI/Models/ProfileImageModel.cs
diff --git a/src/Ryujinx.Ava/UI/Models/SaveModel.cs b/src/Ryujinx/UI/Models/SaveModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/SaveModel.cs
rename to src/Ryujinx/UI/Models/SaveModel.cs
diff --git a/src/Ryujinx.Ava/UI/Models/StatusUpdatedEventArgs.cs b/src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/StatusUpdatedEventArgs.cs
rename to src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs
diff --git a/src/Ryujinx.Ava/UI/Models/TempProfile.cs b/src/Ryujinx/UI/Models/TempProfile.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/TempProfile.cs
rename to src/Ryujinx/UI/Models/TempProfile.cs
diff --git a/src/Ryujinx.Ava/UI/Models/TimeZone.cs b/src/Ryujinx/UI/Models/TimeZone.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/TimeZone.cs
rename to src/Ryujinx/UI/Models/TimeZone.cs
diff --git a/src/Ryujinx.Ava/UI/Models/TitleUpdateModel.cs b/src/Ryujinx/UI/Models/TitleUpdateModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/TitleUpdateModel.cs
rename to src/Ryujinx/UI/Models/TitleUpdateModel.cs
diff --git a/src/Ryujinx.Ava/UI/Models/UserProfile.cs b/src/Ryujinx/UI/Models/UserProfile.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Models/UserProfile.cs
rename to src/Ryujinx/UI/Models/UserProfile.cs
diff --git a/src/Ryujinx.Ava/UI/Renderer/EmbeddedWindow.cs b/src/Ryujinx/UI/Renderer/EmbeddedWindow.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Renderer/EmbeddedWindow.cs
rename to src/Ryujinx/UI/Renderer/EmbeddedWindow.cs
diff --git a/src/Ryujinx.Ava/UI/Renderer/EmbeddedWindowOpenGL.cs b/src/Ryujinx/UI/Renderer/EmbeddedWindowOpenGL.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Renderer/EmbeddedWindowOpenGL.cs
rename to src/Ryujinx/UI/Renderer/EmbeddedWindowOpenGL.cs
diff --git a/src/Ryujinx.Ava/UI/Renderer/EmbeddedWindowVulkan.cs b/src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Renderer/EmbeddedWindowVulkan.cs
rename to src/Ryujinx/UI/Renderer/EmbeddedWindowVulkan.cs
diff --git a/src/Ryujinx.Ava/UI/Renderer/OpenTKBindingsContext.cs b/src/Ryujinx/UI/Renderer/OpenTKBindingsContext.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Renderer/OpenTKBindingsContext.cs
rename to src/Ryujinx/UI/Renderer/OpenTKBindingsContext.cs
diff --git a/src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml b/src/Ryujinx/UI/Renderer/RendererHost.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml
rename to src/Ryujinx/UI/Renderer/RendererHost.axaml
diff --git a/src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml.cs b/src/Ryujinx/UI/Renderer/RendererHost.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml.cs
rename to src/Ryujinx/UI/Renderer/RendererHost.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Renderer/SPBOpenGLContext.cs b/src/Ryujinx/UI/Renderer/SPBOpenGLContext.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Renderer/SPBOpenGLContext.cs
rename to src/Ryujinx/UI/Renderer/SPBOpenGLContext.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/AboutWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/AboutWindowViewModel.cs
rename to src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs
rename to src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/BaseModel.cs b/src/Ryujinx/UI/ViewModels/BaseModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/BaseModel.cs
rename to src/Ryujinx/UI/ViewModels/BaseModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/ControllerInputViewModel.cs b/src/Ryujinx/UI/ViewModels/ControllerInputViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/ControllerInputViewModel.cs
rename to src/Ryujinx/UI/ViewModels/ControllerInputViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/DownloadableContentManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/DownloadableContentManagerViewModel.cs
rename to src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs
rename to src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/ModManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/ModManagerViewModel.cs
rename to src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/MotionInputViewModel.cs b/src/Ryujinx/UI/ViewModels/MotionInputViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/MotionInputViewModel.cs
rename to src/Ryujinx/UI/ViewModels/MotionInputViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/RumbleInputViewModel.cs b/src/Ryujinx/UI/ViewModels/RumbleInputViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/RumbleInputViewModel.cs
rename to src/Ryujinx/UI/ViewModels/RumbleInputViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
rename to src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/TitleUpdateViewModel.cs b/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/TitleUpdateViewModel.cs
rename to src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs b/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
rename to src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/UserProfileImageSelectorViewModel.cs b/src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/UserProfileImageSelectorViewModel.cs
rename to src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/UserProfileViewModel.cs b/src/Ryujinx/UI/ViewModels/UserProfileViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/UserProfileViewModel.cs
rename to src/Ryujinx/UI/ViewModels/UserProfileViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/UserSaveManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/UserSaveManagerViewModel.cs
rename to src/Ryujinx/UI/ViewModels/UserSaveManagerViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml
rename to src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml.cs
rename to src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Input/MotionInputView.axaml b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Input/MotionInputView.axaml
rename to src/Ryujinx/UI/Views/Input/MotionInputView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Input/MotionInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Input/MotionInputView.axaml.cs
rename to src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Input/RumbleInputView.axaml b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Input/RumbleInputView.axaml
rename to src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Input/RumbleInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Input/RumbleInputView.axaml.cs
rename to src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml
rename to src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
similarity index 99%
rename from src/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs
rename to src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index 8dff508685..dc50ce2657 100644
--- a/src/Ryujinx.Ava/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -55,7 +55,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         {
             List<MenuItem> menuItems = new();
 
-            string localePath = "Ryujinx.Ava/Assets/Locales";
+            string localePath = "Ryujinx/Assets/Locales";
             string localeExt = ".json";
 
             string[] localesPath = EmbeddedResources.GetAllAvailableResources(localePath, localeExt);
diff --git a/src/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml
rename to src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Main/MainStatusBarView.axaml.cs
rename to src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml
rename to src/Ryujinx/UI/Views/Main/MainViewControls.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Main/MainViewControls.axaml.cs
rename to src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml
rename to src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml.cs
rename to src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml
rename to src/Ryujinx/UI/Views/User/UserEditorView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml.cs
rename to src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
rename to src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
rename to src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserProfileImageSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserProfileImageSelectorView.axaml
rename to src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserProfileImageSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserProfileImageSelectorView.axaml.cs
rename to src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml
rename to src/Ryujinx/UI/Views/User/UserRecovererView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml.cs b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserRecovererView.axaml.cs
rename to src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml
rename to src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserSaveManagerView.axaml.cs
rename to src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml
rename to src/Ryujinx/UI/Views/User/UserSelectorView.axaml
diff --git a/src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml.cs b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Views/User/UserSelectorView.axaml.cs
rename to src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml b/src/Ryujinx/UI/Windows/AboutWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml
rename to src/Ryujinx/UI/Windows/AboutWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs b/src/Ryujinx/UI/Windows/AboutWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/AboutWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml
rename to src/Ryujinx/UI/Windows/AmiiboWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/AmiiboWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml b/src/Ryujinx/UI/Windows/CheatWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml
rename to src/Ryujinx/UI/Windows/CheatWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml.cs b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/ContentDialogOverlayWindow.axaml b/src/Ryujinx/UI/Windows/ContentDialogOverlayWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/ContentDialogOverlayWindow.axaml
rename to src/Ryujinx/UI/Windows/ContentDialogOverlayWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/ContentDialogOverlayWindow.axaml.cs b/src/Ryujinx/UI/Windows/ContentDialogOverlayWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/ContentDialogOverlayWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/ContentDialogOverlayWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml b/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml
rename to src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs b/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/IconColorPicker.cs b/src/Ryujinx/UI/Windows/IconColorPicker.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/IconColorPicker.cs
rename to src/Ryujinx/UI/Windows/IconColorPicker.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml b/src/Ryujinx/UI/Windows/MainWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/MainWindow.axaml
rename to src/Ryujinx/UI/Windows/MainWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/MainWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/ModManagerWindow.axaml b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/ModManagerWindow.axaml
rename to src/Ryujinx/UI/Windows/ModManagerWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/ModManagerWindow.axaml.cs b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/ModManagerWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
similarity index 98%
rename from src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
rename to src/Ryujinx/UI/Windows/SettingsWindow.axaml
index 40cac90ddc..de3c2291af 100644
--- a/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -76,7 +76,7 @@
                     Tag="CpuPage">
                     <ui:NavigationViewItem.IconSource>
                         <ui:FontIconSource
-                            FontFamily="avares://Ryujinx.Ava/Assets/Fonts#Segoe Fluent Icons"
+                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
                             Glyph="{helpers:GlyphValueConverter Chip}" />
                     </ui:NavigationViewItem.IconSource>
                 </ui:NavigationViewItem>
diff --git a/src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/StyleableWindow.cs b/src/Ryujinx/UI/Windows/StyleableWindow.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/StyleableWindow.cs
rename to src/Ryujinx/UI/Windows/StyleableWindow.cs
diff --git a/src/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml b/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml
rename to src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml
diff --git a/src/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml.cs b/src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/Windows/TitleUpdateWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml.cs
diff --git a/src/Ryujinx.Ava/app.manifest b/src/Ryujinx/app.manifest
similarity index 100%
rename from src/Ryujinx.Ava/app.manifest
rename to src/Ryujinx/app.manifest