diff --git a/PCK-Studio/Features/CemuPanel.Designer.cs b/PCK-Studio/Forms/Features/CemuPanel.Designer.cs
similarity index 99%
rename from PCK-Studio/Features/CemuPanel.Designer.cs
rename to PCK-Studio/Forms/Features/CemuPanel.Designer.cs
index 44f0b0c9..1853180f 100644
--- a/PCK-Studio/Features/CemuPanel.Designer.cs
+++ b/PCK-Studio/Forms/Features/CemuPanel.Designer.cs
@@ -1,4 +1,4 @@
-namespace PckStudio.Features
+namespace PckStudio.Forms.Features
 {
     partial class CemuPanel
     {
diff --git a/PCK-Studio/Features/CemuPanel.cs b/PCK-Studio/Forms/Features/CemuPanel.cs
similarity index 99%
rename from PCK-Studio/Features/CemuPanel.cs
rename to PCK-Studio/Forms/Features/CemuPanel.cs
index e49018e4..6112f75e 100644
--- a/PCK-Studio/Features/CemuPanel.cs
+++ b/PCK-Studio/Forms/Features/CemuPanel.cs
@@ -24,7 +24,7 @@ using PckStudio.Extensions;
 using PckStudio.Classes.Misc;
 using System.Diagnostics;
 
-namespace PckStudio.Features
+namespace PckStudio.Forms.Features
 {
     /// <summary>
     /// Wishlist:
diff --git a/PCK-Studio/Features/CemuPanel.resx b/PCK-Studio/Forms/Features/CemuPanel.resx
similarity index 100%
rename from PCK-Studio/Features/CemuPanel.resx
rename to PCK-Studio/Forms/Features/CemuPanel.resx
diff --git a/PCK-Studio/Features/PckManager.Designer.cs b/PCK-Studio/Forms/Features/PckManager.Designer.cs
similarity index 99%
rename from PCK-Studio/Features/PckManager.Designer.cs
rename to PCK-Studio/Forms/Features/PckManager.Designer.cs
index 61f06c53..a4cf5933 100644
--- a/PCK-Studio/Features/PckManager.Designer.cs
+++ b/PCK-Studio/Forms/Features/PckManager.Designer.cs
@@ -1,4 +1,4 @@
-namespace PckStudio.Features
+namespace PckStudio.Forms.Features
 {
     partial class PckManager
     {
diff --git a/PCK-Studio/Features/PckManager.cs b/PCK-Studio/Forms/Features/PckManager.cs
similarity index 98%
rename from PCK-Studio/Features/PckManager.cs
rename to PCK-Studio/Forms/Features/PckManager.cs
index 9b5874c0..6348649c 100644
--- a/PCK-Studio/Features/PckManager.cs
+++ b/PCK-Studio/Forms/Features/PckManager.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace PckStudio.Features
+namespace PckStudio.Forms.Features
 {
     public partial class PckManager : MetroFramework.Forms.MetroForm
     {
diff --git a/PCK-Studio/Features/PckManager.resx b/PCK-Studio/Forms/Features/PckManager.resx
similarity index 100%
rename from PCK-Studio/Features/PckManager.resx
rename to PCK-Studio/Forms/Features/PckManager.resx
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 6a05c09f..bb924f89 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -25,7 +25,7 @@ using PckStudio.Classes.Misc;
 using PckStudio.Internal.IO.PckAudio;
 using PckStudio.Internal.IO._3DST;
 using PckStudio.Internal;
-using PckStudio.Features;
+using PckStudio.Forms.Features;
 using PckStudio.Extensions;
 using PckStudio.Popups;
 using PckStudio.Classes.Utils;
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 04aab6ba..a042ca2c 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -262,10 +262,10 @@
     <Compile Include="Extensions\ImageExtensions.cs" />
     <Compile Include="Internal\SkinANIM.cs" />
     <Compile Include="Classes\Misc\RichPresenceClient.cs" />
-    <Compile Include="Features\CemuPanel.cs">
+    <Compile Include="Forms\Features\CemuPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Features\CemuPanel.Designer.cs">
+    <Compile Include="Forms\Features\CemuPanel.Designer.cs">
       <DependentUpon>CemuPanel.cs</DependentUpon>
     </Compile>
     <Compile Include="Internal\IO\TGA\TGAFileData.cs" />
@@ -399,10 +399,10 @@
     <Compile Include="Forms\Editor\BoxEditor.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Features\PckManager.cs">
+    <Compile Include="Forms\Features\PckManager.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Features\PckManager.Designer.cs">
+    <Compile Include="Forms\Features\PckManager.Designer.cs">
       <DependentUpon>PckManager.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\Editor\BoxEditor.Designer.cs">
@@ -460,7 +460,7 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Internal\IO\3DST\TextureCodec.cs" />
-    <EmbeddedResource Include="Features\CemuPanel.resx">
+    <EmbeddedResource Include="Forms\Features\CemuPanel.resx">
       <DependentUpon>CemuPanel.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Additional-Popups\EntityForms\AddEntry.resx">
@@ -546,7 +546,7 @@
     <EmbeddedResource Include="Forms\Additional-Popups\InProgressPrompt.resx">
       <DependentUpon>InProgressPrompt.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Features\PckManager.resx">
+    <EmbeddedResource Include="Forms\Features\PckManager.resx">
       <DependentUpon>PckManager.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Editor\BoxEditor.resx">