diff --git a/gx/gx_audio.c b/audio/gx_audio.c
similarity index 94%
rename from gx/gx_audio.c
rename to audio/gx_audio.c
index 9122cad3a3..c04c455e04 100644
--- a/gx/gx_audio.c
+++ b/audio/gx_audio.c
@@ -184,14 +184,14 @@ static size_t gx_audio_buffer_size(void *data)
 }
 
 const audio_driver_t audio_gx = {
-   .init = gx_audio_init,
-   .write = gx_audio_write,
-   .stop = gx_audio_stop,
-   .start = gx_audio_start,
-   .set_nonblock_state = gx_audio_set_nonblock_state,
-   .free = gx_audio_free,
-   .ident = "gx",
-   .write_avail = gx_audio_write_avail,
-   .buffer_size = gx_audio_buffer_size,
+   gx_audio_init,
+   gx_audio_write,
+   gx_audio_stop,
+   gx_audio_start,
+   gx_audio_set_nonblock_state,
+   gx_audio_free,
+   "gx",
+   gx_audio_write_avail,
+   gx_audio_buffer_size,
 };
 
diff --git a/ps3/ps3_audio.c b/audio/ps3_audio.c
similarity index 99%
rename from ps3/ps3_audio.c
rename to audio/ps3_audio.c
index bf8e6c7e8f..fb4f8dd7d7 100644
--- a/ps3/ps3_audio.c
+++ b/audio/ps3_audio.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "../fifo_buffer.h"
 
-#include "sdk_defines.h"
+#include "../ps3/sdk_defines.h"
 
 #define AUDIO_BLOCKS 8 // 8 or 16. Guess what we choose? :)
 #define AUDIO_CHANNELS 2 // All hail glorious stereo!
diff --git a/psp1/psp1_audio.c b/audio/psp1_audio.c
similarity index 97%
rename from psp1/psp1_audio.c
rename to audio/psp1_audio.c
index 8f6f83e2f1..1a227839b1 100644
--- a/psp1/psp1_audio.c
+++ b/audio/psp1_audio.c
@@ -1,5 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2014 - Daniel De Matteis
+ *  Copyright (C) 2014      - Aliaspider (To be replaced with real name)
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU General Public License as published by the Free Software Found-
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 8e2f541d51..414bfabc11 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -412,15 +412,15 @@ AUDIO UTILS
 AUDIO
 ============================================================ */
 #if defined(__CELLOS_LV2__)
-#include "../ps3/ps3_audio.c"
+#include "../audio/ps3_audio.c"
 #elif defined(XENON)
 #include "../xenon/xenon360_audio.c"
 #elif defined(GEKKO)
-#include "../gx/gx_audio.c"
+#include "../audio/gx_audio.c"
 #elif defined(EMSCRIPTEN)
 #include "../audio/rwebaudio.c"
 #elif defined(PSP)
-#include "../psp1/psp1_audio.c"
+#include "../audio/psp1_audio.c"
 #endif
 
 #ifdef HAVE_XAUDIO