diff --git a/README.MD b/README.MD
index 97365cca1..11bee1cb4 100644
--- a/README.MD
+++ b/README.MD
@@ -163,8 +163,6 @@ pikmin2.usa.dol: `sha1: 90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a`
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/plugProjectYamashitaU/kochappyAnimator.cpp">plugProjectYamashitaU/kochappyAnimator.cpp</a>
 - JSystem
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/data.cpp">JSystem/data.cpp</a>
-	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/fvb/fvb-data-parse.cpp">JSystem/fvb/fvb-data-parse.cpp</a>
-	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/fvb/fvb-data.cpp">JSystem/fvb/fvb-data.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DBinaryFormat.cpp">JSystem/J3D/J3DBinaryFormat.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelSaver.cpp">JSystem/J3D/J3DModelSaver.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShapeDraw.cpp">JSystem/J3D/J3DShapeDraw.cpp</a>
@@ -182,7 +180,11 @@ pikmin2.usa.dol: `sha1: 90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a`
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JPA/JPATexture.cpp">JSystem/JPA/JPATexture.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JSG/JSGActor.cpp">JSystem/JSG/JSGActor.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JSG/JSGObject.cpp">JSystem/JSG/JSGObject.cpp</a>
-	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/jstudio/jstudio-data.cpp">JSystem/jstudio/jstudio-data.cpp</a>
+	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/data/jstudio-data.cpp">JSystem/JStudio/data/jstudio-data.cpp</a>
+	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb/data/fvb-data-parse.cpp">JSystem/JStudio/fvb/data/fvb-data-parse.cpp</a>
+	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/fvb/data/fvb-data.cpp">JSystem/JStudio/fvb/data/fvb-data.cpp</a>
+	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/stb/data/stb-data-parse.cpp">JSystem/JStudio/stb/data/stb-data-parse.cpp</a>
+	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/stb/data/stb-data.cpp">JSystem/JStudio/stb/data/stb-data.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JSupport/JSUFileStream.cpp">JSystem/JSupport/JSUFileStream.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JSupport/JSUInputStream.cpp">JSystem/JSupport/JSUInputStream.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JSupport/JSUList.cpp">JSystem/JSupport/JSUList.cpp</a>
@@ -192,8 +194,6 @@ pikmin2.usa.dol: `sha1: 90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a`
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUT/JUTFontData_Ascfont_fix12.cpp">JSystem/JUT/JUTFontData_Ascfont_fix12.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUT/JUTNameTab.cpp">JSystem/JUT/JUTNameTab.cpp</a>
 	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUT/JUTRomFont.cpp">JSystem/JUT/JUTRomFont.cpp</a>
-	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/stb/stb-data-parse.cpp">JSystem/stb/stb-data-parse.cpp</a>
-	- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/stb/stb-data.cpp">JSystem/stb/stb-data.cpp</a>
 ### WIP
 - sysBootupU
 - sysGCU
diff --git a/asm/JSystem/fvb/fvb.s b/asm/JSystem/jstudio/fvb/fvb.s
similarity index 100%
rename from asm/JSystem/fvb/fvb.s
rename to asm/JSystem/jstudio/fvb/fvb.s
diff --git a/asm/JSystem/stb/stb.s b/asm/JSystem/jstudio/stb/stb.s
similarity index 100%
rename from asm/JSystem/stb/stb.s
rename to asm/JSystem/jstudio/stb/stb.s
diff --git a/obj_files.mk b/obj_files.mk
index 5d9c76666..04fa1826a 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -12,18 +12,18 @@ JSYSTEM:=\
 	$(BUILD_DIR)/src/JSystem/data.o\
 	$(BUILD_DIR)/asm/JSystem/processor.o\
 	$(BUILD_DIR)/asm/JSystem/control.o\
-	$(BUILD_DIR)/src/JSystem/stb/stb-data-parse.o\
+	$(BUILD_DIR)/src/JSystem/JStudio/stb/data/stb-data-parse.o\
 	$(BUILD_DIR)/asm/JSystem/functionvalue.o\
