diff --git a/Makefile b/Makefile
index 83ea16fb6f..576e14bffc 100644
--- a/Makefile
+++ b/Makefile
@@ -536,7 +536,7 @@ endif
 
 $(BUILD_DIR)/src/boot/build.o: CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
 
-$(BUILD_DIR)/src/audio/lib/seqplayer.o: CPP_DEFINES += -DMML_VERSION=MML_VERSION_OOT
+$(BUILD_DIR)/src/audio/internal/seqplayer.o: CPP_DEFINES += -DMML_VERSION=MML_VERSION_OOT
 
 ifeq ($(COMPILER),ido)
 $(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2
@@ -617,18 +617,18 @@ $(BUILD_DIR)/src/libc64/%.o: OPTFLAGS := -O2
 
 $(BUILD_DIR)/src/libu64/%.o: OPTFLAGS := -O2
 
-$(BUILD_DIR)/src/audio/%.o: OPTFLAGS := -O2
+$(BUILD_DIR)/src/audio/game/%.o: OPTFLAGS := -O2
 
 # Use signed chars instead of unsigned for this audio file (needed to match AudioDebug_ScrPrt)
-$(BUILD_DIR)/src/audio/general.o: CFLAGS += -signed
+$(BUILD_DIR)/src/audio/game/general.o: CFLAGS += -signed
 
 ifeq ($(PLATFORM),N64)
-$(BUILD_DIR)/src/audio/general.o: CFLAGS += -DNO_SQRTF_INTRINSIC
+$(BUILD_DIR)/src/audio/game/general.o: CFLAGS += -DNO_SQRTF_INTRINSIC
 endif
 
 # Put string literals in .data for some audio files (needed to match these files with literals)
-$(BUILD_DIR)/src/audio/sfx.o: CFLAGS += -use_readwrite_const
-$(BUILD_DIR)/src/audio/sequence.o: CFLAGS += -use_readwrite_const
+$(BUILD_DIR)/src/audio/game/sfx.o: CFLAGS += -use_readwrite_const
+$(BUILD_DIR)/src/audio/game/sequence.o: CFLAGS += -use_readwrite_const
 
 ifeq ($(PLATFORM),IQUE)
 $(BUILD_DIR)/src/libultra/%.o: CC := $(EGCS_CC)
@@ -961,7 +961,7 @@ $(BUILD_DIR)/src/%.o: src/%.c
 	$(POSTPROCESS_OBJ) $@
 	$(OBJDUMP_CMD)
 
-$(BUILD_DIR)/src/audio/session_init.o: src/audio/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h
+$(BUILD_DIR)/src/audio/game/session_init.o: src/audio/game/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h
 	$(CC_CHECK) $< -o $@
 	$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $(@:.o=.tmp) $<
 	$(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $(@:.o=.tmp)
diff --git a/spec/spec b/spec/spec
index 362d83c1aa..ffbd4ac811 100644
--- a/spec/spec
+++ b/spec/spec
@@ -676,31 +676,31 @@ beginseg
 #if OOT_VERSION < NTSC_1_1 || !PLATFORM_N64
     pad_text
 #endif
-    include "$(BUILD_DIR)/src/audio/lib/data.o"
-    include "$(BUILD_DIR)/src/audio/lib/synthesis.o"
-    include "$(BUILD_DIR)/src/audio/lib/heap.o"
-    include "$(BUILD_DIR)/src/audio/lib/load.o"
-    include "$(BUILD_DIR)/src/audio/lib/thread.o"
-    include "$(BUILD_DIR)/src/audio/lib/dcache.o"
-    include "$(BUILD_DIR)/src/audio/lib/aisetnextbuf.o"
+    include "$(BUILD_DIR)/src/audio/internal/data.o"
+    include "$(BUILD_DIR)/src/audio/internal/synthesis.o"
+    include "$(BUILD_DIR)/src/audio/internal/heap.o"
+    include "$(BUILD_DIR)/src/audio/internal/load.o"
+    include "$(BUILD_DIR)/src/audio/internal/thread.o"
+    include "$(BUILD_DIR)/src/audio/internal/dcache.o"
+    include "$(BUILD_DIR)/src/audio/internal/aisetnextbuf.o"
 #if OOT_PAL_N64
     pad_text
     pad_text
     pad_text
 #endif
-    include "$(BUILD_DIR)/src/audio/lib/playback.o"
-    include "$(BUILD_DIR)/src/audio/lib/effects.o"
-    include "$(BUILD_DIR)/src/audio/lib/seqplayer.o"
-    include "$(BUILD_DIR)/src/audio/general.o"
+    include "$(BUILD_DIR)/src/audio/internal/playback.o"
+    include "$(BUILD_DIR)/src/audio/internal/effects.o"
+    include "$(BUILD_DIR)/src/audio/internal/seqplayer.o"
+    include "$(BUILD_DIR)/src/audio/game/general.o"
 #if !PLATFORM_N64 && !DEBUG_FEATURES
     pad_text
 #endif
-    include "$(BUILD_DIR)/src/audio/sfx_params.o"
-    include "$(BUILD_DIR)/src/audio/sfx.o"
-    include "$(BUILD_DIR)/src/audio/sequence.o"
-    include "$(BUILD_DIR)/src/audio/data.o"
-    include "$(BUILD_DIR)/src/audio/session_config.o"
-    include "$(BUILD_DIR)/src/audio/session_init.o"
+    include "$(BUILD_DIR)/src/audio/game/sfx_params.o"
+    include "$(BUILD_DIR)/src/audio/game/sfx.o"
+    include "$(BUILD_DIR)/src/audio/game/sequence.o"
+    include "$(BUILD_DIR)/src/audio/game/data.o"
+    include "$(BUILD_DIR)/src/audio/game/session_config.o"
+    include "$(BUILD_DIR)/src/audio/game/session_init.o"
 
     // libu64
 #if PLATFORM_N64
diff --git a/src/audio/data.c b/src/audio/game/data.c
similarity index 100%
rename from src/audio/data.c
rename to src/audio/game/data.c
diff --git a/src/audio/debug.inc.c b/src/audio/game/debug.inc.c
similarity index 100%
rename from src/audio/debug.inc.c
rename to src/audio/game/debug.inc.c
diff --git a/src/audio/general.c b/src/audio/game/general.c
similarity index 100%
rename from src/audio/general.c
rename to src/audio/game/general.c
diff --git a/src/audio/sequence.c b/src/audio/game/sequence.c
similarity index 100%
rename from src/audio/sequence.c
rename to src/audio/game/sequence.c
diff --git a/src/audio/session_config.c b/src/audio/game/session_config.c
similarity index 100%
rename from src/audio/session_config.c
rename to src/audio/game/session_config.c
diff --git a/src/audio/session_init.c b/src/audio/game/session_init.c
similarity index 100%
rename from src/audio/session_init.c
rename to src/audio/game/session_init.c
diff --git a/src/audio/sfx.c b/src/audio/game/sfx.c
similarity index 100%
rename from src/audio/sfx.c
rename to src/audio/game/sfx.c
diff --git a/src/audio/sfx_params.c b/src/audio/game/sfx_params.c
similarity index 100%
rename from src/audio/sfx_params.c
rename to src/audio/game/sfx_params.c
diff --git a/src/audio/lib/aisetnextbuf.c b/src/audio/internal/aisetnextbuf.c
similarity index 100%
rename from src/audio/lib/aisetnextbuf.c
rename to src/audio/internal/aisetnextbuf.c
diff --git a/src/audio/lib/data.c b/src/audio/internal/data.c
similarity index 100%
rename from src/audio/lib/data.c
rename to src/audio/internal/data.c
diff --git a/src/audio/lib/dcache.c b/src/audio/internal/dcache.c
similarity index 100%
rename from src/audio/lib/dcache.c
rename to src/audio/internal/dcache.c
diff --git a/src/audio/lib/effects.c b/src/audio/internal/effects.c
similarity index 100%
rename from src/audio/lib/effects.c
rename to src/audio/internal/effects.c
diff --git a/src/audio/lib/heap.c b/src/audio/internal/heap.c
similarity index 100%
rename from src/audio/lib/heap.c
rename to src/audio/internal/heap.c
diff --git a/src/audio/lib/load.c b/src/audio/internal/load.c
similarity index 100%
rename from src/audio/lib/load.c
rename to src/audio/internal/load.c
diff --git a/src/audio/lib/playback.c b/src/audio/internal/playback.c
similarity index 100%
rename from src/audio/lib/playback.c
rename to src/audio/internal/playback.c
diff --git a/src/audio/lib/seqplayer.c b/src/audio/internal/seqplayer.c
similarity index 100%
rename from src/audio/lib/seqplayer.c
rename to src/audio/internal/seqplayer.c
diff --git a/src/audio/lib/synthesis.c b/src/audio/internal/synthesis.c
similarity index 100%
rename from src/audio/lib/synthesis.c
rename to src/audio/internal/synthesis.c
diff --git a/src/audio/lib/thread.c b/src/audio/internal/thread.c
similarity index 100%
rename from src/audio/lib/thread.c
rename to src/audio/internal/thread.c