diff --git a/Raylib-cs/Raylib.cs b/Raylib-cs/interop/Raylib.cs
similarity index 100%
rename from Raylib-cs/Raylib.cs
rename to Raylib-cs/interop/Raylib.cs
diff --git a/Raylib-cs/Raymath.cs b/Raylib-cs/interop/Raymath.cs
similarity index 97%
rename from Raylib-cs/Raymath.cs
rename to Raylib-cs/interop/Raymath.cs
index 32775de..99a49c7 100644
--- a/Raylib-cs/Raymath.cs
+++ b/Raylib-cs/interop/Raymath.cs
@@ -16,7 +16,7 @@ namespace Raylib_cs
     }
 
     [SuppressUnmanagedCodeSecurity]
-    public static unsafe class Raymath
+    public static unsafe partial class Raymath
     {
         /// <summary>
         /// Used by DllImport to load the native library
diff --git a/Raylib-cs/Rlgl.cs b/Raylib-cs/interop/Rlgl.cs
similarity index 99%
rename from Raylib-cs/Rlgl.cs
rename to Raylib-cs/interop/Rlgl.cs
index 1d28605..cdf0d5d 100644
--- a/Raylib-cs/Rlgl.cs
+++ b/Raylib-cs/interop/Rlgl.cs
@@ -5,7 +5,7 @@ using System.Security;
 namespace Raylib_cs
 {
     [SuppressUnmanagedCodeSecurity]
-    public static unsafe class Rlgl
+    public static unsafe partial class Rlgl
     {
         /// <summary>
         /// Used by DllImport to load the native library
diff --git a/Raylib-cs/Logging.cs b/Raylib-cs/types/Logging.cs
similarity index 100%
rename from Raylib-cs/Logging.cs
rename to Raylib-cs/types/Logging.cs
diff --git a/Raylib-cs/Raylib.Utils.cs b/Raylib-cs/types/Raylib.Utils.cs
similarity index 100%
rename from Raylib-cs/Raylib.Utils.cs
rename to Raylib-cs/types/Raylib.Utils.cs