diff --git a/PCK-Studio/Forms/Utilities/AppSettingsForm.Designer.cs b/PCK-Studio/Forms/AppSettingsForm.Designer.cs
similarity index 99%
rename from PCK-Studio/Forms/Utilities/AppSettingsForm.Designer.cs
rename to PCK-Studio/Forms/AppSettingsForm.Designer.cs
index b04a858b..e9191a50 100644
--- a/PCK-Studio/Forms/Utilities/AppSettingsForm.Designer.cs
+++ b/PCK-Studio/Forms/AppSettingsForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace PckStudio.Forms.Utilities
+namespace PckStudio.Forms
 {
     partial class AppSettingsForm
     {
diff --git a/PCK-Studio/Forms/Utilities/AppSettingsForm.cs b/PCK-Studio/Forms/AppSettingsForm.cs
similarity index 98%
rename from PCK-Studio/Forms/Utilities/AppSettingsForm.cs
rename to PCK-Studio/Forms/AppSettingsForm.cs
index b62e5c9c..53995275 100644
--- a/PCK-Studio/Forms/Utilities/AppSettingsForm.cs
+++ b/PCK-Studio/Forms/AppSettingsForm.cs
@@ -10,7 +10,7 @@ using System.Windows.Forms;
 using MetroFramework.Forms;
 using PckStudio.Properties;
 
-namespace PckStudio.Forms.Utilities
+namespace PckStudio.Forms
 {
     public partial class AppSettingsForm : MetroForm
     {
diff --git a/PCK-Studio/Forms/Utilities/AppSettingsForm.resx b/PCK-Studio/Forms/AppSettingsForm.resx
similarity index 100%
rename from PCK-Studio/Forms/Utilities/AppSettingsForm.resx
rename to PCK-Studio/Forms/AppSettingsForm.resx
diff --git a/PCK-Studio/Forms/Additional-Popups/CreditsForm.Designer.cs b/PCK-Studio/Forms/CreditsForm.Designer.cs
similarity index 99%
rename from PCK-Studio/Forms/Additional-Popups/CreditsForm.Designer.cs
rename to PCK-Studio/Forms/CreditsForm.Designer.cs
index 8802f918..b22d7492 100644
--- a/PCK-Studio/Forms/Additional-Popups/CreditsForm.Designer.cs
+++ b/PCK-Studio/Forms/CreditsForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace PckStudio
+namespace PckStudio.Forms
 {
     partial class CreditsForm
     {
diff --git a/PCK-Studio/Forms/Additional-Popups/CreditsForm.cs b/PCK-Studio/Forms/CreditsForm.cs
similarity index 95%
rename from PCK-Studio/Forms/Additional-Popups/CreditsForm.cs
rename to PCK-Studio/Forms/CreditsForm.cs
index 3f0b2ae5..3b40faad 100644
--- a/PCK-Studio/Forms/Additional-Popups/CreditsForm.cs
+++ b/PCK-Studio/Forms/CreditsForm.cs
@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using MetroFramework.Forms;
 using PckStudio.Internal;
 
-namespace PckStudio
+namespace PckStudio.Forms
 {
     public partial class CreditsForm : MetroForm
     {
diff --git a/PCK-Studio/Forms/Additional-Popups/CreditsForm.resx b/PCK-Studio/Forms/CreditsForm.resx
similarity index 100%
rename from PCK-Studio/Forms/Additional-Popups/CreditsForm.resx
rename to PCK-Studio/Forms/CreditsForm.resx
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index a1df8b52..ffa8ed76 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -154,10 +154,10 @@
     <Compile Include="Forms\Additional-Popups\NumericPrompt.Designer.cs">
       <DependentUpon>NumericPrompt.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Utilities\AppSettingsForm.cs">
+    <Compile Include="Forms\AppSettingsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Utilities\AppSettingsForm.Designer.cs">
+    <Compile Include="Forms\AppSettingsForm.Designer.cs">
       <DependentUpon>AppSettingsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Internal\ApplicationBuildInfo.cs" />
@@ -438,10 +438,10 @@
     </Compile>
     <Compile Include="PckNodeSorter.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Forms\Additional-Popups\CreditsForm.cs">
+    <Compile Include="Forms\CreditsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Forms\Additional-Popups\CreditsForm.Designer.cs">
+    <Compile Include="Forms\CreditsForm.Designer.cs">
       <DependentUpon>CreditsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -542,7 +542,7 @@
     <EmbeddedResource Include="Forms\Editor\ANIMEditor.resx">
       <DependentUpon>ANIMEditor.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Utilities\AppSettingsForm.resx">
+    <EmbeddedResource Include="Forms\AppSettingsForm.resx">
       <DependentUpon>AppSettingsForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -595,7 +595,7 @@
     <EmbeddedResource Include="Forms\Utilities\TextureConverterUtility.resx">
       <DependentUpon>TextureConverterUtility.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Additional-Popups\CreditsForm.resx">
+    <EmbeddedResource Include="Forms\CreditsForm.resx">
       <DependentUpon>CreditsForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">