diff --git a/asm/Kyoto/CFinalInput.s b/asm/Kyoto/Input/CFinalInput.s
similarity index 100%
rename from asm/Kyoto/CFinalInput.s
rename to asm/Kyoto/Input/CFinalInput.s
diff --git a/configure.py b/configure.py
index 9ef6f9b7..cc874e01 100755
--- a/configure.py
+++ b/configure.py
@@ -782,7 +782,7 @@ LIBS = [
             "Kyoto/Graphics/CCubeSurface",
             "Kyoto/Animation/CCharAnimTime",
             "Kyoto/Animation/CSegIdList",
-            "Kyoto/CFinalInput",
+            "Kyoto/Input/CFinalInput",
             "Kyoto/Graphics/CColor",
             "Kyoto/Audio/DolphinCAudioGroupSet",
             "Kyoto/Audio/DolphinCAudioSys",
diff --git a/obj_files.mk b/obj_files.mk
index ccd5b621..446e02cd 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -580,7 +580,7 @@ KYOTO_2 :=\
 	$(BUILD_DIR)/asm/Kyoto/Graphics/CCubeSurface.o\
 	$(BUILD_DIR)/asm/Kyoto/Animation/CCharAnimTime.o\
 	$(BUILD_DIR)/asm/Kyoto/Animation/CSegIdList.o\
-	$(BUILD_DIR)/asm/Kyoto/CFinalInput.o\
+	$(BUILD_DIR)/asm/Kyoto/Input/CFinalInput.o\
 	$(BUILD_DIR)/src/Kyoto/Graphics/CColor.o\
 	$(BUILD_DIR)/asm/Kyoto/Audio/DolphinCAudioGroupSet.o\
 	$(BUILD_DIR)/asm/Kyoto/Audio/DolphinCAudioSys.o\