diff --git a/CHANGES b/CHANGES
index 26acc5999..ad7d96b59 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,7 @@ Misc:
  - Debugger: Watchpoints now report address watched (fixes #68)
  - GBA: Add API for getting Configuration structs for overrides and input
  - GBA: Refactor gba-sensors and gba-gpio into gba-hardware
+ - GBA: Refactor gba directory, dropping gba- prefix and making supervisor directory
 
 0.1.1: (2015-01-24)
 Bugfixes:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89585597d..305b0af1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ set(BUILD_SDL ON CACHE BOOL "Build SDL frontend")
 set(BUILD_PERF OFF CACHE BOOL "Build performance profiling tool")
 file(GLOB ARM_SRC ${CMAKE_SOURCE_DIR}/src/arm/*.c)
 file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
+file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c)
 file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs])
 file(GLOB VFS_SRC ${CMAKE_SOURCE_DIR}/src/util/vfs/*.c)
 file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/video-software.c)
@@ -22,9 +23,9 @@ file(GLOB THIRD_PARTY_SRC ${CMAKE_SOURCE_DIR}/src/third-party/inih/*.c)
 list(APPEND UTIL_SRC ${CMAKE_SOURCE_DIR}/src/platform/commandline.c)
 source_group("ARM core" FILES ${ARM_SRC})
 source_group("GBA board" FILES ${GBA_SRC} ${RENDERER_SRC})
+source_group("GBA supervisor" FILES ${GBA_SV_SRC})
 source_group("Utilities" FILES ${UTIL_SRC} ${VFS_SRC}})
 include_directories(${CMAKE_SOURCE_DIR}/src/arm)
-include_directories(${CMAKE_SOURCE_DIR}/src/gba)
 include_directories(${CMAKE_SOURCE_DIR}/src)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -138,7 +139,7 @@ if(USE_CLI_DEBUGGER)
 	add_definitions(-DUSE_CLI_DEBUGGER)
 	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/cli-debugger.c)
 	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/debugger/parser.c)
-	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/gba/gba-cli.c)
+	list(APPEND DEBUGGER_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/cli.c)
 	include_directories(AFTER ${LIBEDIT_INCLUDE_DIRS})
 	link_directories(${LIBEDIT_LIBRARY_DIRS})
 	set(DEBUGGER_LIB ${LIBEDIT_LIBRARIES})
@@ -239,6 +240,7 @@ endif()
 add_library(${BINARY_NAME} SHARED
 	${ARM_SRC}
 	${GBA_SRC}
+	${GBA_SV_SRC}
 	${DEBUGGER_SRC}
 	${RENDERER_SRC}
 	${UTIL_SRC}
diff --git a/src/gba/gba-audio.c b/src/gba/audio.c
similarity index 99%
rename from src/gba/gba-audio.c
rename to src/gba/audio.c
index 4ab83254b..63b83556f 100644
--- a/src/gba/gba-audio.c
+++ b/src/gba/audio.c
@@ -1,15 +1,15 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-audio.h"
+#include "audio.h"
 
-#include "gba.h"
-#include "gba-io.h"
-#include "gba-serialize.h"
-#include "gba-thread.h"
-#include "gba-video.h"
+#include "gba/gba.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/supervisor/thread.h"
+#include "gba/video.h"
 
 const unsigned GBA_AUDIO_SAMPLES = 2048;
 const unsigned BLIP_BUFFER_SIZE = 0x4000;
diff --git a/src/gba/gba-audio.h b/src/gba/audio.h
similarity index 99%
rename from src/gba/gba-audio.h
rename to src/gba/audio.h
index 98a07cc9b..2aa5953e5 100644
--- a/src/gba/gba-audio.h
+++ b/src/gba/audio.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/gba/gba-bios.c b/src/gba/bios.c
similarity index 99%
rename from src/gba/gba-bios.c
rename to src/gba/bios.c
index c9d119c37..21987ae03 100644
--- a/src/gba/gba-bios.c
+++ b/src/gba/bios.c
@@ -1,13 +1,13 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-bios.h"
+#include "bios.h"
 
-#include "gba.h"
-#include "gba-io.h"
-#include "gba-memory.h"
+#include "gba/gba.h"
+#include "gba/io.h"
+#include "gba/memory.h"
 #include "isa-inlines.h"
 
 const uint32_t GBA_BIOS_CHECKSUM = 0xBAAE187F;
diff --git a/src/gba/gba-bios.h b/src/gba/bios.h
similarity index 92%
rename from src/gba/gba-bios.h
rename to src/gba/bios.h
index 353f91096..11c177fa0 100644
--- a/src/gba/gba-bios.h
+++ b/src/gba/bios.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/gba/gba.c b/src/gba/gba.c
index e05c02285..86201dbe4 100644
--- a/src/gba/gba.c
+++ b/src/gba/gba.c
@@ -1,16 +1,16 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "gba.h"
 
-#include "gba-bios.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-sio.h"
-#include "gba-thread.h"
+#include "gba/bios.h"
+#include "gba/io.h"
+#include "gba/supervisor/rr.h"
+#include "gba/supervisor/thread.h"
+#include "gba/serialize.h"
+#include "gba/sio.h"
 
 #include "isa-inlines.h"
 
diff --git a/src/gba/gba.h b/src/gba/gba.h
index e9fab4d3c..91e33e513 100644
--- a/src/gba/gba.h
+++ b/src/gba/gba.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,10 +11,10 @@
 #include "arm.h"
 #include "debugger/debugger.h"
 
-#include "gba-memory.h"
-#include "gba-video.h"
-#include "gba-audio.h"
-#include "gba-sio.h"
+#include "gba/memory.h"
+#include "gba/video.h"
+#include "gba/audio.h"
+#include "gba/sio.h"
 
 extern const uint32_t GBA_ARM7TDMI_FREQUENCY;
 
diff --git a/src/gba/gba-hardware.c b/src/gba/hardware.c
similarity index 99%
rename from src/gba/gba-hardware.c
rename to src/gba/hardware.c
index e8acdc6e9..a584886e3 100644
--- a/src/gba/gba-hardware.c
+++ b/src/gba/hardware.c
@@ -3,10 +3,9 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba.h"
+#include "hardware.h"
 
-#include "gba-hardware.h"
-#include "gba-serialize.h"
+#include "gba/serialize.h"
 
 #include <time.h>
 
diff --git a/src/gba/gba-hardware.h b/src/gba/hardware.h
similarity index 100%
rename from src/gba/gba-hardware.h
rename to src/gba/hardware.h
diff --git a/src/gba/hle-bios.c b/src/gba/hle-bios.c
index 2d36ca354..6f9ed4d78 100644
--- a/src/gba/hle-bios.c
+++ b/src/gba/hle-bios.c
@@ -1,6 +1,6 @@
 #include "hle-bios.h"
 
-#include "gba-memory.h"
+#include "gba/memory.h"
 
 const uint8_t hleBios[SIZE_BIOS] = {
   0x06, 0x00, 0x00, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x07, 0x00, 0x00, 0xea,
diff --git a/src/gba/hle-bios.h b/src/gba/hle-bios.h
index 7bf83b7e4..6aa4cb92f 100644
--- a/src/gba/hle-bios.h
+++ b/src/gba/hle-bios.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/gba/hle-bios.make b/src/gba/hle-bios.make
index 84d0f2c69..20c2b50e3 100644
--- a/src/gba/hle-bios.make
+++ b/src/gba/hle-bios.make
@@ -13,6 +13,6 @@ hle-bios.bin: hle-bios.o
 hle-bios.c: hle-bios.bin
 	echo '#include "hle-bios.h"' > $@
 	echo >> $@
-	echo '#include "gba-memory.h"' >> $@
+	echo '#include "gba/memory.h"' >> $@
 	echo >> $@
 	xxd -i $< | sed -e 's/unsigned char hle_bios_bin\[\]/const uint8_t hleBios[SIZE_BIOS]/' | grep -v hle_bios_bin_len >> $@
diff --git a/src/gba/gba-input.c b/src/gba/input.c
similarity index 99%
rename from src/gba/gba-input.c
rename to src/gba/input.c
index 80b640179..5df882b0e 100644
--- a/src/gba/gba-input.c
+++ b/src/gba/input.c
@@ -1,9 +1,9 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-input.h"
+#include "input.h"
 
 #include "util/configuration.h"
 #include "util/table.h"
diff --git a/src/gba/gba-input.h b/src/gba/input.h
similarity index 96%
rename from src/gba/gba-input.h
rename to src/gba/input.h
index b9cb12eb9..a1628720f 100644
--- a/src/gba/gba-input.h
+++ b/src/gba/input.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef GBA_INPUT_H
 #define GBA_INPUT_H
 
-#include "gba.h"
+#include "gba/gba.h"
 
 struct Configuration;
 
diff --git a/src/gba/gba-io.c b/src/gba/io.c
similarity index 98%
rename from src/gba/gba-io.c
rename to src/gba/io.c
index c1fcec949..3adb28d08 100644
--- a/src/gba/gba-io.c
+++ b/src/gba/io.c
@@ -1,14 +1,14 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-io.h"
+#include "io.h"
 
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-sio.h"
-#include "gba-video.h"
+#include "gba/supervisor/rr.h"
+#include "gba/serialize.h"
+#include "gba/sio.h"
+#include "gba/video.h"
 
 const char* GBAIORegisterNames[] = {
 	// Video
diff --git a/src/gba/gba-io.h b/src/gba/io.h
similarity index 98%
rename from src/gba/gba-io.h
rename to src/gba/io.h
index e1e1d7e65..77b28861a 100644
--- a/src/gba/gba-io.h
+++ b/src/gba/io.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 enum GBAIORegisters {
 	// Video
diff --git a/src/gba/gba-memory.c b/src/gba/memory.c
similarity index 99%
rename from src/gba/gba-memory.c
rename to src/gba/memory.c
index cd70496fa..e28196bb1 100644
--- a/src/gba/gba-memory.c
+++ b/src/gba/memory.c
@@ -1,17 +1,17 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-memory.h"
+#include "memory.h"
 
 #include "macros.h"
 
 #include "decoder.h"
-#include "gba-hardware.h"
-#include "gba-io.h"
-#include "gba-serialize.h"
-#include "hle-bios.h"
+#include "gba/hardware.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/hle-bios.h"
 #include "util/memory.h"
 
 #define IDLE_LOOP_THRESHOLD 10000
diff --git a/src/gba/gba-memory.h b/src/gba/memory.h
similarity index 98%
rename from src/gba/gba-memory.h
rename to src/gba/memory.h
index ef787b282..8b13889a0 100644
--- a/src/gba/gba-memory.h
+++ b/src/gba/memory.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,8 +11,8 @@
 #include "arm.h"
 #include "macros.h"
 
-#include "gba-hardware.h"
-#include "gba-savedata.h"
+#include "gba/hardware.h"
+#include "gba/savedata.h"
 
 enum GBAMemoryRegion {
 	REGION_BIOS = 0x0,
diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c
index 6f9c8500d..8bdff07ad 100644
--- a/src/gba/renderers/video-software.c
+++ b/src/gba/renderers/video-software.c
@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "video-software.h"
 
-#include "gba.h"
-#include "gba-io.h"
+#include "gba/gba.h"
+#include "gba/io.h"
 
 #ifdef NDEBUG
 #define VIDEO_CHECKS false
diff --git a/src/gba/renderers/video-software.h b/src/gba/renderers/video-software.h
index 42fcf445a..47a0cbc56 100644
--- a/src/gba/renderers/video-software.h
+++ b/src/gba/renderers/video-software.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-video.h"
+#include "gba/video.h"
 
 #ifdef COLOR_16_BIT
 typedef uint16_t color_t;
diff --git a/src/gba/gba-savedata.c b/src/gba/savedata.c
similarity index 99%
rename from src/gba/gba-savedata.c
rename to src/gba/savedata.c
index 0a11b794c..fb8e83868 100644
--- a/src/gba/gba-savedata.c
+++ b/src/gba/savedata.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-savedata.h"
+#include "savedata.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 #include "util/memory.h"
 #include "util/vfs.h"
diff --git a/src/gba/gba-savedata.h b/src/gba/savedata.h
similarity index 98%
rename from src/gba/gba-savedata.h
rename to src/gba/savedata.h
index 097308062..cef539202 100644
--- a/src/gba/gba-savedata.h
+++ b/src/gba/savedata.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/gba/gba-serialize.c b/src/gba/serialize.c
similarity index 98%
rename from src/gba/gba-serialize.c
rename to src/gba/serialize.c
index 21380e3ea..56914f3dc 100644
--- a/src/gba/gba-serialize.c
+++ b/src/gba/serialize.c
@@ -1,15 +1,15 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-serialize.h"
+#include "serialize.h"
 
-#include "gba-audio.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-thread.h"
-#include "gba-video.h"
+#include "gba/audio.h"
+#include "gba/io.h"
+#include "gba/supervisor/rr.h"
+#include "gba/supervisor/thread.h"
+#include "gba/video.h"
 
 #include "util/memory.h"
 #include "util/vfs.h"
diff --git a/src/gba/gba-serialize.h b/src/gba/serialize.h
similarity index 99%
rename from src/gba/gba-serialize.h
rename to src/gba/serialize.h
index f9862194b..d9e051614 100644
--- a/src/gba/gba-serialize.h
+++ b/src/gba/serialize.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 extern const uint32_t GBA_SAVESTATE_MAGIC;
 
diff --git a/src/gba/gba-sio.c b/src/gba/sio.c
similarity index 97%
rename from src/gba/gba-sio.c
rename to src/gba/sio.c
index d598ffa2a..3bd58a802 100644
--- a/src/gba/gba-sio.c
+++ b/src/gba/sio.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-sio.h"
+#include "sio.h"
 
-#include "gba-io.h"
+#include "gba/io.h"
 
 const int GBASIOCyclesPerTransfer[4][MAX_GBAS] = {
 	{ 31457, 62914, 94371, 125829 },
diff --git a/src/gba/gba-sio.h b/src/gba/sio.h
similarity index 98%
rename from src/gba/gba-sio.h
rename to src/gba/sio.h
index ebc2df7b3..030218cc8 100644
--- a/src/gba/gba-sio.h
+++ b/src/gba/sio.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/gba/gba-cli.c b/src/gba/supervisor/cli.c
similarity index 97%
rename from src/gba/gba-cli.c
rename to src/gba/supervisor/cli.c
index 55dea6340..0bbc94fe3 100644
--- a/src/gba/gba-cli.c
+++ b/src/gba/supervisor/cli.c
@@ -1,13 +1,13 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-cli.h"
+#include "cli.h"
 
-#include "gba-io.h"
-#include "gba-serialize.h"
-#include "gba-thread.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/supervisor/thread.h"
 
 #ifdef USE_CLI_DEBUGGER
 
diff --git a/src/gba/gba-cli.h b/src/gba/supervisor/cli.h
similarity index 92%
rename from src/gba/gba-cli.h
rename to src/gba/supervisor/cli.h
index a1003352a..30cd90b0c 100644
--- a/src/gba/gba-cli.h
+++ b/src/gba/supervisor/cli.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/gba/gba-config.c b/src/gba/supervisor/config.c
similarity index 98%
rename from src/gba/gba-config.c
rename to src/gba/supervisor/config.c
index eff40ffd0..3b385e371 100644
--- a/src/gba/gba-config.c
+++ b/src/gba/supervisor/config.c
@@ -1,11 +1,9 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-config.h"
-
-#include "platform/commandline.h"
+#include "config.h"
 
 #include <sys/stat.h>
 
diff --git a/src/gba/gba-config.h b/src/gba/supervisor/config.h
similarity index 97%
rename from src/gba/gba-config.h
rename to src/gba/supervisor/config.h
index bd52ccf1f..92e8a285d 100644
--- a/src/gba/gba-config.h
+++ b/src/gba/supervisor/config.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba.h"
+#include "gba/gba.h"
 
 #include "util/configuration.h"
 
diff --git a/src/gba/gba-overrides.c b/src/gba/supervisor/overrides.c
similarity index 99%
rename from src/gba/gba-overrides.c
rename to src/gba/supervisor/overrides.c
index dfc036c83..1bbc919d2 100644
--- a/src/gba/gba-overrides.c
+++ b/src/gba/supervisor/overrides.c
@@ -3,10 +3,10 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-overrides.h"
+#include "overrides.h"
 
-#include "gba.h"
-#include "gba-hardware.h"
+#include "gba/gba.h"
+#include "gba/hardware.h"
 
  #include "util/configuration.h"
 
diff --git a/src/gba/gba-overrides.h b/src/gba/supervisor/overrides.h
similarity index 96%
rename from src/gba/gba-overrides.h
rename to src/gba/supervisor/overrides.h
index 8f3be4a0b..cd374572e 100644
--- a/src/gba/gba-overrides.h
+++ b/src/gba/supervisor/overrides.h
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-savedata.h"
+#include "gba/savedata.h"
 
 #define IDLE_LOOP_NONE 0xFFFFFFFF
 
diff --git a/src/gba/gba-rr.c b/src/gba/supervisor/rr.c
similarity index 99%
rename from src/gba/gba-rr.c
rename to src/gba/supervisor/rr.c
index 3f12b7d7b..f216f3b6a 100644
--- a/src/gba/gba-rr.c
+++ b/src/gba/supervisor/rr.c
@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-rr.h"
+#include "rr.h"
 
-#include "gba.h"
-#include "gba-serialize.h"
+#include "gba/gba.h"
+#include "gba/serialize.h"
 #include "util/vfs.h"
 
 #define BINARY_EXT ".dat"
diff --git a/src/gba/gba-rr.h b/src/gba/supervisor/rr.h
similarity index 98%
rename from src/gba/gba-rr.h
rename to src/gba/supervisor/rr.h
index e27ae02a7..fb94ae02d 100644
--- a/src/gba/gba-rr.h
+++ b/src/gba/supervisor/rr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/gba/gba-thread.c b/src/gba/supervisor/thread.c
similarity index 99%
rename from src/gba/gba-thread.c
rename to src/gba/supervisor/thread.c
index 7d02ae040..4f8c028ea 100644
--- a/src/gba/gba-thread.c
+++ b/src/gba/supervisor/thread.c
@@ -1,14 +1,14 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-thread.h"
+#include "thread.h"
 
 #include "arm.h"
-#include "gba.h"
-#include "gba-config.h"
-#include "gba-serialize.h"
+#include "gba/gba.h"
+#include "gba/supervisor/config.h"
+#include "gba/serialize.h"
 
 #include "debugger/debugger.h"
 
diff --git a/src/gba/gba-thread.h b/src/gba/supervisor/thread.h
similarity index 97%
rename from src/gba/gba-thread.h
rename to src/gba/supervisor/thread.h
index cf318c766..2275459fc 100644
--- a/src/gba/gba-thread.h
+++ b/src/gba/supervisor/thread.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,9 +8,9 @@
 
 #include "util/common.h"
 
-#include "gba.h"
-#include "gba-input.h"
-#include "gba-overrides.h"
+#include "gba/gba.h"
+#include "gba/input.h"
+#include "gba/supervisor/overrides.h"
 
 #include "util/threading.h"
 
diff --git a/src/gba/gba-video.c b/src/gba/video.c
similarity index 97%
rename from src/gba/gba-video.c
rename to src/gba/video.c
index 0cd7f52d5..88710f152 100644
--- a/src/gba/gba-video.c
+++ b/src/gba/video.c
@@ -1,15 +1,15 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-video.h"
+#include "video.h"
 
-#include "gba.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-thread.h"
+#include "gba/gba.h"
+#include "gba/io.h"
+#include "gba/serialize.h"
+#include "gba/supervisor/rr.h"
+#include "gba/supervisor/thread.h"
 
 #include "util/memory.h"
 
diff --git a/src/gba/gba-video.h b/src/gba/video.h
similarity index 98%
rename from src/gba/gba-video.h
rename to src/gba/video.h
index 41ba11b1e..b34a9a159 100644
--- a/src/gba/gba-video.h
+++ b/src/gba/video.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-memory.h"
+#include "gba/memory.h"
 #include "macros.h"
 
 #ifdef COLOR_16_BIT
diff --git a/src/platform/commandline.c b/src/platform/commandline.c
index 5909ac63b..4bd8e21ac 100644
--- a/src/platform/commandline.c
+++ b/src/platform/commandline.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,14 +9,14 @@
 
 #ifdef USE_CLI_DEBUGGER
 #include "debugger/cli-debugger.h"
-#include "gba/gba-cli.h"
+#include "gba/supervisor/cli.h"
 #endif
 
 #ifdef USE_GDB_STUB
 #include "debugger/gdb-stub.h"
 #endif
 
-#include "gba/gba-video.h"
+#include "gba/video.h"
 
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/src/platform/commandline.h b/src/platform/commandline.h
index 49b0fa537..ab46ee8b4 100644
--- a/src/platform/commandline.h
+++ b/src/platform/commandline.h
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-config.h"
+#include "gba/supervisor/config.h"
 
 enum DebuggerType {
 	DEBUGGER_NONE = 0,
diff --git a/src/platform/ffmpeg/ffmpeg-encoder.c b/src/platform/ffmpeg/ffmpeg-encoder.c
index b03b97f9d..1c69d96dd 100644
--- a/src/platform/ffmpeg/ffmpeg-encoder.c
+++ b/src/platform/ffmpeg/ffmpeg-encoder.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "ffmpeg-encoder.h"
 
-#include "gba-video.h"
+#include "gba/video.h"
 
 #include <libavcodec/version.h>
 #include <libavcodec/avcodec.h>
diff --git a/src/platform/ffmpeg/ffmpeg-encoder.h b/src/platform/ffmpeg/ffmpeg-encoder.h
index 3d1902870..cf7147bd7 100644
--- a/src/platform/ffmpeg/ffmpeg-encoder.h
+++ b/src/platform/ffmpeg/ffmpeg-encoder.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef FFMPEG_ENCODER
 #define FFMPEG_ENCODER
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #include <libavformat/avformat.h>
 
diff --git a/src/platform/imagemagick/imagemagick-gif-encoder.c b/src/platform/imagemagick/imagemagick-gif-encoder.c
index f1e1195a4..59505f7e7 100644
--- a/src/platform/imagemagick/imagemagick-gif-encoder.c
+++ b/src/platform/imagemagick/imagemagick-gif-encoder.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "imagemagick-gif-encoder.h"
 
-#include "gba-video.h"
+#include "gba/video.h"
 
 static void _magickPostVideoFrame(struct GBAAVStream*, struct GBAVideoRenderer* renderer);
 static void _magickPostAudioFrame(struct GBAAVStream*, int32_t left, int32_t right);
diff --git a/src/platform/imagemagick/imagemagick-gif-encoder.h b/src/platform/imagemagick/imagemagick-gif-encoder.h
index c3dd2c2ee..2786b9221 100644
--- a/src/platform/imagemagick/imagemagick-gif-encoder.h
+++ b/src/platform/imagemagick/imagemagick-gif-encoder.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef IMAGEMAGICK_GIF_ENCODER
 #define IMAGEMAGICK_GIF_ENCODER
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #define MAGICKCORE_HDRI_ENABLE 0
 #define MAGICKCORE_QUANTUM_DEPTH 8
diff --git a/src/platform/perf-main.c b/src/platform/perf-main.c
index 748698c56..7929f9c0c 100644
--- a/src/platform/perf-main.c
+++ b/src/platform/perf-main.c
@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "gba-thread.h"
-#include "gba-config.h"
-#include "gba.h"
-#include "renderers/video-software.h"
+#include "gba/supervisor/thread.h"
+#include "gba/supervisor/config.h"
+#include "gba/gba.h"
+#include "gba/renderers/video-software.h"
 
 #include "platform/commandline.h"
 
diff --git a/src/platform/qt/AudioDevice.cpp b/src/platform/qt/AudioDevice.cpp
index 64a4572b8..cff46b9b5 100644
--- a/src/platform/qt/AudioDevice.cpp
+++ b/src/platform/qt/AudioDevice.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,9 +6,9 @@
 #include "AudioDevice.h"
 
 extern "C" {
-#include "gba.h"
-#include "gba-audio.h"
-#include "gba-thread.h"
+#include "gba/gba.h"
+#include "gba/audio.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/AudioProcessor.cpp b/src/platform/qt/AudioProcessor.cpp
index f7637f850..6516da48f 100644
--- a/src/platform/qt/AudioProcessor.cpp
+++ b/src/platform/qt/AudioProcessor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #endif
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/AudioProcessorQt.cpp b/src/platform/qt/AudioProcessorQt.cpp
index 72fcdd4c8..c32b83ce4 100644
--- a/src/platform/qt/AudioProcessorQt.cpp
+++ b/src/platform/qt/AudioProcessorQt.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,7 @@
 #include <QAudioOutput>
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/AudioProcessorSDL.cpp b/src/platform/qt/AudioProcessorSDL.cpp
index 75868c4ee..f52188f4a 100644
--- a/src/platform/qt/AudioProcessorSDL.cpp
+++ b/src/platform/qt/AudioProcessorSDL.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #include "AudioProcessorSDL.h"
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp
index 558c9ccda..e46595673 100644
--- a/src/platform/qt/ConfigController.cpp
+++ b/src/platform/qt/ConfigController.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #include <QMenu>
 
 extern "C" {
-#include "gba-overrides.h"
+#include "gba/supervisor/overrides.h"
 #include "platform/commandline.h"
 }
 
diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h
index 3536ab67d..1a0997057 100644
--- a/src/platform/qt/ConfigController.h
+++ b/src/platform/qt/ConfigController.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
 #include <functional>
 
 extern "C" {
-#include "gba-config.h"
+#include "gba/supervisor/config.h"
 #include "util/configuration.h"
 }
 
diff --git a/src/platform/qt/Display.cpp b/src/platform/qt/Display.cpp
index b80acacfe..bb41a1518 100644
--- a/src/platform/qt/Display.cpp
+++ b/src/platform/qt/Display.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,7 @@
 #include <QResizeEvent>
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/GBAKeyEditor.h b/src/platform/qt/GBAKeyEditor.h
index e219f634d..ba749e3d6 100644
--- a/src/platform/qt/GBAKeyEditor.h
+++ b/src/platform/qt/GBAKeyEditor.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,7 +12,7 @@
 #include <QWidget>
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 }
 
 class QTimer;
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 533f56013..b32d69d66 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -14,11 +14,11 @@
 #include <ctime>
 
 extern "C" {
-#include "gba.h"
-#include "gba-audio.h"
-#include "gba-config.h"
-#include "gba-serialize.h"
-#include "renderers/video-software.h"
+#include "gba/audio.h"
+#include "gba/gba.h"
+#include "gba/serialize.h"
+#include "gba/renderers/video-software.h"
+#include "gba/supervisor/config.h"
 #include "util/vfs.h"
 }
 
diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h
index 4e95de198..9d1945a3e 100644
--- a/src/platform/qt/GameController.h
+++ b/src/platform/qt/GameController.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,8 +13,8 @@
 #include <QString>
 
 extern "C" {
-#include "gba-hardware.h"
-#include "gba-thread.h"
+#include "gba/hardware.h"
+#include "gba/supervisor/thread.h"
 #ifdef BUILD_SDL
 #include "sdl-events.h"
 #endif
diff --git a/src/platform/qt/GamepadAxisEvent.h b/src/platform/qt/GamepadAxisEvent.h
index 586cb3c62..8ac061e6d 100644
--- a/src/platform/qt/GamepadAxisEvent.h
+++ b/src/platform/qt/GamepadAxisEvent.h
@@ -9,7 +9,7 @@
 #include <QEvent>
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 }
 
 namespace QGBA {
diff --git a/src/platform/qt/GamepadButtonEvent.h b/src/platform/qt/GamepadButtonEvent.h
index 46733465c..c7e76ce9f 100644
--- a/src/platform/qt/GamepadButtonEvent.h
+++ b/src/platform/qt/GamepadButtonEvent.h
@@ -9,7 +9,7 @@
 #include <QEvent>
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 }
 
 namespace QGBA {
diff --git a/src/platform/qt/InputController.h b/src/platform/qt/InputController.h
index 3d1bb0a8a..c50307306 100644
--- a/src/platform/qt/InputController.h
+++ b/src/platform/qt/InputController.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
 class QTimer;
 
 extern "C" {
-#include "gba-input.h"
+#include "gba/input.h"
 
 #ifdef BUILD_SDL
 #include "platform/sdl/sdl-events.h"
diff --git a/src/platform/qt/LoadSaveState.cpp b/src/platform/qt/LoadSaveState.cpp
index 506404b36..1f1acd814 100644
--- a/src/platform/qt/LoadSaveState.cpp
+++ b/src/platform/qt/LoadSaveState.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,8 +14,8 @@
 #include <QPainter>
 
 extern "C" {
-#include "gba-serialize.h"
-#include "gba-video.h"
+#include "gba/serialize.h"
+#include "gba/video.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/LogView.h b/src/platform/qt/LogView.h
index 7c1b394f2..56fa33640 100644
--- a/src/platform/qt/LogView.h
+++ b/src/platform/qt/LogView.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,7 @@
 #include "ui_LogView.h"
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 namespace QGBA {
diff --git a/src/platform/qt/OverrideView.cpp b/src/platform/qt/OverrideView.cpp
index 44a1a2705..20ddbb70f 100644
--- a/src/platform/qt/OverrideView.cpp
+++ b/src/platform/qt/OverrideView.cpp
@@ -9,7 +9,7 @@
 #include "GameController.h"
 
 extern "C" {
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/OverrideView.h b/src/platform/qt/OverrideView.h
index 2b61b92fe..6a217edd5 100644
--- a/src/platform/qt/OverrideView.h
+++ b/src/platform/qt/OverrideView.h
@@ -11,7 +11,7 @@
 #include "ui_OverrideView.h"
 
 extern "C" {
-#include "gba-overrides.h"
+#include "gba/supervisor/overrides.h"
 }
 
 struct GBAThread;
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index 67f8bcb32..4554d8c51 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@
 #include <functional>
 
 extern "C" {
-#include "gba.h"
+#include "gba/gba.h"
 }
 
 #include "GDBController.h"
diff --git a/src/platform/sdl/gl-sdl.c b/src/platform/sdl/gl-sdl.c
index bd80ed12d..66d46b0c9 100644
--- a/src/platform/sdl/gl-sdl.c
+++ b/src/platform/sdl/gl-sdl.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "main.h"
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c
index 8ed606118..31cede4d5 100644
--- a/src/platform/sdl/main.c
+++ b/src/platform/sdl/main.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,10 +13,10 @@
 #include "debugger/gdb-stub.h"
 #endif
 
-#include "gba-thread.h"
-#include "gba.h"
-#include "gba-config.h"
-#include "gba-video.h"
+#include "gba/gba.h"
+#include "gba/supervisor/config.h"
+#include "gba/supervisor/thread.h"
+#include "gba/video.h"
 #include "platform/commandline.h"
 #include "util/configuration.h"
 
diff --git a/src/platform/sdl/main.h b/src/platform/sdl/main.h
index 0066694d1..c62f3bb28 100644
--- a/src/platform/sdl/main.h
+++ b/src/platform/sdl/main.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,7 +6,7 @@
 #ifndef SDL_MAIN_H
 #define SDL_MAIN_H
 
-#include "renderers/video-software.h"
+#include "gba/renderers/video-software.h"
 
 #include "sdl-audio.h"
 #include "sdl-events.h"
diff --git a/src/platform/sdl/sdl-audio.c b/src/platform/sdl/sdl-audio.c
index ccc2fd9d1..ccdd41d2d 100644
--- a/src/platform/sdl/sdl-audio.c
+++ b/src/platform/sdl/sdl-audio.c
@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "sdl-audio.h"
 
-#include "gba.h"
-#include "gba-thread.h"
+#include "gba/gba.h"
+#include "gba/supervisor/thread.h"
 
 #if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF
 #include "third-party/blip_buf/blip_buf.h"
diff --git a/src/platform/sdl/sdl-audio.h b/src/platform/sdl/sdl-audio.h
index cd90e7014..316b07d95 100644
--- a/src/platform/sdl/sdl-audio.h
+++ b/src/platform/sdl/sdl-audio.h
@@ -10,7 +10,7 @@
 
 #include <SDL.h>
 
-#include "gba-audio.h"
+#include "gba/audio.h"
 
 struct GBASDLAudio {
 	// Input
diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c
index ec116030b..4af6edbb7 100644
--- a/src/platform/sdl/sdl-events.c
+++ b/src/platform/sdl/sdl-events.c
@@ -6,11 +6,11 @@
 #include "sdl-events.h"
 
 #include "debugger/debugger.h"
-#include "gba-io.h"
-#include "gba-rr.h"
-#include "gba-serialize.h"
-#include "gba-video.h"
-#include "renderers/video-software.h"
+#include "gba/io.h"
+#include "gba/supervisor/rr.h"
+#include "gba/serialize.h"
+#include "gba/video.h"
+#include "gba/renderers/video-software.h"
 #include "util/vfs.h"
 
 #if SDL_VERSION_ATLEAST(2, 0, 0) && defined(__APPLE__)
diff --git a/src/platform/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h
index b03ee74ce..997345e73 100644
--- a/src/platform/sdl/sdl-events.h
+++ b/src/platform/sdl/sdl-events.h
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #include <SDL.h>
 
diff --git a/src/platform/sdl/sw-sdl.c b/src/platform/sdl/sw-sdl.c
index 3dc774b47..78fcb78fb 100644
--- a/src/platform/sdl/sw-sdl.c
+++ b/src/platform/sdl/sw-sdl.c
@@ -1,11 +1,11 @@
-/* Copyright (c) 2013-2014 Jeffrey Pfau
+/* Copyright (c) 2013-2015 Jeffrey Pfau
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "main.h"
 
-#include "gba-thread.h"
+#include "gba/supervisor/thread.h"
 
 #if defined(__ARM_NEON)
 void _neon2x(void* dest, void* src, int width, int height);