diff --git a/Raylib-cs/types/Audio.cs b/Raylib-cs/types/Audio.cs
deleted file mode 100644
index facf624..0000000
--- a/Raylib-cs/types/Audio.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Raylib_cs;
-
-/// <summary>
-/// Wave type, defines audio wave data
-/// </summary>
-[StructLayout(LayoutKind.Sequential)]
-public unsafe partial struct Wave
-{
-    /// <summary>
-    /// Number of samples
-    /// </summary>
-    public uint SampleCount;
-
-    /// <summary>
-    /// Frequency (samples per second)
-    /// </summary>
-    public uint SampleRate;
-
-    /// <summary>
-    /// Bit depth (bits per sample): 8, 16, 32 (24 not supported)
-    /// </summary>
-    public uint SampleSize;
-
-    /// <summary>
-    /// Number of channels (1-mono, 2-stereo)
-    /// </summary>
-    public uint Channels;
-
-    //TODO: SPAN<byte>  ?
-    /// <summary>
-    /// Buffer data pointer
-    /// </summary>
-    public void* Data;
-}
-
-/// <summary>
-/// Audio stream type<br/>
-/// NOTE: Useful to create custom audio streams not bound to a specific file
-/// </summary>
-[StructLayout(LayoutKind.Sequential)]
-public partial struct AudioStream
-{
-    //TODO: convert
-    /// <summary>
-    /// Pointer to internal data(rAudioBuffer *) used by the audio system
-    /// </summary>
-    public IntPtr Buffer;
-
-    /// <summary>
-    /// Pointer to internal data processor, useful for audio effects
-    /// </summary>
-    public IntPtr Processor;
-
-    /// <summary>
-    /// Frequency (samples per second)
-    /// </summary>
-    public uint SampleRate;
-
-    /// <summary>
-    /// Bit depth (bits per sample): 8, 16, 32 (24 not supported)
-    /// </summary>
-    public uint SampleSize;
-
-    /// <summary>
-    /// Number of channels (1-mono, 2-stereo)
-    /// </summary>
-    public uint Channels;
-}
-
-/// <summary>
-/// Sound source type
-/// </summary>
-[StructLayout(LayoutKind.Sequential)]
-public partial struct Sound
-{
-    /// <summary>
-    /// Audio stream
-    /// </summary>
-    public AudioStream Stream;
-
-    /// <summary>
-    /// Total number of frames (considering channels)
-    /// </summary>
-    public uint FrameCount;
-}
-
-/// <summary>
-/// Music stream type (audio file streaming from memory)<br/>
-/// NOTE: Anything longer than ~10 seconds should be streamed
-/// </summary>
-[StructLayout(LayoutKind.Sequential)]
-public unsafe partial struct Music
-{
-    /// <summary>
-    /// Audio stream
-    /// </summary>
-    public AudioStream Stream;
-
-    /// <summary>
-    /// Total number of samples
-    /// </summary>
-    public uint FrameCount;
-
-    /// <summary>
-    /// Music looping enable
-    /// </summary>
-    public CBool Looping;
-
-    /// <summary>
-    /// Type of music context (audio filetype)
-    /// </summary>
-    public int CtxType;
-
-    //TODO span
-    /// <summary>
-    /// Audio context data, depends on type
-    /// </summary>
-    public void* CtxData;
-}
diff --git a/Raylib-cs/types/AudioStream.cs b/Raylib-cs/types/AudioStream.cs
new file mode 100644
index 0000000..454a155
--- /dev/null
+++ b/Raylib-cs/types/AudioStream.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Raylib_cs;
+
+/// <summary>
+/// Audio stream type<br/>
+/// NOTE: Useful to create custom audio streams not bound to a specific file
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public partial struct AudioStream
+{
+    //TODO: convert
+    /// <summary>
+    /// Pointer to internal data(rAudioBuffer *) used by the audio system
+    /// </summary>
+    public IntPtr Buffer;
+
+    /// <summary>
+    /// Pointer to internal data processor, useful for audio effects
+    /// </summary>
+    public IntPtr Processor;
+
+    /// <summary>
+    /// Frequency (samples per second)
+    /// </summary>
+    public uint SampleRate;
+
+    /// <summary>
+    /// Bit depth (bits per sample): 8, 16, 32 (24 not supported)
+    /// </summary>
+    public uint SampleSize;
+
+    /// <summary>
+    /// Number of channels (1-mono, 2-stereo)
+    /// </summary>
+    public uint Channels;
+}
diff --git a/Raylib-cs/types/Music.cs b/Raylib-cs/types/Music.cs
new file mode 100644
index 0000000..d32c03d
--- /dev/null
+++ b/Raylib-cs/types/Music.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Raylib_cs;
+
+/// <summary>
+/// Music stream type (audio file streaming from memory)<br/>
+/// NOTE: Anything longer than ~10 seconds should be streamed
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public unsafe partial struct Music
+{
+    /// <summary>
+    /// Audio stream
+    /// </summary>
+    public AudioStream Stream;
+
+    /// <summary>
+    /// Total number of samples
+    /// </summary>
+    public uint FrameCount;
+
+    /// <summary>
+    /// Music looping enable
+    /// </summary>
+    public CBool Looping;
+
+    /// <summary>
+    /// Type of music context (audio filetype)
+    /// </summary>
+    public int CtxType;
+
+    //TODO span
+    /// <summary>
+    /// Audio context data, depends on type
+    /// </summary>
+    public void* CtxData;
+}
diff --git a/Raylib-cs/types/Sound.cs b/Raylib-cs/types/Sound.cs
new file mode 100644
index 0000000..ee40597
--- /dev/null
+++ b/Raylib-cs/types/Sound.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Raylib_cs;
+
+/// <summary>
+/// Sound source type
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public partial struct Sound
+{
+    /// <summary>
+    /// Audio stream
+    /// </summary>
+    public AudioStream Stream;
+
+    /// <summary>
+    /// Total number of frames (considering channels)
+    /// </summary>
+    public uint FrameCount;
+}
diff --git a/Raylib-cs/types/Wave.cs b/Raylib-cs/types/Wave.cs
new file mode 100644
index 0000000..ec27cf0
--- /dev/null
+++ b/Raylib-cs/types/Wave.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Raylib_cs;
+
+/// <summary>
+/// Wave type, defines audio wave data
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public unsafe partial struct Wave
+{
+    /// <summary>
+    /// Number of samples
+    /// </summary>
+    public uint SampleCount;
+
+    /// <summary>
+    /// Frequency (samples per second)
+    /// </summary>
+    public uint SampleRate;
+
+    /// <summary>
+    /// Bit depth (bits per sample): 8, 16, 32 (24 not supported)
+    /// </summary>
+    public uint SampleSize;
+
+    /// <summary>
+    /// Number of channels (1-mono, 2-stereo)
+    /// </summary>
+    public uint Channels;
+
+    //TODO: SPAN<byte>  ?
+    /// <summary>
+    /// Buffer data pointer
+    /// </summary>
+    public void* Data;
+}