diff --git a/src/CMakeLists.txt b/src/liberty/CMakeLists.txt
similarity index 100%
rename from src/CMakeLists.txt
rename to src/liberty/CMakeLists.txt
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/liberty/animation/AnimBlendAssocGroup.cpp
similarity index 100%
rename from src/animation/AnimBlendAssocGroup.cpp
rename to src/liberty/animation/AnimBlendAssocGroup.cpp
diff --git a/src/animation/AnimBlendAssocGroup.h b/src/liberty/animation/AnimBlendAssocGroup.h
similarity index 100%
rename from src/animation/AnimBlendAssocGroup.h
rename to src/liberty/animation/AnimBlendAssocGroup.h
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/liberty/animation/AnimBlendAssociation.cpp
similarity index 100%
rename from src/animation/AnimBlendAssociation.cpp
rename to src/liberty/animation/AnimBlendAssociation.cpp
diff --git a/src/animation/AnimBlendAssociation.h b/src/liberty/animation/AnimBlendAssociation.h
similarity index 100%
rename from src/animation/AnimBlendAssociation.h
rename to src/liberty/animation/AnimBlendAssociation.h
diff --git a/miami/animation/AnimBlendClumpData.cpp b/src/liberty/animation/AnimBlendClumpData.cpp
similarity index 100%
rename from miami/animation/AnimBlendClumpData.cpp
rename to src/liberty/animation/AnimBlendClumpData.cpp
diff --git a/src/animation/AnimBlendClumpData.h b/src/liberty/animation/AnimBlendClumpData.h
similarity index 100%
rename from src/animation/AnimBlendClumpData.h
rename to src/liberty/animation/AnimBlendClumpData.h
diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/liberty/animation/AnimBlendHierarchy.cpp
similarity index 100%
rename from src/animation/AnimBlendHierarchy.cpp
rename to src/liberty/animation/AnimBlendHierarchy.cpp
diff --git a/src/animation/AnimBlendHierarchy.h b/src/liberty/animation/AnimBlendHierarchy.h
similarity index 100%
rename from src/animation/AnimBlendHierarchy.h
rename to src/liberty/animation/AnimBlendHierarchy.h
diff --git a/miami/animation/AnimBlendList.h b/src/liberty/animation/AnimBlendList.h
similarity index 100%
rename from miami/animation/AnimBlendList.h
rename to src/liberty/animation/AnimBlendList.h
diff --git a/src/animation/AnimBlendNode.cpp b/src/liberty/animation/AnimBlendNode.cpp
similarity index 100%
rename from src/animation/AnimBlendNode.cpp
rename to src/liberty/animation/AnimBlendNode.cpp
diff --git a/src/animation/AnimBlendNode.h b/src/liberty/animation/AnimBlendNode.h
similarity index 100%
rename from src/animation/AnimBlendNode.h
rename to src/liberty/animation/AnimBlendNode.h
diff --git a/src/animation/AnimBlendSequence.cpp b/src/liberty/animation/AnimBlendSequence.cpp
similarity index 100%
rename from src/animation/AnimBlendSequence.cpp
rename to src/liberty/animation/AnimBlendSequence.cpp
diff --git a/src/animation/AnimBlendSequence.h b/src/liberty/animation/AnimBlendSequence.h
similarity index 100%
rename from src/animation/AnimBlendSequence.h
rename to src/liberty/animation/AnimBlendSequence.h
diff --git a/src/animation/AnimManager.cpp b/src/liberty/animation/AnimManager.cpp
similarity index 100%
rename from src/animation/AnimManager.cpp
rename to src/liberty/animation/AnimManager.cpp
diff --git a/src/animation/AnimManager.h b/src/liberty/animation/AnimManager.h
similarity index 100%
rename from src/animation/AnimManager.h
rename to src/liberty/animation/AnimManager.h
diff --git a/src/animation/AnimationId.h b/src/liberty/animation/AnimationId.h
similarity index 100%
rename from src/animation/AnimationId.h
rename to src/liberty/animation/AnimationId.h
diff --git a/src/animation/Bones.cpp b/src/liberty/animation/Bones.cpp
similarity index 100%
rename from src/animation/Bones.cpp
rename to src/liberty/animation/Bones.cpp
diff --git a/src/animation/Bones.h b/src/liberty/animation/Bones.h
similarity index 100%
rename from src/animation/Bones.h
rename to src/liberty/animation/Bones.h
diff --git a/src/animation/CutsceneMgr.cpp b/src/liberty/animation/CutsceneMgr.cpp
similarity index 100%
rename from src/animation/CutsceneMgr.cpp
rename to src/liberty/animation/CutsceneMgr.cpp
diff --git a/src/animation/CutsceneMgr.h b/src/liberty/animation/CutsceneMgr.h
similarity index 100%
rename from src/animation/CutsceneMgr.h
rename to src/liberty/animation/CutsceneMgr.h
diff --git a/src/animation/FrameUpdate.cpp b/src/liberty/animation/FrameUpdate.cpp
similarity index 100%
rename from src/animation/FrameUpdate.cpp
rename to src/liberty/animation/FrameUpdate.cpp
diff --git a/src/animation/RpAnimBlend.cpp b/src/liberty/animation/RpAnimBlend.cpp
similarity index 100%
rename from src/animation/RpAnimBlend.cpp
rename to src/liberty/animation/RpAnimBlend.cpp
diff --git a/src/animation/RpAnimBlend.h b/src/liberty/animation/RpAnimBlend.h
similarity index 100%
rename from src/animation/RpAnimBlend.h
rename to src/liberty/animation/RpAnimBlend.h
diff --git a/src/audio/AudioCollision.cpp b/src/liberty/audio/AudioCollision.cpp
similarity index 100%
rename from src/audio/AudioCollision.cpp
rename to src/liberty/audio/AudioCollision.cpp
diff --git a/src/audio/AudioCollision.h b/src/liberty/audio/AudioCollision.h
similarity index 100%
rename from src/audio/AudioCollision.h
rename to src/liberty/audio/AudioCollision.h
diff --git a/src/audio/AudioLogic.cpp b/src/liberty/audio/AudioLogic.cpp
similarity index 100%
rename from src/audio/AudioLogic.cpp
rename to src/liberty/audio/AudioLogic.cpp
diff --git a/src/audio/AudioManager.cpp b/src/liberty/audio/AudioManager.cpp
similarity index 100%
rename from src/audio/AudioManager.cpp
rename to src/liberty/audio/AudioManager.cpp
diff --git a/src/audio/AudioManager.h b/src/liberty/audio/AudioManager.h
similarity index 100%
rename from src/audio/AudioManager.h
rename to src/liberty/audio/AudioManager.h
diff --git a/src/audio/AudioSamples.h b/src/liberty/audio/AudioSamples.h
similarity index 100%
rename from src/audio/AudioSamples.h
rename to src/liberty/audio/AudioSamples.h
diff --git a/src/audio/AudioScriptObject.cpp b/src/liberty/audio/AudioScriptObject.cpp
similarity index 100%
rename from src/audio/AudioScriptObject.cpp
rename to src/liberty/audio/AudioScriptObject.cpp
diff --git a/miami/audio/AudioScriptObject.h b/src/liberty/audio/AudioScriptObject.h
similarity index 100%
rename from miami/audio/AudioScriptObject.h
rename to src/liberty/audio/AudioScriptObject.h
diff --git a/src/audio/DMAudio.cpp b/src/liberty/audio/DMAudio.cpp
similarity index 100%
rename from src/audio/DMAudio.cpp
rename to src/liberty/audio/DMAudio.cpp
diff --git a/src/audio/DMAudio.h b/src/liberty/audio/DMAudio.h
similarity index 100%
rename from src/audio/DMAudio.h
rename to src/liberty/audio/DMAudio.h
diff --git a/src/audio/MusicManager.cpp b/src/liberty/audio/MusicManager.cpp
similarity index 100%
rename from src/audio/MusicManager.cpp
rename to src/liberty/audio/MusicManager.cpp
diff --git a/src/audio/MusicManager.h b/src/liberty/audio/MusicManager.h
similarity index 100%
rename from src/audio/MusicManager.h
rename to src/liberty/audio/MusicManager.h
diff --git a/src/audio/PolRadio.cpp b/src/liberty/audio/PolRadio.cpp
similarity index 100%
rename from src/audio/PolRadio.cpp
rename to src/liberty/audio/PolRadio.cpp
diff --git a/src/audio/PolRadio.h b/src/liberty/audio/PolRadio.h
similarity index 100%
rename from src/audio/PolRadio.h
rename to src/liberty/audio/PolRadio.h
diff --git a/src/audio/audio_enums.h b/src/liberty/audio/audio_enums.h
similarity index 100%
rename from src/audio/audio_enums.h
rename to src/liberty/audio/audio_enums.h
diff --git a/miami/audio/eax/eax-util.cpp b/src/liberty/audio/eax/eax-util.cpp
similarity index 100%
rename from miami/audio/eax/eax-util.cpp
rename to src/liberty/audio/eax/eax-util.cpp
diff --git a/miami/audio/eax/eax-util.h b/src/liberty/audio/eax/eax-util.h
similarity index 100%
rename from miami/audio/eax/eax-util.h
rename to src/liberty/audio/eax/eax-util.h
diff --git a/miami/audio/eax/eax.h b/src/liberty/audio/eax/eax.h
similarity index 100%
rename from miami/audio/eax/eax.h
rename to src/liberty/audio/eax/eax.h
diff --git a/miami/audio/oal/aldlist.cpp b/src/liberty/audio/oal/aldlist.cpp
similarity index 100%
rename from miami/audio/oal/aldlist.cpp
rename to src/liberty/audio/oal/aldlist.cpp
diff --git a/miami/audio/oal/aldlist.h b/src/liberty/audio/oal/aldlist.h
similarity index 100%
rename from miami/audio/oal/aldlist.h
rename to src/liberty/audio/oal/aldlist.h
diff --git a/miami/audio/oal/channel.cpp b/src/liberty/audio/oal/channel.cpp
similarity index 100%
rename from miami/audio/oal/channel.cpp
rename to src/liberty/audio/oal/channel.cpp
diff --git a/miami/audio/oal/channel.h b/src/liberty/audio/oal/channel.h
similarity index 100%
rename from miami/audio/oal/channel.h
rename to src/liberty/audio/oal/channel.h
diff --git a/miami/audio/oal/oal_utils.cpp b/src/liberty/audio/oal/oal_utils.cpp
similarity index 100%
rename from miami/audio/oal/oal_utils.cpp
rename to src/liberty/audio/oal/oal_utils.cpp
diff --git a/miami/audio/oal/oal_utils.h b/src/liberty/audio/oal/oal_utils.h
similarity index 100%
rename from miami/audio/oal/oal_utils.h
rename to src/liberty/audio/oal/oal_utils.h
diff --git a/src/audio/oal/stream.cpp b/src/liberty/audio/oal/stream.cpp
similarity index 100%
rename from src/audio/oal/stream.cpp
rename to src/liberty/audio/oal/stream.cpp
diff --git a/miami/audio/oal/stream.h b/src/liberty/audio/oal/stream.h
similarity index 100%
rename from miami/audio/oal/stream.h
rename to src/liberty/audio/oal/stream.h
diff --git a/src/audio/sampman.h b/src/liberty/audio/sampman.h
similarity index 100%
rename from src/audio/sampman.h
rename to src/liberty/audio/sampman.h
diff --git a/src/audio/sampman_dc.cpp b/src/liberty/audio/sampman_dc.cpp
similarity index 100%
rename from src/audio/sampman_dc.cpp
rename to src/liberty/audio/sampman_dc.cpp
diff --git a/src/audio/sampman_miles.cpp b/src/liberty/audio/sampman_miles.cpp
similarity index 100%
rename from src/audio/sampman_miles.cpp
rename to src/liberty/audio/sampman_miles.cpp
diff --git a/src/audio/sampman_null.cpp b/src/liberty/audio/sampman_null.cpp
similarity index 100%
rename from src/audio/sampman_null.cpp
rename to src/liberty/audio/sampman_null.cpp
diff --git a/src/audio/sampman_oal.cpp b/src/liberty/audio/sampman_oal.cpp
similarity index 100%
rename from src/audio/sampman_oal.cpp
rename to src/liberty/audio/sampman_oal.cpp
diff --git a/src/audio/soundlist.h b/src/liberty/audio/soundlist.h
similarity index 100%
rename from src/audio/soundlist.h
rename to src/liberty/audio/soundlist.h
diff --git a/src/buildings/Building.cpp b/src/liberty/buildings/Building.cpp
similarity index 100%
rename from src/buildings/Building.cpp
rename to src/liberty/buildings/Building.cpp
diff --git a/src/buildings/Building.h b/src/liberty/buildings/Building.h
similarity index 100%
rename from src/buildings/Building.h
rename to src/liberty/buildings/Building.h
diff --git a/miami/buildings/Solid.h b/src/liberty/buildings/Solid.h
similarity index 100%
rename from miami/buildings/Solid.h
rename to src/liberty/buildings/Solid.h
diff --git a/miami/buildings/Treadable.cpp b/src/liberty/buildings/Treadable.cpp
similarity index 100%
rename from miami/buildings/Treadable.cpp
rename to src/liberty/buildings/Treadable.cpp
diff --git a/src/buildings/Treadable.h b/src/liberty/buildings/Treadable.h
similarity index 100%
rename from src/buildings/Treadable.h
rename to src/liberty/buildings/Treadable.h
diff --git a/miami/collision/ColBox.cpp b/src/liberty/collision/ColBox.cpp
similarity index 100%
rename from miami/collision/ColBox.cpp
rename to src/liberty/collision/ColBox.cpp
diff --git a/src/collision/ColBox.h b/src/liberty/collision/ColBox.h
similarity index 100%
rename from src/collision/ColBox.h
rename to src/liberty/collision/ColBox.h
diff --git a/miami/collision/ColLine.cpp b/src/liberty/collision/ColLine.cpp
similarity index 100%
rename from miami/collision/ColLine.cpp
rename to src/liberty/collision/ColLine.cpp
diff --git a/miami/collision/ColLine.h b/src/liberty/collision/ColLine.h
similarity index 100%
rename from miami/collision/ColLine.h
rename to src/liberty/collision/ColLine.h
diff --git a/src/collision/ColModel.cpp b/src/liberty/collision/ColModel.cpp
similarity index 100%
rename from src/collision/ColModel.cpp
rename to src/liberty/collision/ColModel.cpp
diff --git a/src/collision/ColModel.h b/src/liberty/collision/ColModel.h
similarity index 100%
rename from src/collision/ColModel.h
rename to src/liberty/collision/ColModel.h
diff --git a/miami/collision/ColPoint.cpp b/src/liberty/collision/ColPoint.cpp
similarity index 100%
rename from miami/collision/ColPoint.cpp
rename to src/liberty/collision/ColPoint.cpp
diff --git a/miami/collision/ColPoint.h b/src/liberty/collision/ColPoint.h
similarity index 100%
rename from miami/collision/ColPoint.h
rename to src/liberty/collision/ColPoint.h
diff --git a/src/collision/ColSphere.cpp b/src/liberty/collision/ColSphere.cpp
similarity index 100%
rename from src/collision/ColSphere.cpp
rename to src/liberty/collision/ColSphere.cpp
diff --git a/src/collision/ColSphere.h b/src/liberty/collision/ColSphere.h
similarity index 100%
rename from src/collision/ColSphere.h
rename to src/liberty/collision/ColSphere.h
diff --git a/src/collision/ColTriangle.cpp b/src/liberty/collision/ColTriangle.cpp
similarity index 100%
rename from src/collision/ColTriangle.cpp
rename to src/liberty/collision/ColTriangle.cpp
diff --git a/src/collision/ColTriangle.h b/src/liberty/collision/ColTriangle.h
similarity index 100%
rename from src/collision/ColTriangle.h
rename to src/liberty/collision/ColTriangle.h
diff --git a/src/collision/Collision.cpp b/src/liberty/collision/Collision.cpp
similarity index 100%
rename from src/collision/Collision.cpp
rename to src/liberty/collision/Collision.cpp
diff --git a/src/collision/Collision.h b/src/liberty/collision/Collision.h
similarity index 100%
rename from src/collision/Collision.h
rename to src/liberty/collision/Collision.h
diff --git a/src/collision/CompressedVector.h b/src/liberty/collision/CompressedVector.h
similarity index 100%
rename from src/collision/CompressedVector.h
rename to src/liberty/collision/CompressedVector.h
diff --git a/src/collision/TempColModels.cpp b/src/liberty/collision/TempColModels.cpp
similarity index 100%
rename from src/collision/TempColModels.cpp
rename to src/liberty/collision/TempColModels.cpp
diff --git a/src/collision/TempColModels.h b/src/liberty/collision/TempColModels.h
similarity index 100%
rename from src/collision/TempColModels.h
rename to src/liberty/collision/TempColModels.h
diff --git a/miami/collision/VuCollision.cpp b/src/liberty/collision/VuCollision.cpp
similarity index 100%
rename from miami/collision/VuCollision.cpp
rename to src/liberty/collision/VuCollision.cpp
diff --git a/miami/collision/VuCollision.h b/src/liberty/collision/VuCollision.h
similarity index 100%
rename from miami/collision/VuCollision.h
rename to src/liberty/collision/VuCollision.h
diff --git a/miami/collision/vu0Collision.dsm b/src/liberty/collision/vu0Collision.dsm
similarity index 100%
rename from miami/collision/vu0Collision.dsm
rename to src/liberty/collision/vu0Collision.dsm
diff --git a/miami/collision/vu0Collision_1.s b/src/liberty/collision/vu0Collision_1.s
similarity index 100%
rename from miami/collision/vu0Collision_1.s
rename to src/liberty/collision/vu0Collision_1.s
diff --git a/miami/collision/vu0Collision_2.s b/src/liberty/collision/vu0Collision_2.s
similarity index 100%
rename from miami/collision/vu0Collision_2.s
rename to src/liberty/collision/vu0Collision_2.s
diff --git a/src/control/AutoPilot.cpp b/src/liberty/control/AutoPilot.cpp
similarity index 100%
rename from src/control/AutoPilot.cpp
rename to src/liberty/control/AutoPilot.cpp
diff --git a/src/control/AutoPilot.h b/src/liberty/control/AutoPilot.h
similarity index 100%
rename from src/control/AutoPilot.h
rename to src/liberty/control/AutoPilot.h
diff --git a/src/control/Bridge.cpp b/src/liberty/control/Bridge.cpp
similarity index 100%
rename from src/control/Bridge.cpp
rename to src/liberty/control/Bridge.cpp
diff --git a/miami/control/Bridge.h b/src/liberty/control/Bridge.h
similarity index 100%
rename from miami/control/Bridge.h
rename to src/liberty/control/Bridge.h
diff --git a/src/control/CarAI.cpp b/src/liberty/control/CarAI.cpp
similarity index 100%
rename from src/control/CarAI.cpp
rename to src/liberty/control/CarAI.cpp
diff --git a/src/control/CarAI.h b/src/liberty/control/CarAI.h
similarity index 100%
rename from src/control/CarAI.h
rename to src/liberty/control/CarAI.h
diff --git a/src/control/CarCtrl.cpp b/src/liberty/control/CarCtrl.cpp
similarity index 100%
rename from src/control/CarCtrl.cpp
rename to src/liberty/control/CarCtrl.cpp
diff --git a/src/control/CarCtrl.h b/src/liberty/control/CarCtrl.h
similarity index 100%
rename from src/control/CarCtrl.h
rename to src/liberty/control/CarCtrl.h
diff --git a/src/control/Curves.cpp b/src/liberty/control/Curves.cpp
similarity index 100%
rename from src/control/Curves.cpp
rename to src/liberty/control/Curves.cpp
diff --git a/miami/control/Curves.h b/src/liberty/control/Curves.h
similarity index 100%
rename from miami/control/Curves.h
rename to src/liberty/control/Curves.h
diff --git a/src/control/Darkel.cpp b/src/liberty/control/Darkel.cpp
similarity index 100%
rename from src/control/Darkel.cpp
rename to src/liberty/control/Darkel.cpp
diff --git a/src/control/Darkel.h b/src/liberty/control/Darkel.h
similarity index 100%
rename from src/control/Darkel.h
rename to src/liberty/control/Darkel.h
diff --git a/src/control/GameLogic.cpp b/src/liberty/control/GameLogic.cpp
similarity index 100%
rename from src/control/GameLogic.cpp
rename to src/liberty/control/GameLogic.cpp
diff --git a/src/control/GameLogic.h b/src/liberty/control/GameLogic.h
similarity index 100%
rename from src/control/GameLogic.h
rename to src/liberty/control/GameLogic.h
diff --git a/src/control/Garages.cpp b/src/liberty/control/Garages.cpp
similarity index 100%
rename from src/control/Garages.cpp
rename to src/liberty/control/Garages.cpp
diff --git a/src/control/Garages.h b/src/liberty/control/Garages.h
similarity index 100%
rename from src/control/Garages.h
rename to src/liberty/control/Garages.h
diff --git a/miami/control/NameGrid.cpp b/src/liberty/control/NameGrid.cpp
similarity index 100%
rename from miami/control/NameGrid.cpp
rename to src/liberty/control/NameGrid.cpp
diff --git a/miami/control/NameGrid.h b/src/liberty/control/NameGrid.h
similarity index 100%
rename from miami/control/NameGrid.h
rename to src/liberty/control/NameGrid.h
diff --git a/src/control/OnscreenTimer.cpp b/src/liberty/control/OnscreenTimer.cpp
similarity index 100%
rename from src/control/OnscreenTimer.cpp
rename to src/liberty/control/OnscreenTimer.cpp
diff --git a/src/control/OnscreenTimer.h b/src/liberty/control/OnscreenTimer.h
similarity index 100%
rename from src/control/OnscreenTimer.h
rename to src/liberty/control/OnscreenTimer.h
diff --git a/src/control/PathFind.cpp b/src/liberty/control/PathFind.cpp
similarity index 100%
rename from src/control/PathFind.cpp
rename to src/liberty/control/PathFind.cpp
diff --git a/src/control/PathFind.h b/src/liberty/control/PathFind.h
similarity index 100%
rename from src/control/PathFind.h
rename to src/liberty/control/PathFind.h
diff --git a/src/control/Phones.cpp b/src/liberty/control/Phones.cpp
similarity index 100%
rename from src/control/Phones.cpp
rename to src/liberty/control/Phones.cpp
diff --git a/src/control/Phones.h b/src/liberty/control/Phones.h
similarity index 100%
rename from src/control/Phones.h
rename to src/liberty/control/Phones.h
diff --git a/src/control/Pickups.cpp b/src/liberty/control/Pickups.cpp
similarity index 100%
rename from src/control/Pickups.cpp
rename to src/liberty/control/Pickups.cpp
diff --git a/src/control/Pickups.h b/src/liberty/control/Pickups.h
similarity index 100%
rename from src/control/Pickups.h
rename to src/liberty/control/Pickups.h
diff --git a/miami/control/PowerPoints.cpp b/src/liberty/control/PowerPoints.cpp
similarity index 100%
rename from miami/control/PowerPoints.cpp
rename to src/liberty/control/PowerPoints.cpp
diff --git a/miami/control/PowerPoints.h b/src/liberty/control/PowerPoints.h
similarity index 100%
rename from miami/control/PowerPoints.h
rename to src/liberty/control/PowerPoints.h
diff --git a/src/control/Record.cpp b/src/liberty/control/Record.cpp
similarity index 100%
rename from src/control/Record.cpp
rename to src/liberty/control/Record.cpp
diff --git a/miami/control/Record.h b/src/liberty/control/Record.h
similarity index 100%
rename from miami/control/Record.h
rename to src/liberty/control/Record.h
diff --git a/src/control/Remote.cpp b/src/liberty/control/Remote.cpp
similarity index 100%
rename from src/control/Remote.cpp
rename to src/liberty/control/Remote.cpp
diff --git a/src/control/Remote.h b/src/liberty/control/Remote.h
similarity index 100%
rename from src/control/Remote.h
rename to src/liberty/control/Remote.h
diff --git a/src/control/Replay.cpp b/src/liberty/control/Replay.cpp
similarity index 100%
rename from src/control/Replay.cpp
rename to src/liberty/control/Replay.cpp
diff --git a/src/control/Replay.h b/src/liberty/control/Replay.h
similarity index 100%
rename from src/control/Replay.h
rename to src/liberty/control/Replay.h
diff --git a/src/control/Restart.cpp b/src/liberty/control/Restart.cpp
similarity index 100%
rename from src/control/Restart.cpp
rename to src/liberty/control/Restart.cpp
diff --git a/miami/control/Restart.h b/src/liberty/control/Restart.h
similarity index 100%
rename from miami/control/Restart.h
rename to src/liberty/control/Restart.h
diff --git a/src/control/RoadBlocks.cpp b/src/liberty/control/RoadBlocks.cpp
similarity index 100%
rename from src/control/RoadBlocks.cpp
rename to src/liberty/control/RoadBlocks.cpp
diff --git a/src/control/RoadBlocks.h b/src/liberty/control/RoadBlocks.h
similarity index 100%
rename from src/control/RoadBlocks.h
rename to src/liberty/control/RoadBlocks.h
diff --git a/src/control/SceneEdit.cpp b/src/liberty/control/SceneEdit.cpp
similarity index 100%
rename from src/control/SceneEdit.cpp
rename to src/liberty/control/SceneEdit.cpp
diff --git a/miami/control/SceneEdit.h b/src/liberty/control/SceneEdit.h
similarity index 100%
rename from miami/control/SceneEdit.h
rename to src/liberty/control/SceneEdit.h
diff --git a/src/control/Script.cpp b/src/liberty/control/Script.cpp
similarity index 100%
rename from src/control/Script.cpp
rename to src/liberty/control/Script.cpp
diff --git a/src/control/Script.h b/src/liberty/control/Script.h
similarity index 100%
rename from src/control/Script.h
rename to src/liberty/control/Script.h
diff --git a/src/control/Script2.cpp b/src/liberty/control/Script2.cpp
similarity index 100%
rename from src/control/Script2.cpp
rename to src/liberty/control/Script2.cpp
diff --git a/src/control/Script3.cpp b/src/liberty/control/Script3.cpp
similarity index 100%
rename from src/control/Script3.cpp
rename to src/liberty/control/Script3.cpp
diff --git a/src/control/Script4.cpp b/src/liberty/control/Script4.cpp
similarity index 100%
rename from src/control/Script4.cpp
rename to src/liberty/control/Script4.cpp
diff --git a/src/control/Script5.cpp b/src/liberty/control/Script5.cpp
similarity index 100%
rename from src/control/Script5.cpp
rename to src/liberty/control/Script5.cpp
diff --git a/src/control/Script6.cpp b/src/liberty/control/Script6.cpp
similarity index 100%
rename from src/control/Script6.cpp
rename to src/liberty/control/Script6.cpp
diff --git a/src/control/ScriptCommands.h b/src/liberty/control/ScriptCommands.h
similarity index 100%
rename from src/control/ScriptCommands.h
rename to src/liberty/control/ScriptCommands.h
diff --git a/src/control/ScriptDebug.cpp b/src/liberty/control/ScriptDebug.cpp
similarity index 100%
rename from src/control/ScriptDebug.cpp
rename to src/liberty/control/ScriptDebug.cpp
diff --git a/src/control/TrafficLights.cpp b/src/liberty/control/TrafficLights.cpp
similarity index 100%
rename from src/control/TrafficLights.cpp
rename to src/liberty/control/TrafficLights.cpp
diff --git a/src/control/TrafficLights.h b/src/liberty/control/TrafficLights.h
similarity index 100%
rename from src/control/TrafficLights.h
rename to src/liberty/control/TrafficLights.h
diff --git a/miami/core/Accident.cpp b/src/liberty/core/Accident.cpp
similarity index 100%
rename from miami/core/Accident.cpp
rename to src/liberty/core/Accident.cpp
diff --git a/miami/core/Accident.h b/src/liberty/core/Accident.h
similarity index 100%
rename from miami/core/Accident.h
rename to src/liberty/core/Accident.h
diff --git a/src/core/AnimViewer.cpp b/src/liberty/core/AnimViewer.cpp
similarity index 100%
rename from src/core/AnimViewer.cpp
rename to src/liberty/core/AnimViewer.cpp
diff --git a/miami/core/AnimViewer.h b/src/liberty/core/AnimViewer.h
similarity index 100%
rename from miami/core/AnimViewer.h
rename to src/liberty/core/AnimViewer.h
diff --git a/src/core/Cam.cpp b/src/liberty/core/Cam.cpp
similarity index 100%
rename from src/core/Cam.cpp
rename to src/liberty/core/Cam.cpp
diff --git a/src/core/Camera.cpp b/src/liberty/core/Camera.cpp
similarity index 100%
rename from src/core/Camera.cpp
rename to src/liberty/core/Camera.cpp
diff --git a/src/core/Camera.h b/src/liberty/core/Camera.h
similarity index 100%
rename from src/core/Camera.h
rename to src/liberty/core/Camera.h
diff --git a/miami/core/CdStream.cpp b/src/liberty/core/CdStream.cpp
similarity index 100%
rename from miami/core/CdStream.cpp
rename to src/liberty/core/CdStream.cpp
diff --git a/miami/core/CdStream.h b/src/liberty/core/CdStream.h
similarity index 100%
rename from miami/core/CdStream.h
rename to src/liberty/core/CdStream.h
diff --git a/miami/core/CdStreamDC.cpp b/src/liberty/core/CdStreamDC.cpp
similarity index 100%
rename from miami/core/CdStreamDC.cpp
rename to src/liberty/core/CdStreamDC.cpp
diff --git a/miami/core/CdStreamPosix.cpp b/src/liberty/core/CdStreamPosix.cpp
similarity index 100%
rename from miami/core/CdStreamPosix.cpp
rename to src/liberty/core/CdStreamPosix.cpp
diff --git a/src/core/Clock.cpp b/src/liberty/core/Clock.cpp
similarity index 100%
rename from src/core/Clock.cpp
rename to src/liberty/core/Clock.cpp
diff --git a/miami/core/Clock.h b/src/liberty/core/Clock.h
similarity index 100%
rename from miami/core/Clock.h
rename to src/liberty/core/Clock.h
diff --git a/src/core/ControllerConfig.cpp b/src/liberty/core/ControllerConfig.cpp
similarity index 100%
rename from src/core/ControllerConfig.cpp
rename to src/liberty/core/ControllerConfig.cpp
diff --git a/src/core/ControllerConfig.h b/src/liberty/core/ControllerConfig.h
similarity index 100%
rename from src/core/ControllerConfig.h
rename to src/liberty/core/ControllerConfig.h
diff --git a/src/core/Crime.h b/src/liberty/core/Crime.h
similarity index 100%
rename from src/core/Crime.h
rename to src/liberty/core/Crime.h
diff --git a/src/core/Debug.cpp b/src/liberty/core/Debug.cpp
similarity index 100%
rename from src/core/Debug.cpp
rename to src/liberty/core/Debug.cpp
diff --git a/miami/core/Debug.h b/src/liberty/core/Debug.h
similarity index 100%
rename from miami/core/Debug.h
rename to src/liberty/core/Debug.h
diff --git a/src/core/Directory.cpp b/src/liberty/core/Directory.cpp
similarity index 100%
rename from src/core/Directory.cpp
rename to src/liberty/core/Directory.cpp
diff --git a/miami/core/Directory.h b/src/liberty/core/Directory.h
similarity index 100%
rename from miami/core/Directory.h
rename to src/liberty/core/Directory.h
diff --git a/src/core/EventList.cpp b/src/liberty/core/EventList.cpp
similarity index 100%
rename from src/core/EventList.cpp
rename to src/liberty/core/EventList.cpp
diff --git a/src/core/EventList.h b/src/liberty/core/EventList.h
similarity index 100%
rename from src/core/EventList.h
rename to src/liberty/core/EventList.h
diff --git a/src/core/FileLoader.cpp b/src/liberty/core/FileLoader.cpp
similarity index 100%
rename from src/core/FileLoader.cpp
rename to src/liberty/core/FileLoader.cpp
diff --git a/src/core/FileLoader.h b/src/liberty/core/FileLoader.h
similarity index 100%
rename from src/core/FileLoader.h
rename to src/liberty/core/FileLoader.h
diff --git a/miami/core/FileMgr.cpp b/src/liberty/core/FileMgr.cpp
similarity index 100%
rename from miami/core/FileMgr.cpp
rename to src/liberty/core/FileMgr.cpp
diff --git a/miami/core/FileMgr.h b/src/liberty/core/FileMgr.h
similarity index 100%
rename from miami/core/FileMgr.h
rename to src/liberty/core/FileMgr.h
diff --git a/src/core/Fire.cpp b/src/liberty/core/Fire.cpp
similarity index 100%
rename from src/core/Fire.cpp
rename to src/liberty/core/Fire.cpp
diff --git a/src/core/Fire.h b/src/liberty/core/Fire.h
similarity index 100%
rename from src/core/Fire.h
rename to src/liberty/core/Fire.h
diff --git a/miami/core/FrontEndControls.cpp b/src/liberty/core/FrontEndControls.cpp
similarity index 100%
rename from miami/core/FrontEndControls.cpp
rename to src/liberty/core/FrontEndControls.cpp
diff --git a/miami/core/FrontEndControls.h b/src/liberty/core/FrontEndControls.h
similarity index 100%
rename from miami/core/FrontEndControls.h
rename to src/liberty/core/FrontEndControls.h
diff --git a/src/core/Frontend.cpp b/src/liberty/core/Frontend.cpp
similarity index 100%
rename from src/core/Frontend.cpp
rename to src/liberty/core/Frontend.cpp
diff --git a/src/core/Frontend.h b/src/liberty/core/Frontend.h
similarity index 100%
rename from src/core/Frontend.h
rename to src/liberty/core/Frontend.h
diff --git a/miami/core/FrontendTriggers.h b/src/liberty/core/FrontendTriggers.h
similarity index 100%
rename from miami/core/FrontendTriggers.h
rename to src/liberty/core/FrontendTriggers.h
diff --git a/src/core/Frontend_PS2.cpp b/src/liberty/core/Frontend_PS2.cpp
similarity index 100%
rename from src/core/Frontend_PS2.cpp
rename to src/liberty/core/Frontend_PS2.cpp
diff --git a/src/core/Frontend_PS2.h b/src/liberty/core/Frontend_PS2.h
similarity index 100%
rename from src/core/Frontend_PS2.h
rename to src/liberty/core/Frontend_PS2.h
diff --git a/src/core/Game.cpp b/src/liberty/core/Game.cpp
similarity index 100%
rename from src/core/Game.cpp
rename to src/liberty/core/Game.cpp
diff --git a/src/core/Game.h b/src/liberty/core/Game.h
similarity index 100%
rename from src/core/Game.h
rename to src/liberty/core/Game.h
diff --git a/src/core/General.h b/src/liberty/core/General.h
similarity index 100%
rename from src/core/General.h
rename to src/liberty/core/General.h
diff --git a/src/core/IniFile.cpp b/src/liberty/core/IniFile.cpp
similarity index 100%
rename from src/core/IniFile.cpp
rename to src/liberty/core/IniFile.cpp
diff --git a/src/core/IniFile.h b/src/liberty/core/IniFile.h
similarity index 100%
rename from src/core/IniFile.h
rename to src/liberty/core/IniFile.h
diff --git a/miami/core/Lists.cpp b/src/liberty/core/Lists.cpp
similarity index 100%
rename from miami/core/Lists.cpp
rename to src/liberty/core/Lists.cpp
diff --git a/miami/core/Lists.h b/src/liberty/core/Lists.h
similarity index 100%
rename from miami/core/Lists.h
rename to src/liberty/core/Lists.h
diff --git a/src/core/MenuScreens.cpp b/src/liberty/core/MenuScreens.cpp
similarity index 100%
rename from src/core/MenuScreens.cpp
rename to src/liberty/core/MenuScreens.cpp
diff --git a/src/core/MenuScreensCustom.cpp b/src/liberty/core/MenuScreensCustom.cpp
similarity index 100%
rename from src/core/MenuScreensCustom.cpp
rename to src/liberty/core/MenuScreensCustom.cpp
diff --git a/src/core/Pad.cpp b/src/liberty/core/Pad.cpp
similarity index 100%
rename from src/core/Pad.cpp
rename to src/liberty/core/Pad.cpp
diff --git a/src/core/Pad.h b/src/liberty/core/Pad.h
similarity index 100%
rename from src/core/Pad.h
rename to src/liberty/core/Pad.h
diff --git a/src/core/Placeable.cpp b/src/liberty/core/Placeable.cpp
similarity index 100%
rename from src/core/Placeable.cpp
rename to src/liberty/core/Placeable.cpp
diff --git a/src/core/Placeable.h b/src/liberty/core/Placeable.h
similarity index 100%
rename from src/core/Placeable.h
rename to src/liberty/core/Placeable.h
diff --git a/src/core/PlayerInfo.cpp b/src/liberty/core/PlayerInfo.cpp
similarity index 100%
rename from src/core/PlayerInfo.cpp
rename to src/liberty/core/PlayerInfo.cpp
diff --git a/src/core/PlayerInfo.h b/src/liberty/core/PlayerInfo.h
similarity index 100%
rename from src/core/PlayerInfo.h
rename to src/liberty/core/PlayerInfo.h
diff --git a/src/core/Pools.cpp b/src/liberty/core/Pools.cpp
similarity index 100%
rename from src/core/Pools.cpp
rename to src/liberty/core/Pools.cpp
diff --git a/src/core/Pools.h b/src/liberty/core/Pools.h
similarity index 100%
rename from src/core/Pools.h
rename to src/liberty/core/Pools.h
diff --git a/miami/core/Profile.cpp b/src/liberty/core/Profile.cpp
similarity index 100%
rename from miami/core/Profile.cpp
rename to src/liberty/core/Profile.cpp
diff --git a/miami/core/Profile.h b/src/liberty/core/Profile.h
similarity index 100%
rename from miami/core/Profile.h
rename to src/liberty/core/Profile.h
diff --git a/src/core/Radar.cpp b/src/liberty/core/Radar.cpp
similarity index 100%
rename from src/core/Radar.cpp
rename to src/liberty/core/Radar.cpp
diff --git a/src/core/Radar.h b/src/liberty/core/Radar.h
similarity index 100%
rename from src/core/Radar.h
rename to src/liberty/core/Radar.h
diff --git a/miami/core/Range2D.cpp b/src/liberty/core/Range2D.cpp
similarity index 100%
rename from miami/core/Range2D.cpp
rename to src/liberty/core/Range2D.cpp
diff --git a/miami/core/Range2D.h b/src/liberty/core/Range2D.h
similarity index 100%
rename from miami/core/Range2D.h
rename to src/liberty/core/Range2D.h
diff --git a/miami/core/Range3D.cpp b/src/liberty/core/Range3D.cpp
similarity index 100%
rename from miami/core/Range3D.cpp
rename to src/liberty/core/Range3D.cpp
diff --git a/miami/core/Range3D.h b/src/liberty/core/Range3D.h
similarity index 100%
rename from miami/core/Range3D.h
rename to src/liberty/core/Range3D.h
diff --git a/src/core/References.cpp b/src/liberty/core/References.cpp
similarity index 100%
rename from src/core/References.cpp
rename to src/liberty/core/References.cpp
diff --git a/miami/core/References.h b/src/liberty/core/References.h
similarity index 100%
rename from miami/core/References.h
rename to src/liberty/core/References.h
diff --git a/src/core/Stats.cpp b/src/liberty/core/Stats.cpp
similarity index 100%
rename from src/core/Stats.cpp
rename to src/liberty/core/Stats.cpp
diff --git a/src/core/Stats.h b/src/liberty/core/Stats.h
similarity index 100%
rename from src/core/Stats.h
rename to src/liberty/core/Stats.h
diff --git a/src/core/Streaming.cpp b/src/liberty/core/Streaming.cpp
similarity index 100%
rename from src/core/Streaming.cpp
rename to src/liberty/core/Streaming.cpp
diff --git a/src/core/Streaming.h b/src/liberty/core/Streaming.h
similarity index 100%
rename from src/core/Streaming.h
rename to src/liberty/core/Streaming.h
diff --git a/src/core/SurfaceTable.cpp b/src/liberty/core/SurfaceTable.cpp
similarity index 100%
rename from src/core/SurfaceTable.cpp
rename to src/liberty/core/SurfaceTable.cpp
diff --git a/src/core/SurfaceTable.h b/src/liberty/core/SurfaceTable.h
similarity index 100%
rename from src/core/SurfaceTable.h
rename to src/liberty/core/SurfaceTable.h
diff --git a/miami/core/TimeStep.cpp b/src/liberty/core/TimeStep.cpp
similarity index 100%
rename from miami/core/TimeStep.cpp
rename to src/liberty/core/TimeStep.cpp
diff --git a/miami/core/TimeStep.h b/src/liberty/core/TimeStep.h
similarity index 100%
rename from miami/core/TimeStep.h
rename to src/liberty/core/TimeStep.h
diff --git a/src/core/Timer.cpp b/src/liberty/core/Timer.cpp
similarity index 100%
rename from src/core/Timer.cpp
rename to src/liberty/core/Timer.cpp
diff --git a/miami/core/Timer.h b/src/liberty/core/Timer.h
similarity index 100%
rename from miami/core/Timer.h
rename to src/liberty/core/Timer.h
diff --git a/src/core/User.cpp b/src/liberty/core/User.cpp
similarity index 100%
rename from src/core/User.cpp
rename to src/liberty/core/User.cpp
diff --git a/src/core/User.h b/src/liberty/core/User.h
similarity index 100%
rename from src/core/User.h
rename to src/liberty/core/User.h
diff --git a/src/core/Wanted.cpp b/src/liberty/core/Wanted.cpp
similarity index 100%
rename from src/core/Wanted.cpp
rename to src/liberty/core/Wanted.cpp
diff --git a/src/core/Wanted.h b/src/liberty/core/Wanted.h
similarity index 100%
rename from src/core/Wanted.h
rename to src/liberty/core/Wanted.h
diff --git a/src/core/World.cpp b/src/liberty/core/World.cpp
similarity index 100%
rename from src/core/World.cpp
rename to src/liberty/core/World.cpp
diff --git a/src/core/World.h b/src/liberty/core/World.h
similarity index 100%
rename from src/core/World.h
rename to src/liberty/core/World.h
diff --git a/src/core/ZoneCull.cpp b/src/liberty/core/ZoneCull.cpp
similarity index 100%
rename from src/core/ZoneCull.cpp
rename to src/liberty/core/ZoneCull.cpp
diff --git a/src/core/ZoneCull.h b/src/liberty/core/ZoneCull.h
similarity index 100%
rename from src/core/ZoneCull.h
rename to src/liberty/core/ZoneCull.h
diff --git a/src/core/Zones.cpp b/src/liberty/core/Zones.cpp
similarity index 100%
rename from src/core/Zones.cpp
rename to src/liberty/core/Zones.cpp
diff --git a/src/core/Zones.h b/src/liberty/core/Zones.h
similarity index 100%
rename from src/core/Zones.h
rename to src/liberty/core/Zones.h
diff --git a/src/core/common.h b/src/liberty/core/common.h
similarity index 100%
rename from src/core/common.h
rename to src/liberty/core/common.h
diff --git a/src/core/config.h b/src/liberty/core/config.h
similarity index 100%
rename from src/core/config.h
rename to src/liberty/core/config.h
diff --git a/src/core/main.cpp b/src/liberty/core/main.cpp
similarity index 100%
rename from src/core/main.cpp
rename to src/liberty/core/main.cpp
diff --git a/miami/core/main.h b/src/liberty/core/main.h
similarity index 100%
rename from miami/core/main.h
rename to src/liberty/core/main.h
diff --git a/miami/core/obrstr.cpp b/src/liberty/core/obrstr.cpp
similarity index 100%
rename from miami/core/obrstr.cpp
rename to src/liberty/core/obrstr.cpp
diff --git a/miami/core/obrstr.h b/src/liberty/core/obrstr.h
similarity index 100%
rename from miami/core/obrstr.h
rename to src/liberty/core/obrstr.h
diff --git a/src/core/re3.cpp b/src/liberty/core/re3.cpp
similarity index 100%
rename from src/core/re3.cpp
rename to src/liberty/core/re3.cpp
diff --git a/src/core/templates.h b/src/liberty/core/templates.h
similarity index 100%
rename from src/core/templates.h
rename to src/liberty/core/templates.h
diff --git a/src/core/timebars.cpp b/src/liberty/core/timebars.cpp
similarity index 100%
rename from src/core/timebars.cpp
rename to src/liberty/core/timebars.cpp
diff --git a/miami/core/timebars.h b/src/liberty/core/timebars.h
similarity index 100%
rename from miami/core/timebars.h
rename to src/liberty/core/timebars.h
diff --git a/src/entities/Dummy.cpp b/src/liberty/entities/Dummy.cpp
similarity index 100%
rename from src/entities/Dummy.cpp
rename to src/liberty/entities/Dummy.cpp
diff --git a/src/entities/Dummy.h b/src/liberty/entities/Dummy.h
similarity index 100%
rename from src/entities/Dummy.h
rename to src/liberty/entities/Dummy.h
diff --git a/src/entities/Entity.cpp b/src/liberty/entities/Entity.cpp
similarity index 100%
rename from src/entities/Entity.cpp
rename to src/liberty/entities/Entity.cpp
diff --git a/src/entities/Entity.h b/src/liberty/entities/Entity.h
similarity index 100%
rename from src/entities/Entity.h
rename to src/liberty/entities/Entity.h
diff --git a/src/entities/Physical.cpp b/src/liberty/entities/Physical.cpp
similarity index 100%
rename from src/entities/Physical.cpp
rename to src/liberty/entities/Physical.cpp
diff --git a/src/entities/Physical.h b/src/liberty/entities/Physical.h
similarity index 100%
rename from src/entities/Physical.h
rename to src/liberty/entities/Physical.h
diff --git a/miami/extras/GitSHA1.cpp.in b/src/liberty/extras/GitSHA1.cpp.in
similarity index 100%
rename from miami/extras/GitSHA1.cpp.in
rename to src/liberty/extras/GitSHA1.cpp.in
diff --git a/miami/extras/GitSHA1.h b/src/liberty/extras/GitSHA1.h
similarity index 100%
rename from miami/extras/GitSHA1.h
rename to src/liberty/extras/GitSHA1.h
diff --git a/miami/extras/arrow.inc b/src/liberty/extras/arrow.inc
similarity index 100%
rename from miami/extras/arrow.inc
rename to src/liberty/extras/arrow.inc
diff --git a/miami/extras/cursor.inc b/src/liberty/extras/cursor.inc
similarity index 100%
rename from miami/extras/cursor.inc
rename to src/liberty/extras/cursor.inc
diff --git a/src/extras/custompipes.cpp b/src/liberty/extras/custompipes.cpp
similarity index 100%
rename from src/extras/custompipes.cpp
rename to src/liberty/extras/custompipes.cpp
diff --git a/miami/extras/custompipes.h b/src/liberty/extras/custompipes.h
similarity index 100%
rename from miami/extras/custompipes.h
rename to src/liberty/extras/custompipes.h
diff --git a/src/extras/custompipes_d3d9.cpp b/src/liberty/extras/custompipes_d3d9.cpp
similarity index 100%
rename from src/extras/custompipes_d3d9.cpp
rename to src/liberty/extras/custompipes_d3d9.cpp
diff --git a/src/extras/custompipes_gl.cpp b/src/liberty/extras/custompipes_gl.cpp
similarity index 100%
rename from src/extras/custompipes_gl.cpp
rename to src/liberty/extras/custompipes_gl.cpp
diff --git a/miami/extras/debugmenu.cpp b/src/liberty/extras/debugmenu.cpp
similarity index 100%
rename from miami/extras/debugmenu.cpp
rename to src/liberty/extras/debugmenu.cpp
diff --git a/src/extras/debugmenu.h b/src/liberty/extras/debugmenu.h
similarity index 100%
rename from src/extras/debugmenu.h
rename to src/liberty/extras/debugmenu.h
diff --git a/src/extras/frontendoption.cpp b/src/liberty/extras/frontendoption.cpp
similarity index 100%
rename from src/extras/frontendoption.cpp
rename to src/liberty/extras/frontendoption.cpp
diff --git a/src/extras/frontendoption.h b/src/liberty/extras/frontendoption.h
similarity index 100%
rename from src/extras/frontendoption.h
rename to src/liberty/extras/frontendoption.h
diff --git a/miami/extras/ini.h b/src/liberty/extras/ini.h
similarity index 100%
rename from miami/extras/ini.h
rename to src/liberty/extras/ini.h
diff --git a/src/extras/postfx.cpp b/src/liberty/extras/postfx.cpp
similarity index 100%
rename from src/extras/postfx.cpp
rename to src/liberty/extras/postfx.cpp
diff --git a/src/extras/postfx.h b/src/liberty/extras/postfx.h
similarity index 100%
rename from src/extras/postfx.h
rename to src/liberty/extras/postfx.h
diff --git a/src/extras/re3_inttypes.h b/src/liberty/extras/re3_inttypes.h
similarity index 100%
rename from src/extras/re3_inttypes.h
rename to src/liberty/extras/re3_inttypes.h
diff --git a/miami/extras/screendroplets.cpp b/src/liberty/extras/screendroplets.cpp
similarity index 100%
rename from miami/extras/screendroplets.cpp
rename to src/liberty/extras/screendroplets.cpp
diff --git a/miami/extras/screendroplets.h b/src/liberty/extras/screendroplets.h
similarity index 100%
rename from miami/extras/screendroplets.h
rename to src/liberty/extras/screendroplets.h
diff --git a/src/extras/shaders/colourfilterIII.frag b/src/liberty/extras/shaders/colourfilterIII.frag
similarity index 100%
rename from src/extras/shaders/colourfilterIII.frag
rename to src/liberty/extras/shaders/colourfilterIII.frag
diff --git a/src/extras/shaders/colourfilterIII_PS.hlsl b/src/liberty/extras/shaders/colourfilterIII_PS.hlsl
similarity index 100%
rename from src/extras/shaders/colourfilterIII_PS.hlsl
rename to src/liberty/extras/shaders/colourfilterIII_PS.hlsl
diff --git a/miami/extras/shaders/contrast.frag b/src/liberty/extras/shaders/contrast.frag
similarity index 100%
rename from miami/extras/shaders/contrast.frag
rename to src/liberty/extras/shaders/contrast.frag
diff --git a/miami/extras/shaders/contrastPS.hlsl b/src/liberty/extras/shaders/contrastPS.hlsl
similarity index 100%
rename from miami/extras/shaders/contrastPS.hlsl
rename to src/liberty/extras/shaders/contrastPS.hlsl
diff --git a/miami/extras/shaders/default_UV2.vert b/src/liberty/extras/shaders/default_UV2.vert
similarity index 100%
rename from miami/extras/shaders/default_UV2.vert
rename to src/liberty/extras/shaders/default_UV2.vert
diff --git a/miami/extras/shaders/default_UV2_VS.hlsl b/src/liberty/extras/shaders/default_UV2_VS.hlsl
similarity index 100%
rename from miami/extras/shaders/default_UV2_VS.hlsl
rename to src/liberty/extras/shaders/default_UV2_VS.hlsl
diff --git a/miami/extras/shaders/im2d.vert b/src/liberty/extras/shaders/im2d.vert
similarity index 100%
rename from miami/extras/shaders/im2d.vert
rename to src/liberty/extras/shaders/im2d.vert
diff --git a/miami/extras/shaders/im2d_UV2.vert b/src/liberty/extras/shaders/im2d_UV2.vert
similarity index 100%
rename from miami/extras/shaders/im2d_UV2.vert
rename to src/liberty/extras/shaders/im2d_UV2.vert
diff --git a/miami/extras/shaders/lighting.h b/src/liberty/extras/shaders/lighting.h
similarity index 100%
rename from miami/extras/shaders/lighting.h
rename to src/liberty/extras/shaders/lighting.h
diff --git a/miami/extras/shaders/make_glsl.sh b/src/liberty/extras/shaders/make_glsl.sh
similarity index 100%
rename from miami/extras/shaders/make_glsl.sh
rename to src/liberty/extras/shaders/make_glsl.sh
diff --git a/miami/extras/shaders/make_hlsl.cmd b/src/liberty/extras/shaders/make_hlsl.cmd
similarity index 100%
rename from miami/extras/shaders/make_hlsl.cmd
rename to src/liberty/extras/shaders/make_hlsl.cmd
diff --git a/miami/extras/shaders/makeinc_glsl.sh b/src/liberty/extras/shaders/makeinc_glsl.sh
similarity index 100%
rename from miami/extras/shaders/makeinc_glsl.sh
rename to src/liberty/extras/shaders/makeinc_glsl.sh
diff --git a/miami/extras/shaders/makeinc_hlsl.sh b/src/liberty/extras/shaders/makeinc_hlsl.sh
similarity index 100%
rename from miami/extras/shaders/makeinc_hlsl.sh
rename to src/liberty/extras/shaders/makeinc_hlsl.sh
diff --git a/miami/extras/shaders/neoGloss.frag b/src/liberty/extras/shaders/neoGloss.frag
similarity index 100%
rename from miami/extras/shaders/neoGloss.frag
rename to src/liberty/extras/shaders/neoGloss.frag
diff --git a/miami/extras/shaders/neoGloss.vert b/src/liberty/extras/shaders/neoGloss.vert
similarity index 100%
rename from miami/extras/shaders/neoGloss.vert
rename to src/liberty/extras/shaders/neoGloss.vert
diff --git a/miami/extras/shaders/neoGloss_PS.hlsl b/src/liberty/extras/shaders/neoGloss_PS.hlsl
similarity index 100%
rename from miami/extras/shaders/neoGloss_PS.hlsl
rename to src/liberty/extras/shaders/neoGloss_PS.hlsl
diff --git a/miami/extras/shaders/neoGloss_VS.hlsl b/src/liberty/extras/shaders/neoGloss_VS.hlsl
similarity index 100%
rename from miami/extras/shaders/neoGloss_VS.hlsl
rename to src/liberty/extras/shaders/neoGloss_VS.hlsl
diff --git a/miami/extras/shaders/neoRim.vert b/src/liberty/extras/shaders/neoRim.vert
similarity index 100%
rename from miami/extras/shaders/neoRim.vert
rename to src/liberty/extras/shaders/neoRim.vert
diff --git a/miami/extras/shaders/neoRimSkin.vert b/src/liberty/extras/shaders/neoRimSkin.vert
similarity index 100%
rename from miami/extras/shaders/neoRimSkin.vert
rename to src/liberty/extras/shaders/neoRimSkin.vert
diff --git a/miami/extras/shaders/neoRimSkin_VS.hlsl b/src/liberty/extras/shaders/neoRimSkin_VS.hlsl
similarity index 100%
rename from miami/extras/shaders/neoRimSkin_VS.hlsl
rename to src/liberty/extras/shaders/neoRimSkin_VS.hlsl
diff --git a/miami/extras/shaders/neoRim_VS.hlsl b/src/liberty/extras/shaders/neoRim_VS.hlsl
similarity index 100%
rename from miami/extras/shaders/neoRim_VS.hlsl
rename to src/liberty/extras/shaders/neoRim_VS.hlsl
diff --git a/miami/extras/shaders/neoVehicle.frag b/src/liberty/extras/shaders/neoVehicle.frag
similarity index 100%
rename from miami/extras/shaders/neoVehicle.frag
rename to src/liberty/extras/shaders/neoVehicle.frag
diff --git a/miami/extras/shaders/neoVehicle.vert b/src/liberty/extras/shaders/neoVehicle.vert
similarity index 100%
rename from miami/extras/shaders/neoVehicle.vert
rename to src/liberty/extras/shaders/neoVehicle.vert
diff --git a/miami/extras/shaders/neoVehicle_PS.hlsl b/src/liberty/extras/shaders/neoVehicle_PS.hlsl
similarity index 100%
rename from miami/extras/shaders/neoVehicle_PS.hlsl
rename to src/liberty/extras/shaders/neoVehicle_PS.hlsl
diff --git a/miami/extras/shaders/neoVehicle_VS.hlsl b/src/liberty/extras/shaders/neoVehicle_VS.hlsl
similarity index 100%
rename from miami/extras/shaders/neoVehicle_VS.hlsl
rename to src/liberty/extras/shaders/neoVehicle_VS.hlsl
diff --git a/src/extras/shaders/neoWorldIII.frag b/src/liberty/extras/shaders/neoWorldIII.frag
similarity index 100%
rename from src/extras/shaders/neoWorldIII.frag
rename to src/liberty/extras/shaders/neoWorldIII.frag
diff --git a/src/extras/shaders/neoWorldIII_PS.hlsl b/src/liberty/extras/shaders/neoWorldIII_PS.hlsl
similarity index 100%
rename from src/extras/shaders/neoWorldIII_PS.hlsl
rename to src/liberty/extras/shaders/neoWorldIII_PS.hlsl
diff --git a/src/extras/shaders/obj/colourfilterIII_PS.cso b/src/liberty/extras/shaders/obj/colourfilterIII_PS.cso
similarity index 100%
rename from src/extras/shaders/obj/colourfilterIII_PS.cso
rename to src/liberty/extras/shaders/obj/colourfilterIII_PS.cso
diff --git a/src/extras/shaders/obj/colourfilterIII_PS.inc b/src/liberty/extras/shaders/obj/colourfilterIII_PS.inc
similarity index 100%
rename from src/extras/shaders/obj/colourfilterIII_PS.inc
rename to src/liberty/extras/shaders/obj/colourfilterIII_PS.inc
diff --git a/src/extras/shaders/obj/colourfilterIII_frag.inc b/src/liberty/extras/shaders/obj/colourfilterIII_frag.inc
similarity index 100%
rename from src/extras/shaders/obj/colourfilterIII_frag.inc
rename to src/liberty/extras/shaders/obj/colourfilterIII_frag.inc
diff --git a/src/extras/shaders/obj/contrastPS.cso b/src/liberty/extras/shaders/obj/contrastPS.cso
similarity index 100%
rename from src/extras/shaders/obj/contrastPS.cso
rename to src/liberty/extras/shaders/obj/contrastPS.cso
diff --git a/src/extras/shaders/obj/contrastPS.inc b/src/liberty/extras/shaders/obj/contrastPS.inc
similarity index 100%
rename from src/extras/shaders/obj/contrastPS.inc
rename to src/liberty/extras/shaders/obj/contrastPS.inc
diff --git a/src/extras/shaders/obj/contrast_frag.inc b/src/liberty/extras/shaders/obj/contrast_frag.inc
similarity index 100%
rename from src/extras/shaders/obj/contrast_frag.inc
rename to src/liberty/extras/shaders/obj/contrast_frag.inc
diff --git a/src/extras/shaders/obj/default_UV2_VS.cso b/src/liberty/extras/shaders/obj/default_UV2_VS.cso
similarity index 100%
rename from src/extras/shaders/obj/default_UV2_VS.cso
rename to src/liberty/extras/shaders/obj/default_UV2_VS.cso
diff --git a/src/extras/shaders/obj/default_UV2_VS.inc b/src/liberty/extras/shaders/obj/default_UV2_VS.inc
similarity index 100%
rename from src/extras/shaders/obj/default_UV2_VS.inc
rename to src/liberty/extras/shaders/obj/default_UV2_VS.inc
diff --git a/src/extras/shaders/obj/default_UV2_vert.inc b/src/liberty/extras/shaders/obj/default_UV2_vert.inc
similarity index 100%
rename from src/extras/shaders/obj/default_UV2_vert.inc
rename to src/liberty/extras/shaders/obj/default_UV2_vert.inc
diff --git a/src/extras/shaders/obj/im2d_UV2_vert.inc b/src/liberty/extras/shaders/obj/im2d_UV2_vert.inc
similarity index 100%
rename from src/extras/shaders/obj/im2d_UV2_vert.inc
rename to src/liberty/extras/shaders/obj/im2d_UV2_vert.inc
diff --git a/src/extras/shaders/obj/im2d_vert.inc b/src/liberty/extras/shaders/obj/im2d_vert.inc
similarity index 100%
rename from src/extras/shaders/obj/im2d_vert.inc
rename to src/liberty/extras/shaders/obj/im2d_vert.inc
diff --git a/src/extras/shaders/obj/neoGloss_PS.cso b/src/liberty/extras/shaders/obj/neoGloss_PS.cso
similarity index 100%
rename from src/extras/shaders/obj/neoGloss_PS.cso
rename to src/liberty/extras/shaders/obj/neoGloss_PS.cso
diff --git a/src/extras/shaders/obj/neoGloss_PS.inc b/src/liberty/extras/shaders/obj/neoGloss_PS.inc
similarity index 100%
rename from src/extras/shaders/obj/neoGloss_PS.inc
rename to src/liberty/extras/shaders/obj/neoGloss_PS.inc
diff --git a/src/extras/shaders/obj/neoGloss_VS.cso b/src/liberty/extras/shaders/obj/neoGloss_VS.cso
similarity index 100%
rename from src/extras/shaders/obj/neoGloss_VS.cso
rename to src/liberty/extras/shaders/obj/neoGloss_VS.cso
diff --git a/src/extras/shaders/obj/neoGloss_VS.inc b/src/liberty/extras/shaders/obj/neoGloss_VS.inc
similarity index 100%
rename from src/extras/shaders/obj/neoGloss_VS.inc
rename to src/liberty/extras/shaders/obj/neoGloss_VS.inc
diff --git a/src/extras/shaders/obj/neoGloss_frag.inc b/src/liberty/extras/shaders/obj/neoGloss_frag.inc
similarity index 100%
rename from src/extras/shaders/obj/neoGloss_frag.inc
rename to src/liberty/extras/shaders/obj/neoGloss_frag.inc
diff --git a/src/extras/shaders/obj/neoGloss_vert.inc b/src/liberty/extras/shaders/obj/neoGloss_vert.inc
similarity index 100%
rename from src/extras/shaders/obj/neoGloss_vert.inc
rename to src/liberty/extras/shaders/obj/neoGloss_vert.inc
diff --git a/src/extras/shaders/obj/neoRimSkin_VS.cso b/src/liberty/extras/shaders/obj/neoRimSkin_VS.cso
similarity index 100%
rename from src/extras/shaders/obj/neoRimSkin_VS.cso
rename to src/liberty/extras/shaders/obj/neoRimSkin_VS.cso
diff --git a/src/extras/shaders/obj/neoRimSkin_VS.inc b/src/liberty/extras/shaders/obj/neoRimSkin_VS.inc
similarity index 100%
rename from src/extras/shaders/obj/neoRimSkin_VS.inc
rename to src/liberty/extras/shaders/obj/neoRimSkin_VS.inc
diff --git a/src/extras/shaders/obj/neoRimSkin_vert.inc b/src/liberty/extras/shaders/obj/neoRimSkin_vert.inc
similarity index 100%
rename from src/extras/shaders/obj/neoRimSkin_vert.inc
rename to src/liberty/extras/shaders/obj/neoRimSkin_vert.inc
diff --git a/src/extras/shaders/obj/neoRim_VS.cso b/src/liberty/extras/shaders/obj/neoRim_VS.cso
similarity index 100%
rename from src/extras/shaders/obj/neoRim_VS.cso
rename to src/liberty/extras/shaders/obj/neoRim_VS.cso
diff --git a/src/extras/shaders/obj/neoRim_VS.inc b/src/liberty/extras/shaders/obj/neoRim_VS.inc
similarity index 100%
rename from src/extras/shaders/obj/neoRim_VS.inc
rename to src/liberty/extras/shaders/obj/neoRim_VS.inc
diff --git a/src/extras/shaders/obj/neoRim_vert.inc b/src/liberty/extras/shaders/obj/neoRim_vert.inc
similarity index 100%
rename from src/extras/shaders/obj/neoRim_vert.inc
rename to src/liberty/extras/shaders/obj/neoRim_vert.inc
diff --git a/src/extras/shaders/obj/neoVehicle_PS.cso b/src/liberty/extras/shaders/obj/neoVehicle_PS.cso
similarity index 100%
rename from src/extras/shaders/obj/neoVehicle_PS.cso
rename to src/liberty/extras/shaders/obj/neoVehicle_PS.cso
diff --git a/src/extras/shaders/obj/neoVehicle_PS.inc b/src/liberty/extras/shaders/obj/neoVehicle_PS.inc
similarity index 100%
rename from src/extras/shaders/obj/neoVehicle_PS.inc
rename to src/liberty/extras/shaders/obj/neoVehicle_PS.inc
diff --git a/src/extras/shaders/obj/neoVehicle_VS.cso b/src/liberty/extras/shaders/obj/neoVehicle_VS.cso
similarity index 100%
rename from src/extras/shaders/obj/neoVehicle_VS.cso
rename to src/liberty/extras/shaders/obj/neoVehicle_VS.cso
diff --git a/src/extras/shaders/obj/neoVehicle_VS.inc b/src/liberty/extras/shaders/obj/neoVehicle_VS.inc
similarity index 100%
rename from src/extras/shaders/obj/neoVehicle_VS.inc
rename to src/liberty/extras/shaders/obj/neoVehicle_VS.inc
diff --git a/src/extras/shaders/obj/neoVehicle_frag.inc b/src/liberty/extras/shaders/obj/neoVehicle_frag.inc
similarity index 100%
rename from src/extras/shaders/obj/neoVehicle_frag.inc
rename to src/liberty/extras/shaders/obj/neoVehicle_frag.inc
diff --git a/src/extras/shaders/obj/neoVehicle_vert.inc b/src/liberty/extras/shaders/obj/neoVehicle_vert.inc
similarity index 100%
rename from src/extras/shaders/obj/neoVehicle_vert.inc
rename to src/liberty/extras/shaders/obj/neoVehicle_vert.inc
diff --git a/src/extras/shaders/obj/neoWorldIII_PS.cso b/src/liberty/extras/shaders/obj/neoWorldIII_PS.cso
similarity index 100%
rename from src/extras/shaders/obj/neoWorldIII_PS.cso
rename to src/liberty/extras/shaders/obj/neoWorldIII_PS.cso
diff --git a/src/extras/shaders/obj/neoWorldIII_PS.inc b/src/liberty/extras/shaders/obj/neoWorldIII_PS.inc
similarity index 100%
rename from src/extras/shaders/obj/neoWorldIII_PS.inc
rename to src/liberty/extras/shaders/obj/neoWorldIII_PS.inc
diff --git a/src/extras/shaders/obj/neoWorldIII_frag.inc b/src/liberty/extras/shaders/obj/neoWorldIII_frag.inc
similarity index 100%
rename from src/extras/shaders/obj/neoWorldIII_frag.inc
rename to src/liberty/extras/shaders/obj/neoWorldIII_frag.inc
diff --git a/src/extras/shaders/obj/screenDroplet_PS.cso b/src/liberty/extras/shaders/obj/screenDroplet_PS.cso
similarity index 100%
rename from src/extras/shaders/obj/screenDroplet_PS.cso
rename to src/liberty/extras/shaders/obj/screenDroplet_PS.cso
diff --git a/src/extras/shaders/obj/screenDroplet_PS.inc b/src/liberty/extras/shaders/obj/screenDroplet_PS.inc
similarity index 100%
rename from src/extras/shaders/obj/screenDroplet_PS.inc
rename to src/liberty/extras/shaders/obj/screenDroplet_PS.inc
diff --git a/src/extras/shaders/obj/screenDroplet_frag.inc b/src/liberty/extras/shaders/obj/screenDroplet_frag.inc
similarity index 100%
rename from src/extras/shaders/obj/screenDroplet_frag.inc
rename to src/liberty/extras/shaders/obj/screenDroplet_frag.inc
diff --git a/src/extras/shaders/obj/simple_frag.inc b/src/liberty/extras/shaders/obj/simple_frag.inc
similarity index 100%
rename from src/extras/shaders/obj/simple_frag.inc
rename to src/liberty/extras/shaders/obj/simple_frag.inc
diff --git a/miami/extras/shaders/screenDroplet.frag b/src/liberty/extras/shaders/screenDroplet.frag
similarity index 100%
rename from miami/extras/shaders/screenDroplet.frag
rename to src/liberty/extras/shaders/screenDroplet.frag
diff --git a/miami/extras/shaders/screenDroplet_PS.hlsl b/src/liberty/extras/shaders/screenDroplet_PS.hlsl
similarity index 100%
rename from miami/extras/shaders/screenDroplet_PS.hlsl
rename to src/liberty/extras/shaders/screenDroplet_PS.hlsl
diff --git a/miami/extras/shaders/simple.frag b/src/liberty/extras/shaders/simple.frag
similarity index 100%
rename from miami/extras/shaders/simple.frag
rename to src/liberty/extras/shaders/simple.frag
diff --git a/miami/extras/shaders/standardConstants.h b/src/liberty/extras/shaders/standardConstants.h
similarity index 100%
rename from miami/extras/shaders/standardConstants.h
rename to src/liberty/extras/shaders/standardConstants.h
diff --git a/src/fakerw/fake.cpp b/src/liberty/fakerw/fake.cpp
similarity index 100%
rename from src/fakerw/fake.cpp
rename to src/liberty/fakerw/fake.cpp
diff --git a/miami/fakerw/rpanisot.h b/src/liberty/fakerw/rpanisot.h
similarity index 100%
rename from miami/fakerw/rpanisot.h
rename to src/liberty/fakerw/rpanisot.h
diff --git a/miami/fakerw/rphanim.h b/src/liberty/fakerw/rphanim.h
similarity index 100%
rename from miami/fakerw/rphanim.h
rename to src/liberty/fakerw/rphanim.h
diff --git a/miami/fakerw/rpmatfx.h b/src/liberty/fakerw/rpmatfx.h
similarity index 100%
rename from miami/fakerw/rpmatfx.h
rename to src/liberty/fakerw/rpmatfx.h
diff --git a/miami/fakerw/rpskin.h b/src/liberty/fakerw/rpskin.h
similarity index 100%
rename from miami/fakerw/rpskin.h
rename to src/liberty/fakerw/rpskin.h
diff --git a/miami/fakerw/rpworld.h b/src/liberty/fakerw/rpworld.h
similarity index 100%
rename from miami/fakerw/rpworld.h
rename to src/liberty/fakerw/rpworld.h
diff --git a/src/fakerw/rtbmp.h b/src/liberty/fakerw/rtbmp.h
similarity index 100%
rename from src/fakerw/rtbmp.h
rename to src/liberty/fakerw/rtbmp.h
diff --git a/miami/fakerw/rtcharse.h b/src/liberty/fakerw/rtcharse.h
similarity index 100%
rename from miami/fakerw/rtcharse.h
rename to src/liberty/fakerw/rtcharse.h
diff --git a/src/fakerw/rtpng.h b/src/liberty/fakerw/rtpng.h
similarity index 100%
rename from src/fakerw/rtpng.h
rename to src/liberty/fakerw/rtpng.h
diff --git a/miami/fakerw/rtquat.h b/src/liberty/fakerw/rtquat.h
similarity index 100%
rename from miami/fakerw/rtquat.h
rename to src/liberty/fakerw/rtquat.h
diff --git a/src/fakerw/rwcore.h b/src/liberty/fakerw/rwcore.h
similarity index 100%
rename from src/fakerw/rwcore.h
rename to src/liberty/fakerw/rwcore.h
diff --git a/miami/fakerw/rwplcore.h b/src/liberty/fakerw/rwplcore.h
similarity index 100%
rename from miami/fakerw/rwplcore.h
rename to src/liberty/fakerw/rwplcore.h
diff --git a/src/math/Matrix.cpp b/src/liberty/math/Matrix.cpp
similarity index 100%
rename from src/math/Matrix.cpp
rename to src/liberty/math/Matrix.cpp
diff --git a/src/math/Matrix.h b/src/liberty/math/Matrix.h
similarity index 100%
rename from src/math/Matrix.h
rename to src/liberty/math/Matrix.h
diff --git a/miami/math/Quaternion.cpp b/src/liberty/math/Quaternion.cpp
similarity index 100%
rename from miami/math/Quaternion.cpp
rename to src/liberty/math/Quaternion.cpp
diff --git a/src/math/Quaternion.h b/src/liberty/math/Quaternion.h
similarity index 100%
rename from src/math/Quaternion.h
rename to src/liberty/math/Quaternion.h
diff --git a/miami/math/Rect.cpp b/src/liberty/math/Rect.cpp
similarity index 100%
rename from miami/math/Rect.cpp
rename to src/liberty/math/Rect.cpp
diff --git a/miami/math/Rect.h b/src/liberty/math/Rect.h
similarity index 100%
rename from miami/math/Rect.h
rename to src/liberty/math/Rect.h
diff --git a/src/math/Vector.cpp b/src/liberty/math/Vector.cpp
similarity index 100%
rename from src/math/Vector.cpp
rename to src/liberty/math/Vector.cpp
diff --git a/src/math/Vector.h b/src/liberty/math/Vector.h
similarity index 100%
rename from src/math/Vector.h
rename to src/liberty/math/Vector.h
diff --git a/src/math/Vector2D.h b/src/liberty/math/Vector2D.h
similarity index 100%
rename from src/math/Vector2D.h
rename to src/liberty/math/Vector2D.h
diff --git a/src/math/VuVector.h b/src/liberty/math/VuVector.h
similarity index 100%
rename from src/math/VuVector.h
rename to src/liberty/math/VuVector.h
diff --git a/src/math/math.cpp b/src/liberty/math/math.cpp
similarity index 100%
rename from src/math/math.cpp
rename to src/liberty/math/math.cpp
diff --git a/src/math/maths.h b/src/liberty/math/maths.h
similarity index 100%
rename from src/math/maths.h
rename to src/liberty/math/maths.h
diff --git a/src/modelinfo/BaseModelInfo.cpp b/src/liberty/modelinfo/BaseModelInfo.cpp
similarity index 100%
rename from src/modelinfo/BaseModelInfo.cpp
rename to src/liberty/modelinfo/BaseModelInfo.cpp
diff --git a/src/modelinfo/BaseModelInfo.h b/src/liberty/modelinfo/BaseModelInfo.h
similarity index 100%
rename from src/modelinfo/BaseModelInfo.h
rename to src/liberty/modelinfo/BaseModelInfo.h
diff --git a/src/modelinfo/ClumpModelInfo.cpp b/src/liberty/modelinfo/ClumpModelInfo.cpp
similarity index 100%
rename from src/modelinfo/ClumpModelInfo.cpp
rename to src/liberty/modelinfo/ClumpModelInfo.cpp
diff --git a/src/modelinfo/ClumpModelInfo.h b/src/liberty/modelinfo/ClumpModelInfo.h
similarity index 100%
rename from src/modelinfo/ClumpModelInfo.h
rename to src/liberty/modelinfo/ClumpModelInfo.h
diff --git a/src/modelinfo/MloModelInfo.cpp b/src/liberty/modelinfo/MloModelInfo.cpp
similarity index 100%
rename from src/modelinfo/MloModelInfo.cpp
rename to src/liberty/modelinfo/MloModelInfo.cpp
diff --git a/miami/modelinfo/MloModelInfo.h b/src/liberty/modelinfo/MloModelInfo.h
similarity index 100%
rename from miami/modelinfo/MloModelInfo.h
rename to src/liberty/modelinfo/MloModelInfo.h
diff --git a/miami/modelinfo/ModelIndices.cpp b/src/liberty/modelinfo/ModelIndices.cpp
similarity index 100%
rename from miami/modelinfo/ModelIndices.cpp
rename to src/liberty/modelinfo/ModelIndices.cpp
diff --git a/src/modelinfo/ModelIndices.h b/src/liberty/modelinfo/ModelIndices.h
similarity index 100%
rename from src/modelinfo/ModelIndices.h
rename to src/liberty/modelinfo/ModelIndices.h
diff --git a/src/modelinfo/ModelInfo.cpp b/src/liberty/modelinfo/ModelInfo.cpp
similarity index 100%
rename from src/modelinfo/ModelInfo.cpp
rename to src/liberty/modelinfo/ModelInfo.cpp
diff --git a/src/modelinfo/ModelInfo.h b/src/liberty/modelinfo/ModelInfo.h
similarity index 100%
rename from src/modelinfo/ModelInfo.h
rename to src/liberty/modelinfo/ModelInfo.h
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/liberty/modelinfo/PedModelInfo.cpp
similarity index 100%
rename from src/modelinfo/PedModelInfo.cpp
rename to src/liberty/modelinfo/PedModelInfo.cpp
diff --git a/src/modelinfo/PedModelInfo.h b/src/liberty/modelinfo/PedModelInfo.h
similarity index 100%
rename from src/modelinfo/PedModelInfo.h
rename to src/liberty/modelinfo/PedModelInfo.h
diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/liberty/modelinfo/SimpleModelInfo.cpp
similarity index 100%
rename from src/modelinfo/SimpleModelInfo.cpp
rename to src/liberty/modelinfo/SimpleModelInfo.cpp
diff --git a/src/modelinfo/SimpleModelInfo.h b/src/liberty/modelinfo/SimpleModelInfo.h
similarity index 100%
rename from src/modelinfo/SimpleModelInfo.h
rename to src/liberty/modelinfo/SimpleModelInfo.h
diff --git a/miami/modelinfo/TimeModelInfo.cpp b/src/liberty/modelinfo/TimeModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/TimeModelInfo.cpp
rename to src/liberty/modelinfo/TimeModelInfo.cpp
diff --git a/src/modelinfo/TimeModelInfo.h b/src/liberty/modelinfo/TimeModelInfo.h
similarity index 100%
rename from src/modelinfo/TimeModelInfo.h
rename to src/liberty/modelinfo/TimeModelInfo.h
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/liberty/modelinfo/VehicleModelInfo.cpp
similarity index 100%
rename from src/modelinfo/VehicleModelInfo.cpp
rename to src/liberty/modelinfo/VehicleModelInfo.cpp
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/liberty/modelinfo/VehicleModelInfo.h
similarity index 100%
rename from src/modelinfo/VehicleModelInfo.h
rename to src/liberty/modelinfo/VehicleModelInfo.h
diff --git a/src/modelinfo/XtraCompsModelInfo.h b/src/liberty/modelinfo/XtraCompsModelInfo.h
similarity index 100%
rename from src/modelinfo/XtraCompsModelInfo.h
rename to src/liberty/modelinfo/XtraCompsModelInfo.h
diff --git a/src/objects/CutsceneHead.cpp b/src/liberty/objects/CutsceneHead.cpp
similarity index 100%
rename from src/objects/CutsceneHead.cpp
rename to src/liberty/objects/CutsceneHead.cpp
diff --git a/src/objects/CutsceneHead.h b/src/liberty/objects/CutsceneHead.h
similarity index 100%
rename from src/objects/CutsceneHead.h
rename to src/liberty/objects/CutsceneHead.h
diff --git a/src/objects/CutsceneObject.cpp b/src/liberty/objects/CutsceneObject.cpp
similarity index 100%
rename from src/objects/CutsceneObject.cpp
rename to src/liberty/objects/CutsceneObject.cpp
diff --git a/src/objects/CutsceneObject.h b/src/liberty/objects/CutsceneObject.h
similarity index 100%
rename from src/objects/CutsceneObject.h
rename to src/liberty/objects/CutsceneObject.h
diff --git a/src/objects/DummyObject.cpp b/src/liberty/objects/DummyObject.cpp
similarity index 100%
rename from src/objects/DummyObject.cpp
rename to src/liberty/objects/DummyObject.cpp
diff --git a/src/objects/DummyObject.h b/src/liberty/objects/DummyObject.h
similarity index 100%
rename from src/objects/DummyObject.h
rename to src/liberty/objects/DummyObject.h
diff --git a/src/objects/Object.cpp b/src/liberty/objects/Object.cpp
similarity index 100%
rename from src/objects/Object.cpp
rename to src/liberty/objects/Object.cpp
diff --git a/src/objects/Object.h b/src/liberty/objects/Object.h
similarity index 100%
rename from src/objects/Object.h
rename to src/liberty/objects/Object.h
diff --git a/src/objects/ObjectData.cpp b/src/liberty/objects/ObjectData.cpp
similarity index 100%
rename from src/objects/ObjectData.cpp
rename to src/liberty/objects/ObjectData.cpp
diff --git a/miami/objects/ObjectData.h b/src/liberty/objects/ObjectData.h
similarity index 100%
rename from miami/objects/ObjectData.h
rename to src/liberty/objects/ObjectData.h
diff --git a/src/objects/ParticleObject.cpp b/src/liberty/objects/ParticleObject.cpp
similarity index 100%
rename from src/objects/ParticleObject.cpp
rename to src/liberty/objects/ParticleObject.cpp
diff --git a/src/objects/ParticleObject.h b/src/liberty/objects/ParticleObject.h
similarity index 100%
rename from src/objects/ParticleObject.h
rename to src/liberty/objects/ParticleObject.h
diff --git a/miami/objects/Projectile.cpp b/src/liberty/objects/Projectile.cpp
similarity index 100%
rename from miami/objects/Projectile.cpp
rename to src/liberty/objects/Projectile.cpp
diff --git a/miami/objects/Projectile.h b/src/liberty/objects/Projectile.h
similarity index 100%
rename from miami/objects/Projectile.h
rename to src/liberty/objects/Projectile.h
diff --git a/src/peds/CivilianPed.cpp b/src/liberty/peds/CivilianPed.cpp
similarity index 100%
rename from src/peds/CivilianPed.cpp
rename to src/liberty/peds/CivilianPed.cpp
diff --git a/src/peds/CivilianPed.h b/src/liberty/peds/CivilianPed.h
similarity index 100%
rename from src/peds/CivilianPed.h
rename to src/liberty/peds/CivilianPed.h
diff --git a/src/peds/CopPed.cpp b/src/liberty/peds/CopPed.cpp
similarity index 100%
rename from src/peds/CopPed.cpp
rename to src/liberty/peds/CopPed.cpp
diff --git a/src/peds/CopPed.h b/src/liberty/peds/CopPed.h
similarity index 100%
rename from src/peds/CopPed.h
rename to src/liberty/peds/CopPed.h
diff --git a/src/peds/DummyPed.h b/src/liberty/peds/DummyPed.h
similarity index 100%
rename from src/peds/DummyPed.h
rename to src/liberty/peds/DummyPed.h
diff --git a/src/peds/EmergencyPed.cpp b/src/liberty/peds/EmergencyPed.cpp
similarity index 100%
rename from src/peds/EmergencyPed.cpp
rename to src/liberty/peds/EmergencyPed.cpp
diff --git a/src/peds/EmergencyPed.h b/src/liberty/peds/EmergencyPed.h
similarity index 100%
rename from src/peds/EmergencyPed.h
rename to src/liberty/peds/EmergencyPed.h
diff --git a/src/peds/Gangs.cpp b/src/liberty/peds/Gangs.cpp
similarity index 100%
rename from src/peds/Gangs.cpp
rename to src/liberty/peds/Gangs.cpp
diff --git a/src/peds/Gangs.h b/src/liberty/peds/Gangs.h
similarity index 100%
rename from src/peds/Gangs.h
rename to src/liberty/peds/Gangs.h
diff --git a/src/peds/Ped.cpp b/src/liberty/peds/Ped.cpp
similarity index 100%
rename from src/peds/Ped.cpp
rename to src/liberty/peds/Ped.cpp
diff --git a/src/peds/Ped.h b/src/liberty/peds/Ped.h
similarity index 100%
rename from src/peds/Ped.h
rename to src/liberty/peds/Ped.h
diff --git a/src/peds/PedAI.cpp b/src/liberty/peds/PedAI.cpp
similarity index 100%
rename from src/peds/PedAI.cpp
rename to src/liberty/peds/PedAI.cpp
diff --git a/src/peds/PedChat.cpp b/src/liberty/peds/PedChat.cpp
similarity index 100%
rename from src/peds/PedChat.cpp
rename to src/liberty/peds/PedChat.cpp
diff --git a/src/peds/PedDebug.cpp b/src/liberty/peds/PedDebug.cpp
similarity index 100%
rename from src/peds/PedDebug.cpp
rename to src/liberty/peds/PedDebug.cpp
diff --git a/src/peds/PedFight.cpp b/src/liberty/peds/PedFight.cpp
similarity index 100%
rename from src/peds/PedFight.cpp
rename to src/liberty/peds/PedFight.cpp
diff --git a/src/peds/PedIK.cpp b/src/liberty/peds/PedIK.cpp
similarity index 100%
rename from src/peds/PedIK.cpp
rename to src/liberty/peds/PedIK.cpp
diff --git a/src/peds/PedIK.h b/src/liberty/peds/PedIK.h
similarity index 100%
rename from src/peds/PedIK.h
rename to src/liberty/peds/PedIK.h
diff --git a/src/peds/PedPlacement.cpp b/src/liberty/peds/PedPlacement.cpp
similarity index 100%
rename from src/peds/PedPlacement.cpp
rename to src/liberty/peds/PedPlacement.cpp
diff --git a/src/peds/PedPlacement.h b/src/liberty/peds/PedPlacement.h
similarity index 100%
rename from src/peds/PedPlacement.h
rename to src/liberty/peds/PedPlacement.h
diff --git a/miami/peds/PedRoutes.cpp b/src/liberty/peds/PedRoutes.cpp
similarity index 100%
rename from miami/peds/PedRoutes.cpp
rename to src/liberty/peds/PedRoutes.cpp
diff --git a/miami/peds/PedRoutes.h b/src/liberty/peds/PedRoutes.h
similarity index 100%
rename from miami/peds/PedRoutes.h
rename to src/liberty/peds/PedRoutes.h
diff --git a/miami/peds/PedType.cpp b/src/liberty/peds/PedType.cpp
similarity index 100%
rename from miami/peds/PedType.cpp
rename to src/liberty/peds/PedType.cpp
diff --git a/src/peds/PedType.h b/src/liberty/peds/PedType.h
similarity index 100%
rename from src/peds/PedType.h
rename to src/liberty/peds/PedType.h
diff --git a/src/peds/PlayerPed.cpp b/src/liberty/peds/PlayerPed.cpp
similarity index 100%
rename from src/peds/PlayerPed.cpp
rename to src/liberty/peds/PlayerPed.cpp
diff --git a/src/peds/PlayerPed.h b/src/liberty/peds/PlayerPed.h
similarity index 100%
rename from src/peds/PlayerPed.h
rename to src/liberty/peds/PlayerPed.h
diff --git a/src/peds/Population.cpp b/src/liberty/peds/Population.cpp
similarity index 100%
rename from src/peds/Population.cpp
rename to src/liberty/peds/Population.cpp
diff --git a/src/peds/Population.h b/src/liberty/peds/Population.h
similarity index 100%
rename from src/peds/Population.h
rename to src/liberty/peds/Population.h
diff --git a/miami/prof/profiler.cpp b/src/liberty/prof/profiler.cpp
similarity index 100%
rename from miami/prof/profiler.cpp
rename to src/liberty/prof/profiler.cpp
diff --git a/miami/prof/profiler.h b/src/liberty/prof/profiler.h
similarity index 100%
rename from miami/prof/profiler.h
rename to src/liberty/prof/profiler.h
diff --git a/src/renderer/2dEffect.h b/src/liberty/renderer/2dEffect.h
similarity index 100%
rename from src/renderer/2dEffect.h
rename to src/liberty/renderer/2dEffect.h
diff --git a/miami/renderer/Antennas.cpp b/src/liberty/renderer/Antennas.cpp
similarity index 100%
rename from miami/renderer/Antennas.cpp
rename to src/liberty/renderer/Antennas.cpp
diff --git a/miami/renderer/Antennas.h b/src/liberty/renderer/Antennas.h
similarity index 100%
rename from miami/renderer/Antennas.h
rename to src/liberty/renderer/Antennas.h
diff --git a/src/renderer/Clouds.cpp b/src/liberty/renderer/Clouds.cpp
similarity index 100%
rename from src/renderer/Clouds.cpp
rename to src/liberty/renderer/Clouds.cpp
diff --git a/src/renderer/Clouds.h b/src/liberty/renderer/Clouds.h
similarity index 100%
rename from src/renderer/Clouds.h
rename to src/liberty/renderer/Clouds.h
diff --git a/src/renderer/Console.cpp b/src/liberty/renderer/Console.cpp
similarity index 100%
rename from src/renderer/Console.cpp
rename to src/liberty/renderer/Console.cpp
diff --git a/miami/renderer/Console.h b/src/liberty/renderer/Console.h
similarity index 100%
rename from miami/renderer/Console.h
rename to src/liberty/renderer/Console.h
diff --git a/src/renderer/Coronas.cpp b/src/liberty/renderer/Coronas.cpp
similarity index 100%
rename from src/renderer/Coronas.cpp
rename to src/liberty/renderer/Coronas.cpp
diff --git a/src/renderer/Coronas.h b/src/liberty/renderer/Coronas.h
similarity index 100%
rename from src/renderer/Coronas.h
rename to src/liberty/renderer/Coronas.h
diff --git a/src/renderer/Credits.cpp b/src/liberty/renderer/Credits.cpp
similarity index 100%
rename from src/renderer/Credits.cpp
rename to src/liberty/renderer/Credits.cpp
diff --git a/miami/renderer/Credits.h b/src/liberty/renderer/Credits.h
similarity index 100%
rename from miami/renderer/Credits.h
rename to src/liberty/renderer/Credits.h
diff --git a/src/renderer/Draw.cpp b/src/liberty/renderer/Draw.cpp
similarity index 100%
rename from src/renderer/Draw.cpp
rename to src/liberty/renderer/Draw.cpp
diff --git a/src/renderer/Draw.h b/src/liberty/renderer/Draw.h
similarity index 100%
rename from src/renderer/Draw.h
rename to src/liberty/renderer/Draw.h
diff --git a/src/renderer/Fluff.cpp b/src/liberty/renderer/Fluff.cpp
similarity index 100%
rename from src/renderer/Fluff.cpp
rename to src/liberty/renderer/Fluff.cpp
diff --git a/src/renderer/Fluff.h b/src/liberty/renderer/Fluff.h
similarity index 100%
rename from src/renderer/Fluff.h
rename to src/liberty/renderer/Fluff.h
diff --git a/src/renderer/Font.cpp b/src/liberty/renderer/Font.cpp
similarity index 100%
rename from src/renderer/Font.cpp
rename to src/liberty/renderer/Font.cpp
diff --git a/src/renderer/Font.h b/src/liberty/renderer/Font.h
similarity index 100%
rename from src/renderer/Font.h
rename to src/liberty/renderer/Font.h
diff --git a/src/renderer/Glass.cpp b/src/liberty/renderer/Glass.cpp
similarity index 100%
rename from src/renderer/Glass.cpp
rename to src/liberty/renderer/Glass.cpp
diff --git a/src/renderer/Glass.h b/src/liberty/renderer/Glass.h
similarity index 100%
rename from src/renderer/Glass.h
rename to src/liberty/renderer/Glass.h
diff --git a/src/renderer/Hud.cpp b/src/liberty/renderer/Hud.cpp
similarity index 100%
rename from src/renderer/Hud.cpp
rename to src/liberty/renderer/Hud.cpp
diff --git a/src/renderer/Hud.h b/src/liberty/renderer/Hud.h
similarity index 100%
rename from src/renderer/Hud.h
rename to src/liberty/renderer/Hud.h
diff --git a/miami/renderer/Instance.cpp b/src/liberty/renderer/Instance.cpp
similarity index 100%
rename from miami/renderer/Instance.cpp
rename to src/liberty/renderer/Instance.cpp
diff --git a/miami/renderer/Instance.h b/src/liberty/renderer/Instance.h
similarity index 100%
rename from miami/renderer/Instance.h
rename to src/liberty/renderer/Instance.h
diff --git a/miami/renderer/Lines.cpp b/src/liberty/renderer/Lines.cpp
similarity index 100%
rename from miami/renderer/Lines.cpp
rename to src/liberty/renderer/Lines.cpp
diff --git a/miami/renderer/Lines.h b/src/liberty/renderer/Lines.h
similarity index 100%
rename from miami/renderer/Lines.h
rename to src/liberty/renderer/Lines.h
diff --git a/src/renderer/MBlur.cpp b/src/liberty/renderer/MBlur.cpp
similarity index 100%
rename from src/renderer/MBlur.cpp
rename to src/liberty/renderer/MBlur.cpp
diff --git a/src/renderer/MBlur.h b/src/liberty/renderer/MBlur.h
similarity index 100%
rename from src/renderer/MBlur.h
rename to src/liberty/renderer/MBlur.h
diff --git a/src/renderer/Particle.cpp b/src/liberty/renderer/Particle.cpp
similarity index 100%
rename from src/renderer/Particle.cpp
rename to src/liberty/renderer/Particle.cpp
diff --git a/src/renderer/Particle.h b/src/liberty/renderer/Particle.h
similarity index 100%
rename from src/renderer/Particle.h
rename to src/liberty/renderer/Particle.h
diff --git a/src/renderer/ParticleMgr.cpp b/src/liberty/renderer/ParticleMgr.cpp
similarity index 100%
rename from src/renderer/ParticleMgr.cpp
rename to src/liberty/renderer/ParticleMgr.cpp
diff --git a/src/renderer/ParticleMgr.h b/src/liberty/renderer/ParticleMgr.h
similarity index 100%
rename from src/renderer/ParticleMgr.h
rename to src/liberty/renderer/ParticleMgr.h
diff --git a/src/renderer/ParticleType.h b/src/liberty/renderer/ParticleType.h
similarity index 100%
rename from src/renderer/ParticleType.h
rename to src/liberty/renderer/ParticleType.h
diff --git a/src/renderer/PlayerSkin.cpp b/src/liberty/renderer/PlayerSkin.cpp
similarity index 100%
rename from src/renderer/PlayerSkin.cpp
rename to src/liberty/renderer/PlayerSkin.cpp
diff --git a/miami/renderer/PlayerSkin.h b/src/liberty/renderer/PlayerSkin.h
similarity index 100%
rename from miami/renderer/PlayerSkin.h
rename to src/liberty/renderer/PlayerSkin.h
diff --git a/src/renderer/PointLights.cpp b/src/liberty/renderer/PointLights.cpp
similarity index 100%
rename from src/renderer/PointLights.cpp
rename to src/liberty/renderer/PointLights.cpp
diff --git a/src/renderer/PointLights.h b/src/liberty/renderer/PointLights.h
similarity index 100%
rename from src/renderer/PointLights.h
rename to src/liberty/renderer/PointLights.h
diff --git a/src/renderer/RenderBuffer.cpp b/src/liberty/renderer/RenderBuffer.cpp
similarity index 100%
rename from src/renderer/RenderBuffer.cpp
rename to src/liberty/renderer/RenderBuffer.cpp
diff --git a/src/renderer/RenderBuffer.h b/src/liberty/renderer/RenderBuffer.h
similarity index 100%
rename from src/renderer/RenderBuffer.h
rename to src/liberty/renderer/RenderBuffer.h
diff --git a/src/renderer/Renderer.cpp b/src/liberty/renderer/Renderer.cpp
similarity index 100%
rename from src/renderer/Renderer.cpp
rename to src/liberty/renderer/Renderer.cpp
diff --git a/src/renderer/Renderer.h b/src/liberty/renderer/Renderer.h
similarity index 100%
rename from src/renderer/Renderer.h
rename to src/liberty/renderer/Renderer.h
diff --git a/src/renderer/Rubbish.cpp b/src/liberty/renderer/Rubbish.cpp
similarity index 100%
rename from src/renderer/Rubbish.cpp
rename to src/liberty/renderer/Rubbish.cpp
diff --git a/src/renderer/Rubbish.h b/src/liberty/renderer/Rubbish.h
similarity index 100%
rename from src/renderer/Rubbish.h
rename to src/liberty/renderer/Rubbish.h
diff --git a/src/renderer/Shadows.cpp b/src/liberty/renderer/Shadows.cpp
similarity index 100%
rename from src/renderer/Shadows.cpp
rename to src/liberty/renderer/Shadows.cpp
diff --git a/src/renderer/Shadows.h b/src/liberty/renderer/Shadows.h
similarity index 100%
rename from src/renderer/Shadows.h
rename to src/liberty/renderer/Shadows.h
diff --git a/src/renderer/Skidmarks.cpp b/src/liberty/renderer/Skidmarks.cpp
similarity index 100%
rename from src/renderer/Skidmarks.cpp
rename to src/liberty/renderer/Skidmarks.cpp
diff --git a/src/renderer/Skidmarks.h b/src/liberty/renderer/Skidmarks.h
similarity index 100%
rename from src/renderer/Skidmarks.h
rename to src/liberty/renderer/Skidmarks.h
diff --git a/src/renderer/SpecialFX.cpp b/src/liberty/renderer/SpecialFX.cpp
similarity index 100%
rename from src/renderer/SpecialFX.cpp
rename to src/liberty/renderer/SpecialFX.cpp
diff --git a/src/renderer/SpecialFX.h b/src/liberty/renderer/SpecialFX.h
similarity index 100%
rename from src/renderer/SpecialFX.h
rename to src/liberty/renderer/SpecialFX.h
diff --git a/src/renderer/Sprite.cpp b/src/liberty/renderer/Sprite.cpp
similarity index 100%
rename from src/renderer/Sprite.cpp
rename to src/liberty/renderer/Sprite.cpp
diff --git a/src/renderer/Sprite.h b/src/liberty/renderer/Sprite.h
similarity index 100%
rename from src/renderer/Sprite.h
rename to src/liberty/renderer/Sprite.h
diff --git a/src/renderer/Sprite2d.cpp b/src/liberty/renderer/Sprite2d.cpp
similarity index 100%
rename from src/renderer/Sprite2d.cpp
rename to src/liberty/renderer/Sprite2d.cpp
diff --git a/src/renderer/Sprite2d.h b/src/liberty/renderer/Sprite2d.h
similarity index 100%
rename from src/renderer/Sprite2d.h
rename to src/liberty/renderer/Sprite2d.h
diff --git a/miami/renderer/TexList.cpp b/src/liberty/renderer/TexList.cpp
similarity index 100%
rename from miami/renderer/TexList.cpp
rename to src/liberty/renderer/TexList.cpp
diff --git a/miami/renderer/TexList.h b/src/liberty/renderer/TexList.h
similarity index 100%
rename from miami/renderer/TexList.h
rename to src/liberty/renderer/TexList.h
diff --git a/src/renderer/Timecycle.cpp b/src/liberty/renderer/Timecycle.cpp
similarity index 100%
rename from src/renderer/Timecycle.cpp
rename to src/liberty/renderer/Timecycle.cpp
diff --git a/src/renderer/Timecycle.h b/src/liberty/renderer/Timecycle.h
similarity index 100%
rename from src/renderer/Timecycle.h
rename to src/liberty/renderer/Timecycle.h
diff --git a/src/renderer/WaterCannon.cpp b/src/liberty/renderer/WaterCannon.cpp
similarity index 100%
rename from src/renderer/WaterCannon.cpp
rename to src/liberty/renderer/WaterCannon.cpp
diff --git a/miami/renderer/WaterCannon.h b/src/liberty/renderer/WaterCannon.h
similarity index 100%
rename from miami/renderer/WaterCannon.h
rename to src/liberty/renderer/WaterCannon.h
diff --git a/src/renderer/WaterLevel.cpp b/src/liberty/renderer/WaterLevel.cpp
similarity index 100%
rename from src/renderer/WaterLevel.cpp
rename to src/liberty/renderer/WaterLevel.cpp
diff --git a/src/renderer/WaterLevel.h b/src/liberty/renderer/WaterLevel.h
similarity index 100%
rename from src/renderer/WaterLevel.h
rename to src/liberty/renderer/WaterLevel.h
diff --git a/src/renderer/Weather.cpp b/src/liberty/renderer/Weather.cpp
similarity index 100%
rename from src/renderer/Weather.cpp
rename to src/liberty/renderer/Weather.cpp
diff --git a/src/renderer/Weather.h b/src/liberty/renderer/Weather.h
similarity index 100%
rename from src/renderer/Weather.h
rename to src/liberty/renderer/Weather.h
diff --git a/src/rw/ClumpRead.cpp b/src/liberty/rw/ClumpRead.cpp
similarity index 100%
rename from src/rw/ClumpRead.cpp
rename to src/liberty/rw/ClumpRead.cpp
diff --git a/src/rw/Lights.cpp b/src/liberty/rw/Lights.cpp
similarity index 100%
rename from src/rw/Lights.cpp
rename to src/liberty/rw/Lights.cpp
diff --git a/src/rw/Lights.h b/src/liberty/rw/Lights.h
similarity index 100%
rename from src/rw/Lights.h
rename to src/liberty/rw/Lights.h
diff --git a/src/rw/MemoryHeap.cpp b/src/liberty/rw/MemoryHeap.cpp
similarity index 100%
rename from src/rw/MemoryHeap.cpp
rename to src/liberty/rw/MemoryHeap.cpp
diff --git a/src/rw/MemoryHeap.h b/src/liberty/rw/MemoryHeap.h
similarity index 100%
rename from src/rw/MemoryHeap.h
rename to src/liberty/rw/MemoryHeap.h
diff --git a/miami/rw/MemoryMgr.cpp b/src/liberty/rw/MemoryMgr.cpp
similarity index 100%
rename from miami/rw/MemoryMgr.cpp
rename to src/liberty/rw/MemoryMgr.cpp
diff --git a/miami/rw/MemoryMgr.h b/src/liberty/rw/MemoryMgr.h
similarity index 100%
rename from miami/rw/MemoryMgr.h
rename to src/liberty/rw/MemoryMgr.h
diff --git a/miami/rw/NodeName.cpp b/src/liberty/rw/NodeName.cpp
similarity index 100%
rename from miami/rw/NodeName.cpp
rename to src/liberty/rw/NodeName.cpp
diff --git a/miami/rw/NodeName.h b/src/liberty/rw/NodeName.h
similarity index 100%
rename from miami/rw/NodeName.h
rename to src/liberty/rw/NodeName.h
diff --git a/src/rw/RwHelper.cpp b/src/liberty/rw/RwHelper.cpp
similarity index 100%
rename from src/rw/RwHelper.cpp
rename to src/liberty/rw/RwHelper.cpp
diff --git a/src/rw/RwHelper.h b/src/liberty/rw/RwHelper.h
similarity index 100%
rename from src/rw/RwHelper.h
rename to src/liberty/rw/RwHelper.h
diff --git a/miami/rw/RwMatFX.cpp b/src/liberty/rw/RwMatFX.cpp
similarity index 100%
rename from miami/rw/RwMatFX.cpp
rename to src/liberty/rw/RwMatFX.cpp
diff --git a/miami/rw/RwPS2AlphaTest.cpp b/src/liberty/rw/RwPS2AlphaTest.cpp
similarity index 100%
rename from miami/rw/RwPS2AlphaTest.cpp
rename to src/liberty/rw/RwPS2AlphaTest.cpp
diff --git a/src/rw/TexRead.cpp b/src/liberty/rw/TexRead.cpp
similarity index 100%
rename from src/rw/TexRead.cpp
rename to src/liberty/rw/TexRead.cpp
diff --git a/miami/rw/TexturePools.cpp b/src/liberty/rw/TexturePools.cpp
similarity index 100%
rename from miami/rw/TexturePools.cpp
rename to src/liberty/rw/TexturePools.cpp
diff --git a/miami/rw/TexturePools.h b/src/liberty/rw/TexturePools.h
similarity index 100%
rename from miami/rw/TexturePools.h
rename to src/liberty/rw/TexturePools.h
diff --git a/src/rw/TxdStore.cpp b/src/liberty/rw/TxdStore.cpp
similarity index 100%
rename from src/rw/TxdStore.cpp
rename to src/liberty/rw/TxdStore.cpp
diff --git a/miami/rw/TxdStore.h b/src/liberty/rw/TxdStore.h
similarity index 100%
rename from miami/rw/TxdStore.h
rename to src/liberty/rw/TxdStore.h
diff --git a/src/rw/VisibilityPlugins.cpp b/src/liberty/rw/VisibilityPlugins.cpp
similarity index 100%
rename from src/rw/VisibilityPlugins.cpp
rename to src/liberty/rw/VisibilityPlugins.cpp
diff --git a/src/rw/VisibilityPlugins.h b/src/liberty/rw/VisibilityPlugins.h
similarity index 100%
rename from src/rw/VisibilityPlugins.h
rename to src/liberty/rw/VisibilityPlugins.h
diff --git a/miami/save/Date.cpp b/src/liberty/save/Date.cpp
similarity index 100%
rename from miami/save/Date.cpp
rename to src/liberty/save/Date.cpp
diff --git a/miami/save/Date.h b/src/liberty/save/Date.h
similarity index 100%
rename from miami/save/Date.h
rename to src/liberty/save/Date.h
diff --git a/src/save/GenericGameStorage.cpp b/src/liberty/save/GenericGameStorage.cpp
similarity index 100%
rename from src/save/GenericGameStorage.cpp
rename to src/liberty/save/GenericGameStorage.cpp
diff --git a/src/save/GenericGameStorage.h b/src/liberty/save/GenericGameStorage.h
similarity index 100%
rename from src/save/GenericGameStorage.h
rename to src/liberty/save/GenericGameStorage.h
diff --git a/miami/save/MemoryCard.cpp b/src/liberty/save/MemoryCard.cpp
similarity index 100%
rename from miami/save/MemoryCard.cpp
rename to src/liberty/save/MemoryCard.cpp
diff --git a/miami/save/MemoryCard.h b/src/liberty/save/MemoryCard.h
similarity index 100%
rename from miami/save/MemoryCard.h
rename to src/liberty/save/MemoryCard.h
diff --git a/src/save/PCSave.cpp b/src/liberty/save/PCSave.cpp
similarity index 100%
rename from src/save/PCSave.cpp
rename to src/liberty/save/PCSave.cpp
diff --git a/src/save/PCSave.h b/src/liberty/save/PCSave.h
similarity index 100%
rename from src/save/PCSave.h
rename to src/liberty/save/PCSave.h
diff --git a/src/save/SaveBuf.h b/src/liberty/save/SaveBuf.h
similarity index 100%
rename from src/save/SaveBuf.h
rename to src/liberty/save/SaveBuf.h
diff --git a/src/skel/crossplatform.cpp b/src/liberty/skel/crossplatform.cpp
similarity index 100%
rename from src/skel/crossplatform.cpp
rename to src/liberty/skel/crossplatform.cpp
diff --git a/src/skel/crossplatform.h b/src/liberty/skel/crossplatform.h
similarity index 100%
rename from src/skel/crossplatform.h
rename to src/liberty/skel/crossplatform.h
diff --git a/src/skel/dc/dc.cpp b/src/liberty/skel/dc/dc.cpp
similarity index 100%
rename from src/skel/dc/dc.cpp
rename to src/liberty/skel/dc/dc.cpp
diff --git a/miami/skel/dc/dc.h b/src/liberty/skel/dc/dc.h
similarity index 100%
rename from miami/skel/dc/dc.h
rename to src/liberty/skel/dc/dc.h
diff --git a/miami/skel/events.cpp b/src/liberty/skel/events.cpp
similarity index 100%
rename from miami/skel/events.cpp
rename to src/liberty/skel/events.cpp
diff --git a/miami/skel/events.h b/src/liberty/skel/events.h
similarity index 100%
rename from miami/skel/events.h
rename to src/liberty/skel/events.h
diff --git a/src/skel/glfw/glfw.cpp b/src/liberty/skel/glfw/glfw.cpp
similarity index 100%
rename from src/skel/glfw/glfw.cpp
rename to src/liberty/skel/glfw/glfw.cpp
diff --git a/src/skel/platform.h b/src/liberty/skel/platform.h
similarity index 100%
rename from src/skel/platform.h
rename to src/liberty/skel/platform.h
diff --git a/src/skel/skeleton.cpp b/src/liberty/skel/skeleton.cpp
similarity index 100%
rename from src/skel/skeleton.cpp
rename to src/liberty/skel/skeleton.cpp
diff --git a/miami/skel/skeleton.h b/src/liberty/skel/skeleton.h
similarity index 100%
rename from miami/skel/skeleton.h
rename to src/liberty/skel/skeleton.h
diff --git a/src/skel/win/gta3.ico b/src/liberty/skel/win/gta3.ico
similarity index 100%
rename from src/skel/win/gta3.ico
rename to src/liberty/skel/win/gta3.ico
diff --git a/src/skel/win/resource.h b/src/liberty/skel/win/resource.h
similarity index 100%
rename from src/skel/win/resource.h
rename to src/liberty/skel/win/resource.h
diff --git a/src/skel/win/win.cpp b/src/liberty/skel/win/win.cpp
similarity index 100%
rename from src/skel/win/win.cpp
rename to src/liberty/skel/win/win.cpp
diff --git a/miami/skel/win/win.h b/src/liberty/skel/win/win.h
similarity index 100%
rename from miami/skel/win/win.h
rename to src/liberty/skel/win/win.h
diff --git a/src/skel/win/win.rc b/src/liberty/skel/win/win.rc
similarity index 100%
rename from src/skel/win/win.rc
rename to src/liberty/skel/win/win.rc
diff --git a/src/text/Messages.cpp b/src/liberty/text/Messages.cpp
similarity index 100%
rename from src/text/Messages.cpp
rename to src/liberty/text/Messages.cpp
diff --git a/miami/text/Messages.h b/src/liberty/text/Messages.h
similarity index 100%
rename from miami/text/Messages.h
rename to src/liberty/text/Messages.h
diff --git a/src/text/Pager.cpp b/src/liberty/text/Pager.cpp
similarity index 100%
rename from src/text/Pager.cpp
rename to src/liberty/text/Pager.cpp
diff --git a/miami/text/Pager.h b/src/liberty/text/Pager.h
similarity index 100%
rename from miami/text/Pager.h
rename to src/liberty/text/Pager.h
diff --git a/src/text/Text.cpp b/src/liberty/text/Text.cpp
similarity index 100%
rename from src/text/Text.cpp
rename to src/liberty/text/Text.cpp
diff --git a/src/text/Text.h b/src/liberty/text/Text.h
similarity index 100%
rename from src/text/Text.h
rename to src/liberty/text/Text.h
diff --git a/src/vehicles/Automobile.cpp b/src/liberty/vehicles/Automobile.cpp
similarity index 100%
rename from src/vehicles/Automobile.cpp
rename to src/liberty/vehicles/Automobile.cpp
diff --git a/src/vehicles/Automobile.h b/src/liberty/vehicles/Automobile.h
similarity index 100%
rename from src/vehicles/Automobile.h
rename to src/liberty/vehicles/Automobile.h
diff --git a/src/vehicles/Bike.h b/src/liberty/vehicles/Bike.h
similarity index 100%
rename from src/vehicles/Bike.h
rename to src/liberty/vehicles/Bike.h
diff --git a/src/vehicles/Boat.cpp b/src/liberty/vehicles/Boat.cpp
similarity index 100%
rename from src/vehicles/Boat.cpp
rename to src/liberty/vehicles/Boat.cpp
diff --git a/src/vehicles/Boat.h b/src/liberty/vehicles/Boat.h
similarity index 100%
rename from src/vehicles/Boat.h
rename to src/liberty/vehicles/Boat.h
diff --git a/src/vehicles/CarGen.cpp b/src/liberty/vehicles/CarGen.cpp
similarity index 100%
rename from src/vehicles/CarGen.cpp
rename to src/liberty/vehicles/CarGen.cpp
diff --git a/src/vehicles/CarGen.h b/src/liberty/vehicles/CarGen.h
similarity index 100%
rename from src/vehicles/CarGen.h
rename to src/liberty/vehicles/CarGen.h
diff --git a/src/vehicles/Cranes.cpp b/src/liberty/vehicles/Cranes.cpp
similarity index 100%
rename from src/vehicles/Cranes.cpp
rename to src/liberty/vehicles/Cranes.cpp
diff --git a/src/vehicles/Cranes.h b/src/liberty/vehicles/Cranes.h
similarity index 100%
rename from src/vehicles/Cranes.h
rename to src/liberty/vehicles/Cranes.h
diff --git a/src/vehicles/DamageManager.cpp b/src/liberty/vehicles/DamageManager.cpp
similarity index 100%
rename from src/vehicles/DamageManager.cpp
rename to src/liberty/vehicles/DamageManager.cpp
diff --git a/miami/vehicles/DamageManager.h b/src/liberty/vehicles/DamageManager.h
similarity index 100%
rename from miami/vehicles/DamageManager.h
rename to src/liberty/vehicles/DamageManager.h
diff --git a/miami/vehicles/Door.cpp b/src/liberty/vehicles/Door.cpp
similarity index 100%
rename from miami/vehicles/Door.cpp
rename to src/liberty/vehicles/Door.cpp
diff --git a/miami/vehicles/Door.h b/src/liberty/vehicles/Door.h
similarity index 100%
rename from miami/vehicles/Door.h
rename to src/liberty/vehicles/Door.h
diff --git a/src/vehicles/Floater.cpp b/src/liberty/vehicles/Floater.cpp
similarity index 100%
rename from src/vehicles/Floater.cpp
rename to src/liberty/vehicles/Floater.cpp
diff --git a/src/vehicles/Floater.h b/src/liberty/vehicles/Floater.h
similarity index 100%
rename from src/vehicles/Floater.h
rename to src/liberty/vehicles/Floater.h
diff --git a/src/vehicles/HandlingMgr.cpp b/src/liberty/vehicles/HandlingMgr.cpp
similarity index 100%
rename from src/vehicles/HandlingMgr.cpp
rename to src/liberty/vehicles/HandlingMgr.cpp
diff --git a/src/vehicles/HandlingMgr.h b/src/liberty/vehicles/HandlingMgr.h
similarity index 100%
rename from src/vehicles/HandlingMgr.h
rename to src/liberty/vehicles/HandlingMgr.h
diff --git a/src/vehicles/Heli.cpp b/src/liberty/vehicles/Heli.cpp
similarity index 100%
rename from src/vehicles/Heli.cpp
rename to src/liberty/vehicles/Heli.cpp
diff --git a/src/vehicles/Heli.h b/src/liberty/vehicles/Heli.h
similarity index 100%
rename from src/vehicles/Heli.h
rename to src/liberty/vehicles/Heli.h
diff --git a/src/vehicles/Plane.cpp b/src/liberty/vehicles/Plane.cpp
similarity index 100%
rename from src/vehicles/Plane.cpp
rename to src/liberty/vehicles/Plane.cpp
diff --git a/src/vehicles/Plane.h b/src/liberty/vehicles/Plane.h
similarity index 100%
rename from src/vehicles/Plane.h
rename to src/liberty/vehicles/Plane.h
diff --git a/src/vehicles/Train.cpp b/src/liberty/vehicles/Train.cpp
similarity index 100%
rename from src/vehicles/Train.cpp
rename to src/liberty/vehicles/Train.cpp
diff --git a/src/vehicles/Train.h b/src/liberty/vehicles/Train.h
similarity index 100%
rename from src/vehicles/Train.h
rename to src/liberty/vehicles/Train.h
diff --git a/src/vehicles/Transmission.cpp b/src/liberty/vehicles/Transmission.cpp
similarity index 100%
rename from src/vehicles/Transmission.cpp
rename to src/liberty/vehicles/Transmission.cpp
diff --git a/miami/vehicles/Transmission.h b/src/liberty/vehicles/Transmission.h
similarity index 100%
rename from miami/vehicles/Transmission.h
rename to src/liberty/vehicles/Transmission.h
diff --git a/src/vehicles/Vehicle.cpp b/src/liberty/vehicles/Vehicle.cpp
similarity index 100%
rename from src/vehicles/Vehicle.cpp
rename to src/liberty/vehicles/Vehicle.cpp
diff --git a/src/vehicles/Vehicle.h b/src/liberty/vehicles/Vehicle.h
similarity index 100%
rename from src/vehicles/Vehicle.h
rename to src/liberty/vehicles/Vehicle.h
diff --git a/miami/vmu/vmu.cpp b/src/liberty/vmu/vmu.cpp
similarity index 100%
rename from miami/vmu/vmu.cpp
rename to src/liberty/vmu/vmu.cpp
diff --git a/miami/vmu/vmu.h b/src/liberty/vmu/vmu.h
similarity index 100%
rename from miami/vmu/vmu.h
rename to src/liberty/vmu/vmu.h
diff --git a/src/weapons/BulletInfo.cpp b/src/liberty/weapons/BulletInfo.cpp
similarity index 100%
rename from src/weapons/BulletInfo.cpp
rename to src/liberty/weapons/BulletInfo.cpp
diff --git a/miami/weapons/BulletInfo.h b/src/liberty/weapons/BulletInfo.h
similarity index 100%
rename from miami/weapons/BulletInfo.h
rename to src/liberty/weapons/BulletInfo.h
diff --git a/src/weapons/Explosion.cpp b/src/liberty/weapons/Explosion.cpp
similarity index 100%
rename from src/weapons/Explosion.cpp
rename to src/liberty/weapons/Explosion.cpp
diff --git a/src/weapons/Explosion.h b/src/liberty/weapons/Explosion.h
similarity index 100%
rename from src/weapons/Explosion.h
rename to src/liberty/weapons/Explosion.h
diff --git a/src/weapons/ProjectileInfo.cpp b/src/liberty/weapons/ProjectileInfo.cpp
similarity index 100%
rename from src/weapons/ProjectileInfo.cpp
rename to src/liberty/weapons/ProjectileInfo.cpp
diff --git a/src/weapons/ProjectileInfo.h b/src/liberty/weapons/ProjectileInfo.h
similarity index 100%
rename from src/weapons/ProjectileInfo.h
rename to src/liberty/weapons/ProjectileInfo.h
diff --git a/src/weapons/ShotInfo.cpp b/src/liberty/weapons/ShotInfo.cpp
similarity index 100%
rename from src/weapons/ShotInfo.cpp
rename to src/liberty/weapons/ShotInfo.cpp
diff --git a/miami/weapons/ShotInfo.h b/src/liberty/weapons/ShotInfo.h
similarity index 100%
rename from miami/weapons/ShotInfo.h
rename to src/liberty/weapons/ShotInfo.h
diff --git a/src/weapons/Weapon.cpp b/src/liberty/weapons/Weapon.cpp
similarity index 100%
rename from src/weapons/Weapon.cpp
rename to src/liberty/weapons/Weapon.cpp
diff --git a/src/weapons/Weapon.h b/src/liberty/weapons/Weapon.h
similarity index 100%
rename from src/weapons/Weapon.h
rename to src/liberty/weapons/Weapon.h
diff --git a/src/weapons/WeaponEffects.cpp b/src/liberty/weapons/WeaponEffects.cpp
similarity index 100%
rename from src/weapons/WeaponEffects.cpp
rename to src/liberty/weapons/WeaponEffects.cpp
diff --git a/miami/weapons/WeaponEffects.h b/src/liberty/weapons/WeaponEffects.h
similarity index 100%
rename from miami/weapons/WeaponEffects.h
rename to src/liberty/weapons/WeaponEffects.h
diff --git a/src/weapons/WeaponInfo.cpp b/src/liberty/weapons/WeaponInfo.cpp
similarity index 100%
rename from src/weapons/WeaponInfo.cpp
rename to src/liberty/weapons/WeaponInfo.cpp
diff --git a/src/weapons/WeaponInfo.h b/src/liberty/weapons/WeaponInfo.h
similarity index 100%
rename from src/weapons/WeaponInfo.h
rename to src/liberty/weapons/WeaponInfo.h
diff --git a/src/weapons/WeaponType.h b/src/liberty/weapons/WeaponType.h
similarity index 100%
rename from src/weapons/WeaponType.h
rename to src/liberty/weapons/WeaponType.h
diff --git a/miami/CMakeLists.txt b/src/miami/CMakeLists.txt
similarity index 100%
rename from miami/CMakeLists.txt
rename to src/miami/CMakeLists.txt
diff --git a/miami/animation/AnimBlendAssocGroup.cpp b/src/miami/animation/AnimBlendAssocGroup.cpp
similarity index 100%
rename from miami/animation/AnimBlendAssocGroup.cpp
rename to src/miami/animation/AnimBlendAssocGroup.cpp
diff --git a/miami/animation/AnimBlendAssocGroup.h b/src/miami/animation/AnimBlendAssocGroup.h
similarity index 100%
rename from miami/animation/AnimBlendAssocGroup.h
rename to src/miami/animation/AnimBlendAssocGroup.h
diff --git a/miami/animation/AnimBlendAssociation.cpp b/src/miami/animation/AnimBlendAssociation.cpp
similarity index 100%
rename from miami/animation/AnimBlendAssociation.cpp
rename to src/miami/animation/AnimBlendAssociation.cpp
diff --git a/miami/animation/AnimBlendAssociation.h b/src/miami/animation/AnimBlendAssociation.h
similarity index 100%
rename from miami/animation/AnimBlendAssociation.h
rename to src/miami/animation/AnimBlendAssociation.h
diff --git a/src/animation/AnimBlendClumpData.cpp b/src/miami/animation/AnimBlendClumpData.cpp
similarity index 100%
rename from src/animation/AnimBlendClumpData.cpp
rename to src/miami/animation/AnimBlendClumpData.cpp
diff --git a/miami/animation/AnimBlendClumpData.h b/src/miami/animation/AnimBlendClumpData.h
similarity index 100%
rename from miami/animation/AnimBlendClumpData.h
rename to src/miami/animation/AnimBlendClumpData.h
diff --git a/miami/animation/AnimBlendHierarchy.cpp b/src/miami/animation/AnimBlendHierarchy.cpp
similarity index 100%
rename from miami/animation/AnimBlendHierarchy.cpp
rename to src/miami/animation/AnimBlendHierarchy.cpp
diff --git a/miami/animation/AnimBlendHierarchy.h b/src/miami/animation/AnimBlendHierarchy.h
similarity index 100%
rename from miami/animation/AnimBlendHierarchy.h
rename to src/miami/animation/AnimBlendHierarchy.h
diff --git a/src/animation/AnimBlendList.h b/src/miami/animation/AnimBlendList.h
similarity index 100%
rename from src/animation/AnimBlendList.h
rename to src/miami/animation/AnimBlendList.h
diff --git a/miami/animation/AnimBlendNode.cpp b/src/miami/animation/AnimBlendNode.cpp
similarity index 100%
rename from miami/animation/AnimBlendNode.cpp
rename to src/miami/animation/AnimBlendNode.cpp
diff --git a/miami/animation/AnimBlendNode.h b/src/miami/animation/AnimBlendNode.h
similarity index 100%
rename from miami/animation/AnimBlendNode.h
rename to src/miami/animation/AnimBlendNode.h
diff --git a/miami/animation/AnimBlendSequence.cpp b/src/miami/animation/AnimBlendSequence.cpp
similarity index 100%
rename from miami/animation/AnimBlendSequence.cpp
rename to src/miami/animation/AnimBlendSequence.cpp
diff --git a/miami/animation/AnimBlendSequence.h b/src/miami/animation/AnimBlendSequence.h
similarity index 100%
rename from miami/animation/AnimBlendSequence.h
rename to src/miami/animation/AnimBlendSequence.h
diff --git a/miami/animation/AnimManager.cpp b/src/miami/animation/AnimManager.cpp
similarity index 100%
rename from miami/animation/AnimManager.cpp
rename to src/miami/animation/AnimManager.cpp
diff --git a/miami/animation/AnimManager.h b/src/miami/animation/AnimManager.h
similarity index 100%
rename from miami/animation/AnimManager.h
rename to src/miami/animation/AnimManager.h
diff --git a/miami/animation/AnimationId.h b/src/miami/animation/AnimationId.h
similarity index 100%
rename from miami/animation/AnimationId.h
rename to src/miami/animation/AnimationId.h
diff --git a/miami/animation/Bones.cpp b/src/miami/animation/Bones.cpp
similarity index 100%
rename from miami/animation/Bones.cpp
rename to src/miami/animation/Bones.cpp
diff --git a/miami/animation/Bones.h b/src/miami/animation/Bones.h
similarity index 100%
rename from miami/animation/Bones.h
rename to src/miami/animation/Bones.h
diff --git a/miami/animation/CutsceneMgr.cpp b/src/miami/animation/CutsceneMgr.cpp
similarity index 100%
rename from miami/animation/CutsceneMgr.cpp
rename to src/miami/animation/CutsceneMgr.cpp
diff --git a/miami/animation/CutsceneMgr.h b/src/miami/animation/CutsceneMgr.h
similarity index 100%
rename from miami/animation/CutsceneMgr.h
rename to src/miami/animation/CutsceneMgr.h
diff --git a/miami/animation/FrameUpdate.cpp b/src/miami/animation/FrameUpdate.cpp
similarity index 100%
rename from miami/animation/FrameUpdate.cpp
rename to src/miami/animation/FrameUpdate.cpp
diff --git a/miami/animation/RpAnimBlend.cpp b/src/miami/animation/RpAnimBlend.cpp
similarity index 100%
rename from miami/animation/RpAnimBlend.cpp
rename to src/miami/animation/RpAnimBlend.cpp
diff --git a/miami/animation/RpAnimBlend.h b/src/miami/animation/RpAnimBlend.h
similarity index 100%
rename from miami/animation/RpAnimBlend.h
rename to src/miami/animation/RpAnimBlend.h
diff --git a/miami/audio/AudioCollision.cpp b/src/miami/audio/AudioCollision.cpp
similarity index 100%
rename from miami/audio/AudioCollision.cpp
rename to src/miami/audio/AudioCollision.cpp
diff --git a/miami/audio/AudioCollision.h b/src/miami/audio/AudioCollision.h
similarity index 100%
rename from miami/audio/AudioCollision.h
rename to src/miami/audio/AudioCollision.h
diff --git a/miami/audio/AudioLogic.cpp b/src/miami/audio/AudioLogic.cpp
similarity index 100%
rename from miami/audio/AudioLogic.cpp
rename to src/miami/audio/AudioLogic.cpp
diff --git a/miami/audio/AudioManager.cpp b/src/miami/audio/AudioManager.cpp
similarity index 100%
rename from miami/audio/AudioManager.cpp
rename to src/miami/audio/AudioManager.cpp
diff --git a/miami/audio/AudioManager.h b/src/miami/audio/AudioManager.h
similarity index 100%
rename from miami/audio/AudioManager.h
rename to src/miami/audio/AudioManager.h
diff --git a/miami/audio/AudioSamples.h b/src/miami/audio/AudioSamples.h
similarity index 100%
rename from miami/audio/AudioSamples.h
rename to src/miami/audio/AudioSamples.h
diff --git a/miami/audio/AudioScriptObject.cpp b/src/miami/audio/AudioScriptObject.cpp
similarity index 100%
rename from miami/audio/AudioScriptObject.cpp
rename to src/miami/audio/AudioScriptObject.cpp
diff --git a/src/audio/AudioScriptObject.h b/src/miami/audio/AudioScriptObject.h
similarity index 100%
rename from src/audio/AudioScriptObject.h
rename to src/miami/audio/AudioScriptObject.h
diff --git a/miami/audio/DMAudio.cpp b/src/miami/audio/DMAudio.cpp
similarity index 100%
rename from miami/audio/DMAudio.cpp
rename to src/miami/audio/DMAudio.cpp
diff --git a/miami/audio/DMAudio.h b/src/miami/audio/DMAudio.h
similarity index 100%
rename from miami/audio/DMAudio.h
rename to src/miami/audio/DMAudio.h
diff --git a/miami/audio/MusicManager.cpp b/src/miami/audio/MusicManager.cpp
similarity index 100%
rename from miami/audio/MusicManager.cpp
rename to src/miami/audio/MusicManager.cpp
diff --git a/miami/audio/MusicManager.h b/src/miami/audio/MusicManager.h
similarity index 100%
rename from miami/audio/MusicManager.h
rename to src/miami/audio/MusicManager.h
diff --git a/miami/audio/PolRadio.cpp b/src/miami/audio/PolRadio.cpp
similarity index 100%
rename from miami/audio/PolRadio.cpp
rename to src/miami/audio/PolRadio.cpp
diff --git a/miami/audio/PolRadio.h b/src/miami/audio/PolRadio.h
similarity index 100%
rename from miami/audio/PolRadio.h
rename to src/miami/audio/PolRadio.h
diff --git a/miami/audio/audio_enums.h b/src/miami/audio/audio_enums.h
similarity index 100%
rename from miami/audio/audio_enums.h
rename to src/miami/audio/audio_enums.h
diff --git a/src/audio/eax/eax-util.cpp b/src/miami/audio/eax/eax-util.cpp
similarity index 100%
rename from src/audio/eax/eax-util.cpp
rename to src/miami/audio/eax/eax-util.cpp
diff --git a/src/audio/eax/eax-util.h b/src/miami/audio/eax/eax-util.h
similarity index 100%
rename from src/audio/eax/eax-util.h
rename to src/miami/audio/eax/eax-util.h
diff --git a/src/audio/eax/eax.h b/src/miami/audio/eax/eax.h
similarity index 100%
rename from src/audio/eax/eax.h
rename to src/miami/audio/eax/eax.h
diff --git a/src/audio/oal/aldlist.cpp b/src/miami/audio/oal/aldlist.cpp
similarity index 100%
rename from src/audio/oal/aldlist.cpp
rename to src/miami/audio/oal/aldlist.cpp
diff --git a/src/audio/oal/aldlist.h b/src/miami/audio/oal/aldlist.h
similarity index 100%
rename from src/audio/oal/aldlist.h
rename to src/miami/audio/oal/aldlist.h
diff --git a/src/audio/oal/channel.cpp b/src/miami/audio/oal/channel.cpp
similarity index 100%
rename from src/audio/oal/channel.cpp
rename to src/miami/audio/oal/channel.cpp
diff --git a/src/audio/oal/channel.h b/src/miami/audio/oal/channel.h
similarity index 100%
rename from src/audio/oal/channel.h
rename to src/miami/audio/oal/channel.h
diff --git a/src/audio/oal/oal_utils.cpp b/src/miami/audio/oal/oal_utils.cpp
similarity index 100%
rename from src/audio/oal/oal_utils.cpp
rename to src/miami/audio/oal/oal_utils.cpp
diff --git a/src/audio/oal/oal_utils.h b/src/miami/audio/oal/oal_utils.h
similarity index 100%
rename from src/audio/oal/oal_utils.h
rename to src/miami/audio/oal/oal_utils.h
diff --git a/miami/audio/oal/stream.cpp b/src/miami/audio/oal/stream.cpp
similarity index 100%
rename from miami/audio/oal/stream.cpp
rename to src/miami/audio/oal/stream.cpp
diff --git a/src/audio/oal/stream.h b/src/miami/audio/oal/stream.h
similarity index 100%
rename from src/audio/oal/stream.h
rename to src/miami/audio/oal/stream.h
diff --git a/miami/audio/sampman.h b/src/miami/audio/sampman.h
similarity index 100%
rename from miami/audio/sampman.h
rename to src/miami/audio/sampman.h
diff --git a/miami/audio/sampman_dc.cpp b/src/miami/audio/sampman_dc.cpp
similarity index 100%
rename from miami/audio/sampman_dc.cpp
rename to src/miami/audio/sampman_dc.cpp
diff --git a/miami/audio/sampman_miles.cpp b/src/miami/audio/sampman_miles.cpp
similarity index 100%
rename from miami/audio/sampman_miles.cpp
rename to src/miami/audio/sampman_miles.cpp
diff --git a/miami/audio/sampman_null.cpp b/src/miami/audio/sampman_null.cpp
similarity index 100%
rename from miami/audio/sampman_null.cpp
rename to src/miami/audio/sampman_null.cpp
diff --git a/miami/audio/sampman_oal.cpp b/src/miami/audio/sampman_oal.cpp
similarity index 100%
rename from miami/audio/sampman_oal.cpp
rename to src/miami/audio/sampman_oal.cpp
diff --git a/miami/audio/soundlist.h b/src/miami/audio/soundlist.h
similarity index 100%
rename from miami/audio/soundlist.h
rename to src/miami/audio/soundlist.h
diff --git a/miami/buildings/Building.cpp b/src/miami/buildings/Building.cpp
similarity index 100%
rename from miami/buildings/Building.cpp
rename to src/miami/buildings/Building.cpp
diff --git a/miami/buildings/Building.h b/src/miami/buildings/Building.h
similarity index 100%
rename from miami/buildings/Building.h
rename to src/miami/buildings/Building.h
diff --git a/src/buildings/Solid.h b/src/miami/buildings/Solid.h
similarity index 100%
rename from src/buildings/Solid.h
rename to src/miami/buildings/Solid.h
diff --git a/src/buildings/Treadable.cpp b/src/miami/buildings/Treadable.cpp
similarity index 100%
rename from src/buildings/Treadable.cpp
rename to src/miami/buildings/Treadable.cpp
diff --git a/miami/buildings/Treadable.h b/src/miami/buildings/Treadable.h
similarity index 100%
rename from miami/buildings/Treadable.h
rename to src/miami/buildings/Treadable.h
diff --git a/src/collision/ColBox.cpp b/src/miami/collision/ColBox.cpp
similarity index 100%
rename from src/collision/ColBox.cpp
rename to src/miami/collision/ColBox.cpp
diff --git a/miami/collision/ColBox.h b/src/miami/collision/ColBox.h
similarity index 100%
rename from miami/collision/ColBox.h
rename to src/miami/collision/ColBox.h
diff --git a/src/collision/ColLine.cpp b/src/miami/collision/ColLine.cpp
similarity index 100%
rename from src/collision/ColLine.cpp
rename to src/miami/collision/ColLine.cpp
diff --git a/src/collision/ColLine.h b/src/miami/collision/ColLine.h
similarity index 100%
rename from src/collision/ColLine.h
rename to src/miami/collision/ColLine.h
diff --git a/miami/collision/ColModel.cpp b/src/miami/collision/ColModel.cpp
similarity index 100%
rename from miami/collision/ColModel.cpp
rename to src/miami/collision/ColModel.cpp
diff --git a/miami/collision/ColModel.h b/src/miami/collision/ColModel.h
similarity index 100%
rename from miami/collision/ColModel.h
rename to src/miami/collision/ColModel.h
diff --git a/src/collision/ColPoint.cpp b/src/miami/collision/ColPoint.cpp
similarity index 100%
rename from src/collision/ColPoint.cpp
rename to src/miami/collision/ColPoint.cpp
diff --git a/src/collision/ColPoint.h b/src/miami/collision/ColPoint.h
similarity index 100%
rename from src/collision/ColPoint.h
rename to src/miami/collision/ColPoint.h
diff --git a/miami/collision/ColSphere.cpp b/src/miami/collision/ColSphere.cpp
similarity index 100%
rename from miami/collision/ColSphere.cpp
rename to src/miami/collision/ColSphere.cpp
diff --git a/miami/collision/ColSphere.h b/src/miami/collision/ColSphere.h
similarity index 100%
rename from miami/collision/ColSphere.h
rename to src/miami/collision/ColSphere.h
diff --git a/miami/collision/ColStore.cpp b/src/miami/collision/ColStore.cpp
similarity index 100%
rename from miami/collision/ColStore.cpp
rename to src/miami/collision/ColStore.cpp
diff --git a/miami/collision/ColStore.h b/src/miami/collision/ColStore.h
similarity index 100%
rename from miami/collision/ColStore.h
rename to src/miami/collision/ColStore.h
diff --git a/miami/collision/ColTriangle.cpp b/src/miami/collision/ColTriangle.cpp
similarity index 100%
rename from miami/collision/ColTriangle.cpp
rename to src/miami/collision/ColTriangle.cpp
diff --git a/miami/collision/ColTriangle.h b/src/miami/collision/ColTriangle.h
similarity index 100%
rename from miami/collision/ColTriangle.h
rename to src/miami/collision/ColTriangle.h
diff --git a/miami/collision/Collision.cpp b/src/miami/collision/Collision.cpp
similarity index 100%
rename from miami/collision/Collision.cpp
rename to src/miami/collision/Collision.cpp
diff --git a/miami/collision/Collision.h b/src/miami/collision/Collision.h
similarity index 100%
rename from miami/collision/Collision.h
rename to src/miami/collision/Collision.h
diff --git a/miami/collision/CompressedVector.h b/src/miami/collision/CompressedVector.h
similarity index 100%
rename from miami/collision/CompressedVector.h
rename to src/miami/collision/CompressedVector.h
diff --git a/miami/collision/TempColModels.cpp b/src/miami/collision/TempColModels.cpp
similarity index 100%
rename from miami/collision/TempColModels.cpp
rename to src/miami/collision/TempColModels.cpp
diff --git a/miami/collision/TempColModels.h b/src/miami/collision/TempColModels.h
similarity index 100%
rename from miami/collision/TempColModels.h
rename to src/miami/collision/TempColModels.h
diff --git a/src/collision/VuCollision.cpp b/src/miami/collision/VuCollision.cpp
similarity index 100%
rename from src/collision/VuCollision.cpp
rename to src/miami/collision/VuCollision.cpp
diff --git a/src/collision/VuCollision.h b/src/miami/collision/VuCollision.h
similarity index 100%
rename from src/collision/VuCollision.h
rename to src/miami/collision/VuCollision.h
diff --git a/src/collision/vu0Collision.dsm b/src/miami/collision/vu0Collision.dsm
similarity index 100%
rename from src/collision/vu0Collision.dsm
rename to src/miami/collision/vu0Collision.dsm
diff --git a/src/collision/vu0Collision_1.s b/src/miami/collision/vu0Collision_1.s
similarity index 100%
rename from src/collision/vu0Collision_1.s
rename to src/miami/collision/vu0Collision_1.s
diff --git a/src/collision/vu0Collision_2.s b/src/miami/collision/vu0Collision_2.s
similarity index 100%
rename from src/collision/vu0Collision_2.s
rename to src/miami/collision/vu0Collision_2.s
diff --git a/miami/control/AutoPilot.cpp b/src/miami/control/AutoPilot.cpp
similarity index 100%
rename from miami/control/AutoPilot.cpp
rename to src/miami/control/AutoPilot.cpp
diff --git a/miami/control/AutoPilot.h b/src/miami/control/AutoPilot.h
similarity index 100%
rename from miami/control/AutoPilot.h
rename to src/miami/control/AutoPilot.h
diff --git a/miami/control/Bridge.cpp b/src/miami/control/Bridge.cpp
similarity index 100%
rename from miami/control/Bridge.cpp
rename to src/miami/control/Bridge.cpp
diff --git a/src/control/Bridge.h b/src/miami/control/Bridge.h
similarity index 100%
rename from src/control/Bridge.h
rename to src/miami/control/Bridge.h
diff --git a/miami/control/CarAI.cpp b/src/miami/control/CarAI.cpp
similarity index 100%
rename from miami/control/CarAI.cpp
rename to src/miami/control/CarAI.cpp
diff --git a/miami/control/CarAI.h b/src/miami/control/CarAI.h
similarity index 100%
rename from miami/control/CarAI.h
rename to src/miami/control/CarAI.h
diff --git a/miami/control/CarCtrl.cpp b/src/miami/control/CarCtrl.cpp
similarity index 100%
rename from miami/control/CarCtrl.cpp
rename to src/miami/control/CarCtrl.cpp
diff --git a/miami/control/CarCtrl.h b/src/miami/control/CarCtrl.h
similarity index 100%
rename from miami/control/CarCtrl.h
rename to src/miami/control/CarCtrl.h
diff --git a/miami/control/Curves.cpp b/src/miami/control/Curves.cpp
similarity index 100%
rename from miami/control/Curves.cpp
rename to src/miami/control/Curves.cpp
diff --git a/src/control/Curves.h b/src/miami/control/Curves.h
similarity index 100%
rename from src/control/Curves.h
rename to src/miami/control/Curves.h
diff --git a/miami/control/Darkel.cpp b/src/miami/control/Darkel.cpp
similarity index 100%
rename from miami/control/Darkel.cpp
rename to src/miami/control/Darkel.cpp
diff --git a/miami/control/Darkel.h b/src/miami/control/Darkel.h
similarity index 100%
rename from miami/control/Darkel.h
rename to src/miami/control/Darkel.h
diff --git a/miami/control/GameLogic.cpp b/src/miami/control/GameLogic.cpp
similarity index 100%
rename from miami/control/GameLogic.cpp
rename to src/miami/control/GameLogic.cpp
diff --git a/miami/control/GameLogic.h b/src/miami/control/GameLogic.h
similarity index 100%
rename from miami/control/GameLogic.h
rename to src/miami/control/GameLogic.h
diff --git a/miami/control/Garages.cpp b/src/miami/control/Garages.cpp
similarity index 100%
rename from miami/control/Garages.cpp
rename to src/miami/control/Garages.cpp
diff --git a/miami/control/Garages.h b/src/miami/control/Garages.h
similarity index 100%
rename from miami/control/Garages.h
rename to src/miami/control/Garages.h
diff --git a/src/control/NameGrid.cpp b/src/miami/control/NameGrid.cpp
similarity index 100%
rename from src/control/NameGrid.cpp
rename to src/miami/control/NameGrid.cpp
diff --git a/src/control/NameGrid.h b/src/miami/control/NameGrid.h
similarity index 100%
rename from src/control/NameGrid.h
rename to src/miami/control/NameGrid.h
diff --git a/miami/control/OnscreenTimer.cpp b/src/miami/control/OnscreenTimer.cpp
similarity index 100%
rename from miami/control/OnscreenTimer.cpp
rename to src/miami/control/OnscreenTimer.cpp
diff --git a/miami/control/OnscreenTimer.h b/src/miami/control/OnscreenTimer.h
similarity index 100%
rename from miami/control/OnscreenTimer.h
rename to src/miami/control/OnscreenTimer.h
diff --git a/miami/control/PathFind.cpp b/src/miami/control/PathFind.cpp
similarity index 100%
rename from miami/control/PathFind.cpp
rename to src/miami/control/PathFind.cpp
diff --git a/miami/control/PathFind.h b/src/miami/control/PathFind.h
similarity index 100%
rename from miami/control/PathFind.h
rename to src/miami/control/PathFind.h
diff --git a/miami/control/Phones.cpp b/src/miami/control/Phones.cpp
similarity index 100%
rename from miami/control/Phones.cpp
rename to src/miami/control/Phones.cpp
diff --git a/miami/control/Phones.h b/src/miami/control/Phones.h
similarity index 100%
rename from miami/control/Phones.h
rename to src/miami/control/Phones.h
diff --git a/miami/control/Pickups.cpp b/src/miami/control/Pickups.cpp
similarity index 100%
rename from miami/control/Pickups.cpp
rename to src/miami/control/Pickups.cpp
diff --git a/miami/control/Pickups.h b/src/miami/control/Pickups.h
similarity index 100%
rename from miami/control/Pickups.h
rename to src/miami/control/Pickups.h
diff --git a/src/control/PowerPoints.cpp b/src/miami/control/PowerPoints.cpp
similarity index 100%
rename from src/control/PowerPoints.cpp
rename to src/miami/control/PowerPoints.cpp
diff --git a/src/control/PowerPoints.h b/src/miami/control/PowerPoints.h
similarity index 100%
rename from src/control/PowerPoints.h
rename to src/miami/control/PowerPoints.h
diff --git a/miami/control/Record.cpp b/src/miami/control/Record.cpp
similarity index 100%
rename from miami/control/Record.cpp
rename to src/miami/control/Record.cpp
diff --git a/src/control/Record.h b/src/miami/control/Record.h
similarity index 100%
rename from src/control/Record.h
rename to src/miami/control/Record.h
diff --git a/miami/control/Remote.cpp b/src/miami/control/Remote.cpp
similarity index 100%
rename from miami/control/Remote.cpp
rename to src/miami/control/Remote.cpp
diff --git a/miami/control/Remote.h b/src/miami/control/Remote.h
similarity index 100%
rename from miami/control/Remote.h
rename to src/miami/control/Remote.h
diff --git a/miami/control/Replay.cpp b/src/miami/control/Replay.cpp
similarity index 100%
rename from miami/control/Replay.cpp
rename to src/miami/control/Replay.cpp
diff --git a/miami/control/Replay.h b/src/miami/control/Replay.h
similarity index 100%
rename from miami/control/Replay.h
rename to src/miami/control/Replay.h
diff --git a/miami/control/Restart.cpp b/src/miami/control/Restart.cpp
similarity index 100%
rename from miami/control/Restart.cpp
rename to src/miami/control/Restart.cpp
diff --git a/src/control/Restart.h b/src/miami/control/Restart.h
similarity index 100%
rename from src/control/Restart.h
rename to src/miami/control/Restart.h
diff --git a/miami/control/RoadBlocks.cpp b/src/miami/control/RoadBlocks.cpp
similarity index 100%
rename from miami/control/RoadBlocks.cpp
rename to src/miami/control/RoadBlocks.cpp
diff --git a/miami/control/RoadBlocks.h b/src/miami/control/RoadBlocks.h
similarity index 100%
rename from miami/control/RoadBlocks.h
rename to src/miami/control/RoadBlocks.h
diff --git a/miami/control/SceneEdit.cpp b/src/miami/control/SceneEdit.cpp
similarity index 100%
rename from miami/control/SceneEdit.cpp
rename to src/miami/control/SceneEdit.cpp
diff --git a/src/control/SceneEdit.h b/src/miami/control/SceneEdit.h
similarity index 100%
rename from src/control/SceneEdit.h
rename to src/miami/control/SceneEdit.h
diff --git a/miami/control/Script.cpp b/src/miami/control/Script.cpp
similarity index 100%
rename from miami/control/Script.cpp
rename to src/miami/control/Script.cpp
diff --git a/miami/control/Script.h b/src/miami/control/Script.h
similarity index 100%
rename from miami/control/Script.h
rename to src/miami/control/Script.h
diff --git a/miami/control/Script2.cpp b/src/miami/control/Script2.cpp
similarity index 100%
rename from miami/control/Script2.cpp
rename to src/miami/control/Script2.cpp
diff --git a/miami/control/Script3.cpp b/src/miami/control/Script3.cpp
similarity index 100%
rename from miami/control/Script3.cpp
rename to src/miami/control/Script3.cpp
diff --git a/miami/control/Script4.cpp b/src/miami/control/Script4.cpp
similarity index 100%
rename from miami/control/Script4.cpp
rename to src/miami/control/Script4.cpp
diff --git a/miami/control/Script5.cpp b/src/miami/control/Script5.cpp
similarity index 100%
rename from miami/control/Script5.cpp
rename to src/miami/control/Script5.cpp
diff --git a/miami/control/Script6.cpp b/src/miami/control/Script6.cpp
similarity index 100%
rename from miami/control/Script6.cpp
rename to src/miami/control/Script6.cpp
diff --git a/miami/control/Script7.cpp b/src/miami/control/Script7.cpp
similarity index 100%
rename from miami/control/Script7.cpp
rename to src/miami/control/Script7.cpp
diff --git a/miami/control/Script8.cpp b/src/miami/control/Script8.cpp
similarity index 100%
rename from miami/control/Script8.cpp
rename to src/miami/control/Script8.cpp
diff --git a/miami/control/ScriptCommands.h b/src/miami/control/ScriptCommands.h
similarity index 100%
rename from miami/control/ScriptCommands.h
rename to src/miami/control/ScriptCommands.h
diff --git a/miami/control/ScriptDebug.cpp b/src/miami/control/ScriptDebug.cpp
similarity index 100%
rename from miami/control/ScriptDebug.cpp
rename to src/miami/control/ScriptDebug.cpp
diff --git a/miami/control/SetPieces.cpp b/src/miami/control/SetPieces.cpp
similarity index 100%
rename from miami/control/SetPieces.cpp
rename to src/miami/control/SetPieces.cpp
diff --git a/miami/control/SetPieces.h b/src/miami/control/SetPieces.h
similarity index 100%
rename from miami/control/SetPieces.h
rename to src/miami/control/SetPieces.h
diff --git a/miami/control/TrafficLights.cpp b/src/miami/control/TrafficLights.cpp
similarity index 100%
rename from miami/control/TrafficLights.cpp
rename to src/miami/control/TrafficLights.cpp
diff --git a/miami/control/TrafficLights.h b/src/miami/control/TrafficLights.h
similarity index 100%
rename from miami/control/TrafficLights.h
rename to src/miami/control/TrafficLights.h
diff --git a/src/core/Accident.cpp b/src/miami/core/Accident.cpp
similarity index 100%
rename from src/core/Accident.cpp
rename to src/miami/core/Accident.cpp
diff --git a/src/core/Accident.h b/src/miami/core/Accident.h
similarity index 100%
rename from src/core/Accident.h
rename to src/miami/core/Accident.h
diff --git a/miami/core/AnimViewer.cpp b/src/miami/core/AnimViewer.cpp
similarity index 100%
rename from miami/core/AnimViewer.cpp
rename to src/miami/core/AnimViewer.cpp
diff --git a/src/core/AnimViewer.h b/src/miami/core/AnimViewer.h
similarity index 100%
rename from src/core/AnimViewer.h
rename to src/miami/core/AnimViewer.h
diff --git a/miami/core/Cam.cpp b/src/miami/core/Cam.cpp
similarity index 100%
rename from miami/core/Cam.cpp
rename to src/miami/core/Cam.cpp
diff --git a/miami/core/Camera.cpp b/src/miami/core/Camera.cpp
similarity index 100%
rename from miami/core/Camera.cpp
rename to src/miami/core/Camera.cpp
diff --git a/miami/core/Camera.h b/src/miami/core/Camera.h
similarity index 100%
rename from miami/core/Camera.h
rename to src/miami/core/Camera.h
diff --git a/src/core/CdStream.cpp b/src/miami/core/CdStream.cpp
similarity index 100%
rename from src/core/CdStream.cpp
rename to src/miami/core/CdStream.cpp
diff --git a/src/core/CdStream.h b/src/miami/core/CdStream.h
similarity index 100%
rename from src/core/CdStream.h
rename to src/miami/core/CdStream.h
diff --git a/src/core/CdStreamDC.cpp b/src/miami/core/CdStreamDC.cpp
similarity index 100%
rename from src/core/CdStreamDC.cpp
rename to src/miami/core/CdStreamDC.cpp
diff --git a/src/core/CdStreamPosix.cpp b/src/miami/core/CdStreamPosix.cpp
similarity index 100%
rename from src/core/CdStreamPosix.cpp
rename to src/miami/core/CdStreamPosix.cpp
diff --git a/miami/core/Clock.cpp b/src/miami/core/Clock.cpp
similarity index 100%
rename from miami/core/Clock.cpp
rename to src/miami/core/Clock.cpp
diff --git a/src/core/Clock.h b/src/miami/core/Clock.h
similarity index 100%
rename from src/core/Clock.h
rename to src/miami/core/Clock.h
diff --git a/miami/core/ControllerConfig.cpp b/src/miami/core/ControllerConfig.cpp
similarity index 100%
rename from miami/core/ControllerConfig.cpp
rename to src/miami/core/ControllerConfig.cpp
diff --git a/miami/core/ControllerConfig.h b/src/miami/core/ControllerConfig.h
similarity index 100%
rename from miami/core/ControllerConfig.h
rename to src/miami/core/ControllerConfig.h
diff --git a/miami/core/Crime.h b/src/miami/core/Crime.h
similarity index 100%
rename from miami/core/Crime.h
rename to src/miami/core/Crime.h
diff --git a/miami/core/Debug.cpp b/src/miami/core/Debug.cpp
similarity index 100%
rename from miami/core/Debug.cpp
rename to src/miami/core/Debug.cpp
diff --git a/src/core/Debug.h b/src/miami/core/Debug.h
similarity index 100%
rename from src/core/Debug.h
rename to src/miami/core/Debug.h
diff --git a/miami/core/Directory.cpp b/src/miami/core/Directory.cpp
similarity index 100%
rename from miami/core/Directory.cpp
rename to src/miami/core/Directory.cpp
diff --git a/src/core/Directory.h b/src/miami/core/Directory.h
similarity index 100%
rename from src/core/Directory.h
rename to src/miami/core/Directory.h
diff --git a/miami/core/EventList.cpp b/src/miami/core/EventList.cpp
similarity index 100%
rename from miami/core/EventList.cpp
rename to src/miami/core/EventList.cpp
diff --git a/miami/core/EventList.h b/src/miami/core/EventList.h
similarity index 100%
rename from miami/core/EventList.h
rename to src/miami/core/EventList.h
diff --git a/miami/core/FileLoader.cpp b/src/miami/core/FileLoader.cpp
similarity index 100%
rename from miami/core/FileLoader.cpp
rename to src/miami/core/FileLoader.cpp
diff --git a/miami/core/FileLoader.h b/src/miami/core/FileLoader.h
similarity index 100%
rename from miami/core/FileLoader.h
rename to src/miami/core/FileLoader.h
diff --git a/src/core/FileMgr.cpp b/src/miami/core/FileMgr.cpp
similarity index 100%
rename from src/core/FileMgr.cpp
rename to src/miami/core/FileMgr.cpp
diff --git a/src/core/FileMgr.h b/src/miami/core/FileMgr.h
similarity index 100%
rename from src/core/FileMgr.h
rename to src/miami/core/FileMgr.h
diff --git a/miami/core/Fire.cpp b/src/miami/core/Fire.cpp
similarity index 100%
rename from miami/core/Fire.cpp
rename to src/miami/core/Fire.cpp
diff --git a/miami/core/Fire.h b/src/miami/core/Fire.h
similarity index 100%
rename from miami/core/Fire.h
rename to src/miami/core/Fire.h
diff --git a/src/core/FrontEndControls.cpp b/src/miami/core/FrontEndControls.cpp
similarity index 100%
rename from src/core/FrontEndControls.cpp
rename to src/miami/core/FrontEndControls.cpp
diff --git a/src/core/FrontEndControls.h b/src/miami/core/FrontEndControls.h
similarity index 100%
rename from src/core/FrontEndControls.h
rename to src/miami/core/FrontEndControls.h
diff --git a/miami/core/Frontend.cpp b/src/miami/core/Frontend.cpp
similarity index 100%
rename from miami/core/Frontend.cpp
rename to src/miami/core/Frontend.cpp
diff --git a/miami/core/Frontend.h b/src/miami/core/Frontend.h
similarity index 100%
rename from miami/core/Frontend.h
rename to src/miami/core/Frontend.h
diff --git a/src/core/FrontendTriggers.h b/src/miami/core/FrontendTriggers.h
similarity index 100%
rename from src/core/FrontendTriggers.h
rename to src/miami/core/FrontendTriggers.h
diff --git a/miami/core/Frontend_PS2.cpp b/src/miami/core/Frontend_PS2.cpp
similarity index 100%
rename from miami/core/Frontend_PS2.cpp
rename to src/miami/core/Frontend_PS2.cpp
diff --git a/miami/core/Frontend_PS2.h b/src/miami/core/Frontend_PS2.h
similarity index 100%
rename from miami/core/Frontend_PS2.h
rename to src/miami/core/Frontend_PS2.h
diff --git a/miami/core/Game.cpp b/src/miami/core/Game.cpp
similarity index 100%
rename from miami/core/Game.cpp
rename to src/miami/core/Game.cpp
diff --git a/miami/core/Game.h b/src/miami/core/Game.h
similarity index 100%
rename from miami/core/Game.h
rename to src/miami/core/Game.h
diff --git a/miami/core/General.h b/src/miami/core/General.h
similarity index 100%
rename from miami/core/General.h
rename to src/miami/core/General.h
diff --git a/miami/core/IniFile.cpp b/src/miami/core/IniFile.cpp
similarity index 100%
rename from miami/core/IniFile.cpp
rename to src/miami/core/IniFile.cpp
diff --git a/miami/core/IniFile.h b/src/miami/core/IniFile.h
similarity index 100%
rename from miami/core/IniFile.h
rename to src/miami/core/IniFile.h
diff --git a/src/core/Lists.cpp b/src/miami/core/Lists.cpp
similarity index 100%
rename from src/core/Lists.cpp
rename to src/miami/core/Lists.cpp
diff --git a/src/core/Lists.h b/src/miami/core/Lists.h
similarity index 100%
rename from src/core/Lists.h
rename to src/miami/core/Lists.h
diff --git a/miami/core/MenuScreens.cpp b/src/miami/core/MenuScreens.cpp
similarity index 100%
rename from miami/core/MenuScreens.cpp
rename to src/miami/core/MenuScreens.cpp
diff --git a/miami/core/MenuScreensCustom.cpp b/src/miami/core/MenuScreensCustom.cpp
similarity index 100%
rename from miami/core/MenuScreensCustom.cpp
rename to src/miami/core/MenuScreensCustom.cpp
diff --git a/miami/core/Pad.cpp b/src/miami/core/Pad.cpp
similarity index 100%
rename from miami/core/Pad.cpp
rename to src/miami/core/Pad.cpp
diff --git a/miami/core/Pad.h b/src/miami/core/Pad.h
similarity index 100%
rename from miami/core/Pad.h
rename to src/miami/core/Pad.h
diff --git a/miami/core/Placeable.cpp b/src/miami/core/Placeable.cpp
similarity index 100%
rename from miami/core/Placeable.cpp
rename to src/miami/core/Placeable.cpp
diff --git a/miami/core/Placeable.h b/src/miami/core/Placeable.h
similarity index 100%
rename from miami/core/Placeable.h
rename to src/miami/core/Placeable.h
diff --git a/miami/core/PlayerInfo.cpp b/src/miami/core/PlayerInfo.cpp
similarity index 100%
rename from miami/core/PlayerInfo.cpp
rename to src/miami/core/PlayerInfo.cpp
diff --git a/miami/core/PlayerInfo.h b/src/miami/core/PlayerInfo.h
similarity index 100%
rename from miami/core/PlayerInfo.h
rename to src/miami/core/PlayerInfo.h
diff --git a/miami/core/Pools.cpp b/src/miami/core/Pools.cpp
similarity index 100%
rename from miami/core/Pools.cpp
rename to src/miami/core/Pools.cpp
diff --git a/miami/core/Pools.h b/src/miami/core/Pools.h
similarity index 100%
rename from miami/core/Pools.h
rename to src/miami/core/Pools.h
diff --git a/src/core/Profile.cpp b/src/miami/core/Profile.cpp
similarity index 100%
rename from src/core/Profile.cpp
rename to src/miami/core/Profile.cpp
diff --git a/src/core/Profile.h b/src/miami/core/Profile.h
similarity index 100%
rename from src/core/Profile.h
rename to src/miami/core/Profile.h
diff --git a/miami/core/Radar.cpp b/src/miami/core/Radar.cpp
similarity index 100%
rename from miami/core/Radar.cpp
rename to src/miami/core/Radar.cpp
diff --git a/miami/core/Radar.h b/src/miami/core/Radar.h
similarity index 100%
rename from miami/core/Radar.h
rename to src/miami/core/Radar.h
diff --git a/src/core/Range2D.cpp b/src/miami/core/Range2D.cpp
similarity index 100%
rename from src/core/Range2D.cpp
rename to src/miami/core/Range2D.cpp
diff --git a/src/core/Range2D.h b/src/miami/core/Range2D.h
similarity index 100%
rename from src/core/Range2D.h
rename to src/miami/core/Range2D.h
diff --git a/src/core/Range3D.cpp b/src/miami/core/Range3D.cpp
similarity index 100%
rename from src/core/Range3D.cpp
rename to src/miami/core/Range3D.cpp
diff --git a/src/core/Range3D.h b/src/miami/core/Range3D.h
similarity index 100%
rename from src/core/Range3D.h
rename to src/miami/core/Range3D.h
diff --git a/miami/core/References.cpp b/src/miami/core/References.cpp
similarity index 100%
rename from miami/core/References.cpp
rename to src/miami/core/References.cpp
diff --git a/src/core/References.h b/src/miami/core/References.h
similarity index 100%
rename from src/core/References.h
rename to src/miami/core/References.h
diff --git a/miami/core/Ropes.cpp b/src/miami/core/Ropes.cpp
similarity index 100%
rename from miami/core/Ropes.cpp
rename to src/miami/core/Ropes.cpp
diff --git a/miami/core/Ropes.h b/src/miami/core/Ropes.h
similarity index 100%
rename from miami/core/Ropes.h
rename to src/miami/core/Ropes.h
diff --git a/miami/core/Stats.cpp b/src/miami/core/Stats.cpp
similarity index 100%
rename from miami/core/Stats.cpp
rename to src/miami/core/Stats.cpp
diff --git a/miami/core/Stats.h b/src/miami/core/Stats.h
similarity index 100%
rename from miami/core/Stats.h
rename to src/miami/core/Stats.h
diff --git a/miami/core/Streaming.cpp b/src/miami/core/Streaming.cpp
similarity index 100%
rename from miami/core/Streaming.cpp
rename to src/miami/core/Streaming.cpp
diff --git a/miami/core/Streaming.h b/src/miami/core/Streaming.h
similarity index 100%
rename from miami/core/Streaming.h
rename to src/miami/core/Streaming.h
diff --git a/miami/core/SurfaceTable.cpp b/src/miami/core/SurfaceTable.cpp
similarity index 100%
rename from miami/core/SurfaceTable.cpp
rename to src/miami/core/SurfaceTable.cpp
diff --git a/miami/core/SurfaceTable.h b/src/miami/core/SurfaceTable.h
similarity index 100%
rename from miami/core/SurfaceTable.h
rename to src/miami/core/SurfaceTable.h
diff --git a/src/core/TimeStep.cpp b/src/miami/core/TimeStep.cpp
similarity index 100%
rename from src/core/TimeStep.cpp
rename to src/miami/core/TimeStep.cpp
diff --git a/src/core/TimeStep.h b/src/miami/core/TimeStep.h
similarity index 100%
rename from src/core/TimeStep.h
rename to src/miami/core/TimeStep.h
diff --git a/miami/core/Timer.cpp b/src/miami/core/Timer.cpp
similarity index 100%
rename from miami/core/Timer.cpp
rename to src/miami/core/Timer.cpp
diff --git a/src/core/Timer.h b/src/miami/core/Timer.h
similarity index 100%
rename from src/core/Timer.h
rename to src/miami/core/Timer.h
diff --git a/miami/core/User.cpp b/src/miami/core/User.cpp
similarity index 100%
rename from miami/core/User.cpp
rename to src/miami/core/User.cpp
diff --git a/miami/core/User.h b/src/miami/core/User.h
similarity index 100%
rename from miami/core/User.h
rename to src/miami/core/User.h
diff --git a/miami/core/Wanted.cpp b/src/miami/core/Wanted.cpp
similarity index 100%
rename from miami/core/Wanted.cpp
rename to src/miami/core/Wanted.cpp
diff --git a/miami/core/Wanted.h b/src/miami/core/Wanted.h
similarity index 100%
rename from miami/core/Wanted.h
rename to src/miami/core/Wanted.h
diff --git a/miami/core/World.cpp b/src/miami/core/World.cpp
similarity index 100%
rename from miami/core/World.cpp
rename to src/miami/core/World.cpp
diff --git a/miami/core/World.h b/src/miami/core/World.h
similarity index 100%
rename from miami/core/World.h
rename to src/miami/core/World.h
diff --git a/miami/core/ZoneCull.cpp b/src/miami/core/ZoneCull.cpp
similarity index 100%
rename from miami/core/ZoneCull.cpp
rename to src/miami/core/ZoneCull.cpp
diff --git a/miami/core/ZoneCull.h b/src/miami/core/ZoneCull.h
similarity index 100%
rename from miami/core/ZoneCull.h
rename to src/miami/core/ZoneCull.h
diff --git a/miami/core/Zones.cpp b/src/miami/core/Zones.cpp
similarity index 100%
rename from miami/core/Zones.cpp
rename to src/miami/core/Zones.cpp
diff --git a/miami/core/Zones.h b/src/miami/core/Zones.h
similarity index 100%
rename from miami/core/Zones.h
rename to src/miami/core/Zones.h
diff --git a/miami/core/common.h b/src/miami/core/common.h
similarity index 100%
rename from miami/core/common.h
rename to src/miami/core/common.h
diff --git a/miami/core/config.h b/src/miami/core/config.h
similarity index 100%
rename from miami/core/config.h
rename to src/miami/core/config.h
diff --git a/miami/core/main.cpp b/src/miami/core/main.cpp
similarity index 100%
rename from miami/core/main.cpp
rename to src/miami/core/main.cpp
diff --git a/src/core/main.h b/src/miami/core/main.h
similarity index 100%
rename from src/core/main.h
rename to src/miami/core/main.h
diff --git a/src/core/obrstr.cpp b/src/miami/core/obrstr.cpp
similarity index 100%
rename from src/core/obrstr.cpp
rename to src/miami/core/obrstr.cpp
diff --git a/src/core/obrstr.h b/src/miami/core/obrstr.h
similarity index 100%
rename from src/core/obrstr.h
rename to src/miami/core/obrstr.h
diff --git a/miami/core/re3.cpp b/src/miami/core/re3.cpp
similarity index 100%
rename from miami/core/re3.cpp
rename to src/miami/core/re3.cpp
diff --git a/miami/core/templates.h b/src/miami/core/templates.h
similarity index 100%
rename from miami/core/templates.h
rename to src/miami/core/templates.h
diff --git a/miami/core/timebars.cpp b/src/miami/core/timebars.cpp
similarity index 100%
rename from miami/core/timebars.cpp
rename to src/miami/core/timebars.cpp
diff --git a/src/core/timebars.h b/src/miami/core/timebars.h
similarity index 100%
rename from src/core/timebars.h
rename to src/miami/core/timebars.h
diff --git a/miami/entities/Dummy.cpp b/src/miami/entities/Dummy.cpp
similarity index 100%
rename from miami/entities/Dummy.cpp
rename to src/miami/entities/Dummy.cpp
diff --git a/miami/entities/Dummy.h b/src/miami/entities/Dummy.h
similarity index 100%
rename from miami/entities/Dummy.h
rename to src/miami/entities/Dummy.h
diff --git a/miami/entities/Entity.cpp b/src/miami/entities/Entity.cpp
similarity index 100%
rename from miami/entities/Entity.cpp
rename to src/miami/entities/Entity.cpp
diff --git a/miami/entities/Entity.h b/src/miami/entities/Entity.h
similarity index 100%
rename from miami/entities/Entity.h
rename to src/miami/entities/Entity.h
diff --git a/miami/entities/Physical.cpp b/src/miami/entities/Physical.cpp
similarity index 100%
rename from miami/entities/Physical.cpp
rename to src/miami/entities/Physical.cpp
diff --git a/miami/entities/Physical.h b/src/miami/entities/Physical.h
similarity index 100%
rename from miami/entities/Physical.h
rename to src/miami/entities/Physical.h
diff --git a/src/extras/GitSHA1.cpp.in b/src/miami/extras/GitSHA1.cpp.in
similarity index 100%
rename from src/extras/GitSHA1.cpp.in
rename to src/miami/extras/GitSHA1.cpp.in
diff --git a/src/extras/GitSHA1.h b/src/miami/extras/GitSHA1.h
similarity index 100%
rename from src/extras/GitSHA1.h
rename to src/miami/extras/GitSHA1.h
diff --git a/src/extras/arrow.inc b/src/miami/extras/arrow.inc
similarity index 100%
rename from src/extras/arrow.inc
rename to src/miami/extras/arrow.inc
diff --git a/src/extras/cursor.inc b/src/miami/extras/cursor.inc
similarity index 100%
rename from src/extras/cursor.inc
rename to src/miami/extras/cursor.inc
diff --git a/miami/extras/custompipes.cpp b/src/miami/extras/custompipes.cpp
similarity index 100%
rename from miami/extras/custompipes.cpp
rename to src/miami/extras/custompipes.cpp
diff --git a/src/extras/custompipes.h b/src/miami/extras/custompipes.h
similarity index 100%
rename from src/extras/custompipes.h
rename to src/miami/extras/custompipes.h
diff --git a/miami/extras/custompipes_d3d9.cpp b/src/miami/extras/custompipes_d3d9.cpp
similarity index 100%
rename from miami/extras/custompipes_d3d9.cpp
rename to src/miami/extras/custompipes_d3d9.cpp
diff --git a/miami/extras/custompipes_gl.cpp b/src/miami/extras/custompipes_gl.cpp
similarity index 100%
rename from miami/extras/custompipes_gl.cpp
rename to src/miami/extras/custompipes_gl.cpp
diff --git a/src/extras/debugmenu.cpp b/src/miami/extras/debugmenu.cpp
similarity index 100%
rename from src/extras/debugmenu.cpp
rename to src/miami/extras/debugmenu.cpp
diff --git a/miami/extras/debugmenu.h b/src/miami/extras/debugmenu.h
similarity index 100%
rename from miami/extras/debugmenu.h
rename to src/miami/extras/debugmenu.h
diff --git a/miami/extras/frontendoption.cpp b/src/miami/extras/frontendoption.cpp
similarity index 100%
rename from miami/extras/frontendoption.cpp
rename to src/miami/extras/frontendoption.cpp
diff --git a/miami/extras/frontendoption.h b/src/miami/extras/frontendoption.h
similarity index 100%
rename from miami/extras/frontendoption.h
rename to src/miami/extras/frontendoption.h
diff --git a/src/extras/ini.h b/src/miami/extras/ini.h
similarity index 100%
rename from src/extras/ini.h
rename to src/miami/extras/ini.h
diff --git a/miami/extras/postfx.cpp b/src/miami/extras/postfx.cpp
similarity index 100%
rename from miami/extras/postfx.cpp
rename to src/miami/extras/postfx.cpp
diff --git a/miami/extras/postfx.h b/src/miami/extras/postfx.h
similarity index 100%
rename from miami/extras/postfx.h
rename to src/miami/extras/postfx.h
diff --git a/miami/extras/re3_inttypes.h b/src/miami/extras/re3_inttypes.h
similarity index 100%
rename from miami/extras/re3_inttypes.h
rename to src/miami/extras/re3_inttypes.h
diff --git a/src/extras/screendroplets.cpp b/src/miami/extras/screendroplets.cpp
similarity index 100%
rename from src/extras/screendroplets.cpp
rename to src/miami/extras/screendroplets.cpp
diff --git a/src/extras/screendroplets.h b/src/miami/extras/screendroplets.h
similarity index 100%
rename from src/extras/screendroplets.h
rename to src/miami/extras/screendroplets.h
diff --git a/miami/extras/shaders/colourfilterVC.frag b/src/miami/extras/shaders/colourfilterVC.frag
similarity index 100%
rename from miami/extras/shaders/colourfilterVC.frag
rename to src/miami/extras/shaders/colourfilterVC.frag
diff --git a/miami/extras/shaders/colourfilterVC_PS.hlsl b/src/miami/extras/shaders/colourfilterVC_PS.hlsl
similarity index 100%
rename from miami/extras/shaders/colourfilterVC_PS.hlsl
rename to src/miami/extras/shaders/colourfilterVC_PS.hlsl
diff --git a/src/extras/shaders/contrast.frag b/src/miami/extras/shaders/contrast.frag
similarity index 100%
rename from src/extras/shaders/contrast.frag
rename to src/miami/extras/shaders/contrast.frag
diff --git a/src/extras/shaders/contrastPS.hlsl b/src/miami/extras/shaders/contrastPS.hlsl
similarity index 100%
rename from src/extras/shaders/contrastPS.hlsl
rename to src/miami/extras/shaders/contrastPS.hlsl
diff --git a/src/extras/shaders/default_UV2.vert b/src/miami/extras/shaders/default_UV2.vert
similarity index 100%
rename from src/extras/shaders/default_UV2.vert
rename to src/miami/extras/shaders/default_UV2.vert
diff --git a/src/extras/shaders/default_UV2_VS.hlsl b/src/miami/extras/shaders/default_UV2_VS.hlsl
similarity index 100%
rename from src/extras/shaders/default_UV2_VS.hlsl
rename to src/miami/extras/shaders/default_UV2_VS.hlsl
diff --git a/src/extras/shaders/im2d.vert b/src/miami/extras/shaders/im2d.vert
similarity index 100%
rename from src/extras/shaders/im2d.vert
rename to src/miami/extras/shaders/im2d.vert
diff --git a/src/extras/shaders/im2d_UV2.vert b/src/miami/extras/shaders/im2d_UV2.vert
similarity index 100%
rename from src/extras/shaders/im2d_UV2.vert
rename to src/miami/extras/shaders/im2d_UV2.vert
diff --git a/src/extras/shaders/lighting.h b/src/miami/extras/shaders/lighting.h
similarity index 100%
rename from src/extras/shaders/lighting.h
rename to src/miami/extras/shaders/lighting.h
diff --git a/src/extras/shaders/make_glsl.sh b/src/miami/extras/shaders/make_glsl.sh
similarity index 100%
rename from src/extras/shaders/make_glsl.sh
rename to src/miami/extras/shaders/make_glsl.sh
diff --git a/src/extras/shaders/make_hlsl.cmd b/src/miami/extras/shaders/make_hlsl.cmd
similarity index 100%
rename from src/extras/shaders/make_hlsl.cmd
rename to src/miami/extras/shaders/make_hlsl.cmd
diff --git a/src/extras/shaders/makeinc_glsl.sh b/src/miami/extras/shaders/makeinc_glsl.sh
similarity index 100%
rename from src/extras/shaders/makeinc_glsl.sh
rename to src/miami/extras/shaders/makeinc_glsl.sh
diff --git a/src/extras/shaders/makeinc_hlsl.sh b/src/miami/extras/shaders/makeinc_hlsl.sh
similarity index 100%
rename from src/extras/shaders/makeinc_hlsl.sh
rename to src/miami/extras/shaders/makeinc_hlsl.sh
diff --git a/src/extras/shaders/neoGloss.frag b/src/miami/extras/shaders/neoGloss.frag
similarity index 100%
rename from src/extras/shaders/neoGloss.frag
rename to src/miami/extras/shaders/neoGloss.frag
diff --git a/src/extras/shaders/neoGloss.vert b/src/miami/extras/shaders/neoGloss.vert
similarity index 100%
rename from src/extras/shaders/neoGloss.vert
rename to src/miami/extras/shaders/neoGloss.vert
diff --git a/src/extras/shaders/neoGloss_PS.hlsl b/src/miami/extras/shaders/neoGloss_PS.hlsl
similarity index 100%
rename from src/extras/shaders/neoGloss_PS.hlsl
rename to src/miami/extras/shaders/neoGloss_PS.hlsl
diff --git a/src/extras/shaders/neoGloss_VS.hlsl b/src/miami/extras/shaders/neoGloss_VS.hlsl
similarity index 100%
rename from src/extras/shaders/neoGloss_VS.hlsl
rename to src/miami/extras/shaders/neoGloss_VS.hlsl
diff --git a/src/extras/shaders/neoRim.vert b/src/miami/extras/shaders/neoRim.vert
similarity index 100%
rename from src/extras/shaders/neoRim.vert
rename to src/miami/extras/shaders/neoRim.vert
diff --git a/src/extras/shaders/neoRimSkin.vert b/src/miami/extras/shaders/neoRimSkin.vert
similarity index 100%
rename from src/extras/shaders/neoRimSkin.vert
rename to src/miami/extras/shaders/neoRimSkin.vert
diff --git a/src/extras/shaders/neoRimSkin_VS.hlsl b/src/miami/extras/shaders/neoRimSkin_VS.hlsl
similarity index 100%
rename from src/extras/shaders/neoRimSkin_VS.hlsl
rename to src/miami/extras/shaders/neoRimSkin_VS.hlsl
diff --git a/src/extras/shaders/neoRim_VS.hlsl b/src/miami/extras/shaders/neoRim_VS.hlsl
similarity index 100%
rename from src/extras/shaders/neoRim_VS.hlsl
rename to src/miami/extras/shaders/neoRim_VS.hlsl
diff --git a/src/extras/shaders/neoVehicle.frag b/src/miami/extras/shaders/neoVehicle.frag
similarity index 100%
rename from src/extras/shaders/neoVehicle.frag
rename to src/miami/extras/shaders/neoVehicle.frag
diff --git a/src/extras/shaders/neoVehicle.vert b/src/miami/extras/shaders/neoVehicle.vert
similarity index 100%
rename from src/extras/shaders/neoVehicle.vert
rename to src/miami/extras/shaders/neoVehicle.vert
diff --git a/src/extras/shaders/neoVehicle_PS.hlsl b/src/miami/extras/shaders/neoVehicle_PS.hlsl
similarity index 100%
rename from src/extras/shaders/neoVehicle_PS.hlsl
rename to src/miami/extras/shaders/neoVehicle_PS.hlsl
diff --git a/src/extras/shaders/neoVehicle_VS.hlsl b/src/miami/extras/shaders/neoVehicle_VS.hlsl
similarity index 100%
rename from src/extras/shaders/neoVehicle_VS.hlsl
rename to src/miami/extras/shaders/neoVehicle_VS.hlsl
diff --git a/miami/extras/shaders/neoWorldVC.frag b/src/miami/extras/shaders/neoWorldVC.frag
similarity index 100%
rename from miami/extras/shaders/neoWorldVC.frag
rename to src/miami/extras/shaders/neoWorldVC.frag
diff --git a/miami/extras/shaders/neoWorldVC_PS.hlsl b/src/miami/extras/shaders/neoWorldVC_PS.hlsl
similarity index 100%
rename from miami/extras/shaders/neoWorldVC_PS.hlsl
rename to src/miami/extras/shaders/neoWorldVC_PS.hlsl
diff --git a/src/extras/shaders/screenDroplet.frag b/src/miami/extras/shaders/screenDroplet.frag
similarity index 100%
rename from src/extras/shaders/screenDroplet.frag
rename to src/miami/extras/shaders/screenDroplet.frag
diff --git a/src/extras/shaders/screenDroplet_PS.hlsl b/src/miami/extras/shaders/screenDroplet_PS.hlsl
similarity index 100%
rename from src/extras/shaders/screenDroplet_PS.hlsl
rename to src/miami/extras/shaders/screenDroplet_PS.hlsl
diff --git a/src/extras/shaders/simple.frag b/src/miami/extras/shaders/simple.frag
similarity index 100%
rename from src/extras/shaders/simple.frag
rename to src/miami/extras/shaders/simple.frag
diff --git a/src/extras/shaders/standardConstants.h b/src/miami/extras/shaders/standardConstants.h
similarity index 100%
rename from src/extras/shaders/standardConstants.h
rename to src/miami/extras/shaders/standardConstants.h
diff --git a/miami/fakerw/fake.cpp b/src/miami/fakerw/fake.cpp
similarity index 100%
rename from miami/fakerw/fake.cpp
rename to src/miami/fakerw/fake.cpp
diff --git a/src/fakerw/rpanisot.h b/src/miami/fakerw/rpanisot.h
similarity index 100%
rename from src/fakerw/rpanisot.h
rename to src/miami/fakerw/rpanisot.h
diff --git a/src/fakerw/rphanim.h b/src/miami/fakerw/rphanim.h
similarity index 100%
rename from src/fakerw/rphanim.h
rename to src/miami/fakerw/rphanim.h
diff --git a/src/fakerw/rpmatfx.h b/src/miami/fakerw/rpmatfx.h
similarity index 100%
rename from src/fakerw/rpmatfx.h
rename to src/miami/fakerw/rpmatfx.h
diff --git a/src/fakerw/rpskin.h b/src/miami/fakerw/rpskin.h
similarity index 100%
rename from src/fakerw/rpskin.h
rename to src/miami/fakerw/rpskin.h
diff --git a/src/fakerw/rpworld.h b/src/miami/fakerw/rpworld.h
similarity index 100%
rename from src/fakerw/rpworld.h
rename to src/miami/fakerw/rpworld.h
diff --git a/miami/fakerw/rtbmp.h b/src/miami/fakerw/rtbmp.h
similarity index 100%
rename from miami/fakerw/rtbmp.h
rename to src/miami/fakerw/rtbmp.h
diff --git a/src/fakerw/rtcharse.h b/src/miami/fakerw/rtcharse.h
similarity index 100%
rename from src/fakerw/rtcharse.h
rename to src/miami/fakerw/rtcharse.h
diff --git a/miami/fakerw/rtpng.h b/src/miami/fakerw/rtpng.h
similarity index 100%
rename from miami/fakerw/rtpng.h
rename to src/miami/fakerw/rtpng.h
diff --git a/src/fakerw/rtquat.h b/src/miami/fakerw/rtquat.h
similarity index 100%
rename from src/fakerw/rtquat.h
rename to src/miami/fakerw/rtquat.h
diff --git a/miami/fakerw/rwcore.h b/src/miami/fakerw/rwcore.h
similarity index 100%
rename from miami/fakerw/rwcore.h
rename to src/miami/fakerw/rwcore.h
diff --git a/src/fakerw/rwplcore.h b/src/miami/fakerw/rwplcore.h
similarity index 100%
rename from src/fakerw/rwplcore.h
rename to src/miami/fakerw/rwplcore.h
diff --git a/miami/math/Matrix.cpp b/src/miami/math/Matrix.cpp
similarity index 100%
rename from miami/math/Matrix.cpp
rename to src/miami/math/Matrix.cpp
diff --git a/miami/math/Matrix.h b/src/miami/math/Matrix.h
similarity index 100%
rename from miami/math/Matrix.h
rename to src/miami/math/Matrix.h
diff --git a/src/math/Quaternion.cpp b/src/miami/math/Quaternion.cpp
similarity index 100%
rename from src/math/Quaternion.cpp
rename to src/miami/math/Quaternion.cpp
diff --git a/miami/math/Quaternion.h b/src/miami/math/Quaternion.h
similarity index 100%
rename from miami/math/Quaternion.h
rename to src/miami/math/Quaternion.h
diff --git a/src/math/Rect.cpp b/src/miami/math/Rect.cpp
similarity index 100%
rename from src/math/Rect.cpp
rename to src/miami/math/Rect.cpp
diff --git a/src/math/Rect.h b/src/miami/math/Rect.h
similarity index 100%
rename from src/math/Rect.h
rename to src/miami/math/Rect.h
diff --git a/miami/math/Vector.cpp b/src/miami/math/Vector.cpp
similarity index 100%
rename from miami/math/Vector.cpp
rename to src/miami/math/Vector.cpp
diff --git a/miami/math/Vector.h b/src/miami/math/Vector.h
similarity index 100%
rename from miami/math/Vector.h
rename to src/miami/math/Vector.h
diff --git a/miami/math/Vector2D.h b/src/miami/math/Vector2D.h
similarity index 100%
rename from miami/math/Vector2D.h
rename to src/miami/math/Vector2D.h
diff --git a/miami/math/VuVector.h b/src/miami/math/VuVector.h
similarity index 100%
rename from miami/math/VuVector.h
rename to src/miami/math/VuVector.h
diff --git a/miami/math/math.cpp b/src/miami/math/math.cpp
similarity index 100%
rename from miami/math/math.cpp
rename to src/miami/math/math.cpp
diff --git a/miami/math/maths.h b/src/miami/math/maths.h
similarity index 100%
rename from miami/math/maths.h
rename to src/miami/math/maths.h
diff --git a/miami/modelinfo/BaseModelInfo.cpp b/src/miami/modelinfo/BaseModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/BaseModelInfo.cpp
rename to src/miami/modelinfo/BaseModelInfo.cpp
diff --git a/miami/modelinfo/BaseModelInfo.h b/src/miami/modelinfo/BaseModelInfo.h
similarity index 100%
rename from miami/modelinfo/BaseModelInfo.h
rename to src/miami/modelinfo/BaseModelInfo.h
diff --git a/miami/modelinfo/ClumpModelInfo.cpp b/src/miami/modelinfo/ClumpModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/ClumpModelInfo.cpp
rename to src/miami/modelinfo/ClumpModelInfo.cpp
diff --git a/miami/modelinfo/ClumpModelInfo.h b/src/miami/modelinfo/ClumpModelInfo.h
similarity index 100%
rename from miami/modelinfo/ClumpModelInfo.h
rename to src/miami/modelinfo/ClumpModelInfo.h
diff --git a/miami/modelinfo/MloModelInfo.cpp b/src/miami/modelinfo/MloModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/MloModelInfo.cpp
rename to src/miami/modelinfo/MloModelInfo.cpp
diff --git a/src/modelinfo/MloModelInfo.h b/src/miami/modelinfo/MloModelInfo.h
similarity index 100%
rename from src/modelinfo/MloModelInfo.h
rename to src/miami/modelinfo/MloModelInfo.h
diff --git a/src/modelinfo/ModelIndices.cpp b/src/miami/modelinfo/ModelIndices.cpp
similarity index 100%
rename from src/modelinfo/ModelIndices.cpp
rename to src/miami/modelinfo/ModelIndices.cpp
diff --git a/miami/modelinfo/ModelIndices.h b/src/miami/modelinfo/ModelIndices.h
similarity index 100%
rename from miami/modelinfo/ModelIndices.h
rename to src/miami/modelinfo/ModelIndices.h
diff --git a/miami/modelinfo/ModelInfo.cpp b/src/miami/modelinfo/ModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/ModelInfo.cpp
rename to src/miami/modelinfo/ModelInfo.cpp
diff --git a/miami/modelinfo/ModelInfo.h b/src/miami/modelinfo/ModelInfo.h
similarity index 100%
rename from miami/modelinfo/ModelInfo.h
rename to src/miami/modelinfo/ModelInfo.h
diff --git a/miami/modelinfo/PedModelInfo.cpp b/src/miami/modelinfo/PedModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/PedModelInfo.cpp
rename to src/miami/modelinfo/PedModelInfo.cpp
diff --git a/miami/modelinfo/PedModelInfo.h b/src/miami/modelinfo/PedModelInfo.h
similarity index 100%
rename from miami/modelinfo/PedModelInfo.h
rename to src/miami/modelinfo/PedModelInfo.h
diff --git a/miami/modelinfo/SimpleModelInfo.cpp b/src/miami/modelinfo/SimpleModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/SimpleModelInfo.cpp
rename to src/miami/modelinfo/SimpleModelInfo.cpp
diff --git a/miami/modelinfo/SimpleModelInfo.h b/src/miami/modelinfo/SimpleModelInfo.h
similarity index 100%
rename from miami/modelinfo/SimpleModelInfo.h
rename to src/miami/modelinfo/SimpleModelInfo.h
diff --git a/src/modelinfo/TimeModelInfo.cpp b/src/miami/modelinfo/TimeModelInfo.cpp
similarity index 100%
rename from src/modelinfo/TimeModelInfo.cpp
rename to src/miami/modelinfo/TimeModelInfo.cpp
diff --git a/miami/modelinfo/TimeModelInfo.h b/src/miami/modelinfo/TimeModelInfo.h
similarity index 100%
rename from miami/modelinfo/TimeModelInfo.h
rename to src/miami/modelinfo/TimeModelInfo.h
diff --git a/miami/modelinfo/VehicleModelInfo.cpp b/src/miami/modelinfo/VehicleModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/VehicleModelInfo.cpp
rename to src/miami/modelinfo/VehicleModelInfo.cpp
diff --git a/miami/modelinfo/VehicleModelInfo.h b/src/miami/modelinfo/VehicleModelInfo.h
similarity index 100%
rename from miami/modelinfo/VehicleModelInfo.h
rename to src/miami/modelinfo/VehicleModelInfo.h
diff --git a/miami/modelinfo/WeaponModelInfo.cpp b/src/miami/modelinfo/WeaponModelInfo.cpp
similarity index 100%
rename from miami/modelinfo/WeaponModelInfo.cpp
rename to src/miami/modelinfo/WeaponModelInfo.cpp
diff --git a/miami/modelinfo/WeaponModelInfo.h b/src/miami/modelinfo/WeaponModelInfo.h
similarity index 100%
rename from miami/modelinfo/WeaponModelInfo.h
rename to src/miami/modelinfo/WeaponModelInfo.h
diff --git a/miami/objects/CutsceneObject.cpp b/src/miami/objects/CutsceneObject.cpp
similarity index 100%
rename from miami/objects/CutsceneObject.cpp
rename to src/miami/objects/CutsceneObject.cpp
diff --git a/miami/objects/CutsceneObject.h b/src/miami/objects/CutsceneObject.h
similarity index 100%
rename from miami/objects/CutsceneObject.h
rename to src/miami/objects/CutsceneObject.h
diff --git a/miami/objects/DummyObject.cpp b/src/miami/objects/DummyObject.cpp
similarity index 100%
rename from miami/objects/DummyObject.cpp
rename to src/miami/objects/DummyObject.cpp
diff --git a/miami/objects/DummyObject.h b/src/miami/objects/DummyObject.h
similarity index 100%
rename from miami/objects/DummyObject.h
rename to src/miami/objects/DummyObject.h
diff --git a/miami/objects/Object.cpp b/src/miami/objects/Object.cpp
similarity index 100%
rename from miami/objects/Object.cpp
rename to src/miami/objects/Object.cpp
diff --git a/miami/objects/Object.h b/src/miami/objects/Object.h
similarity index 100%
rename from miami/objects/Object.h
rename to src/miami/objects/Object.h
diff --git a/miami/objects/ObjectData.cpp b/src/miami/objects/ObjectData.cpp
similarity index 100%
rename from miami/objects/ObjectData.cpp
rename to src/miami/objects/ObjectData.cpp
diff --git a/src/objects/ObjectData.h b/src/miami/objects/ObjectData.h
similarity index 100%
rename from src/objects/ObjectData.h
rename to src/miami/objects/ObjectData.h
diff --git a/miami/objects/ParticleObject.cpp b/src/miami/objects/ParticleObject.cpp
similarity index 100%
rename from miami/objects/ParticleObject.cpp
rename to src/miami/objects/ParticleObject.cpp
diff --git a/miami/objects/ParticleObject.h b/src/miami/objects/ParticleObject.h
similarity index 100%
rename from miami/objects/ParticleObject.h
rename to src/miami/objects/ParticleObject.h
diff --git a/src/objects/Projectile.cpp b/src/miami/objects/Projectile.cpp
similarity index 100%
rename from src/objects/Projectile.cpp
rename to src/miami/objects/Projectile.cpp
diff --git a/src/objects/Projectile.h b/src/miami/objects/Projectile.h
similarity index 100%
rename from src/objects/Projectile.h
rename to src/miami/objects/Projectile.h
diff --git a/miami/objects/Stinger.cpp b/src/miami/objects/Stinger.cpp
similarity index 100%
rename from miami/objects/Stinger.cpp
rename to src/miami/objects/Stinger.cpp
diff --git a/miami/objects/Stinger.h b/src/miami/objects/Stinger.h
similarity index 100%
rename from miami/objects/Stinger.h
rename to src/miami/objects/Stinger.h
diff --git a/miami/peds/CivilianPed.cpp b/src/miami/peds/CivilianPed.cpp
similarity index 100%
rename from miami/peds/CivilianPed.cpp
rename to src/miami/peds/CivilianPed.cpp
diff --git a/miami/peds/CivilianPed.h b/src/miami/peds/CivilianPed.h
similarity index 100%
rename from miami/peds/CivilianPed.h
rename to src/miami/peds/CivilianPed.h
diff --git a/miami/peds/CopPed.cpp b/src/miami/peds/CopPed.cpp
similarity index 100%
rename from miami/peds/CopPed.cpp
rename to src/miami/peds/CopPed.cpp
diff --git a/miami/peds/CopPed.h b/src/miami/peds/CopPed.h
similarity index 100%
rename from miami/peds/CopPed.h
rename to src/miami/peds/CopPed.h
diff --git a/miami/peds/DummyPed.h b/src/miami/peds/DummyPed.h
similarity index 100%
rename from miami/peds/DummyPed.h
rename to src/miami/peds/DummyPed.h
diff --git a/miami/peds/EmergencyPed.cpp b/src/miami/peds/EmergencyPed.cpp
similarity index 100%
rename from miami/peds/EmergencyPed.cpp
rename to src/miami/peds/EmergencyPed.cpp
diff --git a/miami/peds/EmergencyPed.h b/src/miami/peds/EmergencyPed.h
similarity index 100%
rename from miami/peds/EmergencyPed.h
rename to src/miami/peds/EmergencyPed.h
diff --git a/miami/peds/Gangs.cpp b/src/miami/peds/Gangs.cpp
similarity index 100%
rename from miami/peds/Gangs.cpp
rename to src/miami/peds/Gangs.cpp
diff --git a/miami/peds/Gangs.h b/src/miami/peds/Gangs.h
similarity index 100%
rename from miami/peds/Gangs.h
rename to src/miami/peds/Gangs.h
diff --git a/miami/peds/Ped.cpp b/src/miami/peds/Ped.cpp
similarity index 100%
rename from miami/peds/Ped.cpp
rename to src/miami/peds/Ped.cpp
diff --git a/miami/peds/Ped.h b/src/miami/peds/Ped.h
similarity index 100%
rename from miami/peds/Ped.h
rename to src/miami/peds/Ped.h
diff --git a/miami/peds/PedAI.cpp b/src/miami/peds/PedAI.cpp
similarity index 100%
rename from miami/peds/PedAI.cpp
rename to src/miami/peds/PedAI.cpp
diff --git a/miami/peds/PedAttractor.cpp b/src/miami/peds/PedAttractor.cpp
similarity index 100%
rename from miami/peds/PedAttractor.cpp
rename to src/miami/peds/PedAttractor.cpp
diff --git a/miami/peds/PedAttractor.h b/src/miami/peds/PedAttractor.h
similarity index 100%
rename from miami/peds/PedAttractor.h
rename to src/miami/peds/PedAttractor.h
diff --git a/miami/peds/PedChat.cpp b/src/miami/peds/PedChat.cpp
similarity index 100%
rename from miami/peds/PedChat.cpp
rename to src/miami/peds/PedChat.cpp
diff --git a/miami/peds/PedDebug.cpp b/src/miami/peds/PedDebug.cpp
similarity index 100%
rename from miami/peds/PedDebug.cpp
rename to src/miami/peds/PedDebug.cpp
diff --git a/miami/peds/PedFight.cpp b/src/miami/peds/PedFight.cpp
similarity index 100%
rename from miami/peds/PedFight.cpp
rename to src/miami/peds/PedFight.cpp
diff --git a/miami/peds/PedIK.cpp b/src/miami/peds/PedIK.cpp
similarity index 100%
rename from miami/peds/PedIK.cpp
rename to src/miami/peds/PedIK.cpp
diff --git a/miami/peds/PedIK.h b/src/miami/peds/PedIK.h
similarity index 100%
rename from miami/peds/PedIK.h
rename to src/miami/peds/PedIK.h
diff --git a/miami/peds/PedPlacement.cpp b/src/miami/peds/PedPlacement.cpp
similarity index 100%
rename from miami/peds/PedPlacement.cpp
rename to src/miami/peds/PedPlacement.cpp
diff --git a/miami/peds/PedPlacement.h b/src/miami/peds/PedPlacement.h
similarity index 100%
rename from miami/peds/PedPlacement.h
rename to src/miami/peds/PedPlacement.h
diff --git a/src/peds/PedRoutes.cpp b/src/miami/peds/PedRoutes.cpp
similarity index 100%
rename from src/peds/PedRoutes.cpp
rename to src/miami/peds/PedRoutes.cpp
diff --git a/src/peds/PedRoutes.h b/src/miami/peds/PedRoutes.h
similarity index 100%
rename from src/peds/PedRoutes.h
rename to src/miami/peds/PedRoutes.h
diff --git a/src/peds/PedType.cpp b/src/miami/peds/PedType.cpp
similarity index 100%
rename from src/peds/PedType.cpp
rename to src/miami/peds/PedType.cpp
diff --git a/miami/peds/PedType.h b/src/miami/peds/PedType.h
similarity index 100%
rename from miami/peds/PedType.h
rename to src/miami/peds/PedType.h
diff --git a/miami/peds/PlayerPed.cpp b/src/miami/peds/PlayerPed.cpp
similarity index 100%
rename from miami/peds/PlayerPed.cpp
rename to src/miami/peds/PlayerPed.cpp
diff --git a/miami/peds/PlayerPed.h b/src/miami/peds/PlayerPed.h
similarity index 100%
rename from miami/peds/PlayerPed.h
rename to src/miami/peds/PlayerPed.h
diff --git a/miami/peds/Population.cpp b/src/miami/peds/Population.cpp
similarity index 100%
rename from miami/peds/Population.cpp
rename to src/miami/peds/Population.cpp
diff --git a/miami/peds/Population.h b/src/miami/peds/Population.h
similarity index 100%
rename from miami/peds/Population.h
rename to src/miami/peds/Population.h
diff --git a/src/prof/profiler.cpp b/src/miami/prof/profiler.cpp
similarity index 100%
rename from src/prof/profiler.cpp
rename to src/miami/prof/profiler.cpp
diff --git a/src/prof/profiler.h b/src/miami/prof/profiler.h
similarity index 100%
rename from src/prof/profiler.h
rename to src/miami/prof/profiler.h
diff --git a/miami/renderer/2dEffect.h b/src/miami/renderer/2dEffect.h
similarity index 100%
rename from miami/renderer/2dEffect.h
rename to src/miami/renderer/2dEffect.h
diff --git a/src/renderer/Antennas.cpp b/src/miami/renderer/Antennas.cpp
similarity index 100%
rename from src/renderer/Antennas.cpp
rename to src/miami/renderer/Antennas.cpp
diff --git a/src/renderer/Antennas.h b/src/miami/renderer/Antennas.h
similarity index 100%
rename from src/renderer/Antennas.h
rename to src/miami/renderer/Antennas.h
diff --git a/miami/renderer/Clouds.cpp b/src/miami/renderer/Clouds.cpp
similarity index 100%
rename from miami/renderer/Clouds.cpp
rename to src/miami/renderer/Clouds.cpp
diff --git a/miami/renderer/Clouds.h b/src/miami/renderer/Clouds.h
similarity index 100%
rename from miami/renderer/Clouds.h
rename to src/miami/renderer/Clouds.h
diff --git a/miami/renderer/Console.cpp b/src/miami/renderer/Console.cpp
similarity index 100%
rename from miami/renderer/Console.cpp
rename to src/miami/renderer/Console.cpp
diff --git a/src/renderer/Console.h b/src/miami/renderer/Console.h
similarity index 100%
rename from src/renderer/Console.h
rename to src/miami/renderer/Console.h
diff --git a/miami/renderer/Coronas.cpp b/src/miami/renderer/Coronas.cpp
similarity index 100%
rename from miami/renderer/Coronas.cpp
rename to src/miami/renderer/Coronas.cpp
diff --git a/miami/renderer/Coronas.h b/src/miami/renderer/Coronas.h
similarity index 100%
rename from miami/renderer/Coronas.h
rename to src/miami/renderer/Coronas.h
diff --git a/miami/renderer/Credits.cpp b/src/miami/renderer/Credits.cpp
similarity index 100%
rename from miami/renderer/Credits.cpp
rename to src/miami/renderer/Credits.cpp
diff --git a/src/renderer/Credits.h b/src/miami/renderer/Credits.h
similarity index 100%
rename from src/renderer/Credits.h
rename to src/miami/renderer/Credits.h
diff --git a/miami/renderer/CutsceneShadow.cpp b/src/miami/renderer/CutsceneShadow.cpp
similarity index 100%
rename from miami/renderer/CutsceneShadow.cpp
rename to src/miami/renderer/CutsceneShadow.cpp
diff --git a/miami/renderer/CutsceneShadow.h b/src/miami/renderer/CutsceneShadow.h
similarity index 100%
rename from miami/renderer/CutsceneShadow.h
rename to src/miami/renderer/CutsceneShadow.h
diff --git a/miami/renderer/Draw.cpp b/src/miami/renderer/Draw.cpp
similarity index 100%
rename from miami/renderer/Draw.cpp
rename to src/miami/renderer/Draw.cpp
diff --git a/miami/renderer/Draw.h b/src/miami/renderer/Draw.h
similarity index 100%
rename from miami/renderer/Draw.h
rename to src/miami/renderer/Draw.h
diff --git a/miami/renderer/Fluff.cpp b/src/miami/renderer/Fluff.cpp
similarity index 100%
rename from miami/renderer/Fluff.cpp
rename to src/miami/renderer/Fluff.cpp
diff --git a/miami/renderer/Fluff.h b/src/miami/renderer/Fluff.h
similarity index 100%
rename from miami/renderer/Fluff.h
rename to src/miami/renderer/Fluff.h
diff --git a/miami/renderer/Font.cpp b/src/miami/renderer/Font.cpp
similarity index 100%
rename from miami/renderer/Font.cpp
rename to src/miami/renderer/Font.cpp
diff --git a/miami/renderer/Font.h b/src/miami/renderer/Font.h
similarity index 100%
rename from miami/renderer/Font.h
rename to src/miami/renderer/Font.h
diff --git a/miami/renderer/Glass.cpp b/src/miami/renderer/Glass.cpp
similarity index 100%
rename from miami/renderer/Glass.cpp
rename to src/miami/renderer/Glass.cpp
diff --git a/miami/renderer/Glass.h b/src/miami/renderer/Glass.h
similarity index 100%
rename from miami/renderer/Glass.h
rename to src/miami/renderer/Glass.h
diff --git a/miami/renderer/Hud.cpp b/src/miami/renderer/Hud.cpp
similarity index 100%
rename from miami/renderer/Hud.cpp
rename to src/miami/renderer/Hud.cpp
diff --git a/miami/renderer/Hud.h b/src/miami/renderer/Hud.h
similarity index 100%
rename from miami/renderer/Hud.h
rename to src/miami/renderer/Hud.h
diff --git a/src/renderer/Instance.cpp b/src/miami/renderer/Instance.cpp
similarity index 100%
rename from src/renderer/Instance.cpp
rename to src/miami/renderer/Instance.cpp
diff --git a/src/renderer/Instance.h b/src/miami/renderer/Instance.h
similarity index 100%
rename from src/renderer/Instance.h
rename to src/miami/renderer/Instance.h
diff --git a/src/renderer/Lines.cpp b/src/miami/renderer/Lines.cpp
similarity index 100%
rename from src/renderer/Lines.cpp
rename to src/miami/renderer/Lines.cpp
diff --git a/src/renderer/Lines.h b/src/miami/renderer/Lines.h
similarity index 100%
rename from src/renderer/Lines.h
rename to src/miami/renderer/Lines.h
diff --git a/miami/renderer/MBlur.cpp b/src/miami/renderer/MBlur.cpp
similarity index 100%
rename from miami/renderer/MBlur.cpp
rename to src/miami/renderer/MBlur.cpp
diff --git a/miami/renderer/MBlur.h b/src/miami/renderer/MBlur.h
similarity index 100%
rename from miami/renderer/MBlur.h
rename to src/miami/renderer/MBlur.h
diff --git a/miami/renderer/Occlusion.cpp b/src/miami/renderer/Occlusion.cpp
similarity index 100%
rename from miami/renderer/Occlusion.cpp
rename to src/miami/renderer/Occlusion.cpp
diff --git a/miami/renderer/Occlusion.h b/src/miami/renderer/Occlusion.h
similarity index 100%
rename from miami/renderer/Occlusion.h
rename to src/miami/renderer/Occlusion.h
diff --git a/miami/renderer/Particle.cpp b/src/miami/renderer/Particle.cpp
similarity index 100%
rename from miami/renderer/Particle.cpp
rename to src/miami/renderer/Particle.cpp
diff --git a/miami/renderer/Particle.h b/src/miami/renderer/Particle.h
similarity index 100%
rename from miami/renderer/Particle.h
rename to src/miami/renderer/Particle.h
diff --git a/miami/renderer/ParticleMgr.cpp b/src/miami/renderer/ParticleMgr.cpp
similarity index 100%
rename from miami/renderer/ParticleMgr.cpp
rename to src/miami/renderer/ParticleMgr.cpp
diff --git a/miami/renderer/ParticleMgr.h b/src/miami/renderer/ParticleMgr.h
similarity index 100%
rename from miami/renderer/ParticleMgr.h
rename to src/miami/renderer/ParticleMgr.h
diff --git a/miami/renderer/ParticleType.h b/src/miami/renderer/ParticleType.h
similarity index 100%
rename from miami/renderer/ParticleType.h
rename to src/miami/renderer/ParticleType.h
diff --git a/miami/renderer/PlayerSkin.cpp b/src/miami/renderer/PlayerSkin.cpp
similarity index 100%
rename from miami/renderer/PlayerSkin.cpp
rename to src/miami/renderer/PlayerSkin.cpp
diff --git a/src/renderer/PlayerSkin.h b/src/miami/renderer/PlayerSkin.h
similarity index 100%
rename from src/renderer/PlayerSkin.h
rename to src/miami/renderer/PlayerSkin.h
diff --git a/miami/renderer/PointLights.cpp b/src/miami/renderer/PointLights.cpp
similarity index 100%
rename from miami/renderer/PointLights.cpp
rename to src/miami/renderer/PointLights.cpp
diff --git a/miami/renderer/PointLights.h b/src/miami/renderer/PointLights.h
similarity index 100%
rename from miami/renderer/PointLights.h
rename to src/miami/renderer/PointLights.h
diff --git a/miami/renderer/RenderBuffer.cpp b/src/miami/renderer/RenderBuffer.cpp
similarity index 100%
rename from miami/renderer/RenderBuffer.cpp
rename to src/miami/renderer/RenderBuffer.cpp
diff --git a/miami/renderer/RenderBuffer.h b/src/miami/renderer/RenderBuffer.h
similarity index 100%
rename from miami/renderer/RenderBuffer.h
rename to src/miami/renderer/RenderBuffer.h
diff --git a/miami/renderer/Renderer.cpp b/src/miami/renderer/Renderer.cpp
similarity index 100%
rename from miami/renderer/Renderer.cpp
rename to src/miami/renderer/Renderer.cpp
diff --git a/miami/renderer/Renderer.h b/src/miami/renderer/Renderer.h
similarity index 100%
rename from miami/renderer/Renderer.h
rename to src/miami/renderer/Renderer.h
diff --git a/miami/renderer/Rubbish.cpp b/src/miami/renderer/Rubbish.cpp
similarity index 100%
rename from miami/renderer/Rubbish.cpp
rename to src/miami/renderer/Rubbish.cpp
diff --git a/miami/renderer/Rubbish.h b/src/miami/renderer/Rubbish.h
similarity index 100%
rename from miami/renderer/Rubbish.h
rename to src/miami/renderer/Rubbish.h
diff --git a/miami/renderer/ShadowCamera.cpp b/src/miami/renderer/ShadowCamera.cpp
similarity index 100%
rename from miami/renderer/ShadowCamera.cpp
rename to src/miami/renderer/ShadowCamera.cpp
diff --git a/miami/renderer/ShadowCamera.h b/src/miami/renderer/ShadowCamera.h
similarity index 100%
rename from miami/renderer/ShadowCamera.h
rename to src/miami/renderer/ShadowCamera.h
diff --git a/miami/renderer/Shadows.cpp b/src/miami/renderer/Shadows.cpp
similarity index 100%
rename from miami/renderer/Shadows.cpp
rename to src/miami/renderer/Shadows.cpp
diff --git a/miami/renderer/Shadows.h b/src/miami/renderer/Shadows.h
similarity index 100%
rename from miami/renderer/Shadows.h
rename to src/miami/renderer/Shadows.h
diff --git a/miami/renderer/Skidmarks.cpp b/src/miami/renderer/Skidmarks.cpp
similarity index 100%
rename from miami/renderer/Skidmarks.cpp
rename to src/miami/renderer/Skidmarks.cpp
diff --git a/miami/renderer/Skidmarks.h b/src/miami/renderer/Skidmarks.h
similarity index 100%
rename from miami/renderer/Skidmarks.h
rename to src/miami/renderer/Skidmarks.h
diff --git a/miami/renderer/SpecialFX.cpp b/src/miami/renderer/SpecialFX.cpp
similarity index 100%
rename from miami/renderer/SpecialFX.cpp
rename to src/miami/renderer/SpecialFX.cpp
diff --git a/miami/renderer/SpecialFX.h b/src/miami/renderer/SpecialFX.h
similarity index 100%
rename from miami/renderer/SpecialFX.h
rename to src/miami/renderer/SpecialFX.h
diff --git a/miami/renderer/Sprite.cpp b/src/miami/renderer/Sprite.cpp
similarity index 100%
rename from miami/renderer/Sprite.cpp
rename to src/miami/renderer/Sprite.cpp
diff --git a/miami/renderer/Sprite.h b/src/miami/renderer/Sprite.h
similarity index 100%
rename from miami/renderer/Sprite.h
rename to src/miami/renderer/Sprite.h
diff --git a/miami/renderer/Sprite2d.cpp b/src/miami/renderer/Sprite2d.cpp
similarity index 100%
rename from miami/renderer/Sprite2d.cpp
rename to src/miami/renderer/Sprite2d.cpp
diff --git a/miami/renderer/Sprite2d.h b/src/miami/renderer/Sprite2d.h
similarity index 100%
rename from miami/renderer/Sprite2d.h
rename to src/miami/renderer/Sprite2d.h
diff --git a/src/renderer/TexList.cpp b/src/miami/renderer/TexList.cpp
similarity index 100%
rename from src/renderer/TexList.cpp
rename to src/miami/renderer/TexList.cpp
diff --git a/src/renderer/TexList.h b/src/miami/renderer/TexList.h
similarity index 100%
rename from src/renderer/TexList.h
rename to src/miami/renderer/TexList.h
diff --git a/miami/renderer/Timecycle.cpp b/src/miami/renderer/Timecycle.cpp
similarity index 100%
rename from miami/renderer/Timecycle.cpp
rename to src/miami/renderer/Timecycle.cpp
diff --git a/miami/renderer/Timecycle.h b/src/miami/renderer/Timecycle.h
similarity index 100%
rename from miami/renderer/Timecycle.h
rename to src/miami/renderer/Timecycle.h
diff --git a/miami/renderer/VarConsole.cpp b/src/miami/renderer/VarConsole.cpp
similarity index 100%
rename from miami/renderer/VarConsole.cpp
rename to src/miami/renderer/VarConsole.cpp
diff --git a/miami/renderer/VarConsole.h b/src/miami/renderer/VarConsole.h
similarity index 100%
rename from miami/renderer/VarConsole.h
rename to src/miami/renderer/VarConsole.h
diff --git a/miami/renderer/WaterCannon.cpp b/src/miami/renderer/WaterCannon.cpp
similarity index 100%
rename from miami/renderer/WaterCannon.cpp
rename to src/miami/renderer/WaterCannon.cpp
diff --git a/src/renderer/WaterCannon.h b/src/miami/renderer/WaterCannon.h
similarity index 100%
rename from src/renderer/WaterCannon.h
rename to src/miami/renderer/WaterCannon.h
diff --git a/miami/renderer/WaterCreatures.cpp b/src/miami/renderer/WaterCreatures.cpp
similarity index 100%
rename from miami/renderer/WaterCreatures.cpp
rename to src/miami/renderer/WaterCreatures.cpp
diff --git a/miami/renderer/WaterCreatures.h b/src/miami/renderer/WaterCreatures.h
similarity index 100%
rename from miami/renderer/WaterCreatures.h
rename to src/miami/renderer/WaterCreatures.h
diff --git a/miami/renderer/WaterLevel.cpp b/src/miami/renderer/WaterLevel.cpp
similarity index 100%
rename from miami/renderer/WaterLevel.cpp
rename to src/miami/renderer/WaterLevel.cpp
diff --git a/miami/renderer/WaterLevel.h b/src/miami/renderer/WaterLevel.h
similarity index 100%
rename from miami/renderer/WaterLevel.h
rename to src/miami/renderer/WaterLevel.h
diff --git a/miami/renderer/Weather.cpp b/src/miami/renderer/Weather.cpp
similarity index 100%
rename from miami/renderer/Weather.cpp
rename to src/miami/renderer/Weather.cpp
diff --git a/miami/renderer/Weather.h b/src/miami/renderer/Weather.h
similarity index 100%
rename from miami/renderer/Weather.h
rename to src/miami/renderer/Weather.h
diff --git a/miami/renderer/WindModifiers.cpp b/src/miami/renderer/WindModifiers.cpp
similarity index 100%
rename from miami/renderer/WindModifiers.cpp
rename to src/miami/renderer/WindModifiers.cpp
diff --git a/miami/renderer/WindModifiers.h b/src/miami/renderer/WindModifiers.h
similarity index 100%
rename from miami/renderer/WindModifiers.h
rename to src/miami/renderer/WindModifiers.h
diff --git a/miami/rw/ClumpRead.cpp b/src/miami/rw/ClumpRead.cpp
similarity index 100%
rename from miami/rw/ClumpRead.cpp
rename to src/miami/rw/ClumpRead.cpp
diff --git a/miami/rw/Lights.cpp b/src/miami/rw/Lights.cpp
similarity index 100%
rename from miami/rw/Lights.cpp
rename to src/miami/rw/Lights.cpp
diff --git a/miami/rw/Lights.h b/src/miami/rw/Lights.h
similarity index 100%
rename from miami/rw/Lights.h
rename to src/miami/rw/Lights.h
diff --git a/miami/rw/MemoryHeap.cpp b/src/miami/rw/MemoryHeap.cpp
similarity index 100%
rename from miami/rw/MemoryHeap.cpp
rename to src/miami/rw/MemoryHeap.cpp
diff --git a/miami/rw/MemoryHeap.h b/src/miami/rw/MemoryHeap.h
similarity index 100%
rename from miami/rw/MemoryHeap.h
rename to src/miami/rw/MemoryHeap.h
diff --git a/src/rw/MemoryMgr.cpp b/src/miami/rw/MemoryMgr.cpp
similarity index 100%
rename from src/rw/MemoryMgr.cpp
rename to src/miami/rw/MemoryMgr.cpp
diff --git a/src/rw/MemoryMgr.h b/src/miami/rw/MemoryMgr.h
similarity index 100%
rename from src/rw/MemoryMgr.h
rename to src/miami/rw/MemoryMgr.h
diff --git a/src/rw/NodeName.cpp b/src/miami/rw/NodeName.cpp
similarity index 100%
rename from src/rw/NodeName.cpp
rename to src/miami/rw/NodeName.cpp
diff --git a/src/rw/NodeName.h b/src/miami/rw/NodeName.h
similarity index 100%
rename from src/rw/NodeName.h
rename to src/miami/rw/NodeName.h
diff --git a/miami/rw/RwHelper.cpp b/src/miami/rw/RwHelper.cpp
similarity index 100%
rename from miami/rw/RwHelper.cpp
rename to src/miami/rw/RwHelper.cpp
diff --git a/miami/rw/RwHelper.h b/src/miami/rw/RwHelper.h
similarity index 100%
rename from miami/rw/RwHelper.h
rename to src/miami/rw/RwHelper.h
diff --git a/src/rw/RwMatFX.cpp b/src/miami/rw/RwMatFX.cpp
similarity index 100%
rename from src/rw/RwMatFX.cpp
rename to src/miami/rw/RwMatFX.cpp
diff --git a/src/rw/RwPS2AlphaTest.cpp b/src/miami/rw/RwPS2AlphaTest.cpp
similarity index 100%
rename from src/rw/RwPS2AlphaTest.cpp
rename to src/miami/rw/RwPS2AlphaTest.cpp
diff --git a/miami/rw/TexRead.cpp b/src/miami/rw/TexRead.cpp
similarity index 100%
rename from miami/rw/TexRead.cpp
rename to src/miami/rw/TexRead.cpp
diff --git a/src/rw/TexturePools.cpp b/src/miami/rw/TexturePools.cpp
similarity index 100%
rename from src/rw/TexturePools.cpp
rename to src/miami/rw/TexturePools.cpp
diff --git a/src/rw/TexturePools.h b/src/miami/rw/TexturePools.h
similarity index 100%
rename from src/rw/TexturePools.h
rename to src/miami/rw/TexturePools.h
diff --git a/miami/rw/TxdStore.cpp b/src/miami/rw/TxdStore.cpp
similarity index 100%
rename from miami/rw/TxdStore.cpp
rename to src/miami/rw/TxdStore.cpp
diff --git a/src/rw/TxdStore.h b/src/miami/rw/TxdStore.h
similarity index 100%
rename from src/rw/TxdStore.h
rename to src/miami/rw/TxdStore.h
diff --git a/miami/rw/VisibilityPlugins.cpp b/src/miami/rw/VisibilityPlugins.cpp
similarity index 100%
rename from miami/rw/VisibilityPlugins.cpp
rename to src/miami/rw/VisibilityPlugins.cpp
diff --git a/miami/rw/VisibilityPlugins.h b/src/miami/rw/VisibilityPlugins.h
similarity index 100%
rename from miami/rw/VisibilityPlugins.h
rename to src/miami/rw/VisibilityPlugins.h
diff --git a/src/save/Date.cpp b/src/miami/save/Date.cpp
similarity index 100%
rename from src/save/Date.cpp
rename to src/miami/save/Date.cpp
diff --git a/src/save/Date.h b/src/miami/save/Date.h
similarity index 100%
rename from src/save/Date.h
rename to src/miami/save/Date.h
diff --git a/miami/save/GenericGameStorage.cpp b/src/miami/save/GenericGameStorage.cpp
similarity index 100%
rename from miami/save/GenericGameStorage.cpp
rename to src/miami/save/GenericGameStorage.cpp
diff --git a/miami/save/GenericGameStorage.h b/src/miami/save/GenericGameStorage.h
similarity index 100%
rename from miami/save/GenericGameStorage.h
rename to src/miami/save/GenericGameStorage.h
diff --git a/src/save/MemoryCard.cpp b/src/miami/save/MemoryCard.cpp
similarity index 100%
rename from src/save/MemoryCard.cpp
rename to src/miami/save/MemoryCard.cpp
diff --git a/src/save/MemoryCard.h b/src/miami/save/MemoryCard.h
similarity index 100%
rename from src/save/MemoryCard.h
rename to src/miami/save/MemoryCard.h
diff --git a/miami/save/PCSave.cpp b/src/miami/save/PCSave.cpp
similarity index 100%
rename from miami/save/PCSave.cpp
rename to src/miami/save/PCSave.cpp
diff --git a/miami/save/PCSave.h b/src/miami/save/PCSave.h
similarity index 100%
rename from miami/save/PCSave.h
rename to src/miami/save/PCSave.h
diff --git a/miami/save/SaveBuf.h b/src/miami/save/SaveBuf.h
similarity index 100%
rename from miami/save/SaveBuf.h
rename to src/miami/save/SaveBuf.h
diff --git a/miami/skel/crossplatform.cpp b/src/miami/skel/crossplatform.cpp
similarity index 100%
rename from miami/skel/crossplatform.cpp
rename to src/miami/skel/crossplatform.cpp
diff --git a/miami/skel/crossplatform.h b/src/miami/skel/crossplatform.h
similarity index 100%
rename from miami/skel/crossplatform.h
rename to src/miami/skel/crossplatform.h
diff --git a/miami/skel/dc/dc.cpp b/src/miami/skel/dc/dc.cpp
similarity index 100%
rename from miami/skel/dc/dc.cpp
rename to src/miami/skel/dc/dc.cpp
diff --git a/src/skel/dc/dc.h b/src/miami/skel/dc/dc.h
similarity index 100%
rename from src/skel/dc/dc.h
rename to src/miami/skel/dc/dc.h
diff --git a/src/skel/events.cpp b/src/miami/skel/events.cpp
similarity index 100%
rename from src/skel/events.cpp
rename to src/miami/skel/events.cpp
diff --git a/src/skel/events.h b/src/miami/skel/events.h
similarity index 100%
rename from src/skel/events.h
rename to src/miami/skel/events.h
diff --git a/miami/skel/glfw/glfw.cpp b/src/miami/skel/glfw/glfw.cpp
similarity index 100%
rename from miami/skel/glfw/glfw.cpp
rename to src/miami/skel/glfw/glfw.cpp
diff --git a/miami/skel/platform.h b/src/miami/skel/platform.h
similarity index 100%
rename from miami/skel/platform.h
rename to src/miami/skel/platform.h
diff --git a/miami/skel/skeleton.cpp b/src/miami/skel/skeleton.cpp
similarity index 100%
rename from miami/skel/skeleton.cpp
rename to src/miami/skel/skeleton.cpp
diff --git a/src/skel/skeleton.h b/src/miami/skel/skeleton.h
similarity index 100%
rename from src/skel/skeleton.h
rename to src/miami/skel/skeleton.h
diff --git a/miami/skel/win/gtavc.ico b/src/miami/skel/win/gtavc.ico
similarity index 100%
rename from miami/skel/win/gtavc.ico
rename to src/miami/skel/win/gtavc.ico
diff --git a/miami/skel/win/resource.h b/src/miami/skel/win/resource.h
similarity index 100%
rename from miami/skel/win/resource.h
rename to src/miami/skel/win/resource.h
diff --git a/miami/skel/win/win.cpp b/src/miami/skel/win/win.cpp
similarity index 100%
rename from miami/skel/win/win.cpp
rename to src/miami/skel/win/win.cpp
diff --git a/src/skel/win/win.h b/src/miami/skel/win/win.h
similarity index 100%
rename from src/skel/win/win.h
rename to src/miami/skel/win/win.h
diff --git a/miami/skel/win/win.rc b/src/miami/skel/win/win.rc
similarity index 100%
rename from miami/skel/win/win.rc
rename to src/miami/skel/win/win.rc
diff --git a/miami/text/Messages.cpp b/src/miami/text/Messages.cpp
similarity index 100%
rename from miami/text/Messages.cpp
rename to src/miami/text/Messages.cpp
diff --git a/src/text/Messages.h b/src/miami/text/Messages.h
similarity index 100%
rename from src/text/Messages.h
rename to src/miami/text/Messages.h
diff --git a/miami/text/Pager.cpp b/src/miami/text/Pager.cpp
similarity index 100%
rename from miami/text/Pager.cpp
rename to src/miami/text/Pager.cpp
diff --git a/src/text/Pager.h b/src/miami/text/Pager.h
similarity index 100%
rename from src/text/Pager.h
rename to src/miami/text/Pager.h
diff --git a/miami/text/Text.cpp b/src/miami/text/Text.cpp
similarity index 100%
rename from miami/text/Text.cpp
rename to src/miami/text/Text.cpp
diff --git a/miami/text/Text.h b/src/miami/text/Text.h
similarity index 100%
rename from miami/text/Text.h
rename to src/miami/text/Text.h
diff --git a/miami/vehicles/Automobile.cpp b/src/miami/vehicles/Automobile.cpp
similarity index 100%
rename from miami/vehicles/Automobile.cpp
rename to src/miami/vehicles/Automobile.cpp
diff --git a/miami/vehicles/Automobile.h b/src/miami/vehicles/Automobile.h
similarity index 100%
rename from miami/vehicles/Automobile.h
rename to src/miami/vehicles/Automobile.h
diff --git a/miami/vehicles/Bike.cpp b/src/miami/vehicles/Bike.cpp
similarity index 100%
rename from miami/vehicles/Bike.cpp
rename to src/miami/vehicles/Bike.cpp
diff --git a/miami/vehicles/Bike.h b/src/miami/vehicles/Bike.h
similarity index 100%
rename from miami/vehicles/Bike.h
rename to src/miami/vehicles/Bike.h
diff --git a/miami/vehicles/Boat.cpp b/src/miami/vehicles/Boat.cpp
similarity index 100%
rename from miami/vehicles/Boat.cpp
rename to src/miami/vehicles/Boat.cpp
diff --git a/miami/vehicles/Boat.h b/src/miami/vehicles/Boat.h
similarity index 100%
rename from miami/vehicles/Boat.h
rename to src/miami/vehicles/Boat.h
diff --git a/miami/vehicles/CarGen.cpp b/src/miami/vehicles/CarGen.cpp
similarity index 100%
rename from miami/vehicles/CarGen.cpp
rename to src/miami/vehicles/CarGen.cpp
diff --git a/miami/vehicles/CarGen.h b/src/miami/vehicles/CarGen.h
similarity index 100%
rename from miami/vehicles/CarGen.h
rename to src/miami/vehicles/CarGen.h
diff --git a/miami/vehicles/Cranes.cpp b/src/miami/vehicles/Cranes.cpp
similarity index 100%
rename from miami/vehicles/Cranes.cpp
rename to src/miami/vehicles/Cranes.cpp
diff --git a/miami/vehicles/Cranes.h b/src/miami/vehicles/Cranes.h
similarity index 100%
rename from miami/vehicles/Cranes.h
rename to src/miami/vehicles/Cranes.h
diff --git a/miami/vehicles/DamageManager.cpp b/src/miami/vehicles/DamageManager.cpp
similarity index 100%
rename from miami/vehicles/DamageManager.cpp
rename to src/miami/vehicles/DamageManager.cpp
diff --git a/src/vehicles/DamageManager.h b/src/miami/vehicles/DamageManager.h
similarity index 100%
rename from src/vehicles/DamageManager.h
rename to src/miami/vehicles/DamageManager.h
diff --git a/src/vehicles/Door.cpp b/src/miami/vehicles/Door.cpp
similarity index 100%
rename from src/vehicles/Door.cpp
rename to src/miami/vehicles/Door.cpp
diff --git a/src/vehicles/Door.h b/src/miami/vehicles/Door.h
similarity index 100%
rename from src/vehicles/Door.h
rename to src/miami/vehicles/Door.h
diff --git a/miami/vehicles/Floater.cpp b/src/miami/vehicles/Floater.cpp
similarity index 100%
rename from miami/vehicles/Floater.cpp
rename to src/miami/vehicles/Floater.cpp
diff --git a/miami/vehicles/Floater.h b/src/miami/vehicles/Floater.h
similarity index 100%
rename from miami/vehicles/Floater.h
rename to src/miami/vehicles/Floater.h
diff --git a/miami/vehicles/HandlingMgr.cpp b/src/miami/vehicles/HandlingMgr.cpp
similarity index 100%
rename from miami/vehicles/HandlingMgr.cpp
rename to src/miami/vehicles/HandlingMgr.cpp
diff --git a/miami/vehicles/HandlingMgr.h b/src/miami/vehicles/HandlingMgr.h
similarity index 100%
rename from miami/vehicles/HandlingMgr.h
rename to src/miami/vehicles/HandlingMgr.h
diff --git a/miami/vehicles/Heli.cpp b/src/miami/vehicles/Heli.cpp
similarity index 100%
rename from miami/vehicles/Heli.cpp
rename to src/miami/vehicles/Heli.cpp
diff --git a/miami/vehicles/Heli.h b/src/miami/vehicles/Heli.h
similarity index 100%
rename from miami/vehicles/Heli.h
rename to src/miami/vehicles/Heli.h
diff --git a/miami/vehicles/Plane.cpp b/src/miami/vehicles/Plane.cpp
similarity index 100%
rename from miami/vehicles/Plane.cpp
rename to src/miami/vehicles/Plane.cpp
diff --git a/miami/vehicles/Plane.h b/src/miami/vehicles/Plane.h
similarity index 100%
rename from miami/vehicles/Plane.h
rename to src/miami/vehicles/Plane.h
diff --git a/miami/vehicles/Train.cpp b/src/miami/vehicles/Train.cpp
similarity index 100%
rename from miami/vehicles/Train.cpp
rename to src/miami/vehicles/Train.cpp
diff --git a/miami/vehicles/Train.h b/src/miami/vehicles/Train.h
similarity index 100%
rename from miami/vehicles/Train.h
rename to src/miami/vehicles/Train.h
diff --git a/miami/vehicles/Transmission.cpp b/src/miami/vehicles/Transmission.cpp
similarity index 100%
rename from miami/vehicles/Transmission.cpp
rename to src/miami/vehicles/Transmission.cpp
diff --git a/src/vehicles/Transmission.h b/src/miami/vehicles/Transmission.h
similarity index 100%
rename from src/vehicles/Transmission.h
rename to src/miami/vehicles/Transmission.h
diff --git a/miami/vehicles/Vehicle.cpp b/src/miami/vehicles/Vehicle.cpp
similarity index 100%
rename from miami/vehicles/Vehicle.cpp
rename to src/miami/vehicles/Vehicle.cpp
diff --git a/miami/vehicles/Vehicle.h b/src/miami/vehicles/Vehicle.h
similarity index 100%
rename from miami/vehicles/Vehicle.h
rename to src/miami/vehicles/Vehicle.h
diff --git a/src/vmu/vmu.cpp b/src/miami/vmu/vmu.cpp
similarity index 100%
rename from src/vmu/vmu.cpp
rename to src/miami/vmu/vmu.cpp
diff --git a/src/vmu/vmu.h b/src/miami/vmu/vmu.h
similarity index 100%
rename from src/vmu/vmu.h
rename to src/miami/vmu/vmu.h
diff --git a/miami/weapons/BulletInfo.cpp b/src/miami/weapons/BulletInfo.cpp
similarity index 100%
rename from miami/weapons/BulletInfo.cpp
rename to src/miami/weapons/BulletInfo.cpp
diff --git a/src/weapons/BulletInfo.h b/src/miami/weapons/BulletInfo.h
similarity index 100%
rename from src/weapons/BulletInfo.h
rename to src/miami/weapons/BulletInfo.h
diff --git a/miami/weapons/Explosion.cpp b/src/miami/weapons/Explosion.cpp
similarity index 100%
rename from miami/weapons/Explosion.cpp
rename to src/miami/weapons/Explosion.cpp
diff --git a/miami/weapons/Explosion.h b/src/miami/weapons/Explosion.h
similarity index 100%
rename from miami/weapons/Explosion.h
rename to src/miami/weapons/Explosion.h
diff --git a/miami/weapons/ProjectileInfo.cpp b/src/miami/weapons/ProjectileInfo.cpp
similarity index 100%
rename from miami/weapons/ProjectileInfo.cpp
rename to src/miami/weapons/ProjectileInfo.cpp
diff --git a/miami/weapons/ProjectileInfo.h b/src/miami/weapons/ProjectileInfo.h
similarity index 100%
rename from miami/weapons/ProjectileInfo.h
rename to src/miami/weapons/ProjectileInfo.h
diff --git a/miami/weapons/ShotInfo.cpp b/src/miami/weapons/ShotInfo.cpp
similarity index 100%
rename from miami/weapons/ShotInfo.cpp
rename to src/miami/weapons/ShotInfo.cpp
diff --git a/src/weapons/ShotInfo.h b/src/miami/weapons/ShotInfo.h
similarity index 100%
rename from src/weapons/ShotInfo.h
rename to src/miami/weapons/ShotInfo.h
diff --git a/miami/weapons/Weapon.cpp b/src/miami/weapons/Weapon.cpp
similarity index 100%
rename from miami/weapons/Weapon.cpp
rename to src/miami/weapons/Weapon.cpp
diff --git a/miami/weapons/Weapon.h b/src/miami/weapons/Weapon.h
similarity index 100%
rename from miami/weapons/Weapon.h
rename to src/miami/weapons/Weapon.h
diff --git a/miami/weapons/WeaponEffects.cpp b/src/miami/weapons/WeaponEffects.cpp
similarity index 100%
rename from miami/weapons/WeaponEffects.cpp
rename to src/miami/weapons/WeaponEffects.cpp
diff --git a/src/weapons/WeaponEffects.h b/src/miami/weapons/WeaponEffects.h
similarity index 100%
rename from src/weapons/WeaponEffects.h
rename to src/miami/weapons/WeaponEffects.h
diff --git a/miami/weapons/WeaponInfo.cpp b/src/miami/weapons/WeaponInfo.cpp
similarity index 100%
rename from miami/weapons/WeaponInfo.cpp
rename to src/miami/weapons/WeaponInfo.cpp
diff --git a/miami/weapons/WeaponInfo.h b/src/miami/weapons/WeaponInfo.h
similarity index 100%
rename from miami/weapons/WeaponInfo.h
rename to src/miami/weapons/WeaponInfo.h
diff --git a/miami/weapons/WeaponType.h b/src/miami/weapons/WeaponType.h
similarity index 100%
rename from miami/weapons/WeaponType.h
rename to src/miami/weapons/WeaponType.h
diff --git a/dreamcast/adf2mp3.cpp b/src/tools/adf2mp3.cpp
similarity index 100%
rename from dreamcast/adf2mp3.cpp
rename to src/tools/adf2mp3.cpp
diff --git a/dreamcast/analyze-profile.cpp b/src/tools/analyze-profile.cpp
similarity index 100%
rename from dreamcast/analyze-profile.cpp
rename to src/tools/analyze-profile.cpp
diff --git a/dreamcast/aud2adpcm.c b/src/tools/aud2adpcm.c
similarity index 100%
rename from dreamcast/aud2adpcm.c
rename to src/tools/aud2adpcm.c
diff --git a/dreamcast/extract-sfx.cpp b/src/tools/extract-sfx.cpp
similarity index 100%
rename from dreamcast/extract-sfx.cpp
rename to src/tools/extract-sfx.cpp
diff --git a/dreamcast/imgtool.cpp b/src/tools/imgtool.cpp
similarity index 100%
rename from dreamcast/imgtool.cpp
rename to src/tools/imgtool.cpp
diff --git a/dreamcast/pack-sfx.cpp b/src/tools/pack-sfx.cpp
similarity index 100%
rename from dreamcast/pack-sfx.cpp
rename to src/tools/pack-sfx.cpp
diff --git a/dreamcast/texconv.cpp b/src/tools/texconv.cpp
similarity index 100%
rename from dreamcast/texconv.cpp
rename to src/tools/texconv.cpp