diff --git a/CMakeLists.txt b/CMakeLists.txt
index 491be7068..e79ce1281 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,21 +39,20 @@ file(GLOB GBA_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/*.c)
 file(GLOB GB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/*.c)
 file(GLOB GBA_CHEATS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/cheats/*.c)
 file(GLOB GBA_RR_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/rr/*.c)
-file(GLOB GBA_SV_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/supervisor/*.c)
-file(GLOB GBA_CTX_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/context/*.c)
+file(GLOB GBA_EXTRA_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/extra/*.c)
 file(GLOB UTIL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/*.[cSs] ${CMAKE_CURRENT_SOURCE_DIR}/src/core/*.c)
-file(GLOB GUI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/gui/*.c ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/gui/*.c)
+file(GLOB GUI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/gui/*.c ${CMAKE_CURRENT_SOURCE_DIR}/src/feature/gui/*.c)
 file(GLOB GBA_RENDERER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/renderers/*.c)
 file(GLOB SIO_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/sio/lockstep.c)
 file(GLOB GB_RENDERER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gb/renderers/*.c)
 file(GLOB THIRD_PARTY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/inih/*.c)
-set(CLI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/platform/commandline.c)
+set(CLI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/feature/commandline.c)
 set(CORE_VFS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/util/vfs/vfs-mem.c)
 set(VFS_SRC)
 source_group("ARM core" FILES ${ARM_SRC})
 source_group("LR35902 core" FILES ${LR35902_SRC})
 source_group("GBA board" FILES ${GBA_SRC} ${GBA_RENDERER_SRC} ${SIO_SRC})
-source_group("GBA extra" FILES ${GBA_CHEATS_SRC} ${GBA_CTX_SRC} ${GBA_SV_SRC} ${GBA_RR_SRC})
+source_group("GBA extra" FILES ${GBA_CHEATS_SRC} ${GBA_EXTRA_SRC} ${GBA_RR_SRC})
 source_group("GB board" FILES ${GB_SRC})
 source_group("Utilities" FILES ${UTIL_SRC})
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
@@ -327,7 +326,7 @@ if(USE_CLI_DEBUGGER)
 	list(APPEND FEATURES CLI_DEBUGGER)
 	list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/debugger/cli-debugger.c)
 	list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/debugger/parser.c)
-	list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/supervisor/cli.c)
+	list(APPEND DEBUGGER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/gba/extra/cli.c)
 	include_directories(AFTER ${LIBEDIT_INCLUDE_DIRS})
 	link_directories(${LIBEDIT_LIBRARY_DIRS})
 	set(DEBUGGER_LIB ${LIBEDIT_LIBRARIES})
@@ -350,7 +349,7 @@ if(USE_FFMPEG)
 	endif()
 	include_directories(AFTER ${LIBAVCODEC_INCLUDE_DIRS} ${LIBAVFORMAT_INCLUDE_DIRS} ${LIBAVRESAMPLE_INCLUDE_DIRS} ${LIBAVUTIL_INCLUDE_DIRS} ${LIBSWSCALE_INCLUDE_DIRS})
 	link_directories(${LIBAVCODEC_LIBRARY_DIRS} ${LIBAVFORMAT_LIBRARY_DIRS} ${LIBAVRESAMPLE_LIBRARY_DIRS} ${LIBAVUTIL_LIBRARY_DIRS} ${LIBSWSCALE_LIBRARY_DIRS})
-	list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/platform/ffmpeg/ffmpeg-encoder.c")
+	list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/ffmpeg/ffmpeg-encoder.c")
 	string(REGEX MATCH "^[0-9]+" LIBAVCODEC_VERSION_MAJOR ${libavcodec_VERSION})
 	string(REGEX MATCH "^[0-9]+" LIBAVFORMAT_VERSION_MAJOR ${libavformat_VERSION})
 	string(REGEX MATCH "^[0-9]+" LIBAVRESAMPLE_VERSION_MAJOR ${libavresample_VERSION})
@@ -375,7 +374,7 @@ if(USE_MAGICK)
 	list(APPEND FEATURES MAGICK)
 	include_directories(AFTER ${MAGICKWAND_INCLUDE_DIRS})
 	link_directories(${MAGICKWAND_LIBRARY_DIRS})
-	list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/platform/imagemagick/imagemagick-gif-encoder.c")
+	list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
 	list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
 	string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
 	if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
@@ -503,7 +502,6 @@ if(M_CORE_GBA)
 		${ARM_SRC}
 		${GBA_SRC}
 		${GBA_CHEATS_SRC}
-		${GBA_CTX_SRC}
 		${DEBUGGER_SRC}
 		${GBA_RENDERER_SRC})
 	if(NOT M_CORE_GB)
@@ -540,7 +538,7 @@ if(NOT MINIMAL_CORE)
 	if(M_CORE_GBA)
 		list(APPEND SRC
 			${GBA_RR_SRC}
-			${GBA_SV_SRC}
+			${GBA_EXTRA_SRC}
 			${SIO_SRC})
 	endif()
 	list(APPEND SRC
diff --git a/src/core/thread.c b/src/core/thread.c
index 506d8af5f..6c2cf0627 100644
--- a/src/core/thread.c
+++ b/src/core/thread.c
@@ -9,7 +9,7 @@
 #include "util/patch.h"
 #include "util/vfs.h"
 
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 
 #include <signal.h>
 
diff --git a/src/debugger/debugger.c b/src/debugger/debugger.c
index 45dbbb6d4..d1a17656f 100644
--- a/src/debugger/debugger.c
+++ b/src/debugger/debugger.c
@@ -9,7 +9,6 @@
 
 #ifdef USE_CLI_DEBUGGER
 #include "debugger/cli-debugger.h"
-#include "gba/supervisor/cli.h"
 #endif
 
 #ifdef USE_GDB_STUB
diff --git a/src/platform/commandline.c b/src/feature/commandline.c
similarity index 100%
rename from src/platform/commandline.c
rename to src/feature/commandline.c
diff --git a/src/platform/commandline.h b/src/feature/commandline.h
similarity index 100%
rename from src/platform/commandline.h
rename to src/feature/commandline.h
diff --git a/src/platform/ffmpeg/ffmpeg-encoder.c b/src/feature/ffmpeg/ffmpeg-encoder.c
similarity index 100%
rename from src/platform/ffmpeg/ffmpeg-encoder.c
rename to src/feature/ffmpeg/ffmpeg-encoder.c
diff --git a/src/platform/ffmpeg/ffmpeg-encoder.h b/src/feature/ffmpeg/ffmpeg-encoder.h
similarity index 100%
rename from src/platform/ffmpeg/ffmpeg-encoder.h
rename to src/feature/ffmpeg/ffmpeg-encoder.h
diff --git a/src/gba/gui/gui-config.c b/src/feature/gui/gui-config.c
similarity index 98%
rename from src/gba/gui/gui-config.c
rename to src/feature/gui/gui-config.c
index c19f01c08..1581c8259 100644
--- a/src/gba/gui/gui-config.c
+++ b/src/feature/gui/gui-config.c
@@ -7,9 +7,9 @@
 
 #include "core/config.h"
 #include "core/core.h"
+#include "feature/gui/gui-runner.h"
+#include "feature/gui/remap.h"
 #include "gba/gba.h"
-#include "gba/gui/gui-runner.h"
-#include "gba/gui/remap.h"
 #include "util/gui/file-select.h"
 #include "util/gui/menu.h"
 
diff --git a/src/gba/gui/gui-config.h b/src/feature/gui/gui-config.h
similarity index 100%
rename from src/gba/gui/gui-config.h
rename to src/feature/gui/gui-config.h
diff --git a/src/gba/gui/gui-runner.c b/src/feature/gui/gui-runner.c
similarity index 99%
rename from src/gba/gui/gui-runner.c
rename to src/feature/gui/gui-runner.c
index 8b8b97646..1d0977720 100644
--- a/src/gba/gui/gui-runner.c
+++ b/src/feature/gui/gui-runner.c
@@ -6,7 +6,7 @@
 #include "gui-runner.h"
 
 #include "core/core.h"
-#include "gba/gui/gui-config.h"
+#include "feature/gui/gui-config.h"
 #include "gba/input.h"
 #include "gba/interface.h"
 #include "gba/serialize.h"
diff --git a/src/gba/gui/gui-runner.h b/src/feature/gui/gui-runner.h
similarity index 98%
rename from src/gba/gui/gui-runner.h
rename to src/feature/gui/gui-runner.h
index 1eea11dc3..e1a0a3d85 100644
--- a/src/gba/gui/gui-runner.h
+++ b/src/feature/gui/gui-runner.h
@@ -8,7 +8,7 @@
 
 #include "util/common.h"
 
-#include "gba/gui/remap.h"
+#include "feature/gui/remap.h"
 #include "gba/hardware.h"
 #include "util/circle-buffer.h"
 #include "util/gui.h"
diff --git a/src/gba/gui/remap.c b/src/feature/gui/remap.c
similarity index 100%
rename from src/gba/gui/remap.c
rename to src/feature/gui/remap.c
diff --git a/src/gba/gui/remap.h b/src/feature/gui/remap.h
similarity index 100%
rename from src/gba/gui/remap.h
rename to src/feature/gui/remap.h
diff --git a/src/platform/imagemagick/imagemagick-gif-encoder.c b/src/feature/imagemagick/imagemagick-gif-encoder.c
similarity index 100%
rename from src/platform/imagemagick/imagemagick-gif-encoder.c
rename to src/feature/imagemagick/imagemagick-gif-encoder.c
diff --git a/src/platform/imagemagick/imagemagick-gif-encoder.h b/src/feature/imagemagick/imagemagick-gif-encoder.h
similarity index 100%
rename from src/platform/imagemagick/imagemagick-gif-encoder.h
rename to src/feature/imagemagick/imagemagick-gif-encoder.h
diff --git a/src/gba/core.c b/src/gba/core.c
index f0a99fb34..b326b5f7a 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -8,10 +8,10 @@
 #include "core/core.h"
 #include "core/log.h"
 #include "gba/gba.h"
-#include "gba/context/overrides.h"
+#include "gba/extra/cli.h"
+#include "gba/overrides.h"
 #include "gba/renderers/video-software.h"
 #include "gba/serialize.h"
-#include "gba/supervisor/cli.h"
 #include "util/memory.h"
 #include "util/patch.h"
 #include "util/vfs.h"
diff --git a/src/gba/supervisor/cli.c b/src/gba/extra/cli.c
similarity index 100%
rename from src/gba/supervisor/cli.c
rename to src/gba/extra/cli.c
diff --git a/src/gba/supervisor/cli.h b/src/gba/extra/cli.h
similarity index 100%
rename from src/gba/supervisor/cli.h
rename to src/gba/extra/cli.h
diff --git a/src/gba/supervisor/export.c b/src/gba/extra/export.c
similarity index 100%
rename from src/gba/supervisor/export.c
rename to src/gba/extra/export.c
diff --git a/src/gba/supervisor/export.h b/src/gba/extra/export.h
similarity index 100%
rename from src/gba/supervisor/export.h
rename to src/gba/extra/export.h
diff --git a/src/gba/sharkport.c b/src/gba/extra/sharkport.c
similarity index 100%
rename from src/gba/sharkport.c
rename to src/gba/extra/sharkport.c
diff --git a/src/gba/sharkport.h b/src/gba/extra/sharkport.h
similarity index 100%
rename from src/gba/sharkport.h
rename to src/gba/extra/sharkport.h
diff --git a/src/gba/gba.c b/src/gba/gba.c
index c605216ba..371a2ace3 100644
--- a/src/gba/gba.c
+++ b/src/gba/gba.c
@@ -12,8 +12,8 @@
 
 #include "gba/bios.h"
 #include "gba/cheats.h"
-#include "gba/context/overrides.h"
 #include "gba/io.h"
+#include "gba/overrides.h"
 #include "gba/rr/rr.h"
 #include "gba/serialize.h"
 #include "gba/sio.h"
diff --git a/src/gba/context/overrides.c b/src/gba/overrides.c
similarity index 100%
rename from src/gba/context/overrides.c
rename to src/gba/overrides.c
diff --git a/src/gba/context/overrides.h b/src/gba/overrides.h
similarity index 100%
rename from src/gba/context/overrides.h
rename to src/gba/overrides.h
diff --git a/src/platform/3ds/main.c b/src/platform/3ds/main.c
index c016d8ddc..e67668e5f 100644
--- a/src/platform/3ds/main.c
+++ b/src/platform/3ds/main.c
@@ -6,13 +6,13 @@
 
 #ifdef M_CORE_GBA
 #include "gba/gba.h"
-#include "gba/gui/gui-runner.h"
 #include "gba/input.h"
 #include "gba/video.h"
 #endif
 #ifdef M_CORE_GB
 #include "gb/gb.h"
 #endif
+#include "feature/gui/gui-runner.h"
 #include "util/gui.h"
 #include "util/gui/file-select.h"
 #include "util/gui/font.h"
diff --git a/src/platform/example/client-server/server.c b/src/platform/example/client-server/server.c
index b124b6a89..8267ff1b7 100644
--- a/src/platform/example/client-server/server.c
+++ b/src/platform/example/client-server/server.c
@@ -1,6 +1,6 @@
 // This source file is placed into the public domain.
 #include "core/core.h"
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 #include "util/socket.h"
 
 #define DEFAULT_PORT 13721
diff --git a/src/platform/psp2/main.c b/src/platform/psp2/main.c
index 8648c8d65..5855ce041 100644
--- a/src/platform/psp2/main.c
+++ b/src/platform/psp2/main.c
@@ -6,7 +6,7 @@
 #include "psp2-context.h"
 
 #include "gba/gba.h"
-#include "gba/gui/gui-runner.h"
+#include "feature/gui/gui-runner.h"
 #include "util/gui.h"
 #include "util/gui/font.h"
 #include "util/gui/file-select.h"
diff --git a/src/platform/psp2/psp2-context.c b/src/platform/psp2/psp2-context.c
index c4d11e218..29967864a 100644
--- a/src/platform/psp2/psp2-context.c
+++ b/src/platform/psp2/psp2-context.c
@@ -14,8 +14,8 @@
 #include "gb/gb.h"
 #endif
 
+#include "feature/gui/gui-runner.h"
 #include "gba/input.h"
-#include "gba/gui/gui-runner.h"
 
 #include "util/circle-buffer.h"
 #include "util/memory.h"
diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp
index fb213b76c..ee7beb890 100644
--- a/src/platform/qt/ConfigController.cpp
+++ b/src/platform/qt/ConfigController.cpp
@@ -12,8 +12,8 @@
 #include <QMenu>
 
 extern "C" {
-#include "gba/context/overrides.h"
-#include "platform/commandline.h"
+#include "gba/overrides.h"
+#include "feature/commandline.h"
 }
 
 using namespace QGBA;
diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h
index 1f12472d1..a5f4c5d6b 100644
--- a/src/platform/qt/ConfigController.h
+++ b/src/platform/qt/ConfigController.h
@@ -16,7 +16,7 @@
 extern "C" {
 #include "core/config.h"
 #include "util/configuration.h"
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 }
 
 class QAction;
diff --git a/src/platform/qt/GBAApp.cpp b/src/platform/qt/GBAApp.cpp
index f186345fa..153ca9aa7 100644
--- a/src/platform/qt/GBAApp.cpp
+++ b/src/platform/qt/GBAApp.cpp
@@ -16,7 +16,7 @@
 #include <QIcon>
 
 extern "C" {
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 #include "util/nointro.h"
 #include "util/socket.h"
 }
diff --git a/src/platform/qt/GIFView.h b/src/platform/qt/GIFView.h
index 93f67e146..ccfeddbc0 100644
--- a/src/platform/qt/GIFView.h
+++ b/src/platform/qt/GIFView.h
@@ -13,7 +13,7 @@
 #include "ui_GIFView.h"
 
 extern "C" {
-#include "platform/imagemagick/imagemagick-gif-encoder.h"
+#include "feature/imagemagick/imagemagick-gif-encoder.h"
 }
 
 namespace QGBA {
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 6e4de2fcb..327153574 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -25,7 +25,7 @@ extern "C" {
 #include "gba/core.h"
 #include "gba/gba.h"
 #include "gba/serialize.h"
-#include "gba/sharkport.h"
+#include "gba/extra/sharkport.h"
 #endif
 #ifdef M_CORE_GB
 #include "gb/gb.h"
diff --git a/src/platform/qt/GameController.h b/src/platform/qt/GameController.h
index 8def51f87..515e07b3e 100644
--- a/src/platform/qt/GameController.h
+++ b/src/platform/qt/GameController.h
@@ -19,9 +19,9 @@ extern "C" {
 #include "core/core.h"
 #include "core/thread.h"
 #include "gba/cheats.h"
-#include "gba/context/overrides.h"
 #include "gba/hardware.h"
 #include "gba/input.h"
+#include "gba/overrides.h"
 #ifdef BUILD_SDL
 #include "sdl-events.h"
 #endif
diff --git a/src/platform/qt/OverrideView.h b/src/platform/qt/OverrideView.h
index babf7a989..16e578c19 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/context/overrides.h"
+#include "gba/overrides.h"
 }
 
 struct mCoreThread;
diff --git a/src/platform/qt/PaletteView.cpp b/src/platform/qt/PaletteView.cpp
index 6ad14257b..d30ae1010 100644
--- a/src/platform/qt/PaletteView.cpp
+++ b/src/platform/qt/PaletteView.cpp
@@ -14,7 +14,7 @@
 
 extern "C" {
 #include "core/core.h"
-#include "gba/supervisor/export.h"
+#include "gba/extra/export.h"
 #include "util/vfs.h"
 }
 
diff --git a/src/platform/qt/VideoView.h b/src/platform/qt/VideoView.h
index d5088362e..75249fda3 100644
--- a/src/platform/qt/VideoView.h
+++ b/src/platform/qt/VideoView.h
@@ -13,7 +13,7 @@
 #include "ui_VideoView.h"
 
 extern "C" {
-#include "platform/ffmpeg/ffmpeg-encoder.h"
+#include "feature/ffmpeg/ffmpeg-encoder.h"
 }
 
 namespace QGBA {
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 515bd2303..019ebaab8 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -41,7 +41,7 @@ extern "C" {
 #ifdef M_CORE_GB
 #include "gb/gb.h"
 #endif
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 #include "util/nointro.h"
 #include "util/vfs.h"
 }
diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c
index 95f45fad2..d66f85668 100644
--- a/src/platform/sdl/main.c
+++ b/src/platform/sdl/main.c
@@ -28,7 +28,7 @@
 #include "gb/gb.h"
 #include "gb/video.h"
 #endif
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 #include "util/configuration.h"
 #include "util/vfs.h"
 
diff --git a/src/platform/test/fuzz-main.c b/src/platform/test/fuzz-main.c
index 01e28113c..432ff7d9d 100644
--- a/src/platform/test/fuzz-main.c
+++ b/src/platform/test/fuzz-main.c
@@ -9,7 +9,7 @@
 #include "gba/gba.h"
 #include "gba/serialize.h"
 
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 #include "util/memory.h"
 #include "util/string.h"
 #include "util/vfs.h"
diff --git a/src/platform/test/perf-main.c b/src/platform/test/perf-main.c
index 78aca7eaa..26a1f6b31 100644
--- a/src/platform/test/perf-main.c
+++ b/src/platform/test/perf-main.c
@@ -9,7 +9,7 @@
 #include "gba/renderers/video-software.h"
 #include "gba/serialize.h"
 
-#include "platform/commandline.h"
+#include "feature/commandline.h"
 #include "util/socket.h"
 #include "util/string.h"
 #include "util/vfs.h"
diff --git a/src/platform/wii/main.c b/src/platform/wii/main.c
index c99e68829..40e6c9e04 100644
--- a/src/platform/wii/main.c
+++ b/src/platform/wii/main.c
@@ -15,9 +15,9 @@
 #include "util/common.h"
 
 #include "core/core.h"
+#include "feature/gui/gui-runner.h"
 #include "gba/audio.h"
 #include "gba/gba.h"
-#include "gba/gui/gui-runner.h"
 #include "gba/input.h"
 #include "util/gui.h"
 #include "util/gui/file-select.h"