diff --git a/Makefile b/Makefile
index 740f056935..987fe2ef31 100644
--- a/Makefile
+++ b/Makefile
@@ -9,27 +9,27 @@ libsnes = -lsnes
 LIBS = -lsamplerate $(libsnes)
 
 ifeq ($(BUILD_RSOUND), 1)
-   OBJ += rsound.o
+   OBJ += audio/rsound.o
    LIBS += -lrsound
 endif
 ifeq ($(BUILD_OSS), 1)
-   OBJ += oss.o
+   OBJ += audio/oss.o
 endif
 ifeq ($(BUILD_ALSA), 1)
-   OBJ += alsa.o
+   OBJ += audio/alsa.o
    LIBS += -lasound
 endif
 ifeq ($(BUILD_ROAR), 1)
-   OBJ += roar.o
+   OBJ += audio/roar.o
    LIBS += -lroar
 endif
 ifeq ($(BUILD_AL), 1)
-   OBJ += openal.o
+   OBJ += audio/openal.o
    LIBS += -lopenal
 endif
 
 ifeq ($(BUILD_OPENGL), 1)
-   OBJ += gl.o
+   OBJ += gfx/gl.o
    LIBS += -lglfw
 endif
 
diff --git a/alsa.c b/audio/alsa.c
similarity index 100%
rename from alsa.c
rename to audio/alsa.c
diff --git a/openal.c b/audio/openal.c
similarity index 100%
rename from openal.c
rename to audio/openal.c
diff --git a/oss.c b/audio/oss.c
similarity index 100%
rename from oss.c
rename to audio/oss.c
diff --git a/roar.c b/audio/roar.c
similarity index 100%
rename from roar.c
rename to audio/roar.c
diff --git a/rsound.c b/audio/rsound.c
similarity index 100%
rename from rsound.c
rename to audio/rsound.c
diff --git a/gl.c b/gfx/gl.c
similarity index 100%
rename from gl.c
rename to gfx/gl.c