Rename projects (LostArtefacts#654)

Part of LostArtefacts#653.
lahm86 · May 4, 2024 · ff10b3c · ff10b3c
1 parent d86b360
commit ff10b3c
Show file tree

Hide file tree

Showing 221 changed files with 12 additions and 42 deletions.
diff --git a/Deps/TRGE.Coord.dll b/Deps/TRGE.Coord.dll
diff --git a/ModelExport/ModelExport.csproj b/ModelExport/ModelExport.csproj
@@ -9,8 +9,8 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\TRDataControl\TRDataControl.csproj" />
+    <ProjectReference Include="..\TRImageControl\TRImageControl.csproj" />
     <ProjectReference Include="..\TRLevelControl\TRLevelControl.csproj" />
-    <ProjectReference Include="..\TRModelTransporter\TRModelTransporter.csproj" />
-    <ProjectReference Include="..\TRTexture16Importer\TRTexture16Importer.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...ransporter/Data/ITransportDataProvider.cs → TRDataControl/Data/ITransportDataProvider.cs b/...ransporter/Data/ITransportDataProvider.cs → TRDataControl/Data/ITransportDataProvider.cs
diff --git a/...ransporter/Data/TR1DefaultDataProvider.cs → TRDataControl/Data/TR1DefaultDataProvider.cs b/...ransporter/Data/TR1DefaultDataProvider.cs → TRDataControl/Data/TR1DefaultDataProvider.cs
diff --git a/...ransporter/Data/TR2DefaultDataProvider.cs → TRDataControl/Data/TR2DefaultDataProvider.cs b/...ransporter/Data/TR2DefaultDataProvider.cs → TRDataControl/Data/TR2DefaultDataProvider.cs
diff --git a/...ransporter/Data/TR3DefaultDataProvider.cs → TRDataControl/Data/TR3DefaultDataProvider.cs b/...ransporter/Data/TR3DefaultDataProvider.cs → TRDataControl/Data/TR3DefaultDataProvider.cs
diff --git a/TREnvironmentEditor/EMEditorMapping.cs → TRDataControl/Environment/EMEditorMapping.cs b/TREnvironmentEditor/EMEditorMapping.cs → TRDataControl/Environment/EMEditorMapping.cs
diff --git a/TREnvironmentEditor/Helpers/EMDirection.cs → ...ontrol/Environment/Helpers/EMDirection.cs b/TREnvironmentEditor/Helpers/EMDirection.cs → ...ontrol/Environment/Helpers/EMDirection.cs
diff --git a/...vironmentEditor/Helpers/EMEntityFinder.cs → ...rol/Environment/Helpers/EMEntityFinder.cs b/...vironmentEditor/Helpers/EMEntityFinder.cs → ...rol/Environment/Helpers/EMEntityFinder.cs
diff --git a/TREnvironmentEditor/Helpers/EMEntityType.cs → ...ntrol/Environment/Helpers/EMEntityType.cs b/TREnvironmentEditor/Helpers/EMEntityType.cs → ...ntrol/Environment/Helpers/EMEntityType.cs
diff --git a/...ironmentEditor/Helpers/EMExclusionMode.cs → ...ol/Environment/Helpers/EMExclusionMode.cs b/...ironmentEditor/Helpers/EMExclusionMode.cs → ...ol/Environment/Helpers/EMExclusionMode.cs
diff --git a/TREnvironmentEditor/Helpers/EMLevelData.cs → ...ontrol/Environment/Helpers/EMLevelData.cs b/TREnvironmentEditor/Helpers/EMLevelData.cs → ...ontrol/Environment/Helpers/EMLevelData.cs
diff --git a/TREnvironmentEditor/Helpers/EMLocation.cs → ...Control/Environment/Helpers/EMLocation.cs b/TREnvironmentEditor/Helpers/EMLocation.cs → ...Control/Environment/Helpers/EMLocation.cs
diff --git a/...nmentEditor/Helpers/EMLocationExpander.cs → ...Environment/Helpers/EMLocationExpander.cs b/...nmentEditor/Helpers/EMLocationExpander.cs → ...Environment/Helpers/EMLocationExpander.cs
diff --git a/...mentEditor/Helpers/EMLocationUtilities.cs → ...nvironment/Helpers/EMLocationUtilities.cs b/...mentEditor/Helpers/EMLocationUtilities.cs → ...nvironment/Helpers/EMLocationUtilities.cs
diff --git a/...onmentEditor/Helpers/EMMeshTextureData.cs → .../Environment/Helpers/EMMeshTextureData.cs b/...onmentEditor/Helpers/EMMeshTextureData.cs → .../Environment/Helpers/EMMeshTextureData.cs
diff --git a/TREnvironmentEditor/Helpers/EMOptions.cs → ...aControl/Environment/Helpers/EMOptions.cs b/TREnvironmentEditor/Helpers/EMOptions.cs → ...aControl/Environment/Helpers/EMOptions.cs
diff --git a/...ronmentEditor/Helpers/EMRoomDefinition.cs → ...l/Environment/Helpers/EMRoomDefinition.cs b/...ronmentEditor/Helpers/EMRoomDefinition.cs → ...l/Environment/Helpers/EMRoomDefinition.cs
diff --git a/TREnvironmentEditor/Helpers/EMRoomLight.cs → ...ontrol/Environment/Helpers/EMRoomLight.cs b/TREnvironmentEditor/Helpers/EMRoomLight.cs → ...ontrol/Environment/Helpers/EMRoomLight.cs
diff --git a/TREnvironmentEditor/Helpers/EMRoomVertex.cs → ...ntrol/Environment/Helpers/EMRoomVertex.cs b/TREnvironmentEditor/Helpers/EMRoomVertex.cs → ...ntrol/Environment/Helpers/EMRoomVertex.cs
diff --git a/TREnvironmentEditor/Helpers/EMTag.cs → TRDataControl/Environment/Helpers/EMTag.cs b/TREnvironmentEditor/Helpers/EMTag.cs → TRDataControl/Environment/Helpers/EMTag.cs
diff --git a/...vironmentEditor/Helpers/EMTextureGroup.cs → ...rol/Environment/Helpers/EMTextureGroup.cs b/...vironmentEditor/Helpers/EMTextureGroup.cs → ...rol/Environment/Helpers/EMTextureGroup.cs
diff --git a/TREnvironmentEditor/Helpers/EMTextureMap.cs → ...ntrol/Environment/Helpers/EMTextureMap.cs b/TREnvironmentEditor/Helpers/EMTextureMap.cs → ...ntrol/Environment/Helpers/EMTextureMap.cs
diff --git a/TREnvironmentEditor/Helpers/EMTrigger.cs → ...aControl/Environment/Helpers/EMTrigger.cs b/TREnvironmentEditor/Helpers/EMTrigger.cs → ...aControl/Environment/Helpers/EMTrigger.cs
diff --git a/...ironmentEditor/Helpers/EMTriggerAction.cs → ...ol/Environment/Helpers/EMTriggerAction.cs b/...ironmentEditor/Helpers/EMTriggerAction.cs → ...ol/Environment/Helpers/EMTriggerAction.cs
diff --git a/...nmentEditor/Helpers/EMVisibilityPortal.cs → ...Environment/Helpers/EMVisibilityPortal.cs b/...nmentEditor/Helpers/EMVisibilityPortal.cs → ...Environment/Helpers/EMVisibilityPortal.cs
diff --git a/TREnvironmentEditor/Model/BaseEMCondition.cs → ...trol/Environment/Model/BaseEMCondition.cs b/TREnvironmentEditor/Model/BaseEMCondition.cs → ...trol/Environment/Model/BaseEMCondition.cs
diff --git a/TREnvironmentEditor/Model/BaseEMFunction.cs → ...ntrol/Environment/Model/BaseEMFunction.cs b/TREnvironmentEditor/Model/BaseEMFunction.cs → ...ntrol/Environment/Model/BaseEMFunction.cs
diff --git a/...ons/Entities/EMEntityPropertyCondition.cs → ...ons/Entities/EMEntityPropertyCondition.cs b/...ons/Entities/EMEntityPropertyCondition.cs → ...ons/Entities/EMEntityPropertyCondition.cs
diff --git a/...ditions/Entities/EMSecretRoomCondition.cs → ...ditions/Entities/EMSecretRoomCondition.cs b/...ditions/Entities/EMSecretRoomCondition.cs → ...ditions/Entities/EMSecretRoomCondition.cs
diff --git a/...nditions/Models/EMModelExistsCondition.cs → ...nditions/Models/EMModelExistsCondition.cs b/...nditions/Models/EMModelExistsCondition.cs → ...nditions/Models/EMModelExistsCondition.cs
diff --git a/...itions/Models/EMUnconditionalBirdCheck.cs → ...itions/Models/EMUnconditionalBirdCheck.cs b/...itions/Models/EMUnconditionalBirdCheck.cs → ...itions/Models/EMUnconditionalBirdCheck.cs
diff --git a/...ions/Room/EMRoomContainsWaterCondition.cs → ...ions/Room/EMRoomContainsWaterCondition.cs b/...ions/Room/EMRoomContainsWaterCondition.cs → ...ions/Room/EMRoomContainsWaterCondition.cs
diff --git a/...s/Room/EMSectorContainsSecretCondition.cs → ...s/Room/EMSectorContainsSecretCondition.cs b/...s/Room/EMSectorContainsSecretCondition.cs → ...s/Room/EMSectorContainsSecretCondition.cs
diff --git a/...onditions/Room/EMSectorIsWallCondition.cs → ...onditions/Room/EMSectorIsWallCondition.cs b/...onditions/Room/EMSectorIsWallCondition.cs → ...onditions/Room/EMSectorIsWallCondition.cs
diff --git a/TREnvironmentEditor/Model/EMConditionType.cs → ...trol/Environment/Model/EMConditionType.cs b/TREnvironmentEditor/Model/EMConditionType.cs → ...trol/Environment/Model/EMConditionType.cs
diff --git a/...entEditor/Model/EMConditionalEditorSet.cs → ...vironment/Model/EMConditionalEditorSet.cs b/...entEditor/Model/EMConditionalEditorSet.cs → ...vironment/Model/EMConditionalEditorSet.cs
diff --git a/...ntEditor/Model/EMConditionalGroupedSet.cs → ...ironment/Model/EMConditionalGroupedSet.cs b/...ntEditor/Model/EMConditionalGroupedSet.cs → ...ironment/Model/EMConditionalGroupedSet.cs
diff --git a/...tor/Model/EMConditionalSingleEditorSet.cs → ...ent/Model/EMConditionalSingleEditorSet.cs b/...tor/Model/EMConditionalSingleEditorSet.cs → ...ent/Model/EMConditionalSingleEditorSet.cs
diff --git a/...ronmentEditor/Model/EMEditorGroupedSet.cs → ...l/Environment/Model/EMEditorGroupedSet.cs b/...ronmentEditor/Model/EMEditorGroupedSet.cs → ...l/Environment/Model/EMEditorGroupedSet.cs
diff --git a/TREnvironmentEditor/Model/EMEditorSet.cs → ...aControl/Environment/Model/EMEditorSet.cs b/TREnvironmentEditor/Model/EMEditorSet.cs → ...aControl/Environment/Model/EMEditorSet.cs
diff --git a/TREnvironmentEditor/Model/EMType.cs → TRDataControl/Environment/Model/EMType.cs b/TREnvironmentEditor/Model/EMType.cs → TRDataControl/Environment/Model/EMType.cs
diff --git a/...vironmentEditor/Model/ITextureModifier.cs → ...rol/Environment/Model/ITextureModifier.cs b/...vironmentEditor/Model/ITextureModifier.cs → ...rol/Environment/Model/ITextureModifier.cs
diff --git a/...itor/Model/Types/EMPlaceholderFunction.cs → ...ment/Model/Types/EMPlaceholderFunction.cs b/...itor/Model/Types/EMPlaceholderFunction.cs → ...ment/Model/Types/EMPlaceholderFunction.cs
diff --git a/...s/Entities/BaseMoveTriggerableFunction.cs → ...s/Entities/BaseMoveTriggerableFunction.cs b/...s/Entities/BaseMoveTriggerableFunction.cs → ...s/Entities/BaseMoveTriggerableFunction.cs
diff --git a/...pes/Entities/EMAddDoppelgangerFunction.cs → ...pes/Entities/EMAddDoppelgangerFunction.cs b/...pes/Entities/EMAddDoppelgangerFunction.cs → ...pes/Entities/EMAddDoppelgangerFunction.cs
diff --git a/...del/Types/Entities/EMAddEntityFunction.cs → ...del/Types/Entities/EMAddEntityFunction.cs b/...del/Types/Entities/EMAddEntityFunction.cs → ...del/Types/Entities/EMAddEntityFunction.cs
diff --git a/...ntities/EMAdjustEntityPositionFunction.cs → ...ntities/EMAdjustEntityPositionFunction.cs b/...ntities/EMAdjustEntityPositionFunction.cs → ...ntities/EMAdjustEntityPositionFunction.cs
diff --git a/.../Types/Entities/EMConvertEnemyFunction.cs → .../Types/Entities/EMConvertEnemyFunction.cs b/.../Types/Entities/EMConvertEnemyFunction.cs → .../Types/Entities/EMConvertEnemyFunction.cs
diff --git a/...Types/Entities/EMConvertEntityFunction.cs → ...Types/Entities/EMConvertEntityFunction.cs b/...Types/Entities/EMConvertEntityFunction.cs → ...Types/Entities/EMConvertEntityFunction.cs
diff --git a/...es/Entities/EMConvertWheelDoorFunction.cs → ...es/Entities/EMConvertWheelDoorFunction.cs b/...es/Entities/EMConvertWheelDoorFunction.cs → ...es/Entities/EMConvertWheelDoorFunction.cs
diff --git a/.../Types/Entities/EMModifyEntityFunction.cs → .../Types/Entities/EMModifyEntityFunction.cs b/.../Types/Entities/EMModifyEntityFunction.cs → .../Types/Entities/EMModifyEntityFunction.cs
diff --git a/...del/Types/Entities/EMMoveEnemyFunction.cs → ...del/Types/Entities/EMMoveEnemyFunction.cs b/...del/Types/Entities/EMMoveEnemyFunction.cs → ...del/Types/Entities/EMMoveEnemyFunction.cs
diff --git a/...el/Types/Entities/EMMoveEntityFunction.cs → ...el/Types/Entities/EMMoveEntityFunction.cs b/...el/Types/Entities/EMMoveEntityFunction.cs → ...el/Types/Entities/EMMoveEntityFunction.cs
diff --git a/...el/Types/Entities/EMMovePickupFunction.cs → ...el/Types/Entities/EMMovePickupFunction.cs b/...el/Types/Entities/EMMovePickupFunction.cs → ...el/Types/Entities/EMMovePickupFunction.cs
diff --git a/...el/Types/Entities/EMMoveSecretFunction.cs → ...el/Types/Entities/EMMoveSecretFunction.cs b/...el/Types/Entities/EMMoveSecretFunction.cs → ...el/Types/Entities/EMMoveSecretFunction.cs
diff --git a/...odel/Types/Entities/EMMoveSlotFunction.cs → ...odel/Types/Entities/EMMoveSlotFunction.cs b/...odel/Types/Entities/EMMoveSlotFunction.cs → ...odel/Types/Entities/EMMoveSlotFunction.cs
diff --git a/...odel/Types/Entities/EMMoveTrapFunction.cs → ...odel/Types/Entities/EMMoveTrapFunction.cs b/...odel/Types/Entities/EMMoveTrapFunction.cs → ...odel/Types/Entities/EMMoveTrapFunction.cs
diff --git a/...es/Entities/EMSwapGroupedSlotsFunction.cs → ...es/Entities/EMSwapGroupedSlotsFunction.cs b/...es/Entities/EMSwapGroupedSlotsFunction.cs → ...es/Entities/EMSwapGroupedSlotsFunction.cs
diff --git a/...odel/Types/Entities/EMSwapSlotFunction.cs → ...odel/Types/Entities/EMSwapSlotFunction.cs b/...odel/Types/Entities/EMSwapSlotFunction.cs → ...odel/Types/Entities/EMSwapSlotFunction.cs
diff --git a/...Model/Types/Mirroring/EMMirrorFunction.cs → ...Model/Types/Mirroring/EMMirrorFunction.cs b/...Model/Types/Mirroring/EMMirrorFunction.cs → ...Model/Types/Mirroring/EMMirrorFunction.cs
diff --git a/.../Types/Mirroring/EMMirrorModelFunction.cs → .../Types/Mirroring/EMMirrorModelFunction.cs b/.../Types/Mirroring/EMMirrorModelFunction.cs → .../Types/Mirroring/EMMirrorModelFunction.cs
diff --git a/.../Types/Mirroring/EMMirrorObjectTexture.cs → .../Types/Mirroring/EMMirrorObjectTexture.cs b/.../Types/Mirroring/EMMirrorObjectTexture.cs → .../Types/Mirroring/EMMirrorObjectTexture.cs
diff --git a/...s/Mirroring/EMMirrorStaticMeshFunction.cs → ...s/Mirroring/EMMirrorStaticMeshFunction.cs b/...s/Mirroring/EMMirrorStaticMeshFunction.cs → ...s/Mirroring/EMMirrorStaticMeshFunction.cs
diff --git a/...el/Types/Models/EMConvertModelFunction.cs → ...el/Types/Models/EMConvertModelFunction.cs b/...el/Types/Models/EMConvertModelFunction.cs → ...el/Types/Models/EMConvertModelFunction.cs
diff --git a/...Models/EMConvertSpriteSequenceFunction.cs → ...Models/EMConvertSpriteSequenceFunction.cs b/...Models/EMConvertSpriteSequenceFunction.cs → ...Models/EMConvertSpriteSequenceFunction.cs
diff --git a/...es/Models/EMCopySpriteSequenceFunction.cs → ...es/Models/EMCopySpriteSequenceFunction.cs b/...es/Models/EMCopySpriteSequenceFunction.cs → ...es/Models/EMCopySpriteSequenceFunction.cs
diff --git a/...del/Types/Models/EMImportModelFunction.cs → ...del/Types/Models/EMImportModelFunction.cs b/...del/Types/Models/EMImportModelFunction.cs → ...del/Types/Models/EMImportModelFunction.cs
diff --git a/...odels/EMImportNonGraphicsModelFunction.cs → ...odels/EMImportNonGraphicsModelFunction.cs b/...odels/EMImportNonGraphicsModelFunction.cs → ...odels/EMImportNonGraphicsModelFunction.cs
diff --git a/...rtals/EMAdjustVisibilityPortalFunction.cs → ...rtals/EMAdjustVisibilityPortalFunction.cs b/...rtals/EMAdjustVisibilityPortalFunction.cs → ...rtals/EMAdjustVisibilityPortalFunction.cs
diff --git a/.../EMHorizontalCollisionalPortalFunction.cs → .../EMHorizontalCollisionalPortalFunction.cs b/.../EMHorizontalCollisionalPortalFunction.cs → .../EMHorizontalCollisionalPortalFunction.cs
diff --git a/...tals/EMRemoveCollisionalPortalFunction.cs → ...tals/EMRemoveCollisionalPortalFunction.cs b/...tals/EMRemoveCollisionalPortalFunction.cs → ...tals/EMRemoveCollisionalPortalFunction.cs
diff --git a/...als/EMReplaceCollisionalPortalFunction.cs → ...als/EMReplaceCollisionalPortalFunction.cs b/...als/EMReplaceCollisionalPortalFunction.cs → ...als/EMReplaceCollisionalPortalFunction.cs
diff --git a/...ls/EMVerticalCollisionalPortalFunction.cs → ...ls/EMVerticalCollisionalPortalFunction.cs b/...ls/EMVerticalCollisionalPortalFunction.cs → ...ls/EMVerticalCollisionalPortalFunction.cs
diff --git a/...pes/Portals/EMVisibilityPortalFunction.cs → ...pes/Portals/EMVisibilityPortalFunction.cs b/...pes/Portals/EMVisibilityPortalFunction.cs → ...pes/Portals/EMVisibilityPortalFunction.cs
diff --git a/...l/Types/Rooms/BaseEMRoomImportFunction.cs → ...l/Types/Rooms/BaseEMRoomImportFunction.cs b/...l/Types/Rooms/BaseEMRoomImportFunction.cs → ...l/Types/Rooms/BaseEMRoomImportFunction.cs
diff --git a/...r/Model/Types/Rooms/EMCopyRoomFunction.cs → ...t/Model/Types/Rooms/EMCopyRoomFunction.cs b/...r/Model/Types/Rooms/EMCopyRoomFunction.cs → ...t/Model/Types/Rooms/EMCopyRoomFunction.cs
diff --git a/...s/Rooms/EMCopyVertexAttributesFunction.cs → ...s/Rooms/EMCopyVertexAttributesFunction.cs b/...s/Rooms/EMCopyVertexAttributesFunction.cs → ...s/Rooms/EMCopyVertexAttributesFunction.cs
diff --git a/...Model/Types/Rooms/EMCreateRoomFunction.cs → ...Model/Types/Rooms/EMCreateRoomFunction.cs b/...Model/Types/Rooms/EMCreateRoomFunction.cs → ...Model/Types/Rooms/EMCreateRoomFunction.cs
diff --git a/...Model/Types/Rooms/EMCreateWallFunction.cs → ...Model/Types/Rooms/EMCreateWallFunction.cs b/...Model/Types/Rooms/EMCreateWallFunction.cs → ...Model/Types/Rooms/EMCreateWallFunction.cs
diff --git a/...el/Types/Rooms/EMGenerateLightFunction.cs → ...el/Types/Rooms/EMGenerateLightFunction.cs b/...el/Types/Rooms/EMGenerateLightFunction.cs → ...el/Types/Rooms/EMGenerateLightFunction.cs
diff --git a/...Model/Types/Rooms/EMImportRoomFunction.cs → ...Model/Types/Rooms/EMImportRoomFunction.cs b/...Model/Types/Rooms/EMImportRoomFunction.cs → ...Model/Types/Rooms/EMImportRoomFunction.cs
diff --git a/.../Model/Types/Rooms/EMLockMusicFunction.cs → .../Model/Types/Rooms/EMLockMusicFunction.cs b/.../Model/Types/Rooms/EMLockMusicFunction.cs → .../Model/Types/Rooms/EMLockMusicFunction.cs
diff --git a/...l/Types/Rooms/EMModifyOverlapsFunction.cs → ...l/Types/Rooms/EMModifyOverlapsFunction.cs b/...l/Types/Rooms/EMModifyOverlapsFunction.cs → ...l/Types/Rooms/EMModifyOverlapsFunction.cs
diff --git a/...Model/Types/Rooms/EMModifyRoomFunction.cs → ...Model/Types/Rooms/EMModifyRoomFunction.cs b/...Model/Types/Rooms/EMModifyRoomFunction.cs → ...Model/Types/Rooms/EMModifyRoomFunction.cs
diff --git a/...Model/Types/Rooms/EMMoveCameraFunction.cs → ...Model/Types/Rooms/EMMoveCameraFunction.cs b/...Model/Types/Rooms/EMMoveCameraFunction.cs → ...Model/Types/Rooms/EMMoveCameraFunction.cs
diff --git a/.../Types/Sounds/EMAddSoundSourceFunction.cs → .../Types/Sounds/EMAddSoundSourceFunction.cs b/.../Types/Sounds/EMAddSoundSourceFunction.cs → .../Types/Sounds/EMAddSoundSourceFunction.cs
diff --git a/...Types/Sounds/EMMoveSoundSourceFunction.cs → ...Types/Sounds/EMMoveSoundSourceFunction.cs b/...Types/Sounds/EMMoveSoundSourceFunction.cs → ...Types/Sounds/EMMoveSoundSourceFunction.cs
diff --git a/...pes/Sounds/EMRemoveSoundSourceFunction.cs → ...pes/Sounds/EMRemoveSoundSourceFunction.cs b/...pes/Sounds/EMRemoveSoundSourceFunction.cs → ...pes/Sounds/EMRemoveSoundSourceFunction.cs
diff --git a/...Model/Types/Surfaces/BaseWaterFunction.cs → ...Model/Types/Surfaces/BaseWaterFunction.cs b/...Model/Types/Surfaces/BaseWaterFunction.cs → ...Model/Types/Surfaces/BaseWaterFunction.cs
diff --git a/...Model/Types/Surfaces/EMCeilingFunction.cs → ...Model/Types/Surfaces/EMCeilingFunction.cs b/...Model/Types/Surfaces/EMCeilingFunction.cs → ...Model/Types/Surfaces/EMCeilingFunction.cs
diff --git a/...r/Model/Types/Surfaces/EMClickFunction.cs → ...t/Model/Types/Surfaces/EMClickFunction.cs b/...r/Model/Types/Surfaces/EMClickFunction.cs → ...t/Model/Types/Surfaces/EMClickFunction.cs
diff --git a/...r/Model/Types/Surfaces/EMDrainFunction.cs → ...t/Model/Types/Surfaces/EMDrainFunction.cs b/...r/Model/Types/Surfaces/EMDrainFunction.cs → ...t/Model/Types/Surfaces/EMDrainFunction.cs
diff --git a/...r/Model/Types/Surfaces/EMFloodFunction.cs → ...t/Model/Types/Surfaces/EMFloodFunction.cs b/...r/Model/Types/Surfaces/EMFloodFunction.cs → ...t/Model/Types/Surfaces/EMFloodFunction.cs
diff --git a/...r/Model/Types/Surfaces/EMFloorFunction.cs → ...t/Model/Types/Surfaces/EMFloorFunction.cs b/...r/Model/Types/Surfaces/EMFloorFunction.cs → ...t/Model/Types/Surfaces/EMFloorFunction.cs
diff --git a/.../Model/Types/Surfaces/EMLadderFunction.cs → .../Model/Types/Surfaces/EMLadderFunction.cs b/.../Model/Types/Surfaces/EMLadderFunction.cs → .../Model/Types/Surfaces/EMLadderFunction.cs
diff --git a/...r/Model/Types/Surfaces/EMSlantFunction.cs → ...t/Model/Types/Surfaces/EMSlantFunction.cs b/...r/Model/Types/Surfaces/EMSlantFunction.cs → ...t/Model/Types/Surfaces/EMSlantFunction.cs
diff --git a/...Model/Types/Textures/EMAddFaceFunction.cs → ...Model/Types/Textures/EMAddFaceFunction.cs b/...Model/Types/Textures/EMAddFaceFunction.cs → ...Model/Types/Textures/EMAddFaceFunction.cs
diff --git a/...Types/Textures/EMAddRoomSpriteFunction.cs → ...Types/Textures/EMAddRoomSpriteFunction.cs b/...Types/Textures/EMAddRoomSpriteFunction.cs → ...Types/Textures/EMAddRoomSpriteFunction.cs
diff --git a/...Types/Textures/EMAddStaticMeshFunction.cs → ...Types/Textures/EMAddStaticMeshFunction.cs b/...Types/Textures/EMAddStaticMeshFunction.cs → ...Types/Textures/EMAddStaticMeshFunction.cs
diff --git a/...es/Textures/EMCreateStaticMeshFunction.cs → ...es/Textures/EMCreateStaticMeshFunction.cs b/...es/Textures/EMCreateStaticMeshFunction.cs → ...es/Textures/EMCreateStaticMeshFunction.cs
diff --git a/...Types/Textures/EMCreateTextureFunction.cs → ...Types/Textures/EMCreateTextureFunction.cs b/...Types/Textures/EMCreateTextureFunction.cs → ...Types/Textures/EMCreateTextureFunction.cs
diff --git a/...Types/Textures/EMImportTextureFunction.cs → ...Types/Textures/EMImportTextureFunction.cs b/...Types/Textures/EMImportTextureFunction.cs → ...Types/Textures/EMImportTextureFunction.cs
diff --git a/...el/Types/Textures/EMModifyFaceFunction.cs → ...el/Types/Textures/EMModifyFaceFunction.cs b/...el/Types/Textures/EMModifyFaceFunction.cs → ...el/Types/Textures/EMModifyFaceFunction.cs
diff --git a/...ypes/Textures/EMMoveStaticMeshFunction.cs → ...ypes/Textures/EMMoveStaticMeshFunction.cs b/...ypes/Textures/EMMoveStaticMeshFunction.cs → ...ypes/Textures/EMMoveStaticMeshFunction.cs
diff --git a/...es/Textures/EMOverwriteTextureFunction.cs → ...es/Textures/EMOverwriteTextureFunction.cs b/...es/Textures/EMOverwriteTextureFunction.cs → ...es/Textures/EMOverwriteTextureFunction.cs
diff --git a/.../Model/Types/Textures/EMRefaceFunction.cs → .../Model/Types/Textures/EMRefaceFunction.cs b/.../Model/Types/Textures/EMRefaceFunction.cs → .../Model/Types/Textures/EMRefaceFunction.cs
diff --git a/...el/Types/Textures/EMRemoveFaceFunction.cs → ...el/Types/Textures/EMRemoveFaceFunction.cs b/...el/Types/Textures/EMRemoveFaceFunction.cs → ...el/Types/Textures/EMRemoveFaceFunction.cs
diff --git a/...es/Textures/EMRemoveStaticMeshFunction.cs → ...es/Textures/EMRemoveStaticMeshFunction.cs b/...es/Textures/EMRemoveStaticMeshFunction.cs → ...es/Textures/EMRemoveStaticMeshFunction.cs
diff --git a/...odel/Types/Textures/EMSwapFaceFunction.cs → ...odel/Types/Textures/EMSwapFaceFunction.cs b/...odel/Types/Textures/EMSwapFaceFunction.cs → ...odel/Types/Textures/EMSwapFaceFunction.cs
diff --git a/...Triggers/EMAppendTriggerActionFunction.cs → ...Triggers/EMAppendTriggerActionFunction.cs b/...Triggers/EMAppendTriggerActionFunction.cs → ...Triggers/EMAppendTriggerActionFunction.cs
diff --git a/...Types/Triggers/EMCameraTriggerFunction.cs → ...Types/Triggers/EMCameraTriggerFunction.cs b/...Types/Triggers/EMCameraTriggerFunction.cs → ...Types/Triggers/EMCameraTriggerFunction.cs
diff --git a/...ypes/Triggers/EMConvertTriggerFunction.cs → ...ypes/Triggers/EMConvertTriggerFunction.cs b/...ypes/Triggers/EMConvertTriggerFunction.cs → ...ypes/Triggers/EMConvertTriggerFunction.cs
diff --git a/...ggers/EMDuplicateSwitchTriggerFunction.cs → ...ggers/EMDuplicateSwitchTriggerFunction.cs b/...ggers/EMDuplicateSwitchTriggerFunction.cs → ...ggers/EMDuplicateSwitchTriggerFunction.cs
diff --git a/...es/Triggers/EMDuplicateTriggerFunction.cs → ...es/Triggers/EMDuplicateTriggerFunction.cs b/...es/Triggers/EMDuplicateTriggerFunction.cs → ...es/Triggers/EMDuplicateTriggerFunction.cs
diff --git a/...odel/Types/Triggers/EMKillLaraFunction.cs → ...odel/Types/Triggers/EMKillLaraFunction.cs b/...odel/Types/Triggers/EMKillLaraFunction.cs → ...odel/Types/Triggers/EMKillLaraFunction.cs
diff --git a/...Types/Triggers/EMMergeTriggersFunction.cs → ...Types/Triggers/EMMergeTriggersFunction.cs b/...Types/Triggers/EMMergeTriggersFunction.cs → ...Types/Triggers/EMMergeTriggersFunction.cs
diff --git a/...l/Types/Triggers/EMMoveTriggerFunction.cs → ...l/Types/Triggers/EMMoveTriggerFunction.cs b/...l/Types/Triggers/EMMoveTriggerFunction.cs → ...l/Types/Triggers/EMMoveTriggerFunction.cs
diff --git a/...riggers/EMRemoveEntityTriggersFunction.cs → ...riggers/EMRemoveEntityTriggersFunction.cs b/...riggers/EMRemoveEntityTriggersFunction.cs → ...riggers/EMRemoveEntityTriggersFunction.cs
diff --git a/...Triggers/EMRemoveTriggerActionFunction.cs → ...Triggers/EMRemoveTriggerActionFunction.cs b/...Triggers/EMRemoveTriggerActionFunction.cs → ...Triggers/EMRemoveTriggerActionFunction.cs
diff --git a/...Types/Triggers/EMRemoveTriggerFunction.cs → ...Types/Triggers/EMRemoveTriggerFunction.cs b/...Types/Triggers/EMRemoveTriggerFunction.cs → ...Types/Triggers/EMRemoveTriggerFunction.cs
diff --git a/...MReplaceTriggerActionParameterFunction.cs → ...MReplaceTriggerActionParameterFunction.cs b/...MReplaceTriggerActionParameterFunction.cs → ...MReplaceTriggerActionParameterFunction.cs
diff --git a/.../Triggers/EMResetPickupTriggerFunction.cs → .../Triggers/EMResetPickupTriggerFunction.cs b/.../Triggers/EMResetPickupTriggerFunction.cs → .../Triggers/EMResetPickupTriggerFunction.cs
diff --git a/...Model/Types/Triggers/EMTriggerFunction.cs → ...Model/Types/Triggers/EMTriggerFunction.cs b/...Model/Types/Triggers/EMTriggerFunction.cs → ...Model/Types/Triggers/EMTriggerFunction.cs
diff --git a/TREnvironmentEditor/Parsing/EMConverter.cs → ...ontrol/Environment/Parsing/EMConverter.cs b/TREnvironmentEditor/Parsing/EMConverter.cs → ...ontrol/Environment/Parsing/EMConverter.cs
diff --git a/...itor/Parsing/EMDeserializationResolver.cs → ...ment/Parsing/EMDeserializationResolver.cs b/...itor/Parsing/EMDeserializationResolver.cs → ...ment/Parsing/EMDeserializationResolver.cs
diff --git a/...Editor/Parsing/EMSerializationResolver.cs → ...onment/Parsing/EMSerializationResolver.cs b/...Editor/Parsing/EMSerializationResolver.cs → ...onment/Parsing/EMSerializationResolver.cs
diff --git a/...delTransporter/Events/SegmentEventArgs.cs → TRDataControl/Events/SegmentEventArgs.cs b/...delTransporter/Events/SegmentEventArgs.cs → TRDataControl/Events/SegmentEventArgs.cs
diff --git a/...ter/Handlers/CinematicTransportHandler.cs → ...rol/Handlers/CinematicTransportHandler.cs b/...ter/Handlers/CinematicTransportHandler.cs → ...rol/Handlers/CinematicTransportHandler.cs
diff --git a/...porter/Handlers/ColourTransportHandler.cs → ...ontrol/Handlers/ColourTransportHandler.cs b/...porter/Handlers/ColourTransportHandler.cs → ...ontrol/Handlers/ColourTransportHandler.cs
diff --git a/...sporter/Handlers/ModelTransportHandler.cs → ...Control/Handlers/ModelTransportHandler.cs b/...sporter/Handlers/ModelTransportHandler.cs → ...Control/Handlers/ModelTransportHandler.cs
diff --git a/...r/Handlers/Sound/SoundTransportHandler.cs → ...l/Handlers/Sound/SoundTransportHandler.cs b/...r/Handlers/Sound/SoundTransportHandler.cs → ...l/Handlers/Sound/SoundTransportHandler.cs
diff --git a/.../Textures/AbstractTextureExportHandler.cs → .../Textures/AbstractTextureExportHandler.cs b/.../Textures/AbstractTextureExportHandler.cs → .../Textures/AbstractTextureExportHandler.cs
diff --git a/.../Textures/AbstractTextureImportHandler.cs → .../Textures/AbstractTextureImportHandler.cs b/.../Textures/AbstractTextureImportHandler.cs → .../Textures/AbstractTextureImportHandler.cs
diff --git a/...s/Textures/TR1/TR1TextureExportHandler.cs → ...s/Textures/TR1/TR1TextureExportHandler.cs b/...s/Textures/TR1/TR1TextureExportHandler.cs → ...s/Textures/TR1/TR1TextureExportHandler.cs
diff --git a/...s/Textures/TR1/TR1TextureImportHandler.cs → ...s/Textures/TR1/TR1TextureImportHandler.cs b/...s/Textures/TR1/TR1TextureImportHandler.cs → ...s/Textures/TR1/TR1TextureImportHandler.cs
diff --git a/...s/Textures/TR2/TR2TextureExportHandler.cs → ...s/Textures/TR2/TR2TextureExportHandler.cs b/...s/Textures/TR2/TR2TextureExportHandler.cs → ...s/Textures/TR2/TR2TextureExportHandler.cs
diff --git a/...s/Textures/TR2/TR2TextureImportHandler.cs → ...s/Textures/TR2/TR2TextureImportHandler.cs b/...s/Textures/TR2/TR2TextureImportHandler.cs → ...s/Textures/TR2/TR2TextureImportHandler.cs
diff --git a/...s/Textures/TR3/TR3TextureExportHandler.cs → ...s/Textures/TR3/TR3TextureExportHandler.cs b/...s/Textures/TR3/TR3TextureExportHandler.cs → ...s/Textures/TR3/TR3TextureExportHandler.cs
diff --git a/...s/Textures/TR3/TR3TextureImportHandler.cs → ...s/Textures/TR3/TR3TextureImportHandler.cs b/...s/Textures/TR3/TR3TextureImportHandler.cs → ...s/Textures/TR3/TR3TextureImportHandler.cs
diff --git a/...lTransporter/Helpers/TRModelExtensions.cs → TRDataControl/Helpers/TRModelExtensions.cs b/...lTransporter/Helpers/TRModelExtensions.cs → TRDataControl/Helpers/TRModelExtensions.cs
diff --git a/...r/Helpers/TRTextureReverseAreaComparer.cs → ...l/Helpers/TRTextureReverseAreaComparer.cs b/...r/Helpers/TRTextureReverseAreaComparer.cs → ...l/Helpers/TRTextureReverseAreaComparer.cs
diff --git a/...porter/Model/AbstractTRModelDefinition.cs → ...ontrol/Model/AbstractTRModelDefinition.cs b/...porter/Model/AbstractTRModelDefinition.cs → ...ontrol/Model/AbstractTRModelDefinition.cs
diff --git a/...r/Model/Definitions/TR1ModelDefinition.cs → ...l/Model/Definitions/TR1ModelDefinition.cs b/...r/Model/Definitions/TR1ModelDefinition.cs → ...l/Model/Definitions/TR1ModelDefinition.cs
diff --git a/...r/Model/Definitions/TR2ModelDefinition.cs → ...l/Model/Definitions/TR2ModelDefinition.cs b/...r/Model/Definitions/TR2ModelDefinition.cs → ...l/Model/Definitions/TR2ModelDefinition.cs
diff --git a/...r/Model/Definitions/TR3ModelDefinition.cs → ...l/Model/Definitions/TR3ModelDefinition.cs b/...r/Model/Definitions/TR3ModelDefinition.cs → ...l/Model/Definitions/TR3ModelDefinition.cs
diff --git a/...odel/Textures/AbstractIndexedTRTexture.cs → ...odel/Textures/AbstractIndexedTRTexture.cs b/...odel/Textures/AbstractIndexedTRTexture.cs → ...odel/Textures/AbstractIndexedTRTexture.cs
diff --git a/...del/Textures/AbstractTextureRemapGroup.cs → ...del/Textures/AbstractTextureRemapGroup.cs b/...del/Textures/AbstractTextureRemapGroup.cs → ...del/Textures/AbstractTextureRemapGroup.cs
diff --git a/...rter/Model/Textures/ITextureClassifier.cs → ...trol/Model/Textures/ITextureClassifier.cs b/...rter/Model/Textures/ITextureClassifier.cs → ...trol/Model/Textures/ITextureClassifier.cs
diff --git a/...Model/Textures/ITexturePositionMonitor.cs → ...Model/Textures/ITexturePositionMonitor.cs b/...Model/Textures/ITexturePositionMonitor.cs → ...Model/Textures/ITexturePositionMonitor.cs
diff --git a/.../Model/Textures/IndexedTRObjectTexture.cs → .../Model/Textures/IndexedTRObjectTexture.cs b/.../Model/Textures/IndexedTRObjectTexture.cs → .../Model/Textures/IndexedTRObjectTexture.cs
diff --git a/.../Model/Textures/IndexedTRSpriteTexture.cs → .../Model/Textures/IndexedTRSpriteTexture.cs b/.../Model/Textures/IndexedTRSpriteTexture.cs → .../Model/Textures/IndexedTRSpriteTexture.cs
diff --git a/...orter/Model/Textures/PositionedTexture.cs → ...ntrol/Model/Textures/PositionedTexture.cs b/...orter/Model/Textures/PositionedTexture.cs → ...ntrol/Model/Textures/PositionedTexture.cs
diff --git a/...xtures/RemapTypes/TR1TextureRemapGroup.cs → ...xtures/RemapTypes/TR1TextureRemapGroup.cs b/...xtures/RemapTypes/TR1TextureRemapGroup.cs → ...xtures/RemapTypes/TR1TextureRemapGroup.cs
diff --git a/...xtures/RemapTypes/TR2TextureRemapGroup.cs → ...xtures/RemapTypes/TR2TextureRemapGroup.cs b/...xtures/RemapTypes/TR2TextureRemapGroup.cs → ...xtures/RemapTypes/TR2TextureRemapGroup.cs
diff --git a/...xtures/RemapTypes/TR3TextureRemapGroup.cs → ...xtures/RemapTypes/TR3TextureRemapGroup.cs b/...xtures/RemapTypes/TR3TextureRemapGroup.cs → ...xtures/RemapTypes/TR3TextureRemapGroup.cs
diff --git a/...orter/Model/Textures/TextureDependency.cs → ...ntrol/Model/Textures/TextureDependency.cs b/...orter/Model/Textures/TextureDependency.cs → ...ntrol/Model/Textures/TextureDependency.cs
diff --git a/...ransporter/Model/Textures/TextureRemap.cs → TRDataControl/Model/Textures/TextureRemap.cs b/...ransporter/Model/Textures/TextureRemap.cs → TRDataControl/Model/Textures/TextureRemap.cs
diff --git a/...nsporter/Packing/AbstractTexturePacker.cs → ...aControl/Packing/AbstractTexturePacker.cs b/...nsporter/Packing/AbstractTexturePacker.cs → ...aControl/Packing/AbstractTexturePacker.cs
diff --git a/...ansporter/Packing/DefaultTexturePacker.cs → ...taControl/Packing/DefaultTexturePacker.cs b/...ansporter/Packing/DefaultTexturePacker.cs → ...taControl/Packing/DefaultTexturePacker.cs
diff --git a/...elTransporter/Packing/PackingException.cs → TRDataControl/Packing/PackingException.cs b/...elTransporter/Packing/PackingException.cs → TRDataControl/Packing/PackingException.cs
diff --git a/TRModelTransporter/Packing/TexturedTile.cs → TRDataControl/Packing/TexturedTile.cs b/TRModelTransporter/Packing/TexturedTile.cs → TRDataControl/Packing/TexturedTile.cs
diff --git a/...ransporter/Packing/TexturedTileSegment.cs → TRDataControl/Packing/TexturedTileSegment.cs b/...ransporter/Packing/TexturedTileSegment.cs → TRDataControl/Packing/TexturedTileSegment.cs
diff --git a/...sporter/Packing/Types/TR1TexturePacker.cs → ...Control/Packing/Types/TR1TexturePacker.cs b/...sporter/Packing/Types/TR1TexturePacker.cs → ...Control/Packing/Types/TR1TexturePacker.cs
diff --git a/...sporter/Packing/Types/TR2TexturePacker.cs → ...Control/Packing/Types/TR2TexturePacker.cs b/...sporter/Packing/Types/TR2TexturePacker.cs → ...Control/Packing/Types/TR2TexturePacker.cs
diff --git a/...sporter/Packing/Types/TR3TexturePacker.cs → ...Control/Packing/Types/TR3TexturePacker.cs b/...sporter/Packing/Types/TR3TexturePacker.cs → ...Control/Packing/Types/TR3TexturePacker.cs
diff --git a/TRModelTransporter/TRModelTransporter.csproj → TRDataControl/TRDataControl.csproj b/TRModelTransporter/TRModelTransporter.csproj → TRDataControl/TRDataControl.csproj
@@ -12,8 +12,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\TRImageControl\TRImageControl.csproj" />
     <ProjectReference Include="..\TRLevelControl\TRLevelControl.csproj" />
-    <ProjectReference Include="..\TRTexture16Importer\TRTexture16Importer.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/...rter/Transport/AbstractTRModelExporter.cs → ...trol/Transport/AbstractTRModelExporter.cs b/...rter/Transport/AbstractTRModelExporter.cs → ...trol/Transport/AbstractTRModelExporter.cs
diff --git a/...rter/Transport/AbstractTRModelImporter.cs → ...trol/Transport/AbstractTRModelImporter.cs b/...rter/Transport/AbstractTRModelImporter.cs → ...trol/Transport/AbstractTRModelImporter.cs
diff --git a/...ter/Transport/AbstractTRModelTransport.cs → ...rol/Transport/AbstractTRModelTransport.cs b/...ter/Transport/AbstractTRModelTransport.cs → ...rol/Transport/AbstractTRModelTransport.cs
diff --git a/...sporter/Transport/TR1/TR1ModelExporter.cs → ...Control/Transport/TR1/TR1ModelExporter.cs b/...sporter/Transport/TR1/TR1ModelExporter.cs → ...Control/Transport/TR1/TR1ModelExporter.cs
diff --git a/...sporter/Transport/TR1/TR1ModelImporter.cs → ...Control/Transport/TR1/TR1ModelImporter.cs b/...sporter/Transport/TR1/TR1ModelImporter.cs → ...Control/Transport/TR1/TR1ModelImporter.cs
diff --git a/...sporter/Transport/TR2/TR2ModelExporter.cs → ...Control/Transport/TR2/TR2ModelExporter.cs b/...sporter/Transport/TR2/TR2ModelExporter.cs → ...Control/Transport/TR2/TR2ModelExporter.cs
diff --git a/...sporter/Transport/TR2/TR2ModelImporter.cs → ...Control/Transport/TR2/TR2ModelImporter.cs b/...sporter/Transport/TR2/TR2ModelImporter.cs → ...Control/Transport/TR2/TR2ModelImporter.cs
diff --git a/...sporter/Transport/TR3/TR3ModelExporter.cs → ...Control/Transport/TR3/TR3ModelExporter.cs b/...sporter/Transport/TR3/TR3ModelExporter.cs → ...Control/Transport/TR3/TR3ModelExporter.cs
diff --git a/...sporter/Transport/TR3/TR3ModelImporter.cs → ...Control/Transport/TR3/TR3ModelImporter.cs b/...sporter/Transport/TR3/TR3ModelImporter.cs → ...Control/Transport/TR3/TR3ModelImporter.cs
diff --git a/...ansporter/Transport/TransportException.cs → ...taControl/Transport/TransportException.cs b/...ansporter/Transport/TransportException.cs → ...taControl/Transport/TransportException.cs
diff --git a/.../Utilities/AbstractMassTRModelExporter.cs → .../Utilities/AbstractMassTRModelExporter.cs b/.../Utilities/AbstractMassTRModelExporter.cs → .../Utilities/AbstractMassTRModelExporter.cs
diff --git a/...ties/AbstractMassTRTextureDeduplicator.cs → ...ties/AbstractMassTRTextureDeduplicator.cs b/...ties/AbstractMassTRTextureDeduplicator.cs → ...ties/AbstractMassTRTextureDeduplicator.cs
diff --git a/...ies/AbstractTRLevelTextureDeduplicator.cs → ...ies/AbstractTRLevelTextureDeduplicator.cs b/...ies/AbstractTRLevelTextureDeduplicator.cs → ...ies/AbstractTRLevelTextureDeduplicator.cs
diff --git a/...duplication/MassTR2TextureDeduplicator.cs → ...duplication/MassTR2TextureDeduplicator.cs b/...duplication/MassTR2TextureDeduplicator.cs → ...duplication/MassTR2TextureDeduplicator.cs
diff --git a/...uplication/TR2LevelTextureDeduplicator.cs → ...uplication/TR2LevelTextureDeduplicator.cs b/...uplication/TR2LevelTextureDeduplicator.cs → ...uplication/TR2LevelTextureDeduplicator.cs
diff --git a/.../Utilities/Export/MassTR1ModelExporter.cs → .../Utilities/Export/MassTR1ModelExporter.cs b/.../Utilities/Export/MassTR1ModelExporter.cs → .../Utilities/Export/MassTR1ModelExporter.cs
diff --git a/.../Utilities/Export/MassTR2ModelExporter.cs → .../Utilities/Export/MassTR2ModelExporter.cs b/.../Utilities/Export/MassTR2ModelExporter.cs → .../Utilities/Export/MassTR2ModelExporter.cs
diff --git a/.../Utilities/Export/MassTR3ModelExporter.cs → .../Utilities/Export/MassTR3ModelExporter.cs b/.../Utilities/Export/MassTR3ModelExporter.cs → .../Utilities/Export/MassTR3ModelExporter.cs
diff --git a/...nsporter/Utilities/TRTextureClassifier.cs → ...aControl/Utilities/TRTextureClassifier.cs b/...nsporter/Utilities/TRTextureClassifier.cs → ...aControl/Utilities/TRTextureClassifier.cs
diff --git a/...porter/Utilities/TRTextureDeduplicator.cs → ...ontrol/Utilities/TRTextureDeduplicator.cs b/...porter/Utilities/TRTextureDeduplicator.cs → ...ontrol/Utilities/TRTextureDeduplicator.cs
diff --git a/...rter/Utilities/TRTextureRemapEventArgs.cs → ...trol/Utilities/TRTextureRemapEventArgs.cs b/...rter/Utilities/TRTextureRemapEventArgs.cs → ...trol/Utilities/TRTextureRemapEventArgs.cs
diff --git a/TREnvironmentEditor/TREnvironmentEditor.csproj b/TREnvironmentEditor/TREnvironmentEditor.csproj
diff --git a/...xture16Importer/Helpers/BitmapGraphics.cs → TRImageControl/Helpers/BitmapGraphics.cs b/...xture16Importer/Helpers/BitmapGraphics.cs → TRImageControl/Helpers/BitmapGraphics.cs
diff --git a/...ure16Importer/Helpers/ColourExtensions.cs → TRImageControl/Helpers/ColourExtensions.cs b/...ure16Importer/Helpers/ColourExtensions.cs → TRImageControl/Helpers/ColourExtensions.cs
diff --git a/TRTexture16Importer/Helpers/HSB.cs → TRImageControl/Helpers/HSB.cs b/TRTexture16Importer/Helpers/HSB.cs → TRImageControl/Helpers/HSB.cs
diff --git a/TRTexture16Importer/Helpers/HSBOperation.cs → TRImageControl/Helpers/HSBOperation.cs b/TRTexture16Importer/Helpers/HSBOperation.cs → TRImageControl/Helpers/HSBOperation.cs
diff --git a/...e16Importer/Helpers/TRPalette16Control.cs → TRImageControl/Helpers/TRPalette16Control.cs b/...e16Importer/Helpers/TRPalette16Control.cs → TRImageControl/Helpers/TRPalette16Control.cs
diff --git a/...re16Importer/Helpers/TRPalette8Control.cs → TRImageControl/Helpers/TRPalette8Control.cs b/...re16Importer/Helpers/TRPalette8Control.cs → TRImageControl/Helpers/TRPalette8Control.cs
diff --git a/...ture16Importer/TRTexture16Importer.csproj → TRImageControl/TRImageControl.csproj b/...ture16Importer/TRTexture16Importer.csproj → TRImageControl/TRImageControl.csproj
diff --git a/TRTexture16Importer/TextureUtilities.cs → TRImageControl/TextureUtilities.cs b/TRTexture16Importer/TextureUtilities.cs → TRImageControl/TextureUtilities.cs
diff --git a/...orter/Textures/Data/TR1TextureDatabase.cs → ...ntrol/Textures/Data/TR1TextureDatabase.cs b/...orter/Textures/Data/TR1TextureDatabase.cs → ...ntrol/Textures/Data/TR1TextureDatabase.cs
diff --git a/...orter/Textures/Data/TR2TextureDatabase.cs → ...ntrol/Textures/Data/TR2TextureDatabase.cs b/...orter/Textures/Data/TR2TextureDatabase.cs → ...ntrol/Textures/Data/TR2TextureDatabase.cs
diff --git a/...orter/Textures/Data/TR3TextureDatabase.cs → ...ntrol/Textures/Data/TR3TextureDatabase.cs b/...orter/Textures/Data/TR3TextureDatabase.cs → ...ntrol/Textures/Data/TR3TextureDatabase.cs
diff --git a/...Importer/Textures/Data/TextureDatabase.cs → ...eControl/Textures/Data/TextureDatabase.cs b/...Importer/Textures/Data/TextureDatabase.cs → ...eControl/Textures/Data/TextureDatabase.cs
diff --git a/...orter/Textures/Grouping/GlobalGrouping.cs → ...ntrol/Textures/Grouping/GlobalGrouping.cs b/...orter/Textures/Grouping/GlobalGrouping.cs → ...ntrol/Textures/Grouping/GlobalGrouping.cs
diff --git a/...rter/Textures/Grouping/TextureCategory.cs → ...trol/Textures/Grouping/TextureCategory.cs b/...rter/Textures/Grouping/TextureCategory.cs → ...trol/Textures/Grouping/TextureCategory.cs
diff --git a/...rter/Textures/Grouping/TextureGrouping.cs → ...trol/Textures/Grouping/TextureGrouping.cs b/...rter/Textures/Grouping/TextureGrouping.cs → ...trol/Textures/Grouping/TextureGrouping.cs
diff --git a/...extures/Mapping/AbstractTextureMapping.cs → ...extures/Mapping/AbstractTextureMapping.cs b/...extures/Mapping/AbstractTextureMapping.cs → ...extures/Mapping/AbstractTextureMapping.cs
diff --git a/...ter/Textures/Mapping/TR1TextureMapping.cs → ...rol/Textures/Mapping/TR1TextureMapping.cs b/...ter/Textures/Mapping/TR1TextureMapping.cs → ...rol/Textures/Mapping/TR1TextureMapping.cs
diff --git a/...ter/Textures/Mapping/TR2TextureMapping.cs → ...rol/Textures/Mapping/TR2TextureMapping.cs b/...ter/Textures/Mapping/TR2TextureMapping.cs → ...rol/Textures/Mapping/TR2TextureMapping.cs
diff --git a/...ter/Textures/Mapping/TR3TextureMapping.cs → ...rol/Textures/Mapping/TR3TextureMapping.cs b/...ter/Textures/Mapping/TR3TextureMapping.cs → ...rol/Textures/Mapping/TR3TextureMapping.cs
diff --git a/.../Textures/Source/AbstractTextureSource.cs → .../Textures/Source/AbstractTextureSource.cs b/.../Textures/Source/AbstractTextureSource.cs → .../Textures/Source/AbstractTextureSource.cs
diff --git a/...r/Textures/Source/DynamicTextureSource.cs → ...l/Textures/Source/DynamicTextureSource.cs b/...r/Textures/Source/DynamicTextureSource.cs → ...l/Textures/Source/DynamicTextureSource.cs
diff --git a/...er/Textures/Source/StaticTextureSource.cs → ...ol/Textures/Source/StaticTextureSource.cs b/...er/Textures/Source/StaticTextureSource.cs → ...ol/Textures/Source/StaticTextureSource.cs
diff --git a/...r/Textures/Target/DynamicTextureTarget.cs → ...l/Textures/Target/DynamicTextureTarget.cs b/...r/Textures/Target/DynamicTextureTarget.cs → ...l/Textures/Target/DynamicTextureTarget.cs
diff --git a/.../Textures/Target/LandmarkTextureTarget.cs → .../Textures/Target/LandmarkTextureTarget.cs b/.../Textures/Target/LandmarkTextureTarget.cs → .../Textures/Target/LandmarkTextureTarget.cs
diff --git a/...xtures/Target/ReplacementTextureTarget.cs → ...xtures/Target/ReplacementTextureTarget.cs b/...xtures/Target/ReplacementTextureTarget.cs → ...xtures/Target/ReplacementTextureTarget.cs
diff --git a/...er/Textures/Target/StaticTextureTarget.cs → ...ol/Textures/Target/StaticTextureTarget.cs b/...er/Textures/Target/StaticTextureTarget.cs → ...ol/Textures/Target/StaticTextureTarget.cs
diff --git a/TRLevelControl/Control/TR4LevelControl.cs b/TRLevelControl/Control/TR4LevelControl.cs
@@ -321,7 +321,7 @@ private static void ReadDemoData(TRLevelReader reader)
         Debug.Assert(numDemoData == 0);
     }
 
