diff --git a/__init__.py b/__init__.py
index 49eee6e..d6ac72f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -19,10 +19,10 @@ from .fast64_internal.sm64.settings.properties import SM64_Properties
 from .fast64_internal.sm64.sm64_geolayout_bone import SM64_BoneProperties
 from .fast64_internal.sm64.sm64_objects import SM64_ObjectProperties
 
-from .fast64_internal.oot import OOT_Properties, oot_register, oot_unregister
-from .fast64_internal.oot.oot_constants import oot_world_defaults
-from .fast64_internal.oot.props_panel_main import OOT_ObjectProperties
-from .fast64_internal.oot.actor.properties import initOOTActorProperties
+from .fast64_internal.z64 import OOT_Properties, oot_register, oot_unregister
+from .fast64_internal.z64.constants import oot_world_defaults
+from .fast64_internal.z64.props_panel_main import OOT_ObjectProperties
+from .fast64_internal.z64.actor.properties import initOOTActorProperties
 from .fast64_internal.utility_anim import utility_anim_register, utility_anim_unregister, ArmatureApplyWithMeshOperator
 
 from .fast64_internal.mk64 import MK64_Properties, mk64_register, mk64_unregister
diff --git a/fast64_internal/__init__.py b/fast64_internal/__init__.py
deleted file mode 100644
index 6bb605c..0000000
--- a/fast64_internal/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from .f3d_material_converter import *
-from .f3d import *
-from .sm64 import *
-from .oot import *  # is this really needed?
-from .panels import *
diff --git a/fast64_internal/oot/oot_spline.py b/fast64_internal/oot/oot_spline.py
deleted file mode 100644
index 0508443..0000000
--- a/fast64_internal/oot/oot_spline.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import bpy
-from ..utility import PluginError, toAlnum
-
-
-class OOTPath:
-    def __init__(self, ownerName, objName: str):
-        self.ownerName = toAlnum(ownerName)
-        self.objName = objName
-        self.points = []
-
-    def pathName(self, headerIndex, index):
-        return f"{self.ownerName}_pathwayList{index}_header{headerIndex}"
-
-
-def ootConvertPath(name, obj, transformMatrix):
-    path = OOTPath(name, obj.name)
-
-    spline = obj.data.splines[0]
-    for point in spline.points:
-        position = transformMatrix @ point.co.xyz
-        path.points.append(position)
-
-    return path
-
-
-def onSplineTypeSet(self, context):
-    self.splines.active.order_u = 1
-
-
-def assertCurveValid(obj):
-    curve = obj.data
-    if not isinstance(curve, bpy.types.Curve) or curve.splines[0].type != "NURBS":
-        # Curve was likely not intended to be exported
-        return False
-    if len(curve.splines) != 1:
-        # Curve was intended to be exported but has multiple disconnected segments
-        raise PluginError("Exported curves should have only one single segment, found " + str(len(curve.splines)))
-    return True
diff --git a/fast64_internal/oot/README.md b/fast64_internal/z64/README.md
similarity index 100%
rename from fast64_internal/oot/README.md
rename to fast64_internal/z64/README.md
diff --git a/fast64_internal/oot/__init__.py b/fast64_internal/z64/__init__.py
similarity index 99%
rename from fast64_internal/oot/__init__.py
rename to fast64_internal/z64/__init__.py
index 3f5862c..9778a7a 100644
--- a/fast64_internal/oot/__init__.py
+++ b/fast64_internal/z64/__init__.py
@@ -12,7 +12,7 @@ from .scene.panels import scene_panels_register, scene_panels_unregister
 from .props_panel_main import oot_obj_panel_register, oot_obj_panel_unregister, oot_obj_register, oot_obj_unregister
 from .skeleton.properties import OOTSkeletonImportSettings, OOTSkeletonExportSettings
 from .collection_utility import collections_register, collections_unregister
-from .oot_utility import setAllActorsVisibility
+from .utility import setAllActorsVisibility
 from .file_settings import file_register, file_unregister
 from .collision.properties import OOTCollisionExportSettings
 
diff --git a/fast64_internal/oot/actor/operators.py b/fast64_internal/z64/actor/operators.py
similarity index 98%
rename from fast64_internal/oot/actor/operators.py
rename to fast64_internal/z64/actor/operators.py
index 44cc609..c8208b9 100644
--- a/fast64_internal/oot/actor/operators.py
+++ b/fast64_internal/z64/actor/operators.py
@@ -3,7 +3,7 @@ from bpy.types import Operator
 from bpy.props import EnumProperty, StringProperty
 from bpy.utils import register_class, unregister_class
 from ...utility import PluginError
-from ..oot_constants import ootData
+from ..constants import ootData
 
 
 class OOT_SearchChestContentEnumOperator(Operator):
diff --git a/fast64_internal/oot/actor/properties.py b/fast64_internal/z64/actor/properties.py
similarity index 99%
rename from fast64_internal/oot/actor/properties.py
rename to fast64_internal/z64/actor/properties.py
index 17b1fcb..db11b9a 100644
--- a/fast64_internal/oot/actor/properties.py
+++ b/fast64_internal/z64/actor/properties.py
@@ -4,8 +4,8 @@ from bpy.types import Object, PropertyGroup, UILayout
 from bpy.utils import register_class, unregister_class
 from bpy.props import EnumProperty, StringProperty, IntProperty, BoolProperty, CollectionProperty, PointerProperty
 from ...utility import PluginError, prop_split, label_split
-from ..oot_constants import ootData, ootEnumCamTransition
-from ..oot_upgrade import upgradeActors
+from ..constants import ootData, ootEnumCamTransition
+from ..upgrade import upgradeActors
 from ..scene.properties import OOTAlternateSceneHeaderProperty
 from ..room.properties import OOTAlternateRoomHeaderProperty
 from ..collection_utility import drawAddButton, drawCollectionOps
@@ -15,7 +15,7 @@ from .operators import (
     OOT_SearchNaviMsgIDEnumOperator,
 )
 
