diff --git a/asm/src/TickerContext_8055f978.s b/asm/src/TickerContext_8055f978.s
deleted file mode 100644
index c91ef920..00000000
--- a/asm/src/TickerContext_8055f978.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@52069_8055F978"
-"@52069_8055F978":
-
-	.4byte 0x3FC00000
-	.4byte 0
diff --git a/asm/src/Ticker_8055f968.s b/asm/src/Ticker_8055f968.s
deleted file mode 100644
index 5c7f925b..00000000
--- a/asm/src/Ticker_8055f968.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@52326_8055F968"
-"@52326_8055F968":
-
-	.4byte 0
-
-.global "@52327_8055F96C"
-"@52327_8055F96C":
-
-	.4byte 0x461C3C00
-
-.global "@52423"
-"@52423":
-
-	.4byte 0x43300000
-	.4byte 0
diff --git a/asm/src/Ticker_801aba4c.s b/asm/src/info/ticker/Ticker.s
similarity index 98%
rename from asm/src/Ticker_801aba4c.s
rename to asm/src/info/ticker/Ticker.s
index e56d0e8d..4ad2bb12 100644
--- a/asm/src/Ticker_801aba4c.s
+++ b/asm/src/info/ticker/Ticker.s
@@ -458,3 +458,21 @@ scrollWindowWidth__Q34info6ticker6TickerFv:
 /* 801AC04C 001A7E8C  7C 08 03 A6 */	mtlr r0
 /* 801AC050 001A7E90  38 21 00 10 */	addi r1, r1, 0x10
 /* 801AC054 001A7E94  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@52326_8055F968"
+"@52326_8055F968":
+
+	.4byte 0
+
+.global "@52327_8055F96C"
+"@52327_8055F96C":
+
+	.4byte 0x461C3C00
+
+.global "@52423"
+"@52423":
+
+	.4byte 0x43300000
+	.4byte 0
diff --git a/asm/src/TickerContext_801ac058.s b/asm/src/info/ticker/TickerContext.s
similarity index 93%
rename from asm/src/TickerContext_801ac058.s
rename to asm/src/info/ticker/TickerContext.s
index d42bf4d1..601dc0f4 100644
--- a/asm/src/TickerContext_801ac058.s
+++ b/asm/src/info/ticker/TickerContext.s
@@ -39,3 +39,11 @@ __ct__Q34info6ticker13TickerContextFQ23lyt12PaneAccessorQ23lyt12PaneAccessorfUlU
 /* 801AC0CC 001A7F0C  7C 08 03 A6 */	mtlr r0
 /* 801AC0D0 001A7F10  38 21 00 30 */	addi r1, r1, 0x30
 /* 801AC0D4 001A7F14  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@52069_8055F978"
+"@52069_8055F978":
+
+	.4byte 0x3FC00000
+	.4byte 0
diff --git a/obj_files.mk b/obj_files.mk
index 466b45ac..f792d021 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -866,10 +866,11 @@ $(BUILD_DIR)/asm/src/info/common/WiiButton.o \
 $(BUILD_DIR)/asm/src/info/cutin/CutIn.o \
 $(BUILD_DIR)/asm/src/info/cutin/Manager.o \
 \
+$(BUILD_DIR)/asm/src/info/ticker/Ticker.o \
+$(BUILD_DIR)/asm/src/info/ticker/TickerContext.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/src/Ticker_801aba4c.o \
-$(BUILD_DIR)/asm/src/TickerContext_801ac058.o \
 $(BUILD_DIR)/asm/src/AllocatorChanger_801ac0d8.o \
 $(BUILD_DIR)/asm/src/Layout_801ac190.o \
 $(BUILD_DIR)/asm/src/LayoutContext_801add64.o \
@@ -5146,8 +5147,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
 $(BUILD_DIR)/asm/src/Alarm_8055df68.o
 # .sdata2
 O_FILES += \
-$(BUILD_DIR)/asm/src/Ticker_8055f968.o \
-$(BUILD_DIR)/asm/src/TickerContext_8055f978.o \
 $(BUILD_DIR)/asm/src/Layout_8055f980.o \
 $(BUILD_DIR)/asm/src/PaneAccessor_8055f990.o \
 $(BUILD_DIR)/asm/src/SystemTagProcessor_8055f998.o \