diff --git a/src/Ryujinx.Ava/UI/ViewModels/ControllerInputViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/Input/ControllerInputViewModel.cs
similarity index 97%
rename from src/Ryujinx.Ava/UI/ViewModels/ControllerInputViewModel.cs
rename to src/Ryujinx.Ava/UI/ViewModels/Input/ControllerInputViewModel.cs
index 11b555db6..2aeb29c1e 100644
--- a/src/Ryujinx.Ava/UI/ViewModels/ControllerInputViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -2,16 +2,11 @@ using Avalonia.Svg.Skia;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Views.Input;
 
-namespace Ryujinx.Ava.UI.ViewModels
+namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public class ControllerInputViewModel : BaseModel
     {
         private ControllerInputConfig _config;
-        private bool _isLeft;
-        private bool _isRight;
-        private bool _showSettings;
-        private SvgImage _image;
-
         public ControllerInputConfig Config
         {
             get => _config;
@@ -22,6 +17,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private bool _isLeft;
         public bool IsLeft
         {
             get => _isLeft;
@@ -32,6 +28,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private bool _isRight;
         public bool IsRight
         {
             get => _isRight;
@@ -42,6 +39,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private bool _showSettings;
         public bool ShowSettings
         {
             get => _showSettings;
@@ -52,6 +50,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private SvgImage _image;
         public SvgImage Image
         {
             get => _image;
diff --git a/src/Ryujinx.Ava/UI/ViewModels/InputViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/Input/InputViewModel.cs
similarity index 99%
rename from src/Ryujinx.Ava/UI/ViewModels/InputViewModel.cs
rename to src/Ryujinx.Ava/UI/ViewModels/Input/InputViewModel.cs
index 6f213e31f..7169c38ae 100644
--- a/src/Ryujinx.Ava/UI/ViewModels/InputViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/Input/InputViewModel.cs
@@ -29,7 +29,7 @@ using ConfigGamepadInputId = Ryujinx.Common.Configuration.Hid.Controller.Gamepad
 using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
-namespace Ryujinx.Ava.UI.ViewModels
+namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public class InputViewModel : BaseModel, IDisposable
     {
diff --git a/src/Ryujinx.Ava/UI/ViewModels/KeyboardInputViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs
similarity index 96%
rename from src/Ryujinx.Ava/UI/ViewModels/KeyboardInputViewModel.cs
rename to src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs
index db8329073..994bdb17e 100644
--- a/src/Ryujinx.Ava/UI/ViewModels/KeyboardInputViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/Input/KeyboardInputViewModel.cs
@@ -1,16 +1,11 @@
 using Avalonia.Svg.Skia;
 using Ryujinx.Ava.UI.Models;
 
-namespace Ryujinx.Ava.UI.ViewModels
+namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public class KeyboardInputViewModel : BaseModel
     {
         private KeyboardInputConfig _config;
-        private bool _isLeft;
-        private bool _isRight;
-        private bool _showSettings;
-        private SvgImage _image;
-
         public KeyboardInputConfig Config
         {
             get => _config;
@@ -21,6 +16,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private bool _isLeft;
         public bool IsLeft
         {
             get => _isLeft;
@@ -31,6 +27,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private bool _isRight;
         public bool IsRight
         {
             get => _isRight;
@@ -41,6 +38,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private bool _showSettings;
         public bool ShowSettings
         {
             get => _showSettings;
@@ -51,6 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        private SvgImage _image;
         public SvgImage Image
         {
             get => _image;
diff --git a/src/Ryujinx.Ava/UI/ViewModels/MotionInputViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/Input/MotionInputViewModel.cs
similarity index 100%
rename from src/Ryujinx.Ava/UI/ViewModels/MotionInputViewModel.cs
rename to src/Ryujinx.Ava/UI/ViewModels/Input/MotionInputViewModel.cs
diff --git a/src/Ryujinx.Ava/UI/ViewModels/RumbleInputViewModel.cs b/src/Ryujinx.Ava/UI/ViewModels/Input/RumbleInputViewModel.cs
similarity index 92%
rename from src/Ryujinx.Ava/UI/ViewModels/RumbleInputViewModel.cs
rename to src/Ryujinx.Ava/UI/ViewModels/Input/RumbleInputViewModel.cs
index 49de19937..8ad33cf4c 100644
--- a/src/Ryujinx.Ava/UI/ViewModels/RumbleInputViewModel.cs
+++ b/src/Ryujinx.Ava/UI/ViewModels/Input/RumbleInputViewModel.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.UI.ViewModels
+namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public class RumbleInputViewModel : BaseModel
     {