-	$(BUILD_DIR)/asm/JSystem/fvb/fvb.o\
-	$(BUILD_DIR)/src/JSystem/fvb/fvb-data.o\
-	$(BUILD_DIR)/src/JSystem/fvb/fvb-data-parse.o\
-	$(BUILD_DIR)/asm/JSystem/jstudio/jstudio-control.o\
-	$(BUILD_DIR)/src/JSystem/jstudio/jstudio-data.o\
-	$(BUILD_DIR)/asm/JSystem/jstudio/jstudio-object.o\
+	$(BUILD_DIR)/asm/JSystem/JStudio/fvb/fvb.o\
+	$(BUILD_DIR)/src/JSystem/JStudio/fvb/data/fvb-data.o\
+	$(BUILD_DIR)/src/JSystem/JStudio/fvb/data/fvb-data-parse.o\
+	$(BUILD_DIR)/asm/JSystem/JStudio/jstudio-control.o\
+	$(BUILD_DIR)/src/JSystem/JStudio/data/jstudio-data.o\
+	$(BUILD_DIR)/asm/JSystem/JStudio/jstudio-object.o\
 	$(BUILD_DIR)/asm/JSystem/object/object-id.o\
-	$(BUILD_DIR)/asm/JSystem/stb/stb.o\
-	$(BUILD_DIR)/src/JSystem/stb/stb-data.o\
-	$(BUILD_DIR)/asm/JSystem/jstudio/jstudio-math.o\
+	$(BUILD_DIR)/asm/JSystem/JStudio/stb/stb.o\
+	$(BUILD_DIR)/src/JSystem/JStudio/stb/data/stb-data.o\
+	$(BUILD_DIR)/asm/JSystem/JStudio/jstudio-math.o\
 	$(BUILD_DIR)/asm/JSystem/object/object-light.o\
 	$(BUILD_DIR)/asm/JSystem/object/object.o\
 	$(BUILD_DIR)/asm/JSystem/object/object-actor.o\
diff --git a/src/JSystem/jstudio/jstudio-data.cpp b/src/JSystem/JStudio/data/jstudio-data.cpp
similarity index 100%
rename from src/JSystem/jstudio/jstudio-data.cpp
rename to src/JSystem/JStudio/data/jstudio-data.cpp
diff --git a/src/JSystem/stb/stb-data-parse.cpp b/src/JSystem/JStudio/stb/data/stb-data-parse.cpp
similarity index 100%
rename from src/JSystem/stb/stb-data-parse.cpp
rename to src/JSystem/JStudio/stb/data/stb-data-parse.cpp
diff --git a/src/JSystem/stb/stb-data.cpp b/src/JSystem/JStudio/stb/data/stb-data.cpp
similarity index 100%
rename from src/JSystem/stb/stb-data.cpp
rename to src/JSystem/JStudio/stb/data/stb-data.cpp
diff --git a/src/JSystem/fvb/fvb-data-parse.cpp b/src/JSystem/jstudio/fvb/data/fvb-data-parse.cpp
similarity index 100%
rename from src/JSystem/fvb/fvb-data-parse.cpp
rename to src/JSystem/jstudio/fvb/data/fvb-data-parse.cpp
diff --git a/src/JSystem/fvb/fvb-data.cpp b/src/JSystem/jstudio/fvb/data/fvb-data.cpp
similarity index 100%
rename from src/JSystem/fvb/fvb-data.cpp
rename to src/JSystem/jstudio/fvb/data/fvb-data.cpp
diff --git a/src/JSystem/fvb/fvb.cpp b/src/JSystem/jstudio/fvb/fvb.cpp
similarity index 100%
rename from src/JSystem/fvb/fvb.cpp
rename to src/JSystem/jstudio/fvb/fvb.cpp
diff --git a/src/JSystem/stb/stb.cpp b/src/JSystem/jstudio/stb/stb.cpp
similarity index 100%
rename from src/JSystem/stb/stb.cpp
rename to src/JSystem/jstudio/stb/stb.cpp