diff --git a/PCK-Studio/Classes/API/Miles/Binka.cs b/PCK-Studio/Classes/API/Miles/Binka.cs
index 78fd8e5a..ad2bb793 100644
--- a/PCK-Studio/Classes/API/Miles/Binka.cs
+++ b/PCK-Studio/Classes/API/Miles/Binka.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using PckStudio.Extensions;
 using PckStudio.Internal;
+using PckStudio.Internal.App;
 using SharpMSS;
 
 namespace PckStudio.API.Miles
diff --git a/PCK-Studio/Classes/Utils/BinkaConverter.cs b/PCK-Studio/Classes/Utils/BinkaConverter.cs
index f6f5e9e6..630f0904 100644
--- a/PCK-Studio/Classes/Utils/BinkaConverter.cs
+++ b/PCK-Studio/Classes/Utils/BinkaConverter.cs
@@ -9,6 +9,7 @@ using System.Windows.Forms;
 using System.IO;
 using PckStudio.Internal;
 using System.Text.RegularExpressions;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Classes.Utils
 {
diff --git a/PCK-Studio/Extensions/ImageExtensions.cs b/PCK-Studio/Extensions/ImageExtensions.cs
index 2a712f23..c1cb44f0 100644
--- a/PCK-Studio/Extensions/ImageExtensions.cs
+++ b/PCK-Studio/Extensions/ImageExtensions.cs
@@ -26,6 +26,7 @@ using System.Linq;
 using PckStudio.Internal;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Extensions
 {
diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
index 9c73ce19..850654fc 100644
--- a/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
+++ b/PCK-Studio/Forms/Additional-Popups/Animation/ChangeTile.cs
@@ -5,6 +5,7 @@ using System.Windows.Forms;
 using MetroFramework.Forms;
 using PckStudio.Extensions;
 using PckStudio.Internal;
+using PckStudio.Internal.App;
 using PckStudio.Internal.Json;
 
 namespace PckStudio.Forms.Additional_Popups.Animation
diff --git a/PCK-Studio/Forms/ContributorsForm.cs b/PCK-Studio/Forms/ContributorsForm.cs
index b4bf59ed..51906542 100644
--- a/PCK-Studio/Forms/ContributorsForm.cs
+++ b/PCK-Studio/Forms/ContributorsForm.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using MetroFramework.Forms;
 using PckStudio.Internal;
+using PckStudio.Internal.App;
 using PckStudio.ToolboxItems;
 
 namespace PckStudio.Forms
diff --git a/PCK-Studio/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs
index e081027a..c8fa145e 100644
--- a/PCK-Studio/Forms/Editor/AudioEditor.cs
+++ b/PCK-Studio/Forms/Editor/AudioEditor.cs
@@ -20,6 +20,7 @@ using PckStudio.API.Miles;
 using PckStudio.Internal;
 using PckStudio.Internal.FileFormats;
 using PckStudio.Extensions;
+using PckStudio.Internal.App;
 
 // Audio Editor by MattNL and Miku-666
 
diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.cs
index 94f22c07..613ddffe 100644
--- a/PCK-Studio/Forms/Editor/BehaviourEditor.cs
+++ b/PCK-Studio/Forms/Editor/BehaviourEditor.cs
@@ -15,6 +15,7 @@ using PckStudio.Properties;
 using PckStudio.Internal;
 using PckStudio.Extensions;
 using PckStudio.Internal.Json;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Forms.Editor
 {
diff --git a/PCK-Studio/Forms/Editor/MaterialsEditor.cs b/PCK-Studio/Forms/Editor/MaterialsEditor.cs
index 7b0cb021..8a878314 100644
--- a/PCK-Studio/Forms/Editor/MaterialsEditor.cs
+++ b/PCK-Studio/Forms/Editor/MaterialsEditor.cs
@@ -13,6 +13,7 @@ using OMI.Workers.Material;
 using PckStudio.Internal;
 using PckStudio.Extensions;
 using PckStudio.Internal.Json;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Forms.Editor
 {
diff --git a/PCK-Studio/Internal/ApplicationBuildInfo.cs b/PCK-Studio/Internal/App/ApplicationBuildInfo.cs
similarity index 98%
rename from PCK-Studio/Internal/ApplicationBuildInfo.cs
rename to PCK-Studio/Internal/App/ApplicationBuildInfo.cs
index cadde39e..f7a0007f 100644
--- a/PCK-Studio/Internal/ApplicationBuildInfo.cs
+++ b/PCK-Studio/Internal/App/ApplicationBuildInfo.cs
@@ -19,7 +19,7 @@ using System;
 using System.IO;
 using System.Reflection;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     static internal class ApplicationBuildInfo
     {
diff --git a/PCK-Studio/Internal/ApplicationScope.cs b/PCK-Studio/Internal/App/ApplicationScope.cs
similarity index 98%
rename from PCK-Studio/Internal/ApplicationScope.cs
rename to PCK-Studio/Internal/App/ApplicationScope.cs
index dfa04d9f..d489938b 100644
--- a/PCK-Studio/Internal/ApplicationScope.cs
+++ b/PCK-Studio/Internal/App/ApplicationScope.cs
@@ -10,7 +10,7 @@ using PckStudio.Internal.Misc;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     internal static class ApplicationScope
     {
diff --git a/PCK-Studio/Internal/CommitInfo.cs b/PCK-Studio/Internal/App/CommitInfo.cs
similarity index 98%
rename from PCK-Studio/Internal/CommitInfo.cs
rename to PCK-Studio/Internal/App/CommitInfo.cs
index 1ccfe3e0..ae341c73 100644
--- a/PCK-Studio/Internal/CommitInfo.cs
+++ b/PCK-Studio/Internal/App/CommitInfo.cs
@@ -18,7 +18,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     static internal class CommitInfo
     {
diff --git a/PCK-Studio/Internal/Profiler.cs b/PCK-Studio/Internal/App/Profiler.cs
similarity index 98%
rename from PCK-Studio/Internal/Profiler.cs
rename to PCK-Studio/Internal/App/Profiler.cs
index f9daff27..aa9af3ef 100644
--- a/PCK-Studio/Internal/Profiler.cs
+++ b/PCK-Studio/Internal/App/Profiler.cs
@@ -23,7 +23,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     internal static class Profiler
     {
diff --git a/PCK-Studio/Internal/SettingsManager.cs b/PCK-Studio/Internal/App/SettingsManager.cs
similarity index 98%
rename from PCK-Studio/Internal/SettingsManager.cs
rename to PCK-Studio/Internal/App/SettingsManager.cs
index e0a7640c..3636c51d 100644
--- a/PCK-Studio/Internal/SettingsManager.cs
+++ b/PCK-Studio/Internal/App/SettingsManager.cs
@@ -21,7 +21,7 @@ using System.ComponentModel;
 using System.Configuration;
 using PckStudio.Properties;
 
-namespace PckStudio.Internal
+namespace PckStudio.Internal.App
 {
     internal static class SettingsManager
     {
diff --git a/PCK-Studio/Internal/Misc/RichPresenceClient.cs b/PCK-Studio/Internal/Misc/RichPresenceClient.cs
index d89f7dc1..94a482e1 100644
--- a/PCK-Studio/Internal/Misc/RichPresenceClient.cs
+++ b/PCK-Studio/Internal/Misc/RichPresenceClient.cs
@@ -4,6 +4,7 @@ using DiscordRPC;
 using PckStudio.Internal;
 using PckStudio.Properties;
 using DiscordRPC.Logging;
+using PckStudio.Internal.App;
 
 namespace PckStudio.Internal.Misc
 {
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index fb452ef9..ea8cbc31 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -35,6 +35,7 @@ using PckStudio.Internal.Json;
 using PckStudio.Internal.Deserializer;
 using PckStudio.Internal.Serializer;
 using OMI.Workers;
+using PckStudio.Internal.App;
 using PckStudio.Internal.Skin;
 
 namespace PckStudio
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 90a21c5e..cfd238e7 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -166,12 +166,12 @@
     <Compile Include="Internal\Json\Entities.cs" />
     <Compile Include="Internal\Json\EntityInfo.cs" />
     <Compile Include="Internal\ResourceCategory.cs" />
+    <Compile Include="Internal\App\CommitInfo.cs" />
     <Compile Include="External\Format\BlockBenchModel.cs" />
     <Compile Include="Internal\Skin\Skin.cs" />
     <Compile Include="Internal\Skin\SkinMetaData.cs" />
     <Compile Include="Internal\Skin\SkinModelInfo.cs" />
     <Compile Include="Internal\Skin\SkinPartOffset.cs" />
-    <Compile Include="Internal\CommitInfo.cs" />
     <Compile Include="Internal\ResourceLocation.cs" />
     <Compile Include="Internal\Serializer\ImageSerializer.cs" />
     <Compile Include="Internal\Skin\SkinAnimFlag.cs" />
@@ -249,7 +249,7 @@
     <Compile Include="Forms\AppSettingsForm.Designer.cs">
       <DependentUpon>AppSettingsForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Internal\ApplicationBuildInfo.cs" />
+    <Compile Include="Internal\App\ApplicationBuildInfo.cs" />
     <Compile Include="Forms\Editor\TextureAtlasEditor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -269,12 +269,12 @@
     <Compile Include="Internal\IO\PckAudio\PckAudioFileWriter.cs" />
     <Compile Include="Internal\Misc\FileCacher.cs" />
     <Compile Include="Internal\Misc\OpenFolderDialog.cs" />
-    <Compile Include="Internal\ApplicationScope.cs" />
+    <Compile Include="Internal\App\ApplicationScope.cs" />
     <Compile Include="Internal\Json\ColorEntry.cs" />
     <Compile Include="Internal\Json\TileInfo.cs" />
     <Compile Include="Internal\Json\Tiles.cs" />
-    <Compile Include="Internal\Profiler.cs" />
-    <Compile Include="Internal\SettingsManager.cs" />
+    <Compile Include="Internal\App\Profiler.cs" />
+    <Compile Include="Internal\App\SettingsManager.cs" />
     <Compile Include="Internal\Skin\SkinBOX.cs" />
     <Compile Include="Extensions\ImageExtensions.cs" />
     <Compile Include="Internal\Skin\SkinANIM.cs" />
diff --git a/PCK-Studio/Program.cs b/PCK-Studio/Program.cs
index 58f43b8d..393faaf9 100644
--- a/PCK-Studio/Program.cs
+++ b/PCK-Studio/Program.cs
@@ -7,6 +7,7 @@ using PckStudio.Internal.Misc;
 using PckStudio.Internal;
 using PckStudio.Properties;
 using PCKStudio_Updater;
+using PckStudio.Internal.App;
 
 
 namespace PckStudio
diff --git a/PCK-Studio/ToolboxItems/GithubUserPanel.cs b/PCK-Studio/ToolboxItems/GithubUserPanel.cs
index 124717d7..e6fde8e5 100644
--- a/PCK-Studio/ToolboxItems/GithubUserPanel.cs
+++ b/PCK-Studio/ToolboxItems/GithubUserPanel.cs
@@ -12,6 +12,7 @@ using System.IO;
 using System.Threading.Tasks;
 using PckStudio.Internal;
 using System.Drawing.Imaging;
+using PckStudio.Internal.App;
 
 namespace PckStudio.ToolboxItems
 {