diff --git a/PCK-Studio/Extensions/PckAssetExtensions.cs b/PCK-Studio/Extensions/PckAssetExtensions.cs
index e5cabd15..aa33b919 100644
--- a/PCK-Studio/Extensions/PckAssetExtensions.cs
+++ b/PCK-Studio/Extensions/PckAssetExtensions.cs
@@ -10,7 +10,6 @@ using System.Threading.Tasks;
 using OMI.Formats.Pck;
 using OMI.Workers;
 using PckStudio.Interfaces;
-using PckStudio.IO.TGA;
 using PckStudio.Internal.Deserializer;
 using PckStudio.Internal.Serializer;
 
diff --git a/PCK-Studio/Forms/Editor/AudioEditor.cs b/PCK-Studio/Forms/Editor/AudioEditor.cs
index 2ed23b7b..f9730a6f 100644
--- a/PCK-Studio/Forms/Editor/AudioEditor.cs
+++ b/PCK-Studio/Forms/Editor/AudioEditor.cs
@@ -14,7 +14,7 @@ using NAudio.Wave;
 using OMI.Formats.Pck;
 
 using PckStudio.FileFormats;
-using PckStudio.IO.PckAudio;
+using PckStudio.Internal.IO.PckAudio;
 using PckStudio.Forms.Additional_Popups;
 using PckStudio.Properties;
 using PckStudio.API.Miles;
diff --git a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.cs b/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.cs
index 911d09b4..743e0cb2 100644
--- a/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.cs
+++ b/PCK-Studio/Forms/Skins-And-Textures/AddNewSkin.cs
@@ -8,7 +8,7 @@ using OMI.Formats.Languages;
 using OMI.Formats.Pck;
 using PckStudio.Internal;
 using PckStudio.Forms.Editor;
-using PckStudio.IO._3DST;
+using PckStudio.Internal.IO._3DST;
 using PckStudio.Properties;
 using PckStudio.Forms;
 using PckStudio.Extensions;
diff --git a/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs b/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs
index 74d02535..2a4d5135 100644
--- a/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs
+++ b/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using OMI.Formats.Pck;
 using PckStudio.Interfaces;
