diff --git a/Makefile b/Makefile
index b5413ea..eab04fc 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ HEADERNAME = header
 
 LINK_FLAGS = -O1 -L$(ROOTDIR)/lib -L$(ROOTDIR)/mips64-elf/lib -ldragon -lmikmod -lmad -lyaml -lc -lm -ldragonsys -lnosys $(LIBS) -Tn64ld.x
 PROG_NAME = menu
-CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O1 -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE
+CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O1 -I./inc -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE
 ASFLAGS = -mtune=vr4300 -march=vr4300
 CC = $(GCCN64PREFIX)gcc
 AS = $(GCCN64PREFIX)as
@@ -20,7 +20,7 @@ OBJS = $(PROG_NAME).o everdrive.o fat.o disk.o mem.o sys.o ini.o strlib.o utils.
 $(PROG_NAME).v64: $(PROG_NAME).elf test.dfs
 	$(OBJCOPY) $(PROG_NAME).elf $(PROG_NAME).bin -O binary
 	rm -f OS64.v64
-	$(N64TOOL) -l 4M -t "EverDrive OS" -h ./header.ed64 -o OS64.v64 $(PROG_NAME).bin -s 1M test.dfs
+	$(N64TOOL) -l 4M -t "EverDrive OS" -h ./res/header.ed64 -o OS64.v64 $(PROG_NAME).bin -s 1M test.dfs
 	$(CHKSUM64PATH) OS64.v64
 
 $(PROG_NAME).elf : $(OBJS)
@@ -30,7 +30,7 @@ copy: $(PROG_NAME).v64
 	sh upload.sh
 
 test.dfs:
-	$(MKDFSPATH) test.dfs ./filesystem/
+	$(MKDFSPATH) test.dfs ./res/filesystem/
 
 all: $(PROG_NAME).v64
 
diff --git a/disk.h b/inc/disk.h
similarity index 100%
rename from disk.h
rename to inc/disk.h
diff --git a/errors.h b/inc/errors.h
similarity index 100%
rename from errors.h
rename to inc/errors.h
diff --git a/everdrive.h b/inc/everdrive.h
similarity index 100%
rename from everdrive.h
rename to inc/everdrive.h
diff --git a/fat.h b/inc/fat.h
similarity index 100%
rename from fat.h
rename to inc/fat.h
diff --git a/ini.h b/inc/ini.h
similarity index 100%
rename from ini.h
rename to inc/ini.h
diff --git a/mem.h b/inc/mem.h
similarity index 100%
rename from mem.h
rename to inc/mem.h
diff --git a/menu.h b/inc/menu.h
similarity index 100%
rename from menu.h
rename to inc/menu.h
diff --git a/mp3.h b/inc/mp3.h
similarity index 100%
rename from mp3.h
rename to inc/mp3.h
diff --git a/sram.h b/inc/sram.h
similarity index 100%
rename from sram.h
rename to inc/sram.h
diff --git a/stb_truetype.h b/inc/stb_truetype.h
similarity index 100%
rename from stb_truetype.h
rename to inc/stb_truetype.h
diff --git a/strlib.h b/inc/strlib.h
similarity index 100%
rename from strlib.h
rename to inc/strlib.h
diff --git a/sys.h b/inc/sys.h
similarity index 100%
rename from sys.h
rename to inc/sys.h
diff --git a/types.h b/inc/types.h
similarity index 100%
rename from types.h
rename to inc/types.h
diff --git a/usb.h b/inc/usb.h
similarity index 100%
rename from usb.h
rename to inc/usb.h
diff --git a/utils.h b/inc/utils.h
similarity index 100%
rename from utils.h
rename to inc/utils.h
diff --git a/filesystem/bamboo.wav b/res/filesystem/bamboo.wav
similarity index 100%
rename from filesystem/bamboo.wav
rename to res/filesystem/bamboo.wav
diff --git a/filesystem/done.wav b/res/filesystem/done.wav
similarity index 100%
rename from filesystem/done.wav
rename to res/filesystem/done.wav
diff --git a/filesystem/ed64_mono.wav b/res/filesystem/ed64_mono.wav
similarity index 100%
rename from filesystem/ed64_mono.wav
rename to res/filesystem/ed64_mono.wav
diff --git a/filesystem/n64controller.sprite b/res/filesystem/n64controller.sprite
similarity index 100%
rename from filesystem/n64controller.sprite
rename to res/filesystem/n64controller.sprite
diff --git a/filesystem/sprites/background.sprite b/res/filesystem/sprites/background.sprite
similarity index 100%
rename from filesystem/sprites/background.sprite
rename to res/filesystem/sprites/background.sprite
diff --git a/filesystem/sprites/splash.sprite b/res/filesystem/sprites/splash.sprite
similarity index 100%
rename from filesystem/sprites/splash.sprite
rename to res/filesystem/sprites/splash.sprite
diff --git a/filesystem/warning.wav b/res/filesystem/warning.wav
similarity index 100%
rename from filesystem/warning.wav
rename to res/filesystem/warning.wav
diff --git a/header.ed64 b/res/header.ed64
similarity index 100%
rename from header.ed64
rename to res/header.ed64