diff --git a/src/audio/ALAudio.cpp b/src/audio/AL/ALAudio.cpp
similarity index 100%
rename from src/audio/ALAudio.cpp
rename to src/audio/AL/ALAudio.cpp
diff --git a/src/audio/ALAudio.h b/src/audio/AL/ALAudio.h
similarity index 98%
rename from src/audio/ALAudio.h
rename to src/audio/AL/ALAudio.h
index 56b2783e..7389b76e 100644
--- a/src/audio/ALAudio.h
+++ b/src/audio/AL/ALAudio.h
@@ -14,8 +14,8 @@
 #include <AL/alc.h>
 #endif
 
-#include "audio.h"
-#include "../typedefs.h"
+#include "../audio.h"
+#include "../../typedefs.h"
 
 namespace audio {
     struct ALBuffer;
diff --git a/src/audio/alutil.cpp b/src/audio/AL/alutil.cpp
similarity index 100%
rename from src/audio/alutil.cpp
rename to src/audio/AL/alutil.cpp
diff --git a/src/audio/alutil.h b/src/audio/AL/alutil.h
similarity index 98%
rename from src/audio/alutil.h
rename to src/audio/AL/alutil.h
index ed7e37be..f07dbc46 100644
--- a/src/audio/alutil.h
+++ b/src/audio/AL/alutil.h
@@ -12,7 +12,7 @@
 #endif
 
 #include <glm/glm.hpp>
-#include "../typedefs.h"
+#include "../../typedefs.h"
 
 #define AL_CHECK(STATEMENT) STATEMENT; AL::check_errors(__FILE__, __LINE__)
 #define AL_GET_ERROR() AL::check_errors(__FILE__, __LINE__)
diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index bf97ff6f..1b927b0b 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -3,8 +3,8 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "ALAudio.h"
 #include "NoAudio.h"
+#include "AL/ALAudio.h"
 
 #include "../coders/wav.h"
 #include "../coders/ogg.h"