-using PckStudio.IO.TGA;
+using PckStudio.Internal.IO.TGA;
 
 namespace PckStudio.Internal.Deserializer
 {
diff --git a/PCK-Studio/Classes/IO/3DST/3DSTextureReader.cs b/PCK-Studio/Internal/IO/3DST/3DSTextureReader.cs
similarity index 98%
rename from PCK-Studio/Classes/IO/3DST/3DSTextureReader.cs
rename to PCK-Studio/Internal/IO/3DST/3DSTextureReader.cs
index 609eb0a8..73831659 100644
--- a/PCK-Studio/Classes/IO/3DST/3DSTextureReader.cs
+++ b/PCK-Studio/Internal/IO/3DST/3DSTextureReader.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using OMI.Workers;
 using OMI;
 
-namespace PckStudio.IO._3DST
+namespace PckStudio.Internal.IO._3DST
 {
     internal class _3DSTextureReader : IDataFormatReader<Image>, IDataFormatReader
     {
diff --git a/PCK-Studio/Classes/IO/3DST/3DSTextureWriter.cs b/PCK-Studio/Internal/IO/3DST/3DSTextureWriter.cs
similarity index 97%
rename from PCK-Studio/Classes/IO/3DST/3DSTextureWriter.cs
rename to PCK-Studio/Internal/IO/3DST/3DSTextureWriter.cs
index 798f4967..2008e53b 100644
--- a/PCK-Studio/Classes/IO/3DST/3DSTextureWriter.cs
+++ b/PCK-Studio/Internal/IO/3DST/3DSTextureWriter.cs
@@ -5,7 +5,7 @@ using System.Text;
 using OMI;
 using OMI.Workers;
 
-namespace PckStudio.IO._3DST
+namespace PckStudio.Internal.IO._3DST
 {
     internal class _3DSTextureWriter : IDataFormatWriter
     {
diff --git a/PCK-Studio/Classes/IO/3DST/TextureCodec.cs b/PCK-Studio/Internal/IO/3DST/TextureCodec.cs
similarity index 99%
rename from PCK-Studio/Classes/IO/3DST/TextureCodec.cs
rename to PCK-Studio/Internal/IO/3DST/TextureCodec.cs
index 1302f37e..a313c4bf 100644
--- a/PCK-Studio/Classes/IO/3DST/TextureCodec.cs
+++ b/PCK-Studio/Internal/IO/3DST/TextureCodec.cs
@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 
-namespace PckStudio.IO._3DST
+namespace PckStudio.Internal.IO._3DST
 {
     /// <summary>
     ///     Format of the texture used on the PICA200.
diff --git a/PCK-Studio/Classes/IO/CSMB/CSMBFileReader.cs b/PCK-Studio/Internal/IO/CSMB/CSMBFileReader.cs
similarity index 98%
rename from PCK-Studio/Classes/IO/CSMB/CSMBFileReader.cs
rename to PCK-Studio/Internal/IO/CSMB/CSMBFileReader.cs
index 86738b6f..c8c41aaa 100644
--- a/PCK-Studio/Classes/IO/CSMB/CSMBFileReader.cs
+++ b/PCK-Studio/Internal/IO/CSMB/CSMBFileReader.cs
@@ -4,7 +4,7 @@ using OMI;
 using OMI.Workers;
 using PckStudio.FileFormats;
 
-namespace PckStudio.IO.CSMB
+namespace PckStudio.Internal.IO.CSMB
 {
     internal class CSMBFileReader : IDataFormatReader<CSMBFile>, IDataFormatReader
     {
diff --git a/PCK-Studio/Classes/IO/CSMB/CSMBFileWriter.cs b/PCK-Studio/Internal/IO/CSMB/CSMBFileWriter.cs
similarity index 98%
rename from PCK-Studio/Classes/IO/CSMB/CSMBFileWriter.cs
rename to PCK-Studio/Internal/IO/CSMB/CSMBFileWriter.cs
index f7847c7d..ede501b7 100644
--- a/PCK-Studio/Classes/IO/CSMB/CSMBFileWriter.cs
+++ b/PCK-Studio/Internal/IO/CSMB/CSMBFileWriter.cs
@@ -4,7 +4,7 @@ using PckStudio.FileFormats;
 using OMI.Workers;
 using OMI;
 
-namespace PckStudio.IO.CSMB
+namespace PckStudio.Internal.IO.CSMB
 {
     internal class CSMBFileWriter : IDataFormatWriter
     {
diff --git a/PCK-Studio/Classes/IO/PckAudio/PckAudioFileReader.cs b/PCK-Studio/Internal/IO/PckAudio/PckAudioFileReader.cs
similarity index 99%
rename from PCK-Studio/Classes/IO/PckAudio/PckAudioFileReader.cs
rename to PCK-Studio/Internal/IO/PckAudio/PckAudioFileReader.cs
index 2e29b2bc..97500de1 100644
--- a/PCK-Studio/Classes/IO/PckAudio/PckAudioFileReader.cs
+++ b/PCK-Studio/Internal/IO/PckAudio/PckAudioFileReader.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-namespace PckStudio.IO.PckAudio
+namespace PckStudio.Internal.IO.PckAudio
 {
 
     public class InvalidAudioPckException : Exception
diff --git a/PCK-Studio/Classes/IO/PckAudio/PckAudioFileWriter.cs b/PCK-Studio/Internal/IO/PckAudio/PckAudioFileWriter.cs
similarity index 98%
rename from PCK-Studio/Classes/IO/PckAudio/PckAudioFileWriter.cs
rename to PCK-Studio/Internal/IO/PckAudio/PckAudioFileWriter.cs
index 5c62e632..a2bfa4c7 100644
--- a/PCK-Studio/Classes/IO/PckAudio/PckAudioFileWriter.cs
+++ b/PCK-Studio/Internal/IO/PckAudio/PckAudioFileWriter.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace PckStudio.IO.PckAudio
+namespace PckStudio.Internal.IO.PckAudio
 {
     internal class PckAudioFileWriter : IDataFormatWriter
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGADataTypeCode.cs b/PCK-Studio/Internal/IO/TGA/TGADataTypeCode.cs
similarity index 98%
rename from PCK-Studio/Classes/IO/TGA/TGADataTypeCode.cs
rename to PCK-Studio/Internal/IO/TGA/TGADataTypeCode.cs
index 60456312..aa092c3a 100644
--- a/PCK-Studio/Classes/IO/TGA/TGADataTypeCode.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGADataTypeCode.cs
@@ -16,7 +16,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
 **/
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal enum TGADataTypeCode : byte
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGADeserializer.cs b/PCK-Studio/Internal/IO/TGA/TGADeserializer.cs
similarity index 97%
rename from PCK-Studio/Classes/IO/TGA/TGADeserializer.cs
rename to PCK-Studio/Internal/IO/TGA/TGADeserializer.cs
index 0382e16e..55690de6 100644
--- a/PCK-Studio/Classes/IO/TGA/TGADeserializer.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGADeserializer.cs
@@ -18,7 +18,7 @@
 using System.IO;
 using System.Drawing;
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal static class TGADeserializer
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGAException.cs b/PCK-Studio/Internal/IO/TGA/TGAException.cs
similarity index 93%
rename from PCK-Studio/Classes/IO/TGA/TGAException.cs
rename to PCK-Studio/Internal/IO/TGA/TGAException.cs
index 9f961579..7e6461c1 100644
--- a/PCK-Studio/Classes/IO/TGA/TGAException.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGAException.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     [Serializable]
     internal class TGAException : Exception
diff --git a/PCK-Studio/Classes/IO/TGA/TGAExtentionData.cs b/PCK-Studio/Internal/IO/TGA/TGAExtentionData.cs
similarity index 98%
rename from PCK-Studio/Classes/IO/TGA/TGAExtentionData.cs
rename to PCK-Studio/Internal/IO/TGA/TGAExtentionData.cs
index 3f5d6e45..c22aec78 100644
--- a/PCK-Studio/Classes/IO/TGA/TGAExtentionData.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGAExtentionData.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal struct TGAExtentionData
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGAFileData.cs b/PCK-Studio/Internal/IO/TGA/TGAFileData.cs
similarity index 97%
rename from PCK-Studio/Classes/IO/TGA/TGAFileData.cs
rename to PCK-Studio/Internal/IO/TGA/TGAFileData.cs
index f4a12859..f1ad1111 100644
--- a/PCK-Studio/Classes/IO/TGA/TGAFileData.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGAFileData.cs
@@ -19,7 +19,7 @@ using System.IO;
 using System.Drawing;
 using System;
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal class TGAFileData
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGAFooter.cs b/PCK-Studio/Internal/IO/TGA/TGAFooter.cs
similarity index 96%
rename from PCK-Studio/Classes/IO/TGA/TGAFooter.cs
rename to PCK-Studio/Internal/IO/TGA/TGAFooter.cs
index cfae98c8..6859de2f 100644
--- a/PCK-Studio/Classes/IO/TGA/TGAFooter.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGAFooter.cs
@@ -16,7 +16,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
 **/
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal struct TGAFooter
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGAHeader.cs b/PCK-Studio/Internal/IO/TGA/TGAHeader.cs
similarity index 97%
rename from PCK-Studio/Classes/IO/TGA/TGAHeader.cs
rename to PCK-Studio/Internal/IO/TGA/TGAHeader.cs
index ce967b22..a1bed5f1 100644
--- a/PCK-Studio/Classes/IO/TGA/TGAHeader.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGAHeader.cs
@@ -16,7 +16,7 @@
  * 3. This notice may not be removed or altered from any source distribution.
 **/
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     /// <summary>
     /// Resources:
diff --git a/PCK-Studio/Classes/IO/TGA/TGAReader.cs b/PCK-Studio/Internal/IO/TGA/TGAReader.cs
similarity index 99%
rename from PCK-Studio/Classes/IO/TGA/TGAReader.cs
rename to PCK-Studio/Internal/IO/TGA/TGAReader.cs
index 112d2fc7..4ed2442a 100644
--- a/PCK-Studio/Classes/IO/TGA/TGAReader.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGAReader.cs
@@ -26,7 +26,7 @@ using System.Collections.Generic;
 using OMI.Workers;
 using OMI;
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal class TGAReader : IDataFormatReader<TGAFileData>, IDataFormatReader
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGASerializer.cs b/PCK-Studio/Internal/IO/TGA/TGASerializer.cs
similarity index 97%
rename from PCK-Studio/Classes/IO/TGA/TGASerializer.cs
rename to PCK-Studio/Internal/IO/TGA/TGASerializer.cs
index dd4254f5..f82d5119 100644
--- a/PCK-Studio/Classes/IO/TGA/TGASerializer.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGASerializer.cs
@@ -18,7 +18,7 @@
 using System.IO;
 using System.Drawing;
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal static class TGASerializer
     {
diff --git a/PCK-Studio/Classes/IO/TGA/TGAWriter.cs b/PCK-Studio/Internal/IO/TGA/TGAWriter.cs
similarity index 99%
rename from PCK-Studio/Classes/IO/TGA/TGAWriter.cs
rename to PCK-Studio/Internal/IO/TGA/TGAWriter.cs
index ff0b5475..97fa1727 100644
--- a/PCK-Studio/Classes/IO/TGA/TGAWriter.cs
+++ b/PCK-Studio/Internal/IO/TGA/TGAWriter.cs
@@ -26,7 +26,7 @@ using OMI;
 using System.Windows.Forms;
 using DiscordRPC;
 
-namespace PckStudio.IO.TGA
+namespace PckStudio.Internal.IO.TGA
 {
     internal class TGAWriter
     {
diff --git a/PCK-Studio/Internal/Serializer/ImageSerializer.cs b/PCK-Studio/Internal/Serializer/ImageSerializer.cs
index b33d13d9..99c9da12 100644
--- a/PCK-Studio/Internal/Serializer/ImageSerializer.cs
+++ b/PCK-Studio/Internal/Serializer/ImageSerializer.cs
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using OMI.Formats.Pck;
 using PckStudio.Interfaces;
-using PckStudio.IO.TGA;
+using PckStudio.Internal.IO.TGA;
 
 namespace PckStudio.Internal.Serializer
 {
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 49241518..1eefee89 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -7,12 +7,10 @@ using System.Windows.Forms;
 using System.Drawing.Drawing2D;
 using System.Diagnostics;
 using System.Drawing.Imaging;
-using OMI.Formats.Archive;
 using OMI.Formats.Pck;
 using OMI.Formats.GameRule;
 using OMI.Formats.Languages;
 using OMI.Formats.Model;
-using OMI.Workers.Archive;
 using OMI.Workers.Pck;
 using OMI.Workers.GameRule;
 using OMI.Workers.Language;
@@ -24,8 +22,8 @@ using PckStudio.Forms.Editor;
 using PckStudio.Forms.Additional_Popups.Animation;
 using PckStudio.Forms.Additional_Popups;
 using PckStudio.Classes.Misc;
-using PckStudio.IO.PckAudio;
-using PckStudio.IO._3DST;
+using PckStudio.Internal.IO.PckAudio;
+using PckStudio.Internal.IO._3DST;
 using PckStudio.Internal;
 using PckStudio.Features;
 using PckStudio.Extensions;
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 4fa1feb1..7626bc86 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -133,8 +133,8 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Classes\IO\TGA\TGADeserializer.cs" />
-    <Compile Include="Classes\IO\TGA\TGASerializer.cs" />
+    <Compile Include="Internal\IO\TGA\TGADeserializer.cs" />
+    <Compile Include="Internal\IO\TGA\TGASerializer.cs" />
     <Compile Include="Extensions\LocFileExtensions.cs" />
     <Compile Include="Extensions\PckAssetExtensions.cs" />
     <Compile Include="Extensions\TreeNodeExtensions.cs" />
@@ -198,12 +198,12 @@
     <Compile Include="FileFormats\CSMBFile.cs" />
     <Compile Include="FileFormats\PckAudioFile.cs" />
     <Compile Include="Classes\API\Miles\Binka.cs" />
-    <Compile Include="Classes\IO\3DST\3DSTextureReader.cs" />
-    <Compile Include="Classes\IO\3DST\3DSTextureWriter.cs" />
-    <Compile Include="Classes\IO\CSMB\CSMBFileReader.cs" />
-    <Compile Include="Classes\IO\CSMB\CSMBFileWriter.cs" />
-    <Compile Include="Classes\IO\PckAudio\PckAudioFileReader.cs" />
-    <Compile Include="Classes\IO\PckAudio\PckAudioFileWriter.cs" />
+    <Compile Include="Internal\IO\3DST\3DSTextureReader.cs" />
+    <Compile Include="Internal\IO\3DST\3DSTextureWriter.cs" />
+    <Compile Include="Internal\IO\CSMB\CSMBFileReader.cs" />
+    <Compile Include="Internal\IO\CSMB\CSMBFileWriter.cs" />
+    <Compile Include="Internal\IO\PckAudio\PckAudioFileReader.cs" />
+    <Compile Include="Internal\IO\PckAudio\PckAudioFileWriter.cs" />
     <Compile Include="Classes\Misc\FileCacher.cs" />
     <Compile Include="Classes\Misc\OpenFolderDialog.cs" />
     <Compile Include="Classes\Models\DefaultModels\Steve64x64Model.cs" />
@@ -245,14 +245,14 @@
     <Compile Include="Features\CemuPanel.Designer.cs">
       <DependentUpon>CemuPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="Classes\IO\TGA\TGAFileData.cs" />
-    <Compile Include="Classes\IO\TGA\TGADataTypeCode.cs" />
-    <Compile Include="Classes\IO\TGA\TGAException.cs" />
-    <Compile Include="Classes\IO\TGA\TGAExtentionData.cs" />
-    <Compile Include="Classes\IO\TGA\TGAFooter.cs" />
-    <Compile Include="Classes\IO\TGA\TGAHeader.cs" />
-    <Compile Include="Classes\IO\TGA\TGAReader.cs" />
-    <Compile Include="Classes\IO\TGA\TGAWriter.cs" />
+    <Compile Include="Internal\IO\TGA\TGAFileData.cs" />
+    <Compile Include="Internal\IO\TGA\TGADataTypeCode.cs" />
+    <Compile Include="Internal\IO\TGA\TGAException.cs" />
+    <Compile Include="Internal\IO\TGA\TGAExtentionData.cs" />
+    <Compile Include="Internal\IO\TGA\TGAFooter.cs" />
+    <Compile Include="Internal\IO\TGA\TGAHeader.cs" />
+    <Compile Include="Internal\IO\TGA\TGAReader.cs" />
+    <Compile Include="Internal\IO\TGA\TGAWriter.cs" />
     <Compile Include="Forms\Additional-Popups\EntityForms\AddEntry.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -436,7 +436,7 @@
       <DependentUpon>CreditsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Classes\IO\3DST\TextureCodec.cs" />
+    <Compile Include="Internal\IO\3DST\TextureCodec.cs" />
     <EmbeddedResource Include="Features\CemuPanel.resx">
       <DependentUpon>CemuPanel.cs</DependentUpon>
     </EmbeddedResource>