diff --git a/src/mars_patcher/connections.py b/src/mars_patcher/connections.py
index b4c1c3a..adc6829 100644
--- a/src/mars_patcher/connections.py
+++ b/src/mars_patcher/connections.py
@@ -1,7 +1,14 @@
 from collections.abc import Sequence
 
-import mars_patcher.constants.game_data as gd
-from mars_patcher.constants.main_hub_numbers import (
+import mars_patcher.mf.constants.game_data as gd
+from mars_patcher.data import get_data_path
+from mars_patcher.mf.auto_generated_types import (
+    MarsschemamfElevatorconnections,
+    MarsschemamfSectorshortcuts,
+    Validelevatorbottoms,
+    Validelevatortops,
+)
+from mars_patcher.mf.constants.main_hub_numbers import (
     MAIN_HUB_CENTER_ROOM,
     MAIN_HUB_CENTER_SMALL_NUM_COORDS_1,
     MAIN_HUB_CENTER_SMALL_NUM_COORDS_2,
@@ -14,13 +21,6 @@
     MAIN_HUB_SMALL_NUM_BLOCK,
     MAIN_HUB_TILEMAP_ADDR,
 )
-from mars_patcher.data import get_data_path
-from mars_patcher.mf.auto_generated_types import (
-    MarsschemamfElevatorconnections,
-    MarsschemamfSectorshortcuts,
-    Validelevatorbottoms,
-    Validelevatortops,
-)
 from mars_patcher.minimap import Minimap
 from mars_patcher.rom import Game, Rom
 from mars_patcher.room_entry import BlockLayer, RoomEntry
diff --git a/src/mars_patcher/credits.py b/src/mars_patcher/credits.py
index a357d24..6c6f460 100644
--- a/src/mars_patcher/credits.py
+++ b/src/mars_patcher/credits.py
@@ -1,4 +1,5 @@
-from mars_patcher.constants.credits_lines import (
+from mars_patcher.mf.auto_generated_types import MarsschemamfCreditstextItem
+from mars_patcher.mf.constants.credits_lines import (
     FUSION_STAFF_LINES,
     LINE_TYPE_HEIGHTS,
     LINE_TYPE_VALS,
@@ -7,7 +8,6 @@
     TEXT_LINE_TYPES,
     LineType,
 )
-from mars_patcher.mf.auto_generated_types import MarsschemamfCreditstextItem
 from mars_patcher.rom import Rom
 
 CREDITS_ADDR = 0x74B0B0
diff --git a/src/mars_patcher/door_locks.py b/src/mars_patcher/door_locks.py
index 2f9a1b0..4cb80a3 100644
--- a/src/mars_patcher/door_locks.py
+++ b/src/mars_patcher/door_locks.py
@@ -4,18 +4,18 @@
 from typing import Annotated, TypedDict
 
 from mars_patcher.common_types import AreaId, AreaRoomPair, RoomId
-from mars_patcher.constants.game_data import (
+from mars_patcher.mf.auto_generated_types import MarsschemamfDoorlocksItem
+from mars_patcher.mf.constants.game_data import (
     area_doors_ptrs,
     hatch_lock_event_count,
     hatch_lock_events,
 )
-from mars_patcher.constants.minimap_tiles import (
+from mars_patcher.mf.constants.minimap_tiles import (
     ALL_DOOR_TILE_IDS,
     ALL_DOOR_TILES,
     ColoredDoor,
     Edge,
 )
-from mars_patcher.mf.auto_generated_types import MarsschemamfDoorlocksItem
 from mars_patcher.minimap import Minimap
 from mars_patcher.rom import Rom
 from mars_patcher.room_entry import BlockLayer, RoomEntry
diff --git a/src/mars_patcher/item_patcher.py b/src/mars_patcher/item_patcher.py
index 55e3c56..888e96d 100644
--- a/src/mars_patcher/item_patcher.py
+++ b/src/mars_patcher/item_patcher.py
@@ -1,4 +1,3 @@
-from mars_patcher.constants.reserved_space import ReservedConstants
 from mars_patcher.locations import (
     ItemMessages,
     ItemMessagesKind,
@@ -7,6 +6,7 @@
     LocationSettings,
 )
 from mars_patcher.mf.auto_generated_types import MarsschemamfTankincrements
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
 from mars_patcher.rom import Rom
 from mars_patcher.room_entry import RoomEntry
 from mars_patcher.text import Language, MessageType, encode_text
diff --git a/src/mars_patcher/locations.py b/src/mars_patcher/locations.py
index 4e3a261..94d4555 100644
--- a/src/mars_patcher/locations.py
+++ b/src/mars_patcher/locations.py
@@ -6,7 +6,8 @@
 
 from frozendict import frozendict
 
-from mars_patcher.constants.items import (
+from mars_patcher.data import get_data_path
+from mars_patcher.mf.constants.items import (
     ITEM_ENUMS,
     ITEM_SPRITE_ENUMS,
     JINGLE_ENUMS,
@@ -34,7 +35,6 @@
     ItemType,
     MajorSource,
 )
-from mars_patcher.data import get_data_path
 from mars_patcher.text import Language
 
 if TYPE_CHECKING:
diff --git a/src/mars_patcher/constants/__init__.py b/src/mars_patcher/mf/constants/__init__.py
similarity index 100%
rename from src/mars_patcher/constants/__init__.py
rename to src/mars_patcher/mf/constants/__init__.py
diff --git a/src/mars_patcher/constants/credits_lines.py b/src/mars_patcher/mf/constants/credits_lines.py
similarity index 100%
rename from src/mars_patcher/constants/credits_lines.py
rename to src/mars_patcher/mf/constants/credits_lines.py
diff --git a/src/mars_patcher/constants/enemies.py b/src/mars_patcher/mf/constants/enemies.py
similarity index 100%
rename from src/mars_patcher/constants/enemies.py
rename to src/mars_patcher/mf/constants/enemies.py
diff --git a/src/mars_patcher/constants/game_data.py b/src/mars_patcher/mf/constants/game_data.py
similarity index 100%
rename from src/mars_patcher/constants/game_data.py
rename to src/mars_patcher/mf/constants/game_data.py
diff --git a/src/mars_patcher/constants/items.py b/src/mars_patcher/mf/constants/items.py
similarity index 100%
rename from src/mars_patcher/constants/items.py
rename to src/mars_patcher/mf/constants/items.py
diff --git a/src/mars_patcher/constants/main_hub_numbers.py b/src/mars_patcher/mf/constants/main_hub_numbers.py
similarity index 100%
rename from src/mars_patcher/constants/main_hub_numbers.py
rename to src/mars_patcher/mf/constants/main_hub_numbers.py
diff --git a/src/mars_patcher/constants/minimap_tiles.py b/src/mars_patcher/mf/constants/minimap_tiles.py
similarity index 100%
rename from src/mars_patcher/constants/minimap_tiles.py
rename to src/mars_patcher/mf/constants/minimap_tiles.py
diff --git a/src/mars_patcher/constants/palettes.py b/src/mars_patcher/mf/constants/palettes.py
similarity index 100%
rename from src/mars_patcher/constants/palettes.py
rename to src/mars_patcher/mf/constants/palettes.py
diff --git a/src/mars_patcher/constants/reserved_space.py b/src/mars_patcher/mf/constants/reserved_space.py
similarity index 100%
rename from src/mars_patcher/constants/reserved_space.py
rename to src/mars_patcher/mf/constants/reserved_space.py
diff --git a/src/mars_patcher/minimap.py b/src/mars_patcher/minimap.py
index 6d5959b..4ea4f01 100644
--- a/src/mars_patcher/minimap.py
+++ b/src/mars_patcher/minimap.py
@@ -4,8 +4,8 @@
 from typing import TYPE_CHECKING
 
 from mars_patcher.compress import comp_lz77, decomp_lz77
-from mars_patcher.constants.game_data import minimap_ptrs
 from mars_patcher.data import get_data_path
+from mars_patcher.mf.constants.game_data import minimap_ptrs
 
 if TYPE_CHECKING:
     from types import TracebackType
diff --git a/src/mars_patcher/misc_patches.py b/src/mars_patcher/misc_patches.py
index 99b6238..4fa4b49 100644
--- a/src/mars_patcher/misc_patches.py
+++ b/src/mars_patcher/misc_patches.py
@@ -1,6 +1,6 @@
-import mars_patcher.constants.game_data as gd
-from mars_patcher.constants.reserved_space import ReservedConstants
+import mars_patcher.mf.constants.game_data as gd
 from mars_patcher.data import get_data_path
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
 from mars_patcher.patching import BpsDecoder, IpsDecoder
 from mars_patcher.rom import Rom
 
diff --git a/src/mars_patcher/navigation_text.py b/src/mars_patcher/navigation_text.py
index 749954f..e313fe3 100644
--- a/src/mars_patcher/navigation_text.py
+++ b/src/mars_patcher/navigation_text.py
@@ -3,8 +3,8 @@
 from enum import Enum
 from typing import TYPE_CHECKING
 
-from mars_patcher.constants.game_data import navigation_text_ptrs
-from mars_patcher.constants.reserved_space import ReservedConstants
+from mars_patcher.mf.constants.game_data import navigation_text_ptrs
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
 from mars_patcher.rom import Rom
 from mars_patcher.text import Language, MessageType, encode_text
 
diff --git a/src/mars_patcher/random_enemies.py b/src/mars_patcher/random_enemies.py
index 48b20b2..16073bd 100644
--- a/src/mars_patcher/random_enemies.py
+++ b/src/mars_patcher/random_enemies.py
@@ -1,7 +1,7 @@
 import random
 
-from mars_patcher.constants.enemies import ENEMY_TYPES, EnemyType
-from mars_patcher.constants.game_data import sprite_vram_sizes, spriteset_count, spriteset_ptrs
+from mars_patcher.mf.constants.enemies import ENEMY_TYPES, EnemyType
+from mars_patcher.mf.constants.game_data import sprite_vram_sizes, spriteset_count, spriteset_ptrs
 from mars_patcher.rom import Rom
 
 
diff --git a/src/mars_patcher/random_palettes.py b/src/mars_patcher/random_palettes.py
index 0f9373c..5626c09 100644
--- a/src/mars_patcher/random_palettes.py
+++ b/src/mars_patcher/random_palettes.py
@@ -1,19 +1,19 @@
 import random
 from enum import Enum
 
-import mars_patcher.constants.game_data as gd
-from mars_patcher.constants.palettes import (
+import mars_patcher.mf.constants.game_data as gd
+from mars_patcher.mf.auto_generated_types import (
+    MarsschemamfPalettes,
+    MarsschemamfPalettesColorspace,
+    MarsschemamfPalettesRandomize,
+)
+from mars_patcher.mf.constants.palettes import (
     ENEMY_GROUPS,
     EXCLUDED_ENEMIES,
     MF_TILESET_ALT_PAL_ROWS,
     NETTORI_EXTRA_PALS,
     TILESET_ANIM_PALS,
 )
-from mars_patcher.mf.auto_generated_types import (
-    MarsschemamfPalettes,
-    MarsschemamfPalettesColorspace,
-    MarsschemamfPalettesRandomize,
-)
 from mars_patcher.palette import ColorChange, Palette, SineWave
 from mars_patcher.rom import Game, Rom
 
diff --git a/src/mars_patcher/rom.py b/src/mars_patcher/rom.py
index f08d309..220bc53 100644
--- a/src/mars_patcher/rom.py
+++ b/src/mars_patcher/rom.py
@@ -1,7 +1,7 @@
 from enum import Enum
 from os import PathLike
 
-from mars_patcher.constants.reserved_space import ReservedConstants
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
 
 BytesLike = bytes | bytearray
 
diff --git a/src/mars_patcher/room_entry.py b/src/mars_patcher/room_entry.py
index e518cf2..aa9585f 100644
--- a/src/mars_patcher/room_entry.py
+++ b/src/mars_patcher/room_entry.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from mars_patcher.compress import comp_rle, decomp_rle
-from mars_patcher.constants.game_data import area_room_entry_ptrs
+from mars_patcher.mf.constants.game_data import area_room_entry_ptrs
 
 if TYPE_CHECKING:
     from types import TracebackType
diff --git a/src/mars_patcher/room_names.py b/src/mars_patcher/room_names.py
index 7cf1403..441d75d 100644
--- a/src/mars_patcher/room_names.py
+++ b/src/mars_patcher/room_names.py
@@ -1,5 +1,5 @@
-from mars_patcher.constants.reserved_space import ReservedConstants
 from mars_patcher.mf.auto_generated_types import Areaid, MarsschemamfRoomnamesItem, Typeu8
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
 from mars_patcher.rom import Rom
 from mars_patcher.text import MessageType, encode_text
 
diff --git a/src/mars_patcher/starting.py b/src/mars_patcher/starting.py
index 94b6135..0e1118f 100644
--- a/src/mars_patcher/starting.py
+++ b/src/mars_patcher/starting.py
@@ -1,10 +1,10 @@
-from mars_patcher.constants.game_data import area_doors_ptrs, spriteset_ptrs, starting_equipment
-from mars_patcher.constants.items import BEAM_FLAGS, MISSILE_BOMB_FLAGS, SUIT_MISC_FLAGS
-from mars_patcher.constants.reserved_space import ReservedConstants
 from mars_patcher.mf.auto_generated_types import (
     MarsschemamfStartingitems,
     MarsschemamfStartinglocation,
 )
+from mars_patcher.mf.constants.game_data import area_doors_ptrs, spriteset_ptrs, starting_equipment
+from mars_patcher.mf.constants.items import BEAM_FLAGS, MISSILE_BOMB_FLAGS, SUIT_MISC_FLAGS
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
 from mars_patcher.rom import Rom
 from mars_patcher.room_entry import RoomEntry
 
diff --git a/src/mars_patcher/text.py b/src/mars_patcher/text.py
index 93dd6ad..b12dcf9 100644
--- a/src/mars_patcher/text.py
+++ b/src/mars_patcher/text.py
@@ -2,8 +2,8 @@
 from enum import Enum
 from functools import cache
 
-from mars_patcher.constants.game_data import character_widths, file_screen_text_ptrs
 from mars_patcher.data import get_data_path
+from mars_patcher.mf.constants.game_data import character_widths, file_screen_text_ptrs
 from mars_patcher.rom import Region, Rom
 
 SPACE_CHAR = 0x40
diff --git a/src/mars_patcher/tileset.py b/src/mars_patcher/tileset.py
index c70e122..e6d6cc2 100644
--- a/src/mars_patcher/tileset.py
+++ b/src/mars_patcher/tileset.py
@@ -1,4 +1,4 @@
-from mars_patcher.constants.game_data import tileset_entries
+from mars_patcher.mf.constants.game_data import tileset_entries
 from mars_patcher.rom import Rom
 
 
diff --git a/src/mars_patcher/titlescreen_text.py b/src/mars_patcher/titlescreen_text.py
index 0595c65..41676e9 100644
--- a/src/mars_patcher/titlescreen_text.py
+++ b/src/mars_patcher/titlescreen_text.py
@@ -1,5 +1,5 @@
-from mars_patcher.constants.reserved_space import ReservedConstants
 from mars_patcher.mf.auto_generated_types import MarsschemamfTitletextItem
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
 from mars_patcher.rom import Rom
 
 TITLE_TEXT_POINTER_ADDR = ReservedConstants.TITLESCREEN_TEXT_POINTERS_POINTER_ADDR