diff --git a/.gitignore b/.gitignore
index 4f578504..6a02a5ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,6 @@
 build-n3ds/
 build-wiiu/
 
-output-wiiu/
-output-3ds/
+output/
 
 .vscode/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 81f23a29..2628130a 100644
--- a/Makefile
+++ b/Makefile
@@ -35,14 +35,14 @@ include $(DEVKITARM)/3ds_rules
 #---------------------------------------------------------------------------------
 TARGET      := $(notdir $(CURDIR))
 PROFILE ?= 0
-BUILD       := build-n3ds$(if $(filter 0,$(PROFILE)),,-profile)
+BUILD       := build/n3ds$(if $(filter 0,$(PROFILE)),,-profile)
 SOURCES     := src src/n3ds
 DATA        := data
 INCLUDES    := src src/n3ds 
 GRAPHICS    := gfx
-OUTPUT      := output
-RESOURCES   := resources
-ROMFS       := romfs
+OUTPUT      := output/3ds
+RESOURCES   := resources/3ds/meta
+ROMFS       := resources/3ds/romfs
 GFXBUILD    := $(ROMFS)/gfx
 #---------------------------------------------------------------------------------
 # Resource Setup
diff --git a/Makefile.wiiu b/Makefile.wiiu
index 69e8948a..cb7308c2 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -14,18 +14,22 @@ TOPDIR ?= $(CURDIR)
 include $(DEVKITPRO)/wut/share/wut_rules
 
 TARGET      := undertale
-BUILD       := build-wiiu
 SOURCES     := src src/wiiu
 INCLUDES    := src src/wiiu
-OUTPUT      := output-wiiu
+RESOURCES	:= resources/wiiu
+OUTPUT      := output/wiiu
+
+# I want to rename this to build/wiiu but I can't because when I do it skips straight to linking and since nothing compiled, it dies.
+BUILD       := build-wiiu
+
 CONTENT_DIR := $(TOPDIR)/$(OUTPUT)/content
 
 export APP_NAME        := Undertale
 export APP_SHORTNAME   := Undertale
 export APP_AUTHOR      := Grayforz2468
-export APP_ICON        := $(TOPDIR)/resources/wiiu/icon.png
-export APP_TV_IMAGE    := $(TOPDIR)/resources/wiiu/tv.png
-export APP_DRC_IMAGE   := $(TOPDIR)/resources/wiiu/drc.png
+export APP_ICON        := $(TOPDIR)/$(RESOURCES)/meta/icon.png
+export APP_TV_IMAGE    := $(TOPDIR)/$(RESOURCES)/meta/tv.png
+export APP_DRC_IMAGE   := $(TOPDIR)/$(RESOURCES)/meta/drc.png
 export APP_CONTENT     := $(CONTENT_DIR)
 
 ifeq ($(OS),Windows_NT)
@@ -34,7 +38,7 @@ else
 CAFEGLSL        ?= $(TOPDIR)/tools/CafeGLSL/glslcompiler.elf
 endif
 
-WIIU_SHADER_DIR := $(TOPDIR)/resources/wiiu/shaders
+WIIU_SHADER_DIR := $(TOPDIR)/$(RESOURCES)/shaders
 WIIU_SHADERS    := $(WIIU_SHADER_DIR)/textured_quad.gsh $(WIIU_SHADER_DIR)/pos_col.gsh
 WIIU_SHADER_HDR := $(TOPDIR)/src/wiiu/textured_quad_gsh.h $(TOPDIR)/src/wiiu/pos_col_gsh.h
 WIIU_SHADER_PREBUILT := $(WIIU_SHADERS) $(WIIU_SHADER_HDR)
diff --git a/build-wiiu.sh b/build-wiiu.sh
index 8bb0f30d..74bc80c5 100644
--- a/build-wiiu.sh
+++ b/build-wiiu.sh
@@ -12,7 +12,7 @@ VERSION="1.0.0"
 
 SOURCE_DIR="./source"
 BUILD_DIR="./build"
-OUTPUT_DIR="./output-wiiu"
+OUTPUT_DIR="./output/wiiu"
 
 ICON="./resources/wiiu/icon.png"        # 128x128 PNG
 TV_IMAGE="./resources/wiiu/tv.png"      # 1280x720 PNG  (TV banner)
diff --git a/make wuhb windows.bat b/make wuhb windows.bat
index 1985e464..cfe0c0f3 100644
--- a/make wuhb windows.bat	
+++ b/make wuhb windows.bat	
@@ -10,7 +10,7 @@ set VERSION=1.0.0
 
 set SOURCE_DIR=.\source
 set BUILD_DIR=.\build
-set OUTPUT_DIR=.\output-wiiu
+set OUTPUT_DIR=.\output/wiiu
 
 set ICON=.\resources\wiiu\icon.png
 set TV_IMAGE=.\resources\wiiu\tv.png
diff --git a/make-cia-n3ds.sh b/make-cia-n3ds.sh
index 62ab7265..f2fdd40e 100755
--- a/make-cia-n3ds.sh
+++ b/make-cia-n3ds.sh
@@ -4,7 +4,7 @@ export DEVKITARM=$DEVKITPRO/devkitARM
 MAKEROM="$DEVKITPRO/tools/bin/makerom"
 
 # Basic makerom params (avoid using RSF). Override values as needed.
-OUT_DIR=./build-n3ds
+OUT_DIR=./build/n3ds
 ELF="$OUT_DIR/cinnamon.elf"
 OUT_CIA="$OUT_DIR/cinnamon.cia"
 
diff --git a/resources/AppInfo b/resources/3ds/meta/AppInfo
similarity index 100%
rename from resources/AppInfo
rename to resources/3ds/meta/AppInfo
diff --git a/resources/audio.mp3 b/resources/3ds/meta/audio.mp3
similarity index 100%
rename from resources/audio.mp3
rename to resources/3ds/meta/audio.mp3
diff --git a/resources/audio.wav b/resources/3ds/meta/audio.wav
similarity index 100%
rename from resources/audio.wav
rename to resources/3ds/meta/audio.wav
diff --git a/resources/banner.png b/resources/3ds/meta/banner.png
similarity index 100%
rename from resources/banner.png
rename to resources/3ds/meta/banner.png
diff --git a/resources/icon.png b/resources/3ds/meta/icon.png
similarity index 100%
rename from resources/icon.png
rename to resources/3ds/meta/icon.png
diff --git a/resources/template.rsf b/resources/3ds/meta/template.rsf
similarity index 100%
rename from resources/template.rsf
rename to resources/3ds/meta/template.rsf
diff --git a/romfs/gfx/border.png b/resources/3ds/romfs/gfx/border.png
similarity index 100%
rename from romfs/gfx/border.png
rename to resources/3ds/romfs/gfx/border.png
diff --git a/romfs/gfx/borders.t3s b/resources/3ds/romfs/gfx/borders.t3s
similarity index 100%
rename from romfs/gfx/borders.t3s
rename to resources/3ds/romfs/gfx/borders.t3s
diff --git a/resources/wiiu/drc.png b/resources/wiiu/meta/drc.png
similarity index 100%
rename from resources/wiiu/drc.png
rename to resources/wiiu/meta/drc.png
diff --git a/resources/wiiu/icon.png b/resources/wiiu/meta/icon.png
similarity index 100%
rename from resources/wiiu/icon.png
rename to resources/wiiu/meta/icon.png
diff --git a/resources/wiiu/tv.png b/resources/wiiu/meta/tv.png
similarity index 100%
rename from resources/wiiu/tv.png
rename to resources/wiiu/meta/tv.png