-from ..oot_utility import (
+from ..utility import (
     getRoomObj,
     getEnumName,
     drawEnumWithCustom,
diff --git a/fast64_internal/oot/animation/importer/__init__.py b/fast64_internal/z64/animation/importer/__init__.py
similarity index 100%
rename from fast64_internal/oot/animation/importer/__init__.py
rename to fast64_internal/z64/animation/importer/__init__.py
diff --git a/fast64_internal/oot/animation/importer/functions.py b/fast64_internal/z64/animation/importer/functions.py
similarity index 99%
rename from fast64_internal/oot/animation/importer/functions.py
rename to fast64_internal/z64/animation/importer/functions.py
index 369a2c5..da56359 100644
--- a/fast64_internal/oot/animation/importer/functions.py
+++ b/fast64_internal/z64/animation/importer/functions.py
@@ -4,7 +4,7 @@ import re
 import math
 from ....utility import PluginError, hexOrDecInt, get_include_data, removeComments
 from ....f3d.f3d_parser import getImportData
-from ...oot_model_classes import ootGetIncludedAssetData
+from ...model_classes import ootGetIncludedAssetData
 
 from ....utility_anim import (
     getTranslationRelativeToRest,
@@ -12,7 +12,7 @@ from ....utility_anim import (
     stashActionInArmature,
 )
 
-from ...oot_utility import (
+from ...utility import (
     getStartBone,
     getNextBone,
 )
diff --git a/fast64_internal/oot/animation/operators.py b/fast64_internal/z64/animation/operators.py
similarity index 99%
rename from fast64_internal/oot/animation/operators.py
rename to fast64_internal/z64/animation/operators.py
index ecc17a8..4c83081 100644
--- a/fast64_internal/oot/animation/operators.py
+++ b/fast64_internal/z64/animation/operators.py
@@ -8,7 +8,7 @@ from .properties import OOTAnimExportSettingsProperty, OOTAnimImportSettingsProp
 from ..exporter.animation import ootExportLinkAnimation, ootExportNonLinkAnimation
 from .importer import ootImportLinkAnimationC, ootImportNonLinkAnimationC
 
-from ..oot_utility import (
+from ..utility import (
     ootGetPath,
     addIncludeFiles,
     checkEmptyName,
diff --git a/fast64_internal/oot/animation/panels.py b/fast64_internal/z64/animation/panels.py
similarity index 100%
rename from fast64_internal/oot/animation/panels.py
rename to fast64_internal/z64/animation/panels.py
diff --git a/fast64_internal/oot/animation/properties.py b/fast64_internal/z64/animation/properties.py
similarity index 100%
rename from fast64_internal/oot/animation/properties.py
rename to fast64_internal/z64/animation/properties.py
diff --git a/fast64_internal/oot/collection_utility.py b/fast64_internal/z64/collection_utility.py
similarity index 100%
rename from fast64_internal/oot/collection_utility.py
rename to fast64_internal/z64/collection_utility.py
diff --git a/fast64_internal/oot/collision/constants.py b/fast64_internal/z64/collision/constants.py
similarity index 100%
rename from fast64_internal/oot/collision/constants.py
rename to fast64_internal/z64/collision/constants.py
diff --git a/fast64_internal/oot/collision/operators.py b/fast64_internal/z64/collision/operators.py
similarity index 97%
rename from fast64_internal/oot/collision/operators.py
rename to fast64_internal/z64/collision/operators.py
index 99bc9f1..ee7b87b 100644
--- a/fast64_internal/oot/collision/operators.py
+++ b/fast64_internal/z64/collision/operators.py
@@ -4,7 +4,7 @@ from bpy.ops import object
 from mathutils import Matrix
 
 from ...utility import PluginError, raisePluginError
-from ..oot_utility import getOOTScale
+from ..utility import getOOTScale
 from ..exporter.collision import CollisionHeader
 from .properties import OOTCollisionExportSettings
 
diff --git a/fast64_internal/oot/collision/panels.py b/fast64_internal/z64/collision/panels.py
similarity index 100%
rename from fast64_internal/oot/collision/panels.py
rename to fast64_internal/z64/collision/panels.py
diff --git a/fast64_internal/oot/collision/properties.py b/fast64_internal/z64/collision/properties.py
similarity index 98%
rename from fast64_internal/oot/collision/properties.py
rename to fast64_internal/z64/collision/properties.py
index 2b23737..34cf225 100644
--- a/fast64_internal/oot/collision/properties.py
+++ b/fast64_internal/z64/collision/properties.py
@@ -3,8 +3,8 @@ from bpy.props import StringProperty, PointerProperty, IntProperty, EnumProperty
 from bpy.types import PropertyGroup, Camera, Object, Material, UILayout
 from bpy.utils import register_class, unregister_class
 from ...utility import prop_split
-from ..oot_utility import drawEnumWithCustom
-from ..oot_constants import ootEnumSceneID
+from ..utility import drawEnumWithCustom
+from ..constants import ootEnumSceneID
 from .constants import (
     ootEnumFloorSetting,
     ootEnumWallSetting,
diff --git a/fast64_internal/oot/oot_constants.py b/fast64_internal/z64/constants.py
similarity index 100%
rename from fast64_internal/oot/oot_constants.py
rename to fast64_internal/z64/constants.py
diff --git a/fast64_internal/oot/cutscene/classes.py b/fast64_internal/z64/cutscene/classes.py
similarity index 99%
rename from fast64_internal/oot/cutscene/classes.py
rename to fast64_internal/z64/cutscene/classes.py
index 043d9f8..0d08fc8 100644
--- a/fast64_internal/oot/cutscene/classes.py
+++ b/fast64_internal/z64/cutscene/classes.py
@@ -3,7 +3,7 @@ import bpy
 from dataclasses import dataclass, field
 from bpy.types import Object
 from typing import Optional
-from ..oot_constants import ootData
+from ..constants import ootData
 from .motion.utility import getBlenderPosition, getBlenderRotation, getRotation, getInteger
 
 
diff --git a/fast64_internal/oot/cutscene/constants.py b/fast64_internal/z64/cutscene/constants.py
similarity index 99%
rename from fast64_internal/oot/cutscene/constants.py
rename to fast64_internal/z64/cutscene/constants.py
index ffccf23..1a72eb6 100644
--- a/fast64_internal/oot/cutscene/constants.py
+++ b/fast64_internal/z64/cutscene/constants.py
@@ -1,4 +1,4 @@
-from ..oot_constants import ootData
+from ..constants import ootData
 from .classes import (
     CutsceneCmdActorCueList,
     CutsceneCmdActorCue,
diff --git a/fast64_internal/oot/cutscene/importer/__init__.py b/fast64_internal/z64/cutscene/importer/__init__.py
similarity index 100%
rename from fast64_internal/oot/cutscene/importer/__init__.py
rename to fast64_internal/z64/cutscene/importer/__init__.py
diff --git a/fast64_internal/oot/cutscene/importer/classes.py b/fast64_internal/z64/cutscene/importer/classes.py
similarity index 100%
rename from fast64_internal/oot/cutscene/importer/classes.py
rename to fast64_internal/z64/cutscene/importer/classes.py
diff --git a/fast64_internal/oot/cutscene/importer/functions.py b/fast64_internal/z64/cutscene/importer/functions.py
similarity index 100%
rename from fast64_internal/oot/cutscene/importer/functions.py
rename to fast64_internal/z64/cutscene/importer/functions.py
diff --git a/fast64_internal/oot/cutscene/motion/operators.py b/fast64_internal/z64/cutscene/motion/operators.py
similarity index 99%
rename from fast64_internal/oot/cutscene/motion/operators.py
rename to fast64_internal/z64/cutscene/motion/operators.py
index 8eff5c5..1a4e0b0 100644
--- a/fast64_internal/oot/cutscene/motion/operators.py
+++ b/fast64_internal/z64/cutscene/motion/operators.py
@@ -6,7 +6,7 @@ from bpy.props import StringProperty, EnumProperty, BoolProperty
 import mathutils
 from dataclasses import dataclass
 from ....utility import PluginError
-from ...oot_constants import ootData
+from ...constants import ootData
 from ..classes import CutsceneObjectFactory
 from ..constants import ootEnumCSActorCueListCommandType
 from ..preview import initFirstFrame, setupCompositorNodes
diff --git a/fast64_internal/oot/cutscene/motion/panels.py b/fast64_internal/z64/cutscene/motion/panels.py
similarity index 100%
rename from fast64_internal/oot/cutscene/motion/panels.py
rename to fast64_internal/z64/cutscene/motion/panels.py
diff --git a/fast64_internal/oot/cutscene/motion/preview.py b/fast64_internal/z64/cutscene/motion/preview.py
similarity index 100%
rename from fast64_internal/oot/cutscene/motion/preview.py
rename to fast64_internal/z64/cutscene/motion/preview.py
diff --git a/fast64_internal/oot/cutscene/motion/properties.py b/fast64_internal/z64/cutscene/motion/properties.py
similarity index 98%
rename from fast64_internal/oot/cutscene/motion/properties.py
rename to fast64_internal/z64/cutscene/motion/properties.py
index 7251b3c..48bf323 100644
--- a/fast64_internal/oot/cutscene/motion/properties.py
+++ b/fast64_internal/z64/cutscene/motion/properties.py
@@ -3,9 +3,9 @@ import bpy
 from bpy.types import PropertyGroup, Object, UILayout, Armature, Bone, Scene, EditBone
 from bpy.props import IntProperty, StringProperty, PointerProperty, EnumProperty, FloatProperty
 from bpy.utils import register_class, unregister_class
-from ...oot_upgrade import upgradeCutsceneMotion
-from ...oot_utility import getEnumName
-from ...oot_constants import ootData
+from ...upgrade import upgradeCutsceneMotion
+from ...utility import getEnumName
+from ...constants import ootData
 from ..constants import ootEnumCSMotionCamMode, ootEnumCSActorCueListCommandType
 
 from .operators import (
diff --git a/fast64_internal/oot/cutscene/motion/utility.py b/fast64_internal/z64/cutscene/motion/utility.py
similarity index 99%
rename from fast64_internal/oot/cutscene/motion/utility.py
rename to fast64_internal/z64/cutscene/motion/utility.py
index 939bd67..de0a731 100644
--- a/fast64_internal/oot/cutscene/motion/utility.py
+++ b/fast64_internal/z64/cutscene/motion/utility.py
@@ -4,7 +4,7 @@ from struct import unpack
 from bpy.types import Object, Bone, Context, EditBone, Armature
 from mathutils import Vector
 from ....utility import yUpToZUp
-from ...oot_utility import ootParseRotation
+from ...utility import ootParseRotation
 
 
 class BoneData:
diff --git a/fast64_internal/oot/cutscene/operators.py b/fast64_internal/z64/cutscene/operators.py
similarity index 99%
rename from fast64_internal/oot/cutscene/operators.py
rename to fast64_internal/z64/cutscene/operators.py
index 1171629..32bc54a 100644
--- a/fast64_internal/oot/cutscene/operators.py
+++ b/fast64_internal/z64/cutscene/operators.py
@@ -7,7 +7,7 @@ from bpy.types import Scene, Operator, Object
 from bpy.utils import register_class, unregister_class
 from ...utility import PluginError, raisePluginError
 from ..collection_utility import getCollection
-from ..oot_constants import ootData
+from ..constants import ootData
 from .constants import ootEnumCSTextboxType, ootEnumCSListType
 from .importer import importCutsceneData
 from ..exporter.cutscene import Cutscene
diff --git a/fast64_internal/oot/cutscene/panels.py b/fast64_internal/z64/cutscene/panels.py
similarity index 100%
rename from fast64_internal/oot/cutscene/panels.py
rename to fast64_internal/z64/cutscene/panels.py
diff --git a/fast64_internal/oot/cutscene/preview.py b/fast64_internal/z64/cutscene/preview.py
similarity index 100%
rename from fast64_internal/oot/cutscene/preview.py
rename to fast64_internal/z64/cutscene/preview.py
diff --git a/fast64_internal/oot/cutscene/properties.py b/fast64_internal/z64/cutscene/properties.py
similarity index 99%
rename from fast64_internal/oot/cutscene/properties.py
rename to fast64_internal/z64/cutscene/properties.py
index 9511dd3..a3130ea 100644
--- a/fast64_internal/oot/cutscene/properties.py
+++ b/fast64_internal/z64/cutscene/properties.py
@@ -3,9 +3,9 @@ from bpy.props import StringProperty, EnumProperty, IntProperty, BoolProperty, C
 from bpy.utils import register_class, unregister_class
 from ...utility import PluginError, prop_split
 from ..collection_utility import OOTCollectionAdd, drawCollectionOps
-from ..oot_utility import getEnumName
-from ..oot_constants import ootData
-from ..oot_upgrade import upgradeCutsceneSubProps, upgradeCSListProps, upgradeCutsceneProperty
+from ..utility import getEnumName
+from ..constants import ootData
+from ..upgrade import upgradeCutsceneSubProps, upgradeCSListProps, upgradeCutsceneProperty
 from .operators import OOTCSTextAdd, OOT_SearchCSDestinationEnumOperator, OOTCSListAdd, OOT_SearchCSSeqOperator
 from .motion.preview import previewFrameHandler
 from .motion.utility import getCutsceneCamera
diff --git a/fast64_internal/oot/cutscene_docs.md b/fast64_internal/z64/cutscene_docs.md
similarity index 100%
rename from fast64_internal/oot/cutscene_docs.md
rename to fast64_internal/z64/cutscene_docs.md
diff --git a/fast64_internal/oot/data/__init__.py b/fast64_internal/z64/data/__init__.py
similarity index 100%
rename from fast64_internal/oot/data/__init__.py
rename to fast64_internal/z64/data/__init__.py
diff --git a/fast64_internal/oot/data/oot_actor_data.py b/fast64_internal/z64/data/oot_actor_data.py
similarity index 100%
rename from fast64_internal/oot/data/oot_actor_data.py
rename to fast64_internal/z64/data/oot_actor_data.py
diff --git a/fast64_internal/oot/data/oot_data.py b/fast64_internal/z64/data/oot_data.py
similarity index 100%
rename from fast64_internal/oot/data/oot_data.py
rename to fast64_internal/z64/data/oot_data.py
diff --git a/fast64_internal/oot/data/oot_enum_data.py b/fast64_internal/z64/data/oot_enum_data.py
similarity index 100%
rename from fast64_internal/oot/data/oot_enum_data.py
rename to fast64_internal/z64/data/oot_enum_data.py
diff --git a/fast64_internal/oot/data/oot_getters.py b/fast64_internal/z64/data/oot_getters.py
similarity index 100%
rename from fast64_internal/oot/data/oot_getters.py
rename to fast64_internal/z64/data/oot_getters.py
diff --git a/fast64_internal/oot/data/oot_object_data.py b/fast64_internal/z64/data/oot_object_data.py
similarity index 100%
rename from fast64_internal/oot/data/oot_object_data.py
rename to fast64_internal/z64/data/oot_object_data.py
diff --git a/fast64_internal/oot/data/xml/ActorList.xml b/fast64_internal/z64/data/xml/ActorList.xml
similarity index 100%
rename from fast64_internal/oot/data/xml/ActorList.xml
rename to fast64_internal/z64/data/xml/ActorList.xml
diff --git a/fast64_internal/oot/data/xml/EnumData.xml b/fast64_internal/z64/data/xml/EnumData.xml
similarity index 100%
rename from fast64_internal/oot/data/xml/EnumData.xml
rename to fast64_internal/z64/data/xml/EnumData.xml
diff --git a/fast64_internal/oot/data/xml/ObjectList.xml b/fast64_internal/z64/data/xml/ObjectList.xml
similarity index 100%
rename from fast64_internal/oot/data/xml/ObjectList.xml
rename to fast64_internal/z64/data/xml/ObjectList.xml
diff --git a/fast64_internal/oot/exporter/__init__.py b/fast64_internal/z64/exporter/__init__.py
similarity index 97%
rename from fast64_internal/oot/exporter/__init__.py
rename to fast64_internal/z64/exporter/__init__.py
index 05d4cef..ec0ad14 100644
--- a/fast64_internal/oot/exporter/__init__.py
+++ b/fast64_internal/z64/exporter/__init__.py
@@ -4,8 +4,8 @@ import os
 from mathutils import Matrix
 from bpy.types import Object
 from ...f3d.f3d_gbi import DLFormat, TextureExportSettings
-from ..oot_model_classes import OOTModel
-from ..oot_f3d_writer import writeTextureArraysNew, writeTextureArraysExisting1D
+from ..model_classes import OOTModel
+from ..f3d_writer import writeTextureArraysNew, writeTextureArraysExisting1D
 from .scene import Scene
 from .decomp_edit import Files
 
@@ -19,7 +19,7 @@ from ...utility import (
     writeFile,
 )
 
-from ..oot_utility import (
+from ..utility import (
     ExportInfo,
     OOTObjectCategorizer,
     ootDuplicateHierarchy,
diff --git a/fast64_internal/oot/exporter/actor.py b/fast64_internal/z64/exporter/actor.py
similarity index 100%
rename from fast64_internal/oot/exporter/actor.py
rename to fast64_internal/z64/exporter/actor.py
diff --git a/fast64_internal/oot/exporter/animation/__init__.py b/fast64_internal/z64/exporter/animation/__init__.py
similarity index 100%
rename from fast64_internal/oot/exporter/animation/__init__.py
rename to fast64_internal/z64/exporter/animation/__init__.py
diff --git a/fast64_internal/oot/exporter/animation/classes.py b/fast64_internal/z64/exporter/animation/classes.py
similarity index 100%
rename from fast64_internal/oot/exporter/animation/classes.py
rename to fast64_internal/z64/exporter/animation/classes.py
diff --git a/fast64_internal/oot/exporter/animation/functions.py b/fast64_internal/z64/exporter/animation/functions.py
similarity index 99%
rename from fast64_internal/oot/exporter/animation/functions.py
rename to fast64_internal/z64/exporter/animation/functions.py
index 7a3d406..dc46212 100644
--- a/fast64_internal/oot/exporter/animation/functions.py
+++ b/fast64_internal/z64/exporter/animation/functions.py
@@ -14,7 +14,7 @@ from ....utility_anim import (
     stashActionInArmature,
 )
 
-from ...oot_utility import (
+from ...utility import (
     checkForStartBone,
     getStartBone,
     getSortedChildren,
diff --git a/fast64_internal/oot/exporter/collision/__init__.py b/fast64_internal/z64/exporter/collision/__init__.py
similarity index 99%
rename from fast64_internal/oot/exporter/collision/__init__.py
rename to fast64_internal/z64/exporter/collision/__init__.py
index be8774b..8846c94 100644
--- a/fast64_internal/oot/exporter/collision/__init__.py
+++ b/fast64_internal/z64/exporter/collision/__init__.py
@@ -9,7 +9,7 @@ from bpy.ops import object
 from typing import Optional
 
 from ....utility import PluginError, CData, toAlnum, unhideAllAndGetHiddenState, restoreHiddenState, indent
-from ...oot_utility import (
+from ...utility import (
     OOTObjectCategorizer,
     convertIntTo2sComplement,
     ootDuplicateHierarchy,
diff --git a/fast64_internal/oot/exporter/collision/camera.py b/fast64_internal/z64/exporter/collision/camera.py
similarity index 99%
rename from fast64_internal/oot/exporter/collision/camera.py
rename to fast64_internal/z64/exporter/collision/camera.py
index 012defc..f4f2ecc 100644
--- a/fast64_internal/oot/exporter/collision/camera.py
+++ b/fast64_internal/z64/exporter/collision/camera.py
@@ -4,7 +4,7 @@ from dataclasses import dataclass, field
 from mathutils import Quaternion, Matrix
 from bpy.types import Object
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getObjectList
+from ...utility import getObjectList
 from ...collision.constants import decomp_compat_map_CameraSType
 from ...collision.properties import OOTCameraPositionProperty
 from ..utility import Utility
diff --git a/fast64_internal/oot/exporter/collision/polygons.py b/fast64_internal/z64/exporter/collision/polygons.py
similarity index 100%
rename from fast64_internal/oot/exporter/collision/polygons.py
rename to fast64_internal/z64/exporter/collision/polygons.py
diff --git a/fast64_internal/oot/exporter/collision/surface.py b/fast64_internal/z64/exporter/collision/surface.py
similarity index 99%
rename from fast64_internal/oot/exporter/collision/surface.py
rename to fast64_internal/z64/exporter/collision/surface.py
index 087bebb..989e763 100644
--- a/fast64_internal/oot/exporter/collision/surface.py
+++ b/fast64_internal/z64/exporter/collision/surface.py
@@ -3,7 +3,7 @@ import bpy
 from dataclasses import dataclass
 
 from ....utility import CData, indent
-from ...oot_constants import ootData
+from ...constants import ootData
 
 
 @dataclass(unsafe_hash=True)
diff --git a/fast64_internal/oot/exporter/collision/vertex.py b/fast64_internal/z64/exporter/collision/vertex.py
similarity index 100%
rename from fast64_internal/oot/exporter/collision/vertex.py
rename to fast64_internal/z64/exporter/collision/vertex.py
diff --git a/fast64_internal/oot/exporter/collision/waterbox.py b/fast64_internal/z64/exporter/collision/waterbox.py
similarity index 99%
rename from fast64_internal/oot/exporter/collision/waterbox.py
rename to fast64_internal/z64/exporter/collision/waterbox.py
index 33c35c5..4b8ccfb 100644
--- a/fast64_internal/oot/exporter/collision/waterbox.py
+++ b/fast64_internal/z64/exporter/collision/waterbox.py
@@ -7,7 +7,7 @@ from mathutils import Matrix
 from bpy.types import Object
 
 from ....utility import CData, hexOrDecInt, checkIdentityRotation, indent, yUpToZUp
-from ...oot_utility import getObjectList
+from ...utility import getObjectList
 from ..utility import Utility
 
 
diff --git a/fast64_internal/oot/exporter/cutscene/__init__.py b/fast64_internal/z64/exporter/cutscene/__init__.py
similarity index 99%
rename from fast64_internal/oot/exporter/cutscene/__init__.py
rename to fast64_internal/z64/exporter/cutscene/__init__.py
index e84972f..3b91d40 100644
--- a/fast64_internal/oot/exporter/cutscene/__init__.py
+++ b/fast64_internal/z64/exporter/cutscene/__init__.py
@@ -6,7 +6,7 @@ from typing import Optional
 from bpy.types import Object
 
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getCustomProperty
+from ...utility import getCustomProperty
 from ...scene.properties import OOTSceneHeaderProperty
 from .data import CutsceneData
 
diff --git a/fast64_internal/oot/exporter/cutscene/actor_cue.py b/fast64_internal/z64/exporter/cutscene/actor_cue.py
similarity index 98%
rename from fast64_internal/oot/exporter/cutscene/actor_cue.py
rename to fast64_internal/z64/exporter/cutscene/actor_cue.py
index 08f4843..62a9243 100644
--- a/fast64_internal/oot/exporter/cutscene/actor_cue.py
+++ b/fast64_internal/z64/exporter/cutscene/actor_cue.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from ....utility import PluginError, indent
-from ...oot_constants import ootData
+from ...constants import ootData
 from ...cutscene.motion.utility import getRotation, getInteger
 from .common import CutsceneCmdBase
 
diff --git a/fast64_internal/oot/exporter/cutscene/camera.py b/fast64_internal/z64/exporter/cutscene/camera.py
similarity index 100%
rename from fast64_internal/oot/exporter/cutscene/camera.py
rename to fast64_internal/z64/exporter/cutscene/camera.py
diff --git a/fast64_internal/oot/exporter/cutscene/common.py b/fast64_internal/z64/exporter/cutscene/common.py
similarity index 97%
rename from fast64_internal/oot/exporter/cutscene/common.py
rename to fast64_internal/z64/exporter/cutscene/common.py
index ab91fb2..9b308b0 100644
--- a/fast64_internal/oot/exporter/cutscene/common.py
+++ b/fast64_internal/z64/exporter/cutscene/common.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional
 from ....utility import PluginError, indent
-from ...oot_constants import ootData
+from ...constants import ootData
 from ...cutscene.motion.utility import getInteger
 
 
diff --git a/fast64_internal/oot/exporter/cutscene/data.py b/fast64_internal/z64/exporter/cutscene/data.py
similarity index 99%
rename from fast64_internal/oot/exporter/cutscene/data.py
rename to fast64_internal/z64/exporter/cutscene/data.py
index 25a92db..28decd6 100644
--- a/fast64_internal/oot/exporter/cutscene/data.py
+++ b/fast64_internal/z64/exporter/cutscene/data.py
@@ -5,7 +5,7 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 from bpy.types import Object, Bone
 from ....utility import PluginError
-from ...oot_constants import ootData
+from ...constants import ootData
 from .actor_cue import CutsceneCmdActorCueList, CutsceneCmdActorCue
 from .seq import CutsceneCmdStartStopSeqList, CutsceneCmdFadeSeqList, CutsceneCmdStartStopSeq, CutsceneCmdFadeSeq
 from .text import CutsceneCmdTextList, CutsceneCmdText, CutsceneCmdTextNone, CutsceneCmdTextOcarinaAction
diff --git a/fast64_internal/oot/exporter/cutscene/misc.py b/fast64_internal/z64/exporter/cutscene/misc.py
similarity index 100%
rename from fast64_internal/oot/exporter/cutscene/misc.py
rename to fast64_internal/z64/exporter/cutscene/misc.py
diff --git a/fast64_internal/oot/exporter/cutscene/seq.py b/fast64_internal/z64/exporter/cutscene/seq.py
similarity index 100%
rename from fast64_internal/oot/exporter/cutscene/seq.py
rename to fast64_internal/z64/exporter/cutscene/seq.py
diff --git a/fast64_internal/oot/exporter/cutscene/text.py b/fast64_internal/z64/exporter/cutscene/text.py
similarity index 100%
rename from fast64_internal/oot/exporter/cutscene/text.py
rename to fast64_internal/z64/exporter/cutscene/text.py
diff --git a/fast64_internal/oot/exporter/decomp_edit/__init__.py b/fast64_internal/z64/exporter/decomp_edit/__init__.py
similarity index 96%
rename from fast64_internal/oot/exporter/decomp_edit/__init__.py
rename to fast64_internal/z64/exporter/decomp_edit/__init__.py
index 95af7f7..15792dd 100644
--- a/fast64_internal/oot/exporter/decomp_edit/__init__.py
+++ b/fast64_internal/z64/exporter/decomp_edit/__init__.py
@@ -2,7 +2,7 @@ import os
 import re
 import shutil
 
-from ...oot_utility import ExportInfo, RemoveInfo, getSceneDirFromLevelName
+from ...utility import ExportInfo, RemoveInfo, getSceneDirFromLevelName
 from ..scene import Scene
 from ..file import SceneFile
 from .scene_table import SceneTableUtility
diff --git a/fast64_internal/oot/exporter/decomp_edit/config.py b/fast64_internal/z64/exporter/decomp_edit/config.py
similarity index 100%
rename from fast64_internal/oot/exporter/decomp_edit/config.py
rename to fast64_internal/z64/exporter/decomp_edit/config.py
diff --git a/fast64_internal/oot/exporter/decomp_edit/scene_table.py b/fast64_internal/z64/exporter/decomp_edit/scene_table.py
similarity index 99%
rename from fast64_internal/oot/exporter/decomp_edit/scene_table.py
rename to fast64_internal/z64/exporter/decomp_edit/scene_table.py
index ccdf43d..e153ba7 100644
--- a/fast64_internal/oot/exporter/decomp_edit/scene_table.py
+++ b/fast64_internal/z64/exporter/decomp_edit/scene_table.py
@@ -4,7 +4,7 @@ import bpy
 from dataclasses import dataclass, field
 from typing import Optional
 from ....utility import PluginError, writeFile
-from ...oot_constants import ootEnumSceneID, ootSceneNameToID
+from ...constants import ootEnumSceneID, ootSceneNameToID
 
 ADDED_SCENES_COMMENT = "// Added scenes"
 
diff --git a/fast64_internal/oot/exporter/decomp_edit/spec.py b/fast64_internal/z64/exporter/decomp_edit/spec.py
similarity index 99%
rename from fast64_internal/oot/exporter/decomp_edit/spec.py
rename to fast64_internal/z64/exporter/decomp_edit/spec.py
index f6b1229..fa28c35 100644
--- a/fast64_internal/oot/exporter/decomp_edit/spec.py
+++ b/fast64_internal/z64/exporter/decomp_edit/spec.py
@@ -6,7 +6,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Optional
 from ....utility import PluginError, writeFile, indent
-from ...oot_utility import ExportInfo, getSceneDirFromLevelName
+from ...utility import ExportInfo, getSceneDirFromLevelName
 from ..scene import Scene
 from ..file import SceneFile
 
diff --git a/fast64_internal/oot/exporter/file.py b/fast64_internal/z64/exporter/file.py
similarity index 100%
rename from fast64_internal/oot/exporter/file.py
rename to fast64_internal/z64/exporter/file.py
diff --git a/fast64_internal/oot/exporter/room/__init__.py b/fast64_internal/z64/exporter/room/__init__.py
similarity index 98%
rename from fast64_internal/oot/exporter/room/__init__.py
rename to fast64_internal/z64/exporter/room/__init__.py
index 3718a15..4c42236 100644
--- a/fast64_internal/oot/exporter/room/__init__.py
+++ b/fast64_internal/z64/exporter/room/__init__.py
@@ -5,8 +5,8 @@ from bpy.types import Object
 from ....utility import PluginError, CData, indent
 from ....f3d.f3d_gbi import ScrollMethod, TextureExportSettings
 from ...room.properties import OOTRoomHeaderProperty
-from ...oot_object import addMissingObjectsToAllRoomHeaders
-from ...oot_model_classes import OOTModel, OOTGfxFormatter
+from ...object import addMissingObjectsToAllRoomHeaders
+from ...model_classes import OOTModel, OOTGfxFormatter
 from ..file import RoomFile
 from ..utility import Utility, altHeaderList
 from .header import RoomAlternateHeader, RoomHeader
diff --git a/fast64_internal/oot/exporter/room/header.py b/fast64_internal/z64/exporter/room/header.py
similarity index 99%
rename from fast64_internal/oot/exporter/room/header.py
rename to fast64_internal/z64/exporter/room/header.py
index 5de9b73..a634126 100644
--- a/fast64_internal/oot/exporter/room/header.py
+++ b/fast64_internal/z64/exporter/room/header.py
@@ -5,8 +5,8 @@ from typing import Optional
 from mathutils import Matrix
 from bpy.types import Object
 from ....utility import CData, indent
-from ...oot_utility import getObjectList
-from ...oot_constants import ootData
+from ...utility import getObjectList
+from ...constants import ootData
 from ...room.properties import OOTRoomHeaderProperty
 from ...actor.properties import OOTActorProperty
 from ..utility import Utility
diff --git a/fast64_internal/oot/exporter/room/shape.py b/fast64_internal/z64/exporter/room/shape.py
similarity index 99%
rename from fast64_internal/oot/exporter/room/shape.py
rename to fast64_internal/z64/exporter/room/shape.py
index 96278f9..e08f141 100644
--- a/fast64_internal/oot/exporter/room/shape.py
+++ b/fast64_internal/z64/exporter/room/shape.py
@@ -8,13 +8,13 @@ from ....utility import PluginError, CData, toAlnum, indent
 from ....f3d.f3d_gbi import SPDisplayList, SPEndDisplayList, GfxListTag, GfxList, DLFormat
 from ....f3d.f3d_writer import TriangleConverterInfo, saveStaticModel, getInfoDict
 from ...room.properties import OOTRoomHeaderProperty, OOTBGProperty
-from ...oot_model_classes import OOTModel
+from ...model_classes import OOTModel
 from ..utility import Utility
 from bpy.types import Object
 from mathutils import Matrix, Vector
 from ....f3d.occlusion_planes.exporter import addOcclusionQuads, OcclusionPlaneCandidatesList
 
-from ...oot_utility import (
+from ...utility import (
     CullGroup,
     checkUniformScale,
     ootConvertTranslation,
diff --git a/fast64_internal/oot/exporter/scene/__init__.py b/fast64_internal/z64/exporter/scene/__init__.py
similarity index 99%
rename from fast64_internal/oot/exporter/scene/__init__.py
rename to fast64_internal/z64/exporter/scene/__init__.py
index 7645a63..cc1d2c5 100644
--- a/fast64_internal/oot/exporter/scene/__init__.py
+++ b/fast64_internal/z64/exporter/scene/__init__.py
@@ -7,7 +7,7 @@ from typing import Optional
 from ....utility import PluginError, CData, indent
 from ....f3d.f3d_gbi import TextureExportSettings, ScrollMethod
 from ...scene.properties import OOTSceneHeaderProperty
-from ...oot_model_classes import OOTModel, OOTGfxFormatter
+from ...model_classes import OOTModel, OOTGfxFormatter
 from ..file import SceneFile
 from ..utility import Utility, altHeaderList
 from ..collision import CollisionHeader
diff --git a/fast64_internal/oot/exporter/scene/actors.py b/fast64_internal/z64/exporter/scene/actors.py
similarity index 99%
rename from fast64_internal/oot/exporter/scene/actors.py
rename to fast64_internal/z64/exporter/scene/actors.py
index 1985758..7d9aa24 100644
--- a/fast64_internal/oot/exporter/scene/actors.py
+++ b/fast64_internal/z64/exporter/scene/actors.py
@@ -6,8 +6,8 @@ from mathutils import Matrix
 from bpy.types import Object
 
 from ....utility import PluginError, CData, hexOrDecInt, indent
-from ...oot_utility import getObjectList, getEvalParams
-from ...oot_constants import ootData
+from ...utility import getObjectList, getEvalParams
+from ...constants import ootData
 from ...actor.properties import OOTActorProperty
 from ..utility import Utility
 from ..actor import Actor
diff --git a/fast64_internal/oot/exporter/scene/general.py b/fast64_internal/z64/exporter/scene/general.py
similarity index 99%
rename from fast64_internal/oot/exporter/scene/general.py
rename to fast64_internal/z64/exporter/scene/general.py
index d575d11..5725745 100644
--- a/fast64_internal/oot/exporter/scene/general.py
+++ b/fast64_internal/z64/exporter/scene/general.py
@@ -5,7 +5,7 @@ from bpy.types import Object
 
 from ....utility import PluginError, CData, exportColor, ootGetBaseOrCustomLight, hexOrDecInt, indent
 from ...scene.properties import OOTSceneHeaderProperty, OOTLightProperty
-from ...oot_utility import getEvalParamsInt
+from ...utility import getEvalParamsInt
 from ..utility import Utility
 
 
diff --git a/fast64_internal/oot/exporter/scene/header.py b/fast64_internal/z64/exporter/scene/header.py
similarity index 100%
rename from fast64_internal/oot/exporter/scene/header.py
rename to fast64_internal/z64/exporter/scene/header.py
diff --git a/fast64_internal/oot/exporter/scene/pathways.py b/fast64_internal/z64/exporter/scene/pathways.py
similarity index 98%
rename from fast64_internal/oot/exporter/scene/pathways.py
rename to fast64_internal/z64/exporter/scene/pathways.py
index 331af8d..7feb192 100644
--- a/fast64_internal/oot/exporter/scene/pathways.py
+++ b/fast64_internal/z64/exporter/scene/pathways.py
@@ -2,7 +2,7 @@ from dataclasses import dataclass, field
 from mathutils import Matrix
 from bpy.types import Object
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getObjectList
+from ...utility import getObjectList
 from ..utility import Utility
 
 
diff --git a/fast64_internal/oot/exporter/scene/rooms.py b/fast64_internal/z64/exporter/scene/rooms.py
similarity index 97%
rename from fast64_internal/oot/exporter/scene/rooms.py
rename to fast64_internal/z64/exporter/scene/rooms.py
index 3ead882..6a64565 100644
--- a/fast64_internal/oot/exporter/scene/rooms.py
+++ b/fast64_internal/z64/exporter/scene/rooms.py
@@ -2,8 +2,8 @@ from dataclasses import dataclass
 from mathutils import Matrix
 from bpy.types import Object
 from ....utility import PluginError, CData, indent
-from ...oot_utility import getObjectList
-from ...oot_model_classes import OOTModel
+from ...utility import getObjectList
+from ...model_classes import OOTModel
 from ..room import Room
 
 
diff --git a/fast64_internal/oot/exporter/skeleton/__init__.py b/fast64_internal/z64/exporter/skeleton/__init__.py
similarity index 100%
rename from fast64_internal/oot/exporter/skeleton/__init__.py
rename to fast64_internal/z64/exporter/skeleton/__init__.py
diff --git a/fast64_internal/oot/exporter/skeleton/classes.py b/fast64_internal/z64/exporter/skeleton/classes.py
similarity index 100%
rename from fast64_internal/oot/exporter/skeleton/classes.py
rename to fast64_internal/z64/exporter/skeleton/classes.py
diff --git a/fast64_internal/oot/exporter/skeleton/functions.py b/fast64_internal/z64/exporter/skeleton/functions.py
similarity index 98%
rename from fast64_internal/oot/exporter/skeleton/functions.py
rename to fast64_internal/z64/exporter/skeleton/functions.py
index 6b603b9..f60219a 100644
--- a/fast64_internal/oot/exporter/skeleton/functions.py
+++ b/fast64_internal/z64/exporter/skeleton/functions.py
@@ -5,8 +5,8 @@ import os
 from pathlib import Path
 from ....f3d.f3d_gbi import DLFormat, FMesh, TextureExportSettings, ScrollMethod
 from ....f3d.f3d_writer import getInfoDict
-from ...oot_f3d_writer import ootProcessVertexGroup, writeTextureArraysNew, writeTextureArraysExisting
-from ...oot_model_classes import OOTModel, OOTGfxFormatter
+from ...f3d_writer import ootProcessVertexGroup, writeTextureArraysNew, writeTextureArraysExisting
+from ...model_classes import OOTModel, OOTGfxFormatter
 from ...skeleton.constants import ootSkeletonImportDict
 from ...skeleton.properties import OOTSkeletonExportSettings
 from ...skeleton.utility import ootDuplicateArmatureAndRemoveRotations, getGroupIndices, ootRemoveSkeleton
@@ -21,7 +21,7 @@ from ....utility import (
     cleanupDuplicatedObjects,
 )
 
-from ...oot_utility import (
+from ...utility import (
     checkEmptyName,
     checkForStartBone,
     getStartBone,
diff --git a/fast64_internal/oot/exporter/utility.py b/fast64_internal/z64/exporter/utility.py
similarity index 98%
rename from fast64_internal/oot/exporter/utility.py
rename to fast64_internal/z64/exporter/utility.py
index 16a7659..297803b 100644
--- a/fast64_internal/oot/exporter/utility.py
+++ b/fast64_internal/z64/exporter/utility.py
@@ -2,7 +2,7 @@ from math import radians
 from mathutils import Quaternion, Matrix
 from bpy.types import Object
 from ...utility import PluginError, indent
-from ..oot_utility import ootConvertTranslation, ootConvertRotation
+from ..utility import ootConvertTranslation, ootConvertRotation
 from ..actor.properties import OOTActorHeaderProperty
 
 
diff --git a/fast64_internal/oot/f3d/operators.py b/fast64_internal/z64/f3d/operators.py
similarity index 95%
rename from fast64_internal/oot/f3d/operators.py
rename to fast64_internal/z64/f3d/operators.py
index 1345d4a..5ac84db 100644
--- a/fast64_internal/oot/f3d/operators.py
+++ b/fast64_internal/z64/f3d/operators.py
@@ -11,14 +11,14 @@ from ...utility import CData, PluginError, raisePluginError, writeCData, toAlnum
 from ...f3d.f3d_parser import importMeshC, getImportData
 from ...f3d.f3d_gbi import DLFormat, F3D, TextureExportSettings, ScrollMethod, get_F3D_GBI
 from ...f3d.f3d_writer import TriangleConverterInfo, removeDL, saveStaticModel, getInfoDict
-from ..oot_utility import ootGetObjectPath, ootGetObjectHeaderPath, getOOTScale
-from ..oot_model_classes import OOTF3DContext, ootGetIncludedAssetData
-from ..oot_texture_array import ootReadTextureArrays
-from ..oot_model_classes import OOTModel, OOTGfxFormatter
-from ..oot_f3d_writer import ootReadActorScale, writeTextureArraysNew, writeTextureArraysExisting
+from ..utility import ootGetObjectPath, ootGetObjectHeaderPath, getOOTScale
+from ..model_classes import OOTF3DContext, ootGetIncludedAssetData
+from ..texture_array import ootReadTextureArrays
+from ..model_classes import OOTModel, OOTGfxFormatter
+from ..f3d_writer import ootReadActorScale, writeTextureArraysNew, writeTextureArraysExisting
 from .properties import OOTDLImportSettings, OOTDLExportSettings
 
-from ..oot_utility import (
+from ..utility import (
     OOTObjectCategorizer,
     ootDuplicateHierarchy,
     ootCleanupScene,
diff --git a/fast64_internal/oot/f3d/panels.py b/fast64_internal/z64/f3d/panels.py
similarity index 100%
rename from fast64_internal/oot/f3d/panels.py
rename to fast64_internal/z64/f3d/panels.py
diff --git a/fast64_internal/oot/f3d/properties.py b/fast64_internal/z64/f3d/properties.py
similarity index 100%
rename from fast64_internal/oot/f3d/properties.py
rename to fast64_internal/z64/f3d/properties.py
diff --git a/fast64_internal/oot/oot_f3d_writer.py b/fast64_internal/z64/f3d_writer.py
similarity index 98%
rename from fast64_internal/oot/oot_f3d_writer.py
rename to fast64_internal/z64/f3d_writer.py
index baaffe8..99385cb 100644
--- a/fast64_internal/oot/oot_f3d_writer.py
+++ b/fast64_internal/z64/f3d_writer.py
@@ -7,8 +7,8 @@ from typing import Optional
 from ..utility import CData, getGroupIndexFromname, readFile, writeFile
 from ..f3d.flipbook import flipbook_to_c, flipbook_2d_to_c, flipbook_data_to_c
 from ..f3d.f3d_material import createF3DMat, F3DMaterial_UpdateLock, update_preset_manual
-from .oot_utility import replaceMatchContent, getOOTScale
-from .oot_texture_array import TextureFlipbook
+from .utility import replaceMatchContent, getOOTScale
+from .texture_array import TextureFlipbook
 
 from ..f3d.f3d_writer import (
     checkForF3dMaterialInFaces,
@@ -17,7 +17,7 @@ from ..f3d.f3d_writer import (
     saveMeshByFaces,
 )
 
-from .oot_model_classes import (
+from .model_classes import (
     OOTTriangleConverterInfo,
     OOTModel,
     ootGetActorData,
diff --git a/fast64_internal/oot/file_settings.py b/fast64_internal/z64/file_settings.py
similarity index 100%
rename from fast64_internal/oot/file_settings.py
rename to fast64_internal/z64/file_settings.py
diff --git a/fast64_internal/oot/importer/__init__.py b/fast64_internal/z64/importer/__init__.py
similarity index 100%
rename from fast64_internal/oot/importer/__init__.py
rename to fast64_internal/z64/importer/__init__.py
diff --git a/fast64_internal/oot/importer/actor.py b/fast64_internal/z64/importer/actor.py
similarity index 98%
rename from fast64_internal/oot/importer/actor.py
rename to fast64_internal/z64/importer/actor.py
index e91201a..bd00ede 100644
--- a/fast64_internal/oot/importer/actor.py
+++ b/fast64_internal/z64/importer/actor.py
@@ -4,8 +4,8 @@ import bpy
 from ...utility import parentObject, hexOrDecInt
 from ..exporter.scene.actors import SceneTransitionActors
 from ..scene.properties import OOTSceneHeaderProperty
-from ..oot_utility import setCustomProperty, getEvalParams, getEvalParamsInt
-from ..oot_constants import ootEnumCamTransition, ootData
+from ..utility import setCustomProperty, getEvalParams, getEvalParamsInt
+from ..constants import ootEnumCamTransition, ootData
 from .classes import SharedSceneData
 from .constants import actorsWithRotAsParam
 
diff --git a/fast64_internal/oot/importer/classes.py b/fast64_internal/z64/importer/classes.py
similarity index 98%
rename from fast64_internal/oot/importer/classes.py
rename to fast64_internal/z64/importer/classes.py
index bf26d60..37927dc 100644
--- a/fast64_internal/oot/importer/classes.py
+++ b/fast64_internal/z64/importer/classes.py
@@ -1,5 +1,5 @@
 from ...utility import PluginError
-from ..oot_utility import getHeaderSettings
+from ..utility import getHeaderSettings
 from .constants import headerNames
 
 
diff --git a/fast64_internal/oot/importer/constants.py b/fast64_internal/z64/importer/constants.py
similarity index 100%
rename from fast64_internal/oot/importer/constants.py
rename to fast64_internal/z64/importer/constants.py
diff --git a/fast64_internal/oot/importer/room_header.py b/fast64_internal/z64/importer/room_header.py
similarity index 97%
rename from fast64_internal/oot/importer/room_header.py
rename to fast64_internal/z64/importer/room_header.py
index 8c8d214..71f2d4d 100644
--- a/fast64_internal/oot/importer/room_header.py
+++ b/fast64_internal/z64/importer/room_header.py
@@ -4,10 +4,10 @@ import re
 from pathlib import Path
 
 from ...utility import PluginError, hexOrDecInt
-from ..oot_utility import setCustomProperty
-from ..oot_model_classes import OOTF3DContext
+from ..utility import setCustomProperty
+from ..model_classes import OOTF3DContext
 from ..room.properties import OOTRoomHeaderProperty
-from ..oot_constants import ootData, ootEnumLinkIdle, ootEnumRoomBehaviour
+from ..constants import ootData, ootEnumLinkIdle, ootEnumRoomBehaviour
 from .utility import getDataMatch, stripName, parse_commands_data
 from .classes import SharedSceneData
 from .constants import headerNames
diff --git a/fast64_internal/oot/importer/room_shape.py b/fast64_internal/z64/importer/room_shape.py
similarity index 98%
rename from fast64_internal/oot/importer/room_shape.py
rename to fast64_internal/z64/importer/room_shape.py
index 5e117d9..58a1bd5 100644
--- a/fast64_internal/oot/importer/room_shape.py
+++ b/fast64_internal/z64/importer/room_shape.py
@@ -5,9 +5,9 @@ import mathutils
 
 from ...utility import parentObject, hexOrDecInt, yUpToZUp
 from ...f3d.f3d_parser import importMeshC
-from ..oot_model_classes import OOTF3DContext
+from ..model_classes import OOTF3DContext
 from ..room.properties import OOTRoomHeaderProperty
-from ..oot_constants import ootEnumRoomShapeType
+from ..constants import ootEnumRoomShapeType
 from .classes import SharedSceneData
 from .utility import getDataMatch, stripName
 
diff --git a/fast64_internal/oot/importer/scene.py b/fast64_internal/z64/importer/scene.py
similarity index 98%
rename from fast64_internal/oot/importer/scene.py
rename to fast64_internal/z64/importer/scene.py
index f330376..d4270c5 100644
--- a/fast64_internal/oot/importer/scene.py
+++ b/fast64_internal/z64/importer/scene.py
@@ -9,15 +9,15 @@ from ...utility import PluginError, readFile, hexOrDecInt
 from ...f3d.f3d_parser import parseMatrices
 from ...f3d.f3d_gbi import get_F3D_GBI
 from ...f3d.flipbook import TextureFlipbook
-from ..oot_model_classes import OOTF3DContext
+from ..model_classes import OOTF3DContext
 from ..exporter.decomp_edit.scene_table import SceneTableUtility
 from ..scene.properties import OOTImportSceneSettingsProperty
-from ..oot_constants import ootEnumDrawConfig
+from ..constants import ootEnumDrawConfig
 from ..cutscene.importer import importCutsceneData
 from .scene_header import parseSceneCommands
 from .classes import SharedSceneData
 
-from ..oot_utility import (
+from ..utility import (
     getSceneDirFromLevelName,
     setCustomProperty,
     sceneNameFromID,
diff --git a/fast64_internal/oot/importer/scene_collision.py b/fast64_internal/z64/importer/scene_collision.py
similarity index 99%
rename from fast64_internal/oot/importer/scene_collision.py
rename to fast64_internal/z64/importer/scene_collision.py
index 508a3a6..e0a7184 100644
--- a/fast64_internal/oot/importer/scene_collision.py
+++ b/fast64_internal/z64/importer/scene_collision.py
@@ -11,8 +11,8 @@ from ..exporter.collision.surface import SurfaceType
 from ..exporter.collision.polygons import CollisionPoly
 from ..exporter.collision.waterbox import WaterBox
 from ..collision.properties import OOTMaterialCollisionProperty
-from ..oot_f3d_writer import getColliderMat
-from ..oot_utility import setCustomProperty, ootParseRotation
+from ..f3d_writer import getColliderMat
+from ..utility import setCustomProperty, ootParseRotation
 from .utility import getDataMatch, getBits, checkBit, createCurveFromPoints, stripName
 from .classes import SharedSceneData
 
diff --git a/fast64_internal/oot/importer/scene_header.py b/fast64_internal/z64/importer/scene_header.py
similarity index 99%
rename from fast64_internal/oot/importer/scene_header.py
rename to fast64_internal/z64/importer/scene_header.py
index e23480f..052875e 100644
--- a/fast64_internal/oot/importer/scene_header.py
+++ b/fast64_internal/z64/importer/scene_header.py
@@ -10,9 +10,9 @@ from typing import Optional
 from ...utility import PluginError, readFile, parentObject, hexOrDecInt, gammaInverse
 from ...f3d.f3d_parser import parseMatrices
 from ..exporter.scene.general import EnvLightSettings
-from ..oot_model_classes import OOTF3DContext
+from ..model_classes import OOTF3DContext
 from ..scene.properties import OOTSceneHeaderProperty, OOTLightProperty
-from ..oot_utility import getEvalParams, setCustomProperty
+from ..utility import getEvalParams, setCustomProperty
 from .constants import headerNames
 from .utility import getDataMatch, stripName, parse_commands_data
 from .classes import SharedSceneData
@@ -21,7 +21,7 @@ from .actor import parseTransActorList, parseSpawnList, parseEntranceList
 from .scene_collision import parseCollisionHeader
 from .scene_pathways import parsePathList
 
-from ..oot_constants import (
+from ..constants import (
     ootEnumAudioSessionPreset,
     ootEnumNightSeq,
     ootEnumMusicSeq,
diff --git a/fast64_internal/oot/importer/scene_pathways.py b/fast64_internal/z64/importer/scene_pathways.py
similarity index 100%
rename from fast64_internal/oot/importer/scene_pathways.py
rename to fast64_internal/z64/importer/scene_pathways.py
diff --git a/fast64_internal/oot/importer/utility.py b/fast64_internal/z64/importer/utility.py
similarity index 99%
rename from fast64_internal/oot/importer/utility.py
rename to fast64_internal/z64/importer/utility.py
index be817b5..d409a87 100644
--- a/fast64_internal/oot/importer/utility.py
+++ b/fast64_internal/z64/importer/utility.py
@@ -6,7 +6,7 @@ from pathlib import Path
 
 from ...utility import PluginError, hexOrDecInt, removeComments, get_include_data, yUpToZUp
 from ..actor.properties import OOTActorProperty, OOTActorHeaderProperty
-from ..oot_utility import ootParseRotation
+from ..utility import ootParseRotation
 from .constants import headerNames, actorsWithRotAsParam
 from .classes import SharedSceneData
 
diff --git a/fast64_internal/oot/oot_model_classes.py b/fast64_internal/z64/model_classes.py
similarity index 100%
rename from fast64_internal/oot/oot_model_classes.py
rename to fast64_internal/z64/model_classes.py
diff --git a/fast64_internal/oot/oot_object.py b/fast64_internal/z64/object.py
similarity index 98%
rename from fast64_internal/oot/oot_object.py
rename to fast64_internal/z64/object.py
index 3b36b5c..3a60317 100644
--- a/fast64_internal/oot/oot_object.py
+++ b/fast64_internal/z64/object.py
@@ -1,6 +1,6 @@
 from bpy.types import Object
 from ..utility import ootGetSceneOrRoomHeader
-from .oot_constants import ootData
+from .constants import ootData
 from .exporter.room.header import RoomHeader
 
 
diff --git a/fast64_internal/oot/props_panel_main.py b/fast64_internal/z64/props_panel_main.py
similarity index 99%
rename from fast64_internal/oot/props_panel_main.py
rename to fast64_internal/z64/props_panel_main.py
index 331a54d..1c7a5ec 100644
--- a/fast64_internal/oot/props_panel_main.py
+++ b/fast64_internal/z64/props_panel_main.py
@@ -1,7 +1,7 @@
 import bpy
 from bpy.utils import register_class, unregister_class
 from ..utility import prop_split, gammaInverse
-from .oot_utility import getSceneObj, getRoomObj
+from .utility import getSceneObj, getRoomObj
 from .scene.properties import OOTSceneProperties
 from .room.properties import OOTObjectProperty, OOTRoomHeaderProperty, OOTAlternateRoomHeaderProperty
 from .collision.properties import OOTWaterBoxProperty
diff --git a/fast64_internal/oot/room/operators.py b/fast64_internal/z64/room/operators.py
similarity index 97%
rename from fast64_internal/oot/room/operators.py
rename to fast64_internal/z64/room/operators.py
index 954f2ee..3ab7da2 100644
--- a/fast64_internal/oot/room/operators.py
+++ b/fast64_internal/z64/room/operators.py
@@ -3,7 +3,7 @@ from bpy.types import Operator
 from bpy.utils import register_class, unregister_class
 from bpy.props import EnumProperty, IntProperty, StringProperty
 from ...utility import ootGetSceneOrRoomHeader
-from ..oot_constants import ootData
+from ..constants import ootData
 
 
 class OOT_SearchObjectEnumOperator(Operator):
diff --git a/fast64_internal/oot/room/properties.py b/fast64_internal/z64/room/properties.py
similarity index 98%
rename from fast64_internal/oot/room/properties.py
rename to fast64_internal/z64/room/properties.py
index 733b2b3..cf41121 100644
--- a/fast64_internal/oot/room/properties.py
+++ b/fast64_internal/z64/room/properties.py
@@ -3,8 +3,8 @@ from bpy.types import PropertyGroup, UILayout, Image, Object
 from bpy.utils import register_class, unregister_class
 from ...utility import prop_split
 from ..collection_utility import drawCollectionOps, drawAddButton
-from ..oot_utility import onMenuTabChange, onHeaderMenuTabChange, drawEnumWithCustom
-from ..oot_upgrade import upgradeRoomHeaders
+from ..utility import onMenuTabChange, onHeaderMenuTabChange, drawEnumWithCustom
+from ..upgrade import upgradeRoomHeaders
 from .operators import OOT_SearchObjectEnumOperator
 
 from bpy.props import (
@@ -18,7 +18,7 @@ from bpy.props import (
     IntVectorProperty,
 )
 
-from ..oot_constants import (
+from ..constants import (
     ootData,
     ootEnumRoomBehaviour,
     ootEnumLinkIdle,
diff --git a/fast64_internal/oot/scene/operators.py b/fast64_internal/z64/scene/operators.py
similarity index 98%
rename from fast64_internal/oot/scene/operators.py
rename to fast64_internal/z64/scene/operators.py
index 72e8b19..4b18692 100644
--- a/fast64_internal/oot/scene/operators.py
+++ b/fast64_internal/z64/scene/operators.py
@@ -9,8 +9,8 @@ from bpy.ops import object
 from mathutils import Matrix, Vector
 from ...f3d.f3d_gbi import TextureExportSettings, DLFormat
 from ...utility import PluginError, raisePluginError, ootGetSceneOrRoomHeader
-from ..oot_utility import ExportInfo, RemoveInfo, sceneNameFromID
-from ..oot_constants import ootEnumMusicSeq, ootEnumSceneID
+from ..utility import ExportInfo, RemoveInfo, sceneNameFromID
+from ..constants import ootEnumMusicSeq, ootEnumSceneID
 from ..importer import parseScene
 from ..exporter.decomp_edit.config import Config
 from ..exporter import SceneExport, Files
diff --git a/fast64_internal/oot/scene/panels.py b/fast64_internal/z64/scene/panels.py
similarity index 97%
rename from fast64_internal/oot/scene/panels.py
rename to fast64_internal/z64/scene/panels.py
index 009c427..a6a2c5a 100644
--- a/fast64_internal/oot/scene/panels.py
+++ b/fast64_internal/z64/scene/panels.py
@@ -4,8 +4,8 @@ import os
 from bpy.types import UILayout
 from bpy.utils import register_class, unregister_class
 from ...panels import OOT_Panel
-from ..oot_constants import ootEnumSceneID
-from ..oot_utility import getEnumName
+from ..constants import ootEnumSceneID
+from ..utility import getEnumName
 from .properties import (
     OOTExportSceneSettingsProperty,
     OOTImportSceneSettingsProperty,
diff --git a/fast64_internal/oot/scene/properties.py b/fast64_internal/z64/scene/properties.py
similarity index 99%
rename from fast64_internal/oot/scene/properties.py
rename to fast64_internal/z64/scene/properties.py
index b530e3b..08f144c 100644
--- a/fast64_internal/oot/scene/properties.py
+++ b/fast64_internal/z64/scene/properties.py
@@ -14,9 +14,9 @@ from ...render_settings import on_update_oot_render_settings
 from ...utility import prop_split, customExportWarning
 from ..cutscene.constants import ootEnumCSWriteType
 from ..collection_utility import drawCollectionOps, drawAddButton
-from ..oot_utility import onMenuTabChange, onHeaderMenuTabChange, drawEnumWithCustom
+from ..utility import onMenuTabChange, onHeaderMenuTabChange, drawEnumWithCustom
 
-from ..oot_constants import (
+from ..constants import (
     ootEnumMusicSeq,
     ootEnumSceneID,
     ootEnumGlobalObject,
diff --git a/fast64_internal/oot/skeleton/constants.py b/fast64_internal/z64/skeleton/constants.py
similarity index 100%
rename from fast64_internal/oot/skeleton/constants.py
rename to fast64_internal/z64/skeleton/constants.py
diff --git a/fast64_internal/oot/skeleton/importer/__init__.py b/fast64_internal/z64/skeleton/importer/__init__.py
similarity index 100%
rename from fast64_internal/oot/skeleton/importer/__init__.py
rename to fast64_internal/z64/skeleton/importer/__init__.py
diff --git a/fast64_internal/oot/skeleton/importer/functions.py b/fast64_internal/z64/skeleton/importer/functions.py
similarity index 97%
rename from fast64_internal/oot/skeleton/importer/functions.py
rename to fast64_internal/z64/skeleton/importer/functions.py
index ca2c3e5..9e973e9 100644
--- a/fast64_internal/oot/skeleton/importer/functions.py
+++ b/fast64_internal/z64/skeleton/importer/functions.py
@@ -17,10 +17,10 @@ from ....utility import (
     get_include_data,
     removeComments,
 )
-from ...oot_f3d_writer import ootReadActorScale
-from ...oot_model_classes import OOTF3DContext, ootGetIncludedAssetData
-from ...oot_utility import OOTEnum, ootGetObjectPath, getOOTScale, ootGetObjectHeaderPath, ootGetEnums, ootStripComments
-from ...oot_texture_array import ootReadTextureArrays
+from ...f3d_writer import ootReadActorScale
+from ...model_classes import OOTF3DContext, ootGetIncludedAssetData
+from ...utility import OOTEnum, ootGetObjectPath, getOOTScale, ootGetObjectHeaderPath, ootGetEnums, ootStripComments
+from ...texture_array import ootReadTextureArrays
 from ..constants import ootSkeletonImportDict
 from ..properties import OOTSkeletonImportSettings
 from ..utility import ootGetLimb, ootGetLimbs, ootGetSkeleton, applySkeletonRestPose
diff --git a/fast64_internal/oot/skeleton/operators.py b/fast64_internal/z64/skeleton/operators.py
similarity index 98%
rename from fast64_internal/oot/skeleton/operators.py
rename to fast64_internal/z64/skeleton/operators.py
index 5ff23f9..5cdef01 100644
--- a/fast64_internal/oot/skeleton/operators.py
+++ b/fast64_internal/z64/skeleton/operators.py
@@ -5,7 +5,7 @@ from bpy.path import abspath
 from mathutils import Matrix
 from ...f3d.f3d_gbi import DLFormat
 from ...utility import PluginError, raisePluginError
-from ..oot_utility import getStartBone, getNextBone, getOOTScale
+from ..utility import getStartBone, getNextBone, getOOTScale
 from ..exporter.skeleton import ootConvertArmatureToC
 from .importer import ootImportSkeletonC
 from .properties import OOTSkeletonImportSettings, OOTSkeletonExportSettings
diff --git a/fast64_internal/oot/skeleton/panels.py b/fast64_internal/z64/skeleton/panels.py
similarity index 100%
rename from fast64_internal/oot/skeleton/panels.py
rename to fast64_internal/z64/skeleton/panels.py
diff --git a/fast64_internal/oot/skeleton/properties.py b/fast64_internal/z64/skeleton/properties.py
similarity index 100%
rename from fast64_internal/oot/skeleton/properties.py
rename to fast64_internal/z64/skeleton/properties.py
diff --git a/fast64_internal/oot/skeleton/utility.py b/fast64_internal/z64/skeleton/utility.py
similarity index 98%
rename from fast64_internal/oot/skeleton/utility.py
rename to fast64_internal/z64/skeleton/utility.py
index a994ac0..28da2c9 100644
--- a/fast64_internal/oot/skeleton/utility.py
+++ b/fast64_internal/z64/skeleton/utility.py
@@ -1,7 +1,7 @@
 import mathutils, bpy, os, re
 from ...utility_anim import armatureApplyWithMesh
-from ..oot_model_classes import OOTVertexGroupInfo
-from ..oot_utility import checkForStartBone, getStartBone, getNextBone, ootStripComments
+from ..model_classes import OOTVertexGroupInfo
+from ..utility import checkForStartBone, getStartBone, getNextBone, ootStripComments
 
 from ...utility import (
     PluginError,
diff --git a/fast64_internal/oot/spline/panels.py b/fast64_internal/z64/spline/panels.py
similarity index 96%
rename from fast64_internal/oot/spline/panels.py
rename to fast64_internal/z64/spline/panels.py
index e899b30..6c2159e 100644
--- a/fast64_internal/oot/spline/panels.py
+++ b/fast64_internal/z64/spline/panels.py
@@ -1,7 +1,7 @@
 from bpy.types import Panel, Curve
 from bpy.utils import register_class, unregister_class
 from ...utility import prop_split
-from ..oot_utility import getSceneObj, drawEnumWithCustom
+from ..utility import getSceneObj, drawEnumWithCustom
 from ..actor.properties import OOTActorHeaderProperty
 from .properties import OOTSplineProperty
 
diff --git a/fast64_internal/oot/spline/properties.py b/fast64_internal/z64/spline/properties.py
similarity index 97%
rename from fast64_internal/oot/spline/properties.py
rename to fast64_internal/z64/spline/properties.py
index b0c32f2..cd5d2a2 100644
--- a/fast64_internal/oot/spline/properties.py
+++ b/fast64_internal/z64/spline/properties.py
@@ -2,7 +2,7 @@ from bpy.types import PropertyGroup, Object, UILayout
 from bpy.props import EnumProperty, PointerProperty, StringProperty, IntProperty
 from bpy.utils import register_class, unregister_class
 from ...utility import prop_split
-from ..oot_utility import drawEnumWithCustom
+from ..utility import drawEnumWithCustom
 from ..collision.constants import ootEnumCameraCrawlspaceSType
 from ..actor.properties import OOTActorHeaderProperty
 from ..scene.properties import OOTAlternateSceneHeaderProperty
diff --git a/fast64_internal/oot/oot_texture_array.py b/fast64_internal/z64/texture_array.py
similarity index 99%
rename from fast64_internal/oot/oot_texture_array.py
rename to fast64_internal/z64/texture_array.py
index 8803312..ad3f567 100644
--- a/fast64_internal/oot/oot_texture_array.py
+++ b/fast64_internal/z64/texture_array.py
@@ -2,7 +2,7 @@ import os, re
 from typing import Callable
 from ..utility import hexOrDecInt
 
-from .oot_model_classes import (
+from .model_classes import (
     OOTF3DContext,
     TextureFlipbook,
     ootGetActorData,
diff --git a/fast64_internal/oot/tools/__init__.py b/fast64_internal/z64/tools/__init__.py
similarity index 100%
rename from fast64_internal/oot/tools/__init__.py
rename to fast64_internal/z64/tools/__init__.py
diff --git a/fast64_internal/oot/tools/operators.py b/fast64_internal/z64/tools/operators.py
similarity index 99%
rename from fast64_internal/oot/tools/operators.py
rename to fast64_internal/z64/tools/operators.py
index a5db2cd..44ef213 100644
--- a/fast64_internal/oot/tools/operators.py
+++ b/fast64_internal/z64/tools/operators.py
@@ -7,7 +7,7 @@ from bpy.props import FloatProperty, StringProperty, EnumProperty, BoolProperty
 from ...operators import AddWaterBox, addMaterialByName
 from ...utility import parentObject, setOrigin
 from ..cutscene.motion.utility import setupCutscene, createNewCameraShot
-from ..oot_utility import getNewPath
+from ..utility import getNewPath
 from .quick_import import QuickImportAborted, quick_import_exec
 
 
diff --git a/fast64_internal/oot/tools/panel.py b/fast64_internal/z64/tools/panel.py
similarity index 100%
rename from fast64_internal/oot/tools/panel.py
rename to fast64_internal/z64/tools/panel.py
diff --git a/fast64_internal/oot/tools/quick_import.py b/fast64_internal/z64/tools/quick_import.py
similarity index 100%
rename from fast64_internal/oot/tools/quick_import.py
rename to fast64_internal/z64/tools/quick_import.py
diff --git a/fast64_internal/oot/oot_upgrade.py b/fast64_internal/z64/upgrade.py
similarity index 99%
rename from fast64_internal/oot/oot_upgrade.py
rename to fast64_internal/z64/upgrade.py
index d575615..c92d93f 100644
--- a/fast64_internal/oot/oot_upgrade.py
+++ b/fast64_internal/z64/upgrade.py
@@ -6,8 +6,8 @@ import bpy
 from bpy.types import Object, CollectionProperty
 from ..utility import PluginError
 from .data import OoT_ObjectData
-from .oot_utility import getEvalParams, get_actor_prop_from_obj
-from .oot_constants import ootData
+from .utility import getEvalParams, get_actor_prop_from_obj
+from .constants import ootData
 from .cutscene.constants import ootEnumCSMotionCamMode
 
 if TYPE_CHECKING:
diff --git a/fast64_internal/oot/oot_utility.py b/fast64_internal/z64/utility.py
similarity index 99%
rename from fast64_internal/oot/oot_utility.py
rename to fast64_internal/z64/utility.py
index c4fbc12..c1d411e 100644
--- a/fast64_internal/oot/oot_utility.py
+++ b/fast64_internal/z64/utility.py
@@ -8,7 +8,7 @@ from ast import parse, Expression, Constant, UnaryOp, USub, Invert, BinOp
 from mathutils import Vector
 from bpy.types import Object
 from typing import Callable, Optional, TYPE_CHECKING, List
-from .oot_constants import ootSceneIDToName
+from .constants import ootSceneIDToName
 from dataclasses import dataclass
 
 from ..utility import (