diff --git a/Source/OpenTK/OpenAL/AlFunctions.cs b/Source/OpenTK/Audio/OpenAL/AL/AL.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/AlFunctions.cs
rename to Source/OpenTK/Audio/OpenAL/AL/AL.cs
diff --git a/Source/OpenTK/OpenAL/AlTokens.cs b/Source/OpenTK/Audio/OpenAL/AL/ALEnums.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/AlTokens.cs
rename to Source/OpenTK/Audio/OpenAL/AL/ALEnums.cs
diff --git a/Source/OpenTK/OpenAL/EfxFunctions.cs b/Source/OpenTK/Audio/OpenAL/AL/Efx.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/EfxFunctions.cs
rename to Source/OpenTK/Audio/OpenAL/AL/Efx.cs
diff --git a/Source/OpenTK/OpenAL/EfxTokens.cs b/Source/OpenTK/Audio/OpenAL/AL/EfxEnums.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/EfxTokens.cs
rename to Source/OpenTK/Audio/OpenAL/AL/EfxEnums.cs
diff --git a/Source/OpenTK/OpenAL/EfxPresets.cs b/Source/OpenTK/Audio/OpenAL/AL/EfxPresets.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/EfxPresets.cs
rename to Source/OpenTK/Audio/OpenAL/AL/EfxPresets.cs
diff --git a/Source/OpenTK/OpenAL/XRamExtension.cs b/Source/OpenTK/Audio/OpenAL/AL/XRam.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/XRamExtension.cs
rename to Source/OpenTK/Audio/OpenAL/AL/XRam.cs
diff --git a/Source/OpenTK/OpenAL/AlcFunctions.cs b/Source/OpenTK/Audio/OpenAL/Alc/Alc.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/AlcFunctions.cs
rename to Source/OpenTK/Audio/OpenAL/Alc/Alc.cs
diff --git a/Source/OpenTK/OpenAL/AlcTokens.cs b/Source/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/AlcTokens.cs
rename to Source/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs
diff --git a/Source/OpenTK/OpenAL/AlutFunctions.cs b/Source/OpenTK/Audio/OpenAL/Alut/Alut.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/AlutFunctions.cs
rename to Source/OpenTK/Audio/OpenAL/Alut/Alut.cs
diff --git a/Source/OpenTK/OpenAL/AlutTokens.cs b/Source/OpenTK/Audio/OpenAL/Alut/AlutEnums.cs
similarity index 100%
rename from Source/OpenTK/OpenAL/AlutTokens.cs
rename to Source/OpenTK/Audio/OpenAL/Alut/AlutEnums.cs