-    private void WriteDemoData(TRLevelWriter writer)
+    private static void WriteDemoData(TRLevelWriter writer)
     {
         writer.Write((ushort)0);
     }

diff --git a/TRLevelControl/Control/TR5LevelControl.cs b/TRLevelControl/Control/TR5LevelControl.cs
@@ -373,7 +373,7 @@ private static void ReadDemoData(TRLevelReader reader)
         Debug.Assert(numDemoData == 0);
     }
 
-    private void WriteDemoData(TRLevelWriter writer)
+    private static void WriteDemoData(TRLevelWriter writer)
     {
         writer.Write((ushort)0);
     }

diff --git a/TRLevelToolset/TRLevelToolset.csproj b/TRLevelToolset/TRLevelToolset.csproj
@@ -18,9 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TREnvironmentEditor\TREnvironmentEditor.csproj" />
+    <ProjectReference Include="..\TRDataControl\TRDataControl.csproj" />
     <ProjectReference Include="..\TRLevelControl\TRLevelControl.csproj" />
-    <ProjectReference Include="..\TRModelTransporter\TRModelTransporter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/TRRandomizer.sln b/TRRandomizer.sln
@@ -11,15 +11,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextureExport", "TextureExport\TextureExport.csproj", "{108D4840-3E84-466F-B5DE-AF00EECA8103}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRTexture16Importer", "TRTexture16Importer\TRTexture16Importer.csproj", "{29F10C62-F4D8-4ACA-91ED-6920AE3F1AC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRImageControl", "TRImageControl\TRImageControl.csproj", "{29F10C62-F4D8-4ACA-91ED-6920AE3F1AC0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRRandomizerView", "TRRandomizerView\TRRandomizerView.csproj", "{6CE82358-524D-4B12-A514-0903521ED13C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRRandomizerCore", "TRRandomizerCore\TRRandomizerCore.csproj", "{B657D758-A095-44B5-AEF1-C77C30667DAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRModelTransporter", "TRModelTransporter\TRModelTransporter.csproj", "{6CE83D8E-30E4-4CE1-9228-8657EF186A17}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TREnvironmentEditor", "TREnvironmentEditor\TREnvironmentEditor.csproj", "{1667C53D-0CCA-48A9-90B7-4950BD92BDFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TRDataControl", "TRDataControl\TRDataControl.csproj", "{6CE83D8E-30E4-4CE1-9228-8657EF186A17}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFXExport", "SFXExport\SFXExport.csproj", "{D3662F36-C8D8-471C-8F43-192CE748B04E}"
 EndProject
@@ -63,10 +61,6 @@ Global
 		{6CE83D8E-30E4-4CE1-9228-8657EF186A17}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6CE83D8E-30E4-4CE1-9228-8657EF186A17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CE83D8E-30E4-4CE1-9228-8657EF186A17}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1667C53D-0CCA-48A9-90B7-4950BD92BDFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1667C53D-0CCA-48A9-90B7-4950BD92BDFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1667C53D-0CCA-48A9-90B7-4950BD92BDFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1667C53D-0CCA-48A9-90B7-4950BD92BDFF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3662F36-C8D8-471C-8F43-192CE748B04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3662F36-C8D8-471C-8F43-192CE748B04E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3662F36-C8D8-471C-8F43-192CE748B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/TRRandomizerCore/TRRandomizerCore.csproj b/TRRandomizerCore/TRRandomizerCore.csproj
@@ -22,10 +22,9 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\TREnvironmentEditor\TREnvironmentEditor.csproj" />
+    <ProjectReference Include="..\TRDataControl\TRDataControl.csproj" />
+    <ProjectReference Include="..\TRImageControl\TRImageControl.csproj" />
     <ProjectReference Include="..\TRLevelControl\TRLevelControl.csproj" />
-    <ProjectReference Include="..\TRModelTransporter\TRModelTransporter.csproj" />
-    <ProjectReference Include="..\TRTexture16Importer\TRTexture16Importer.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\**">

diff --git a/TextureExport/TextureExport.csproj b/TextureExport/TextureExport.csproj
@@ -14,9 +14,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\TRDataControl\TRDataControl.csproj" />
+    <ProjectReference Include="..\TRImageControl\TRImageControl.csproj" />
     <ProjectReference Include="..\TRLevelControl\TRLevelControl.csproj" />
-    <ProjectReference Include="..\TRModelTransporter\TRModelTransporter.csproj" />
-    <ProjectReference Include="..\TRTexture16Importer\TRTexture16Importer.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\TileTemplate.html">