diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm
index 5626cb094..226f1a1fa 100644
--- a/constants/collision_constants.asm
+++ b/constants/collision_constants.asm
@@ -1,11 +1,11 @@
-; collision permissions (see data/collision_permissions.asm)
+; collision permissions (see data/collision/collision_permissions.asm)
 LAND_TILE  EQU $00
 WATER_TILE EQU $01
 WALL_TILE  EQU $0f
 TALK       EQU $10
 
 ; collision data types (see data/tilesets/*_collision.asm)
-; TileCollisionTable indexes (see data/collision_permissions.asm)
+; TileCollisionTable indexes (see data/collision/collision_permissions.asm)
 COLL_FLOOR             EQU $00
 COLL_01                EQU $01 ; garbage
 COLL_03                EQU $03 ; garbage
diff --git a/data/collision_permissions.asm b/data/collision/collision_permissions.asm
similarity index 100%
rename from data/collision_permissions.asm
rename to data/collision/collision_permissions.asm
diff --git a/data/events/collision_stdscripts.asm b/data/collision/collision_stdscripts.asm
similarity index 100%
rename from data/events/collision_stdscripts.asm
rename to data/collision/collision_stdscripts.asm
diff --git a/data/events/field_move_blocks.asm b/data/collision/field_move_blocks.asm
similarity index 90%
rename from data/events/field_move_blocks.asm
rename to data/collision/field_move_blocks.asm
index fea80f537..444be14bb 100644
--- a/data/events/field_move_blocks.asm
+++ b/data/collision/field_move_blocks.asm
@@ -1,3 +1,4 @@
+; these blocks all use COLL_CUT_TREE in one quadrant
 CutTreeBlockPointers:
 ; tileset, block list pointer
 	dbw TILESET_JOHTO,        .johto
@@ -42,6 +43,8 @@ CutTreeBlockPointers:
 	db $0f, $17, 0
 	db -1 ; end
 
+
+; these blocks all use COLL_WHIRLPOOL in one quadrant
 WhirlpoolBlockPointers:
 	dbw TILESET_JOHTO, .johto
 	db -1 ; end
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 7f613ceaf..258b13b1a 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -271,7 +271,7 @@ CheckOverworldTileArrays:
 	xor a
 	ret
 
-INCLUDE "data/events/field_move_blocks.asm"
+INCLUDE "data/collision/field_move_blocks.asm"
 
 FlashFunction:
 	call .CheckUseFlash
diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm
index 8c54c0414..5ab112680 100644
--- a/engine/events/std_collision.asm
+++ b/engine/events/std_collision.asm
@@ -23,7 +23,7 @@ CheckFacingTileForStdScript::
 	xor a
 	ret
 
-INCLUDE "data/events/collision_stdscripts.asm"
+INCLUDE "data/collision/collision_stdscripts.asm"
 
 Script_JumpStdFromRAM:
 	sjump wJumpStdScriptBuffer
diff --git a/main.asm b/main.asm
index e86cdee39..324ef8ac2 100644
--- a/main.asm
+++ b/main.asm
@@ -203,7 +203,7 @@ SECTION "bank13", ROMX
 
 INCLUDE "engine/tilesets/map_palettes.asm"
 INCLUDE "gfx/tileset_palette_maps.asm"
-INCLUDE "data/collision_permissions.asm"
+INCLUDE "data/collision/collision_permissions.asm"
 INCLUDE "engine/menus/empty_sram.asm"
 INCLUDE "engine/menus/savemenu_copytilemapatonce.asm"
 INCLUDE "engine/events/checksave.asm"