diff --git a/src/mars_patcher/common_types.py b/src/mars_patcher/common_types.py
index 7f39fdd..0a09c67 100644
--- a/src/mars_patcher/common_types.py
+++ b/src/mars_patcher/common_types.py
@@ -1,9 +1,12 @@
 from typing import Annotated, TypeAlias
 
-from mars_patcher.mf.auto_generated_types import Areaid, Typeu8
+import mars_patcher.mf.auto_generated_types as types_mf
+import mars_patcher.zm.auto_generated_types as types_zm
 
-AreaId: TypeAlias = Areaid
-RoomId: TypeAlias = Typeu8
+TypeU8: TypeAlias = types_mf.Typeu8 | types_zm.TypeU8
+
+AreaId: TypeAlias = types_mf.Areaid | types_zm.AreaId
+RoomId: TypeAlias = TypeU8
 
 AreaRoomPair = tuple[AreaId, RoomId]
 
diff --git a/src/mars_patcher/connections.py b/src/mars_patcher/mf/connections.py
similarity index 99%
rename from src/mars_patcher/connections.py
rename to src/mars_patcher/mf/connections.py
index adc6829..2b7165d 100644
--- a/src/mars_patcher/connections.py
+++ b/src/mars_patcher/mf/connections.py
@@ -1,7 +1,6 @@
 from collections.abc import Sequence
 
 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,
@@ -21,6 +20,7 @@
     MAIN_HUB_SMALL_NUM_BLOCK,
     MAIN_HUB_TILEMAP_ADDR,
 )
+from mars_patcher.mf.data import get_data_path
 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/data.py b/src/mars_patcher/mf/data.py
similarity index 100%
rename from src/mars_patcher/data.py
rename to src/mars_patcher/mf/data.py
diff --git a/src/mars_patcher/door_locks.py b/src/mars_patcher/mf/door_locks.py
similarity index 100%
rename from src/mars_patcher/door_locks.py
rename to src/mars_patcher/mf/door_locks.py
diff --git a/src/mars_patcher/item_patcher.py b/src/mars_patcher/mf/item_patcher.py
similarity index 99%
rename from src/mars_patcher/item_patcher.py
rename to src/mars_patcher/mf/item_patcher.py
index 888e96d..79d354a 100644
--- a/src/mars_patcher/item_patcher.py
+++ b/src/mars_patcher/mf/item_patcher.py
@@ -1,12 +1,12 @@
-from mars_patcher.locations import (
+from mars_patcher.mf.auto_generated_types import MarsschemamfTankincrements
+from mars_patcher.mf.constants.reserved_space import ReservedConstants
+from mars_patcher.mf.locations import (
     ItemMessages,
     ItemMessagesKind,
     ItemSprite,
     ItemType,
     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/mf/locations.py
similarity index 99%
rename from src/mars_patcher/locations.py
rename to src/mars_patcher/mf/locations.py
index 94d4555..8cfd424 100644
--- a/src/mars_patcher/locations.py
+++ b/src/mars_patcher/mf/locations.py
@@ -6,7 +6,6 @@
 
 from frozendict import frozendict
 
-from mars_patcher.data import get_data_path
 from mars_patcher.mf.constants.items import (
     ITEM_ENUMS,
     ITEM_SPRITE_ENUMS,
@@ -35,6 +34,7 @@
     ItemType,
     MajorSource,
 )
+from mars_patcher.mf.data import get_data_path
 from mars_patcher.text import Language
 
 if TYPE_CHECKING:
diff --git a/src/mars_patcher/misc_patches.py b/src/mars_patcher/mf/misc_patches.py
similarity index 98%
rename from src/mars_patcher/misc_patches.py
rename to src/mars_patcher/mf/misc_patches.py
index 4fa4b49..58bfb13 100644
--- a/src/mars_patcher/misc_patches.py
+++ b/src/mars_patcher/mf/misc_patches.py
@@ -1,6 +1,6 @@
 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.mf.data import get_data_path
 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/mf/navigation_text.py
similarity index 100%
rename from src/mars_patcher/navigation_text.py
rename to src/mars_patcher/mf/navigation_text.py
diff --git a/src/mars_patcher/mf/patcher.py b/src/mars_patcher/mf/patcher.py
index af7dcbf..19a2816 100644
--- a/src/mars_patcher/mf/patcher.py
+++ b/src/mars_patcher/mf/patcher.py
@@ -1,15 +1,18 @@
 from collections.abc import Callable
 from os import PathLike
 
-from mars_patcher.connections import Connections
 from mars_patcher.credits import write_credits
-from mars_patcher.door_locks import set_door_locks
-from mars_patcher.item_patcher import ItemPatcher, set_required_metroid_count, set_tank_increments
 from mars_patcher.level_edits import apply_level_edits
-from mars_patcher.locations import LocationSettings
 from mars_patcher.mf.auto_generated_types import MarsSchemaMF
-from mars_patcher.minimap import apply_base_minimap_edits, apply_minimap_edits
-from mars_patcher.misc_patches import (
+from mars_patcher.mf.connections import Connections
+from mars_patcher.mf.door_locks import set_door_locks
+from mars_patcher.mf.item_patcher import (
+    ItemPatcher,
+    set_required_metroid_count,
+    set_tank_increments,
+)
+from mars_patcher.mf.locations import LocationSettings
+from mars_patcher.mf.misc_patches import (
     apply_accessibility_patch,
     apply_base_patch,
     apply_pbs_without_bombs,
@@ -23,11 +26,12 @@
     skip_door_transitions,
     stereo_default,
 )
-from mars_patcher.navigation_text import NavigationText
+from mars_patcher.mf.navigation_text import NavigationText
+from mars_patcher.mf.room_names import write_room_names
+from mars_patcher.mf.starting import set_starting_items, set_starting_location
+from mars_patcher.minimap import apply_base_minimap_edits, apply_minimap_edits
 from mars_patcher.random_palettes import PaletteRandomizer, PaletteSettings
 from mars_patcher.rom import Rom
-from mars_patcher.room_names import write_room_names
-from mars_patcher.starting import set_starting_items, set_starting_location
 from mars_patcher.text import write_seed_hash
 from mars_patcher.titlescreen_text import write_title_text
 
diff --git a/src/mars_patcher/room_names.py b/src/mars_patcher/mf/room_names.py
similarity index 100%
rename from src/mars_patcher/room_names.py
rename to src/mars_patcher/mf/room_names.py
diff --git a/src/mars_patcher/starting.py b/src/mars_patcher/mf/starting.py
similarity index 100%
rename from src/mars_patcher/starting.py
rename to src/mars_patcher/mf/starting.py
diff --git a/src/mars_patcher/minimap.py b/src/mars_patcher/minimap.py
index 4ea4f01..7e18713 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.data import get_data_path
 from mars_patcher.mf.constants.game_data import minimap_ptrs
+from mars_patcher.mf.data import get_data_path
 
 if TYPE_CHECKING:
     from types import TracebackType
diff --git a/src/mars_patcher/patcher.py b/src/mars_patcher/patcher.py
index df6ad24..96b6eec 100644
--- a/src/mars_patcher/patcher.py
+++ b/src/mars_patcher/patcher.py
@@ -5,7 +5,7 @@
 
 from jsonschema import validate
 
-import mars_patcher.data as data_mf
+import mars_patcher.mf.data as data_mf
 import mars_patcher.zm.data as data_zm
 from mars_patcher.mf.auto_generated_types import MarsSchemaMF
 from mars_patcher.mf.patcher import patch_mf
diff --git a/src/mars_patcher/text.py b/src/mars_patcher/text.py
index b12dcf9..d9bec3c 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.data import get_data_path
 from mars_patcher.mf.constants.game_data import character_widths, file_screen_text_ptrs
+from mars_patcher.mf.data import get_data_path
 from mars_patcher.rom import Region, Rom
 
 SPACE_CHAR = 0x40