diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9b798e5..52944f9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,6 +201,10 @@ add_subdirectory(vecmat)
 add_subdirectory(libmve)
 add_subdirectory(md5)
 add_subdirectory(libacm)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  add_subdirectory(editor)
+endif()
 add_subdirectory(Descent3)
 
 add_subdirectory(tools)
diff --git a/Descent3/LoadLevel.cpp b/Descent3/LoadLevel.cpp
index 4c40db60..9e0f03ff 100644
--- a/Descent3/LoadLevel.cpp
+++ b/Descent3/LoadLevel.cpp
@@ -3923,7 +3923,7 @@ int LoadLevel(char *filename, void (*cb_fn)(const char *, int, int)) {
           uint8_t buf[1000];
           int n = chunk_size, r;
           while (n) {
-            r = cf_ReadBytes(buf, std::min(n, sizeof(buf)), ifile);
+            r = cf_ReadBytes(buf, std::min(n, static_cast<int>(sizeof(buf))), ifile);
             cf_WriteBytes(buf, r, ofile);
             n -= r;
           }
diff --git a/Descent3/objinfo.cpp b/Descent3/objinfo.cpp
index 1261e443..32f7242c 100644
--- a/Descent3/objinfo.cpp
+++ b/Descent3/objinfo.cpp
@@ -60,8 +60,8 @@ const char *Static_object_names[] = {TBL_GENERIC("GuideBot"), TBL_GENERIC("Chaff
 #define NUM_STATIC_OBJECTS (sizeof(Static_object_names) / sizeof(*Static_object_names))
 
 #ifdef EDITOR
-const char *Movement_class_names[] = {"Standing", "Flying", "Rolling", "Walking", "Jumping"};
-const char *Anim_state_names[] = {"Alert",
+extern char *Movement_class_names[] = {"Standing", "Flying", "Rolling", "Walking", "Jumping"};
+extern char *Anim_state_names[] = {"Alert",
                             "Death",
                             "Fire Missile 1",
                             "Missile Recoil 1",
@@ -85,9 +85,6 @@ const char *Anim_state_names[] = {"Alert",
                             "Goto rolling",
                             "Goto walking",
                             "Goto jumping"};
-
-// extern char *Movement_class_names[];
-// extern char *Anim_state_names[];
 #endif
 
 // Sets all objects to unused
diff --git a/legacy/editor/AISettingsDlg.cpp b/editor/AISettingsDlg.cpp
similarity index 100%
rename from legacy/editor/AISettingsDlg.cpp
rename to editor/AISettingsDlg.cpp
diff --git a/legacy/editor/AISettingsDlg.h b/editor/AISettingsDlg.h
similarity index 100%
rename from legacy/editor/AISettingsDlg.h
rename to editor/AISettingsDlg.h
diff --git a/legacy/editor/AddScriptDialog.cpp b/editor/AddScriptDialog.cpp
similarity index 100%
rename from legacy/editor/AddScriptDialog.cpp
rename to editor/AddScriptDialog.cpp
diff --git a/legacy/editor/AddScriptDialog.h b/editor/AddScriptDialog.h
similarity index 100%
rename from legacy/editor/AddScriptDialog.h
rename to editor/AddScriptDialog.h
diff --git a/legacy/editor/AmbientSoundElement.cpp b/editor/AmbientSoundElement.cpp
similarity index 100%
rename from legacy/editor/AmbientSoundElement.cpp
rename to editor/AmbientSoundElement.cpp
diff --git a/legacy/editor/AmbientSoundElement.h b/editor/AmbientSoundElement.h
similarity index 100%
rename from legacy/editor/AmbientSoundElement.h
rename to editor/AmbientSoundElement.h
diff --git a/legacy/editor/AmbientSoundPattern.cpp b/editor/AmbientSoundPattern.cpp
similarity index 100%
rename from legacy/editor/AmbientSoundPattern.cpp
rename to editor/AmbientSoundPattern.cpp
diff --git a/legacy/editor/AmbientSoundPattern.h b/editor/AmbientSoundPattern.h
similarity index 100%
rename from legacy/editor/AmbientSoundPattern.h
rename to editor/AmbientSoundPattern.h
diff --git a/legacy/editor/AnimStatesDialog.cpp b/editor/AnimStatesDialog.cpp
similarity index 100%
rename from legacy/editor/AnimStatesDialog.cpp
rename to editor/AnimStatesDialog.cpp
diff --git a/legacy/editor/AnimStatesDialog.h b/editor/AnimStatesDialog.h
similarity index 100%
rename from legacy/editor/AnimStatesDialog.h
rename to editor/AnimStatesDialog.h
diff --git a/legacy/editor/BriefBitmapEdit.cpp b/editor/BriefBitmapEdit.cpp
similarity index 100%
rename from legacy/editor/BriefBitmapEdit.cpp
rename to editor/BriefBitmapEdit.cpp
diff --git a/legacy/editor/BriefBitmapEdit.h b/editor/BriefBitmapEdit.h
similarity index 100%
rename from legacy/editor/BriefBitmapEdit.h
rename to editor/BriefBitmapEdit.h
diff --git a/legacy/editor/BriefButtonEdit.cpp b/editor/BriefButtonEdit.cpp
similarity index 100%
rename from legacy/editor/BriefButtonEdit.cpp
rename to editor/BriefButtonEdit.cpp
diff --git a/legacy/editor/BriefButtonEdit.h b/editor/BriefButtonEdit.h
similarity index 100%
rename from legacy/editor/BriefButtonEdit.h
rename to editor/BriefButtonEdit.h
diff --git a/legacy/editor/BriefEdit.cpp b/editor/BriefEdit.cpp
similarity index 100%
rename from legacy/editor/BriefEdit.cpp
rename to editor/BriefEdit.cpp
diff --git a/legacy/editor/BriefEdit.h b/editor/BriefEdit.h
similarity index 100%
rename from legacy/editor/BriefEdit.h
rename to editor/BriefEdit.h
diff --git a/legacy/editor/BriefManage.cpp b/editor/BriefManage.cpp
similarity index 100%
rename from legacy/editor/BriefManage.cpp
rename to editor/BriefManage.cpp
diff --git a/legacy/editor/BriefManage.h b/editor/BriefManage.h
similarity index 100%
rename from legacy/editor/BriefManage.h
rename to editor/BriefManage.h
diff --git a/legacy/editor/BriefMissionFlagsDlg.cpp b/editor/BriefMissionFlagsDlg.cpp
similarity index 100%
rename from legacy/editor/BriefMissionFlagsDlg.cpp
rename to editor/BriefMissionFlagsDlg.cpp
diff --git a/legacy/editor/BriefMissionFlagsDlg.h b/editor/BriefMissionFlagsDlg.h
similarity index 100%
rename from legacy/editor/BriefMissionFlagsDlg.h
rename to editor/BriefMissionFlagsDlg.h
diff --git a/legacy/editor/BriefMovieEdit.cpp b/editor/BriefMovieEdit.cpp
similarity index 100%
rename from legacy/editor/BriefMovieEdit.cpp
rename to editor/BriefMovieEdit.cpp
diff --git a/legacy/editor/BriefMovieEdit.h b/editor/BriefMovieEdit.h
similarity index 100%
rename from legacy/editor/BriefMovieEdit.h
rename to editor/BriefMovieEdit.h
diff --git a/legacy/editor/BriefScreenEdit.cpp b/editor/BriefScreenEdit.cpp
similarity index 100%
rename from legacy/editor/BriefScreenEdit.cpp
rename to editor/BriefScreenEdit.cpp
diff --git a/legacy/editor/BriefScreenEdit.h b/editor/BriefScreenEdit.h
similarity index 100%
rename from legacy/editor/BriefScreenEdit.h
rename to editor/BriefScreenEdit.h
diff --git a/legacy/editor/BriefSoundEdit.cpp b/editor/BriefSoundEdit.cpp
similarity index 100%
rename from legacy/editor/BriefSoundEdit.cpp
rename to editor/BriefSoundEdit.cpp
diff --git a/legacy/editor/BriefSoundEdit.h b/editor/BriefSoundEdit.h
similarity index 100%
rename from legacy/editor/BriefSoundEdit.h
rename to editor/BriefSoundEdit.h
diff --git a/legacy/editor/BriefTextEdit.cpp b/editor/BriefTextEdit.cpp
similarity index 100%
rename from legacy/editor/BriefTextEdit.cpp
rename to editor/BriefTextEdit.cpp
diff --git a/legacy/editor/BriefTextEdit.h b/editor/BriefTextEdit.h
similarity index 100%
rename from legacy/editor/BriefTextEdit.h
rename to editor/BriefTextEdit.h
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
new file mode 100644
index 00000000..7a33b2b4
--- /dev/null
+++ b/editor/CMakeLists.txt
@@ -0,0 +1,633 @@
+# Set headers and source files
+set(HEADERS
+    ../descent3/aiambient.h
+    ../descent3/AIGoal.h
+    ../descent3/AIMain.h
+    ../descent3/aipath.h
+    ../descent3/aistruct.h
+    ../descent3/aistruct_external.h
+    ../descent3/aiterrain.h
+    ../descent3/ambient.h
+    ../descent3/args.h
+    ../descent3/attach.h
+    ../descent3/audiotaunts.h
+    ../descent3/bnode.h
+    ../descent3/BOA.h
+    ../descent3/Briefing.h
+    ../descent3/BriefingParse.h
+    ../descent3/bsp.h
+    ../descent3/buddymenu.h
+    ../descent3/cinematics.h
+    ../descent3/cockpit.h
+    ../descent3/config.h
+    ../descent3/ConfigItem.h
+    ../descent3/controls.h
+    ../descent3/credits.h
+    ../descent3/CtlCfgElem.h
+    ../descent3/ctlconfig.h
+    ../descent3/ctlconfigtxt.h
+    ../descent3/D3ForceFeedback.h
+    ../descent3/d3serial.h
+    ../descent3/damage.h
+    ../descent3/damage_external.h
+    ../descent3/DeathInfo.h
+    ../descent3/deathinfo_external.h
+    ../descent3/debuggraph.h
+    ../descent3/descent.h
+    ../descent3/difficulty.h
+    ../descent3/difficulty_external.h
+    ../descent3/DllWrappers.h
+    ../descent3/door.h
+    ../descent3/doorway.h
+    ../descent3/fireball.h
+    ../descent3/fireball_external.h
+    ../descent3/game.h
+    ../descent3/gamecinematics.h
+    ../descent3/gamecinematics_external.h
+    ../descent3/gameevent.h
+    ../descent3/gamefile.h
+    ../descent3/gamefont.h
+    ../descent3/gameloop.h
+    ../descent3/gamepath.h
+    ../descent3/gamesave.h
+    ../descent3/gamesequence.h
+    ../descent3/gametexture.h
+    ../descent3/gauges.h
+    ../descent3/help.h
+    ../descent3/hotspotmap.h
+    ../descent3/hud.h
+    ../descent3/init.h
+    ../descent3/Inventory.h
+    ../descent3/levelgoal.h
+    ../descent3/levelgoal_external.h
+    ../descent3/lighting.h
+    ../descent3/lightmap_info.h
+    ../descent3/list.h
+    ../descent3/LoadLevel.h
+    ../descent3/localization.h
+    ../descent3/marker.h
+    ../descent3/matcen.h
+    ../descent3/matcen_external.h
+    ../descent3/menu.h
+    ../descent3/Mission.h
+    ../descent3/mission_download.h
+    ../descent3/mmItem.h
+    ../descent3/multi.h
+    ../descent3/multisafe.h
+    ../descent3/multi_client.h
+    ../descent3/multi_dll_mgr.h
+    ../descent3/multi_external.h
+    ../descent3/multi_save_settings.h
+    ../descent3/multi_server.h
+    ../descent3/multi_ui.h
+    ../descent3/multi_world_state.h
+    ../descent3/NewPyroGauges.h
+    ../descent3/newui.h
+    ../descent3/newui_core.h
+    ../descent3/object.h
+    ../descent3/object_external.h
+    ../descent3/object_external_struct.h
+    ../descent3/object_lighting.h
+    ../descent3/objinfo.h
+    ../descent3/objinit.h
+    ../descent3/ObjScript.h
+    ../descent3/osiris_dll.h
+    ../descent3/osiris_predefs.h
+    ../descent3/osiris_share.h
+    ../descent3/pilot.h
+    ../descent3/PilotPicsAPI.h
+    ../descent3/pilot_class.h
+    ../descent3/player.h
+    ../descent3/player_external.h
+    ../descent3/player_external_struct.h
+    ../descent3/postrender.h
+    ../descent3/powerup.h
+    ../descent3/procedurals.h
+    ../descent3/program.h
+    ../descent3/render.h
+    ../descent3/renderobject.h
+    ../descent3/resource.h
+    ../descent3/robot.h
+    ../descent3/robotfire.h
+    ../descent3/robotfirestruct.h
+    ../descent3/robotfirestruct_external.h
+    ../descent3/room.h
+    ../descent3/room_external.h
+    ../descent3/scorch.h
+    ../descent3/screens.h
+    ../descent3/ship.h
+    ../descent3/slew.h
+    ../descent3/SmallViews.h
+    ../descent3/soar.h
+    ../descent3/soar_helpers.h
+    ../descent3/sounds.h
+    ../descent3/special_face.h
+    ../descent3/spew.h
+    ../descent3/splinter.h
+    ../descent3/stringtable.h
+    ../descent3/subtitles.h
+    ../descent3/TelCom.h
+    ../descent3/TelComAutoMap.h
+    ../descent3/TelComCargo.h
+    ../descent3/TelComEffects.h
+    ../descent3/TelComEfxStructs.h
+    ../descent3/TelComGoals.h
+    ../descent3/terrain.h
+    ../descent3/trigger.h
+    ../descent3/vclip.h
+    ../descent3/vibeinterface.h
+    ../descent3/viseffect.h
+    ../descent3/viseffect_external.h
+    ../descent3/voice.h
+    ../descent3/weapon.h
+    ../descent3/weapon_external.h
+    ../descent3/weather.h
+    AddScriptDialog.h
+    AISettingsDlg.h
+    AmbientSoundElement.h
+    AmbientSoundPattern.h
+    AnimStatesDialog.h
+    BriefBitmapEdit.h
+    BriefButtonEdit.h
+    BriefEdit.h
+    BriefManage.h
+    BriefMissionFlagsDlg.h
+    BriefMovieEdit.h
+    BriefScreenEdit.h
+    BriefSoundEdit.h
+    BriefTextEdit.h
+    CreateNewScriptDlg.h
+    CustDefaultScriptSelect.h
+    CustomObjectDialog.h
+    d3edit.h
+    D3Splash.h
+    D3XStringEditor.h
+    DallasFlagDlg.h
+    DallasGenericPromptDlg.h
+    DallasImportDlg.h
+    DallasMainDlg.h
+    DallasSoundDlg.h
+    DallasStrmAudioDlg.h
+    DallasTextureDlg.h
+    DallasUserTypesDlg.h
+    DallasUtilities.h
+    DallasVectorPromptDialog.h
+    DeathDialog.h
+    DoorwayDialog.h
+    drawworld.h
+    ebnode.h
+    EditLineDialog.h
+    editor.h
+    editorDoc.h
+    editorView.h
+    editor_lighting.h
+    edoors.h
+    EPath.h
+    Erooms.h
+    FilePageAddDlg.h
+    FilePageDialog.h
+    FloatingKeypadDialog.h
+    GenericDeathDialog.h
+    GenericLightDialog.h
+    GrFontDialog.h
+    GrListBox.h
+    group.h
+    GrWnd.h
+    hemicube.h
+    HFile.h
+    HObject.h
+    HogDialog.h
+    HRoom.h
+    HTexture.h
+    HView.h
+    IpFrame.h
+    KeypadDialog.h
+    LevelDialog.h
+    LevelInfoDialog.h
+    levelkeypad.h
+    LightingDialog.h
+    LightingStatus.h
+    MainFrm.h
+    ManageCheckin.h
+    matcenkeypad.h
+    MegacellDialog.h
+    MegacellKeypad.h
+    moveworld.h
+    ObjCScript.h
+    ObjectClipboard.h
+    ObjectDialog.h
+    ObjectListCombo.h
+    ObjectListDialog.h
+    ObjectPropertiesDialog.h
+    ObjMoveManager.h
+    OrphanRemoveDlg.h
+    OsirisStatusDlg.h
+    PathPadDialog.h
+    PhysicsDlg.h
+    PictListBox.h
+    PlayerWeaponsDialog.h
+    PowerupPropDialog.h
+    PreferencesDialog.h
+    ProceduralDialog.h
+    ProgressWnd.h
+    PropertyAIDlg.h
+    PropertyPhysicsDlg.h
+    QuickCompile.h
+    radiosity.h
+    radscan_leftedge.h
+    radscan_rightedge.h
+    rad_cast.h
+    read3ds.h
+    resource.h
+    RobotEditWeaponsDialog.h
+    roomkeypaddialog.h
+    RoomListCombo.h
+    RoomUVs.h
+    rotateroom.h
+    ScriptCompilerAPI.h
+    ScriptEditorDlg.h
+    ScriptLevelInterface.h
+    ScriptMassCompile.h
+    ScriptParmDialog.h
+    ScriptSelect.h
+    ScriptStudio.h
+    ScriptSyncDialog.h
+    ScriptWizard.h
+    selectedroom.h
+    SelectRangeDialog.h
+    SelManager.h
+    SoundListCombo.h
+    SoundSourceDialog.h
+    SrvrItem.h
+    StatusDlg.h
+    StdAfx.h
+    TableFileEdit.h
+    TableFileFilter.h
+    TableFileFilterAddDlg.h
+    TableFileFilterMng.h
+    TableManage.h
+    TerrainDialog.h
+    TerrainSoundDialog.h
+    TextureDialog.h
+    TextureGrWnd.h
+    TriggerDialog.h
+    TriggerListCombo.h
+    ViewerPropDlg.h
+    VirtualCompilerConfig.h
+    WaterProceduralDialog.h
+    WireframeGrWnd.h
+    WorldObjectsDoorDialog.h
+    WorldObjectsGenericDialog.h
+    WorldObjectsLightDialog.h
+    WorldObjectsPlayerDialog.h
+    WorldObjectsPowerupDialog.h
+    WorldObjectsRobotDialog.h
+    WorldSoundsDialog.h
+    WorldTexturesDialog.h
+    WorldWeaponsDialog.h
+)
+
+set(SOURCE
+    ../descent3/aiambient.cpp
+    ../descent3/AIGoal.cpp
+    ../descent3/AImain.cpp
+    ../descent3/aipath.cpp
+    ../descent3/aiterrain.cpp
+    ../descent3/ambient.cpp
+    ../descent3/args.cpp
+    ../descent3/attach.cpp
+    ../descent3/audiotaunts.cpp
+    ../descent3/bnode.cpp
+    ../descent3/BOA.cpp
+    ../descent3/Briefing.cpp
+    ../descent3/BriefingParse.cpp
+    ../descent3/bsp.cpp
+    ../descent3/buddymenu.cpp
+    ../descent3/cinematics.cpp
+    ../descent3/cockpit.cpp
+    ../descent3/config.cpp
+    ../descent3/ConfigItem.cpp
+    ../descent3/Controls.cpp
+    ../descent3/credits.cpp
+    ../descent3/CtlCfgElem.cpp
+    ../descent3/ctlconfig.cpp
+    ../descent3/D3ForceFeedback.cpp
+    ../descent3/d3serial.cpp
+    ../descent3/damage.cpp
+    ../descent3/debuggraph.cpp
+    ../descent3/dedicated_server.cpp
+    ../descent3/demofile.cpp
+    ../descent3/descent.cpp
+    ../descent3/difficulty.cpp
+    ../descent3/DllWrappers.cpp
+    ../descent3/door.cpp
+    ../descent3/doorway.cpp
+    ../descent3/fireball.cpp
+    ../descent3/game.cpp
+    ../descent3/Game2DLL.cpp
+    ../descent3/GameCheat.cpp
+    ../descent3/gamecinematics.cpp
+    ../descent3/gameevent.cpp
+    ../descent3/gamefile.cpp
+    ../descent3/gamefont.cpp
+    ../descent3/GameLoop.cpp
+    ../descent3/gamepath.cpp
+    ../descent3/gamesave.cpp
+    ../descent3/gamesequence.cpp
+    ../descent3/gametexture.cpp
+    ../descent3/gauges.cpp
+    ../descent3/help.cpp
+    ../descent3/hotspotmap.cpp
+    ../descent3/hud.cpp
+    ../descent3/huddisplay.cpp
+    ../descent3/hudmessage.cpp
+    ../descent3/init.cpp
+    ../descent3/intellivibe.cpp
+    ../descent3/Inventory.cpp
+    ../descent3/levelgoal.cpp
+    ../descent3/lighting.cpp
+    ../descent3/lightmap_info.cpp
+    ../descent3/list.cpp
+    ../descent3/LoadLevel.cpp
+    ../descent3/loadstate.cpp
+    ../descent3/localization.cpp
+    ../descent3/marker.cpp
+    ../descent3/matcen.cpp
+    ../descent3/megacell.cpp
+    ../descent3/menu.cpp
+    ../descent3/Mission.cpp
+    ../descent3/mission_download.cpp
+    ../descent3/mmItem.cpp
+    ../descent3/multi.cpp
+    ../descent3/multisafe.cpp
+    ../descent3/multisafe_server.cpp
+    ../descent3/multi_client.cpp
+    ../descent3/multi_connect.cpp
+    ../descent3/multi_dll_mgr.cpp
+    ../descent3/multi_save_setting.cpp
+    ../descent3/multi_server.cpp
+    ../descent3/multi_ui.cpp
+    ../descent3/NewPyroGauges.cpp
+    ../descent3/newui.cpp
+    ../descent3/newui_core.cpp
+    ../descent3/newui_filedlg.cpp
+    ../descent3/object.cpp
+    ../descent3/object_lighting.cpp
+    ../descent3/objinfo.cpp
+    ../descent3/ObjInit.cpp
+    ../descent3/ObjScript.cpp
+    ../descent3/OsirisLoadandBind.cpp
+    ../descent3/osiris_predefs.cpp
+    ../descent3/pilot.cpp
+    ../descent3/PilotPicsAPI.cpp
+    ../descent3/pilot_class.cpp
+    ../descent3/Player.cpp
+    ../descent3/postrender.cpp
+    ../descent3/procedurals.cpp
+    ../descent3/program.cpp
+    ../descent3/render.cpp
+    ../descent3/renderobject.cpp
+    ../descent3/robotfire.cpp
+    ../descent3/room.cpp
+    ../descent3/scorch.cpp
+    ../descent3/screens.cpp
+    ../descent3/ship.cpp
+    ../descent3/SLEW.cpp
+    ../descent3/SmallViews.cpp
+    ../descent3/soar.cpp
+    ../descent3/soar_helpers.cpp
+    ../descent3/special_face.cpp
+    ../descent3/spew.cpp
+    ../descent3/splinter.cpp
+    ../descent3/subtitles.cpp
+    ../descent3/TelCom.cpp
+    ../descent3/TelComAutoMap.cpp
+    ../descent3/TelComCargo.cpp
+    ../descent3/TelComEffects.cpp
+    ../descent3/TelcomEffectsRender.cpp
+    ../descent3/TelComGoals.cpp
+    ../descent3/terrain.cpp
+    ../descent3/terrainrender.cpp
+    ../descent3/TerrainSearch.cpp
+    ../descent3/trigger.cpp
+    ../descent3/vclip.cpp
+    ../descent3/viseffect.cpp
+    ../descent3/voice.cpp
+    ../descent3/weapon.cpp
+    ../descent3/WeaponFire.cpp
+    ../descent3/weather.cpp
+    AddScriptDialog.cpp
+    AISettingsDlg.cpp
+    AmbientSoundElement.cpp
+    AmbientSoundPattern.cpp
+    AnimStatesDialog.cpp
+    BriefBitmapEdit.cpp
+    BriefButtonEdit.cpp
+    BriefEdit.cpp
+    BriefManage.cpp
+    BriefMissionFlagsDlg.cpp
+    BriefMovieEdit.cpp
+    BriefScreenEdit.cpp
+    BriefSoundEdit.cpp
+    BriefTextEdit.cpp
+    christest.cpp
+    CreateNewScriptDlg.cpp
+    CustDefaultScriptSelect.cpp
+    CustomObjectDialog.cpp
+    D3Splash.cpp
+    D3XStringEditor.cpp
+    DallasFlagDlg.cpp
+    DallasGenericPromptDlg.cpp
+    DallasImportDlg.cpp
+    DallasMainDlg.cpp
+    DallasSoundDlg.cpp
+    DallasStrmAudioDlg.cpp
+    DallasTextureDlg.cpp
+    DallasUserTypesDlg.cpp
+    DallasUtilities.cpp
+    DallasVectorPromptDialog.cpp
+    DeathDialog.cpp
+    DoorwayDialog.cpp
+    drawworld.cpp
+    ebnode.cpp
+    EditLineDialog.cpp
+    editor.cpp
+    editorDoc.cpp
+    editorView.cpp
+    editor_lighting.cpp
+    editor_object_lighting.cpp
+    edoors.cpp
+    EDVARS.cpp
+    EPath.cpp
+    Erooms.cpp
+    FilePageAddDlg.cpp
+    FilePageDialog.cpp
+    FloatingKeypadDialog.cpp
+    gameeditor.cpp
+    GenericDeathDialog.cpp
+    GenericLightDialog.cpp
+    GrFontDialog.cpp
+    GrListBox.cpp
+    Group.cpp
+    GrWnd.cpp
+    HFile.cpp
+    HObject.cpp
+    HogDialog.cpp
+    HRoom.cpp
+    HTexture.cpp
+    HView.cpp
+    IpFrame.cpp
+    KeypadDialog.cpp
+    LevelDialog.cpp
+    LevelInfoDialog.cpp
+    levelkeypad.cpp
+    LightingDialog.cpp
+    LightingStatus.cpp
+    MainFrm.cpp
+    ManageCheckin.cpp
+    matcenkeypad.cpp
+    MegacellDialog.cpp
+    MegacellKeypad.cpp
+    moveworld.cpp
+    ObjCScript.cpp
+    ObjectClipboard.cpp
+    ObjectDialog.cpp
+    ObjectListCombo.cpp
+    ObjectListDialog.cpp
+    ObjectPropertiesDialog.cpp
+    ObjMoveManager.cpp
+    OrphanRemoveDlg.cpp
+    OsirisStatusDlg.cpp
+    PathPadDialog.cpp
+    PhysicsDlg.cpp
+    PictListBox.cpp
+    PlayerWeaponsDialog.cpp
+    PowerupPropDialog.cpp
+    PreferencesDialog.cpp
+    ProceduralDialog.cpp
+    ProgressWnd.cpp
+    PropertyAIDlg.cpp
+    PropertyPhysicsDlg.cpp
+    QuickCompile.cpp
+    rad_cast.cpp
+    rad_init.cpp
+    Read3ds.cpp
+    RobotEditWeaponsDialog.cpp
+    roomkeypaddialog.cpp
+    RoomListCombo.cpp
+    RoomUVs.cpp
+    rotateroom.cpp
+    ScriptCompilerAPI.cpp
+    ScriptEditorDlg.cpp
+    ScriptLevelInterface.cpp
+    ScriptMassCompile.cpp
+    ScriptParmDialog.cpp
+    ScriptSelect.cpp
+    ScriptStudio.cpp
+    ScriptSyncDialog.cpp
+    ScriptWizard.cpp
+    selectedroom.cpp
+    SelectRangeDialog.cpp
+    SelManager.cpp
+    SoundListCombo.cpp
+    SoundSourceDialog.cpp
+    SrvrItem.cpp
+    StatusDlg.cpp
+    StdAfx.cpp
+    TableFileEdit.cpp
+    TableFileFilter.cpp
+    TableFileFilterAddDlg.cpp
+    TableFileFilterMng.cpp
+    TableManage.cpp
+    TerrainDialog.cpp
+    TerrainSoundDialog.cpp
+    TextureDialog.cpp
+    TextureGrWnd.cpp
+    TriggerDialog.cpp
+    TriggerListCombo.cpp
+    ViewerPropDlg.cpp
+    VirtualCompilerConfig.cpp
+    WaterProceduralDialog.cpp
+    WireframeGrWnd.cpp
+    WorldObjectsDoorDialog.cpp
+    WorldObjectsGenericDialog.cpp
+    WorldObjectsLightDialog.cpp
+    WorldObjectsPlayerDialog.cpp
+    WorldObjectsPowerupDialog.cpp
+    WorldObjectsRobotDialog.cpp
+    WorldSoundsDialog.cpp
+    WorldTexturesDialog.cpp
+    WorldWeaponsDialog.cpp
+    editor.rc
+)
+
+# Set platform-specific sources and libraries
+if (WIN32)
+    set(PLATFORM_LIBS dd_sndlib misc libimgui devcon dd_grwin32 dd_vidwin32 ddio_win win32 wsock32.lib winmm.lib Glu32.lib)
+    set(PLATFORM_SOURCES ../descent3/winmain.cpp)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
+elseif (UNIX AND NOT APPLE)
+    set(PLATFORM_LIBS linux dd_lnxsound ddvid_lnx lnxcontroller ddio_lnx ${SDL_LIBRARY} caca asound audio esd aa directfb m dl GLU)
+    set(PLATFORM_SOURCES loki_utils.c lnxmain.cpp)
+    set(CMAKE_EXE_LINKER_FLAGS "/usr/lib/libpulse-simple.so.0")
+elseif (APPLE)
+    set(PLATFORM_LIBS linux dd_lnxsound ddvid_lnx lnxcontroller ddio_lnx ${SDL_LIBRARY} ncurses)
+    set(PLATFORM_SOURCES loki_utils.c lnxmain.cpp SDLMain.m)
+    set(CMAKE_EXE_LINKER_FLAGS "-framework IOKit -framework Cocoa -framework OpenGL -framework Carbon")
+endif()
+
+# Include directories
+include_directories(../lib ../ ../manage/)
+
+# Add executable
+add_executable(Descent3Editor ${HEADERS} ${SOURCE} ${PLATFORM_SOURCES})
+
+if(MSVC)
+    target_compile_definitions(Descent3Editor PUBLIC _CRT_SECURE_NO_WARNINGS _AFXDLL)
+endif()
+
+target_compile_definitions(Descent3Editor PUBLIC EDITOR)
+
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} /Zc:forScope-")
+endif()
+
+target_include_directories(Descent3Editor PRIVATE ${PROJECT_BINARY_DIR}/lib)
+
+# Link libraries
+target_link_libraries(Descent3Editor
+    2dlib
+    AudioEncode
+    bitmap
+    cfile
+    czip
+    d3music
+    ddio_common
+    libmve
+    libacm
+    fix
+    grtext
+    manage
+    mem
+    model
+    module
+    movie
+    stream_audio
+    music
+    networking
+    physics
+    renderer
+    rtperformance
+    sndlib
+    ui
+    unzip
+    vecmat
+    md5
+    ${PLATFORM_LIBS}
+)
+
+add_definitions(-DEDITOR)
+
+if (WIN32)
+    set_target_properties(Descent3Editor PROPERTIES WIN32_EXECUTABLE ON)
+endif()
\ No newline at end of file
diff --git a/legacy/editor/CreateNewScriptDlg.cpp b/editor/CreateNewScriptDlg.cpp
similarity index 100%
rename from legacy/editor/CreateNewScriptDlg.cpp
rename to editor/CreateNewScriptDlg.cpp
diff --git a/legacy/editor/CreateNewScriptDlg.h b/editor/CreateNewScriptDlg.h
similarity index 100%
rename from legacy/editor/CreateNewScriptDlg.h
rename to editor/CreateNewScriptDlg.h
diff --git a/legacy/editor/CustDefaultScriptSelect.cpp b/editor/CustDefaultScriptSelect.cpp
similarity index 100%
rename from legacy/editor/CustDefaultScriptSelect.cpp
rename to editor/CustDefaultScriptSelect.cpp
diff --git a/legacy/editor/CustDefaultScriptSelect.h b/editor/CustDefaultScriptSelect.h
similarity index 100%
rename from legacy/editor/CustDefaultScriptSelect.h
rename to editor/CustDefaultScriptSelect.h
diff --git a/legacy/editor/CustomObjectDialog.cpp b/editor/CustomObjectDialog.cpp
similarity index 100%
rename from legacy/editor/CustomObjectDialog.cpp
rename to editor/CustomObjectDialog.cpp
diff --git a/legacy/editor/CustomObjectDialog.h b/editor/CustomObjectDialog.h
similarity index 100%
rename from legacy/editor/CustomObjectDialog.h
rename to editor/CustomObjectDialog.h
diff --git a/legacy/editor/D3Splash.cpp b/editor/D3Splash.cpp
similarity index 100%
rename from legacy/editor/D3Splash.cpp
rename to editor/D3Splash.cpp
diff --git a/legacy/editor/D3Splash.h b/editor/D3Splash.h
similarity index 100%
rename from legacy/editor/D3Splash.h
rename to editor/D3Splash.h
diff --git a/legacy/editor/D3XStringEditor.cpp b/editor/D3XStringEditor.cpp
similarity index 100%
rename from legacy/editor/D3XStringEditor.cpp
rename to editor/D3XStringEditor.cpp
diff --git a/legacy/editor/D3XStringEditor.h b/editor/D3XStringEditor.h
similarity index 100%
rename from legacy/editor/D3XStringEditor.h
rename to editor/D3XStringEditor.h
diff --git a/legacy/editor/DallasFlagDlg.cpp b/editor/DallasFlagDlg.cpp
similarity index 100%
rename from legacy/editor/DallasFlagDlg.cpp
rename to editor/DallasFlagDlg.cpp
diff --git a/legacy/editor/DallasFlagDlg.h b/editor/DallasFlagDlg.h
similarity index 100%
rename from legacy/editor/DallasFlagDlg.h
rename to editor/DallasFlagDlg.h
diff --git a/legacy/editor/DallasGenericPromptDlg.cpp b/editor/DallasGenericPromptDlg.cpp
similarity index 100%
rename from legacy/editor/DallasGenericPromptDlg.cpp
rename to editor/DallasGenericPromptDlg.cpp
diff --git a/legacy/editor/DallasGenericPromptDlg.h b/editor/DallasGenericPromptDlg.h
similarity index 100%
rename from legacy/editor/DallasGenericPromptDlg.h
rename to editor/DallasGenericPromptDlg.h
diff --git a/legacy/editor/DallasImportDlg.cpp b/editor/DallasImportDlg.cpp
similarity index 100%
rename from legacy/editor/DallasImportDlg.cpp
rename to editor/DallasImportDlg.cpp
diff --git a/legacy/editor/DallasImportDlg.h b/editor/DallasImportDlg.h
similarity index 100%
rename from legacy/editor/DallasImportDlg.h
rename to editor/DallasImportDlg.h
diff --git a/legacy/editor/DallasMainDlg.cpp b/editor/DallasMainDlg.cpp
similarity index 100%
rename from legacy/editor/DallasMainDlg.cpp
rename to editor/DallasMainDlg.cpp
diff --git a/legacy/editor/DallasMainDlg.h b/editor/DallasMainDlg.h
similarity index 100%
rename from legacy/editor/DallasMainDlg.h
rename to editor/DallasMainDlg.h
diff --git a/legacy/editor/DallasSoundDlg.cpp b/editor/DallasSoundDlg.cpp
similarity index 100%
rename from legacy/editor/DallasSoundDlg.cpp
rename to editor/DallasSoundDlg.cpp
diff --git a/legacy/editor/DallasSoundDlg.h b/editor/DallasSoundDlg.h
similarity index 100%
rename from legacy/editor/DallasSoundDlg.h
rename to editor/DallasSoundDlg.h
diff --git a/legacy/editor/DallasStrmAudioDlg.cpp b/editor/DallasStrmAudioDlg.cpp
similarity index 100%
rename from legacy/editor/DallasStrmAudioDlg.cpp
rename to editor/DallasStrmAudioDlg.cpp
diff --git a/legacy/editor/DallasStrmAudioDlg.h b/editor/DallasStrmAudioDlg.h
similarity index 100%
rename from legacy/editor/DallasStrmAudioDlg.h
rename to editor/DallasStrmAudioDlg.h
diff --git a/legacy/editor/DallasTextureDlg.cpp b/editor/DallasTextureDlg.cpp
similarity index 100%
rename from legacy/editor/DallasTextureDlg.cpp
rename to editor/DallasTextureDlg.cpp
diff --git a/legacy/editor/DallasTextureDlg.h b/editor/DallasTextureDlg.h
similarity index 100%
rename from legacy/editor/DallasTextureDlg.h
rename to editor/DallasTextureDlg.h
diff --git a/legacy/editor/DallasUserTypesDlg.cpp b/editor/DallasUserTypesDlg.cpp
similarity index 100%
rename from legacy/editor/DallasUserTypesDlg.cpp
rename to editor/DallasUserTypesDlg.cpp
diff --git a/legacy/editor/DallasUserTypesDlg.h b/editor/DallasUserTypesDlg.h
similarity index 100%
rename from legacy/editor/DallasUserTypesDlg.h
rename to editor/DallasUserTypesDlg.h
diff --git a/legacy/editor/DallasUtilities.cpp b/editor/DallasUtilities.cpp
similarity index 100%
rename from legacy/editor/DallasUtilities.cpp
rename to editor/DallasUtilities.cpp
diff --git a/legacy/editor/DallasUtilities.h b/editor/DallasUtilities.h
similarity index 100%
rename from legacy/editor/DallasUtilities.h
rename to editor/DallasUtilities.h
diff --git a/legacy/editor/DallasVectorPromptDialog.cpp b/editor/DallasVectorPromptDialog.cpp
similarity index 100%
rename from legacy/editor/DallasVectorPromptDialog.cpp
rename to editor/DallasVectorPromptDialog.cpp
diff --git a/legacy/editor/DallasVectorPromptDialog.h b/editor/DallasVectorPromptDialog.h
similarity index 100%
rename from legacy/editor/DallasVectorPromptDialog.h
rename to editor/DallasVectorPromptDialog.h
diff --git a/legacy/editor/DeathDialog.cpp b/editor/DeathDialog.cpp
similarity index 100%
rename from legacy/editor/DeathDialog.cpp
rename to editor/DeathDialog.cpp
diff --git a/legacy/editor/DeathDialog.h b/editor/DeathDialog.h
similarity index 100%
rename from legacy/editor/DeathDialog.h
rename to editor/DeathDialog.h
diff --git a/legacy/editor/DoorwayDialog.cpp b/editor/DoorwayDialog.cpp
similarity index 100%
rename from legacy/editor/DoorwayDialog.cpp
rename to editor/DoorwayDialog.cpp
diff --git a/legacy/editor/DoorwayDialog.h b/editor/DoorwayDialog.h
similarity index 100%
rename from legacy/editor/DoorwayDialog.h
rename to editor/DoorwayDialog.h
diff --git a/legacy/editor/EDVARS.cpp b/editor/EDVARS.cpp
similarity index 100%
rename from legacy/editor/EDVARS.cpp
rename to editor/EDVARS.cpp
diff --git a/legacy/editor/EPath.cpp b/editor/EPath.cpp
similarity index 100%
rename from legacy/editor/EPath.cpp
rename to editor/EPath.cpp
diff --git a/legacy/editor/EPath.h b/editor/EPath.h
similarity index 100%
rename from legacy/editor/EPath.h
rename to editor/EPath.h
diff --git a/legacy/editor/EditLineDialog.cpp b/editor/EditLineDialog.cpp
similarity index 100%
rename from legacy/editor/EditLineDialog.cpp
rename to editor/EditLineDialog.cpp
diff --git a/legacy/editor/EditLineDialog.h b/editor/EditLineDialog.h
similarity index 100%
rename from legacy/editor/EditLineDialog.h
rename to editor/EditLineDialog.h
diff --git a/legacy/editor/Erooms.cpp b/editor/Erooms.cpp
similarity index 100%
rename from legacy/editor/Erooms.cpp
rename to editor/Erooms.cpp
diff --git a/legacy/editor/Erooms.h b/editor/Erooms.h
similarity index 100%
rename from legacy/editor/Erooms.h
rename to editor/Erooms.h
diff --git a/legacy/editor/FilePageAddDlg.cpp b/editor/FilePageAddDlg.cpp
similarity index 100%
rename from legacy/editor/FilePageAddDlg.cpp
rename to editor/FilePageAddDlg.cpp
diff --git a/legacy/editor/FilePageAddDlg.h b/editor/FilePageAddDlg.h
similarity index 100%
rename from legacy/editor/FilePageAddDlg.h
rename to editor/FilePageAddDlg.h
diff --git a/legacy/editor/FilePageDialog.cpp b/editor/FilePageDialog.cpp
similarity index 100%
rename from legacy/editor/FilePageDialog.cpp
rename to editor/FilePageDialog.cpp
diff --git a/legacy/editor/FilePageDialog.h b/editor/FilePageDialog.h
similarity index 100%
rename from legacy/editor/FilePageDialog.h
rename to editor/FilePageDialog.h
diff --git a/legacy/editor/FloatingKeypadDialog.cpp b/editor/FloatingKeypadDialog.cpp
similarity index 100%
rename from legacy/editor/FloatingKeypadDialog.cpp
rename to editor/FloatingKeypadDialog.cpp
diff --git a/legacy/editor/FloatingKeypadDialog.h b/editor/FloatingKeypadDialog.h
similarity index 100%
rename from legacy/editor/FloatingKeypadDialog.h
rename to editor/FloatingKeypadDialog.h
diff --git a/legacy/editor/GenericDeathDialog.cpp b/editor/GenericDeathDialog.cpp
similarity index 100%
rename from legacy/editor/GenericDeathDialog.cpp
rename to editor/GenericDeathDialog.cpp
diff --git a/legacy/editor/GenericDeathDialog.h b/editor/GenericDeathDialog.h
similarity index 100%
rename from legacy/editor/GenericDeathDialog.h
rename to editor/GenericDeathDialog.h
diff --git a/legacy/editor/GenericLightDialog.cpp b/editor/GenericLightDialog.cpp
similarity index 100%
rename from legacy/editor/GenericLightDialog.cpp
rename to editor/GenericLightDialog.cpp
diff --git a/legacy/editor/GenericLightDialog.h b/editor/GenericLightDialog.h
similarity index 100%
rename from legacy/editor/GenericLightDialog.h
rename to editor/GenericLightDialog.h
diff --git a/legacy/editor/GrFontDialog.cpp b/editor/GrFontDialog.cpp
similarity index 100%
rename from legacy/editor/GrFontDialog.cpp
rename to editor/GrFontDialog.cpp
diff --git a/legacy/editor/GrFontDialog.h b/editor/GrFontDialog.h
similarity index 100%
rename from legacy/editor/GrFontDialog.h
rename to editor/GrFontDialog.h
diff --git a/legacy/editor/GrListBox.cpp b/editor/GrListBox.cpp
similarity index 100%
rename from legacy/editor/GrListBox.cpp
rename to editor/GrListBox.cpp
diff --git a/legacy/editor/GrListBox.h b/editor/GrListBox.h
similarity index 100%
rename from legacy/editor/GrListBox.h
rename to editor/GrListBox.h
diff --git a/legacy/editor/GrWnd.cpp b/editor/GrWnd.cpp
similarity index 100%
rename from legacy/editor/GrWnd.cpp
rename to editor/GrWnd.cpp
diff --git a/legacy/editor/GrWnd.h b/editor/GrWnd.h
similarity index 100%
rename from legacy/editor/GrWnd.h
rename to editor/GrWnd.h
diff --git a/legacy/editor/Group.cpp b/editor/Group.cpp
similarity index 100%
rename from legacy/editor/Group.cpp
rename to editor/Group.cpp
diff --git a/legacy/editor/HFile.cpp b/editor/HFile.cpp
similarity index 100%
rename from legacy/editor/HFile.cpp
rename to editor/HFile.cpp
diff --git a/legacy/editor/HFile.h b/editor/HFile.h
similarity index 100%
rename from legacy/editor/HFile.h
rename to editor/HFile.h
diff --git a/legacy/editor/HObject.cpp b/editor/HObject.cpp
similarity index 100%
rename from legacy/editor/HObject.cpp
rename to editor/HObject.cpp
diff --git a/legacy/editor/HObject.h b/editor/HObject.h
similarity index 100%
rename from legacy/editor/HObject.h
rename to editor/HObject.h
diff --git a/legacy/editor/HRoom.cpp b/editor/HRoom.cpp
similarity index 100%
rename from legacy/editor/HRoom.cpp
rename to editor/HRoom.cpp
diff --git a/legacy/editor/HRoom.h b/editor/HRoom.h
similarity index 100%
rename from legacy/editor/HRoom.h
rename to editor/HRoom.h
diff --git a/legacy/editor/HTexture.cpp b/editor/HTexture.cpp
similarity index 100%
rename from legacy/editor/HTexture.cpp
rename to editor/HTexture.cpp
diff --git a/legacy/editor/HTexture.h b/editor/HTexture.h
similarity index 100%
rename from legacy/editor/HTexture.h
rename to editor/HTexture.h
diff --git a/legacy/editor/HView.cpp b/editor/HView.cpp
similarity index 100%
rename from legacy/editor/HView.cpp
rename to editor/HView.cpp
diff --git a/legacy/editor/HView.h b/editor/HView.h
similarity index 100%
rename from legacy/editor/HView.h
rename to editor/HView.h
diff --git a/legacy/editor/HogDialog.cpp b/editor/HogDialog.cpp
similarity index 100%
rename from legacy/editor/HogDialog.cpp
rename to editor/HogDialog.cpp
diff --git a/legacy/editor/HogDialog.h b/editor/HogDialog.h
similarity index 100%
rename from legacy/editor/HogDialog.h
rename to editor/HogDialog.h
diff --git a/legacy/editor/IpFrame.cpp b/editor/IpFrame.cpp
similarity index 100%
rename from legacy/editor/IpFrame.cpp
rename to editor/IpFrame.cpp
diff --git a/legacy/editor/IpFrame.h b/editor/IpFrame.h
similarity index 100%
rename from legacy/editor/IpFrame.h
rename to editor/IpFrame.h
diff --git a/legacy/editor/KeypadDialog.cpp b/editor/KeypadDialog.cpp
similarity index 100%
rename from legacy/editor/KeypadDialog.cpp
rename to editor/KeypadDialog.cpp
diff --git a/legacy/editor/KeypadDialog.h b/editor/KeypadDialog.h
similarity index 100%
rename from legacy/editor/KeypadDialog.h
rename to editor/KeypadDialog.h
diff --git a/legacy/editor/LevelDialog.cpp b/editor/LevelDialog.cpp
similarity index 100%
rename from legacy/editor/LevelDialog.cpp
rename to editor/LevelDialog.cpp
diff --git a/legacy/editor/LevelDialog.h b/editor/LevelDialog.h
similarity index 100%
rename from legacy/editor/LevelDialog.h
rename to editor/LevelDialog.h
diff --git a/legacy/editor/LevelInfoDialog.cpp b/editor/LevelInfoDialog.cpp
similarity index 100%
rename from legacy/editor/LevelInfoDialog.cpp
rename to editor/LevelInfoDialog.cpp
diff --git a/legacy/editor/LevelInfoDialog.h b/editor/LevelInfoDialog.h
similarity index 100%
rename from legacy/editor/LevelInfoDialog.h
rename to editor/LevelInfoDialog.h
diff --git a/legacy/editor/LightingDialog.cpp b/editor/LightingDialog.cpp
similarity index 100%
rename from legacy/editor/LightingDialog.cpp
rename to editor/LightingDialog.cpp
diff --git a/legacy/editor/LightingDialog.h b/editor/LightingDialog.h
similarity index 100%
rename from legacy/editor/LightingDialog.h
rename to editor/LightingDialog.h
diff --git a/legacy/editor/LightingStatus.cpp b/editor/LightingStatus.cpp
similarity index 100%
rename from legacy/editor/LightingStatus.cpp
rename to editor/LightingStatus.cpp
diff --git a/legacy/editor/LightingStatus.h b/editor/LightingStatus.h
similarity index 100%
rename from legacy/editor/LightingStatus.h
rename to editor/LightingStatus.h
diff --git a/legacy/editor/MainFrm.cpp b/editor/MainFrm.cpp
similarity index 100%
rename from legacy/editor/MainFrm.cpp
rename to editor/MainFrm.cpp
diff --git a/legacy/editor/MainFrm.h b/editor/MainFrm.h
similarity index 100%
rename from legacy/editor/MainFrm.h
rename to editor/MainFrm.h
diff --git a/legacy/editor/ManageCheckin.cpp b/editor/ManageCheckin.cpp
similarity index 100%
rename from legacy/editor/ManageCheckin.cpp
rename to editor/ManageCheckin.cpp
diff --git a/legacy/editor/ManageCheckin.h b/editor/ManageCheckin.h
similarity index 100%
rename from legacy/editor/ManageCheckin.h
rename to editor/ManageCheckin.h
diff --git a/legacy/editor/MegacellDialog.cpp b/editor/MegacellDialog.cpp
similarity index 100%
rename from legacy/editor/MegacellDialog.cpp
rename to editor/MegacellDialog.cpp
diff --git a/legacy/editor/MegacellDialog.h b/editor/MegacellDialog.h
similarity index 100%
rename from legacy/editor/MegacellDialog.h
rename to editor/MegacellDialog.h
diff --git a/legacy/editor/MegacellKeypad.cpp b/editor/MegacellKeypad.cpp
similarity index 100%
rename from legacy/editor/MegacellKeypad.cpp
rename to editor/MegacellKeypad.cpp
diff --git a/legacy/editor/MegacellKeypad.h b/editor/MegacellKeypad.h
similarity index 100%
rename from legacy/editor/MegacellKeypad.h
rename to editor/MegacellKeypad.h
diff --git a/legacy/editor/ObjCScript.cpp b/editor/ObjCScript.cpp
similarity index 100%
rename from legacy/editor/ObjCScript.cpp
rename to editor/ObjCScript.cpp
diff --git a/legacy/editor/ObjCScript.h b/editor/ObjCScript.h
similarity index 100%
rename from legacy/editor/ObjCScript.h
rename to editor/ObjCScript.h
diff --git a/legacy/editor/ObjMoveManager.cpp b/editor/ObjMoveManager.cpp
similarity index 100%
rename from legacy/editor/ObjMoveManager.cpp
rename to editor/ObjMoveManager.cpp
diff --git a/legacy/editor/ObjMoveManager.h b/editor/ObjMoveManager.h
similarity index 100%
rename from legacy/editor/ObjMoveManager.h
rename to editor/ObjMoveManager.h
diff --git a/legacy/editor/ObjectClipboard.cpp b/editor/ObjectClipboard.cpp
similarity index 100%
rename from legacy/editor/ObjectClipboard.cpp
rename to editor/ObjectClipboard.cpp
diff --git a/legacy/editor/ObjectClipboard.h b/editor/ObjectClipboard.h
similarity index 100%
rename from legacy/editor/ObjectClipboard.h
rename to editor/ObjectClipboard.h
diff --git a/legacy/editor/ObjectDialog.cpp b/editor/ObjectDialog.cpp
similarity index 100%
rename from legacy/editor/ObjectDialog.cpp
rename to editor/ObjectDialog.cpp
diff --git a/legacy/editor/ObjectDialog.h b/editor/ObjectDialog.h
similarity index 100%
rename from legacy/editor/ObjectDialog.h
rename to editor/ObjectDialog.h
diff --git a/legacy/editor/ObjectListCombo.cpp b/editor/ObjectListCombo.cpp
similarity index 100%
rename from legacy/editor/ObjectListCombo.cpp
rename to editor/ObjectListCombo.cpp
diff --git a/legacy/editor/ObjectListCombo.h b/editor/ObjectListCombo.h
similarity index 100%
rename from legacy/editor/ObjectListCombo.h
rename to editor/ObjectListCombo.h
diff --git a/legacy/editor/ObjectListDialog.cpp b/editor/ObjectListDialog.cpp
similarity index 100%
rename from legacy/editor/ObjectListDialog.cpp
rename to editor/ObjectListDialog.cpp
diff --git a/legacy/editor/ObjectListDialog.h b/editor/ObjectListDialog.h
similarity index 100%
rename from legacy/editor/ObjectListDialog.h
rename to editor/ObjectListDialog.h
diff --git a/legacy/editor/ObjectPropertiesDialog.cpp b/editor/ObjectPropertiesDialog.cpp
similarity index 100%
rename from legacy/editor/ObjectPropertiesDialog.cpp
rename to editor/ObjectPropertiesDialog.cpp
diff --git a/legacy/editor/ObjectPropertiesDialog.h b/editor/ObjectPropertiesDialog.h
similarity index 100%
rename from legacy/editor/ObjectPropertiesDialog.h
rename to editor/ObjectPropertiesDialog.h
diff --git a/legacy/editor/OrphanRemoveDlg.cpp b/editor/OrphanRemoveDlg.cpp
similarity index 100%
rename from legacy/editor/OrphanRemoveDlg.cpp
rename to editor/OrphanRemoveDlg.cpp
diff --git a/legacy/editor/OrphanRemoveDlg.h b/editor/OrphanRemoveDlg.h
similarity index 100%
rename from legacy/editor/OrphanRemoveDlg.h
rename to editor/OrphanRemoveDlg.h
diff --git a/legacy/editor/OsirisStatusDlg.cpp b/editor/OsirisStatusDlg.cpp
similarity index 100%
rename from legacy/editor/OsirisStatusDlg.cpp
rename to editor/OsirisStatusDlg.cpp
diff --git a/legacy/editor/OsirisStatusDlg.h b/editor/OsirisStatusDlg.h
similarity index 100%
rename from legacy/editor/OsirisStatusDlg.h
rename to editor/OsirisStatusDlg.h
diff --git a/legacy/editor/PathPadDialog.cpp b/editor/PathPadDialog.cpp
similarity index 100%
rename from legacy/editor/PathPadDialog.cpp
rename to editor/PathPadDialog.cpp
diff --git a/legacy/editor/PathPadDialog.h b/editor/PathPadDialog.h
similarity index 100%
rename from legacy/editor/PathPadDialog.h
rename to editor/PathPadDialog.h
diff --git a/legacy/editor/PhysicsDlg.cpp b/editor/PhysicsDlg.cpp
similarity index 100%
rename from legacy/editor/PhysicsDlg.cpp
rename to editor/PhysicsDlg.cpp
diff --git a/legacy/editor/PhysicsDlg.h b/editor/PhysicsDlg.h
similarity index 100%
rename from legacy/editor/PhysicsDlg.h
rename to editor/PhysicsDlg.h
diff --git a/legacy/editor/PictListBox.cpp b/editor/PictListBox.cpp
similarity index 100%
rename from legacy/editor/PictListBox.cpp
rename to editor/PictListBox.cpp
diff --git a/legacy/editor/PictListBox.h b/editor/PictListBox.h
similarity index 100%
rename from legacy/editor/PictListBox.h
rename to editor/PictListBox.h
diff --git a/legacy/editor/PlayerWeaponsDialog.cpp b/editor/PlayerWeaponsDialog.cpp
similarity index 100%
rename from legacy/editor/PlayerWeaponsDialog.cpp
rename to editor/PlayerWeaponsDialog.cpp
diff --git a/legacy/editor/PlayerWeaponsDialog.h b/editor/PlayerWeaponsDialog.h
similarity index 100%
rename from legacy/editor/PlayerWeaponsDialog.h
rename to editor/PlayerWeaponsDialog.h
diff --git a/legacy/editor/PowerupPropDialog.cpp b/editor/PowerupPropDialog.cpp
similarity index 100%
rename from legacy/editor/PowerupPropDialog.cpp
rename to editor/PowerupPropDialog.cpp
diff --git a/legacy/editor/PowerupPropDialog.h b/editor/PowerupPropDialog.h
similarity index 100%
rename from legacy/editor/PowerupPropDialog.h
rename to editor/PowerupPropDialog.h
diff --git a/legacy/editor/PreferencesDialog.cpp b/editor/PreferencesDialog.cpp
similarity index 100%
rename from legacy/editor/PreferencesDialog.cpp
rename to editor/PreferencesDialog.cpp
diff --git a/legacy/editor/PreferencesDialog.h b/editor/PreferencesDialog.h
similarity index 100%
rename from legacy/editor/PreferencesDialog.h
rename to editor/PreferencesDialog.h
diff --git a/legacy/editor/ProceduralDialog.cpp b/editor/ProceduralDialog.cpp
similarity index 100%
rename from legacy/editor/ProceduralDialog.cpp
rename to editor/ProceduralDialog.cpp
diff --git a/legacy/editor/ProceduralDialog.h b/editor/ProceduralDialog.h
similarity index 100%
rename from legacy/editor/ProceduralDialog.h
rename to editor/ProceduralDialog.h
diff --git a/legacy/editor/ProgressWnd.cpp b/editor/ProgressWnd.cpp
similarity index 100%
rename from legacy/editor/ProgressWnd.cpp
rename to editor/ProgressWnd.cpp
diff --git a/legacy/editor/ProgressWnd.h b/editor/ProgressWnd.h
similarity index 100%
rename from legacy/editor/ProgressWnd.h
rename to editor/ProgressWnd.h
diff --git a/legacy/editor/PropertyAIDlg.cpp b/editor/PropertyAIDlg.cpp
similarity index 100%
rename from legacy/editor/PropertyAIDlg.cpp
rename to editor/PropertyAIDlg.cpp
diff --git a/legacy/editor/PropertyAIDlg.h b/editor/PropertyAIDlg.h
similarity index 100%
rename from legacy/editor/PropertyAIDlg.h
rename to editor/PropertyAIDlg.h
diff --git a/legacy/editor/PropertyPhysicsDlg.cpp b/editor/PropertyPhysicsDlg.cpp
similarity index 100%
rename from legacy/editor/PropertyPhysicsDlg.cpp
rename to editor/PropertyPhysicsDlg.cpp
diff --git a/legacy/editor/PropertyPhysicsDlg.h b/editor/PropertyPhysicsDlg.h
similarity index 100%
rename from legacy/editor/PropertyPhysicsDlg.h
rename to editor/PropertyPhysicsDlg.h
diff --git a/legacy/editor/QuickCompile.cpp b/editor/QuickCompile.cpp
similarity index 100%
rename from legacy/editor/QuickCompile.cpp
rename to editor/QuickCompile.cpp
diff --git a/legacy/editor/QuickCompile.h b/editor/QuickCompile.h
similarity index 100%
rename from legacy/editor/QuickCompile.h
rename to editor/QuickCompile.h
diff --git a/legacy/editor/Read3ds.cpp b/editor/Read3ds.cpp
similarity index 100%
rename from legacy/editor/Read3ds.cpp
rename to editor/Read3ds.cpp
diff --git a/legacy/editor/RobotEditWeaponsDialog.cpp b/editor/RobotEditWeaponsDialog.cpp
similarity index 100%
rename from legacy/editor/RobotEditWeaponsDialog.cpp
rename to editor/RobotEditWeaponsDialog.cpp
diff --git a/legacy/editor/RobotEditWeaponsDialog.h b/editor/RobotEditWeaponsDialog.h
similarity index 100%
rename from legacy/editor/RobotEditWeaponsDialog.h
rename to editor/RobotEditWeaponsDialog.h
diff --git a/legacy/editor/RoomListCombo.cpp b/editor/RoomListCombo.cpp
similarity index 100%
rename from legacy/editor/RoomListCombo.cpp
rename to editor/RoomListCombo.cpp
diff --git a/legacy/editor/RoomListCombo.h b/editor/RoomListCombo.h
similarity index 100%
rename from legacy/editor/RoomListCombo.h
rename to editor/RoomListCombo.h
diff --git a/legacy/editor/RoomUVs.cpp b/editor/RoomUVs.cpp
similarity index 100%
rename from legacy/editor/RoomUVs.cpp
rename to editor/RoomUVs.cpp
diff --git a/legacy/editor/RoomUVs.h b/editor/RoomUVs.h
similarity index 100%
rename from legacy/editor/RoomUVs.h
rename to editor/RoomUVs.h
diff --git a/legacy/editor/ScriptCompilerAPI.cpp b/editor/ScriptCompilerAPI.cpp
similarity index 100%
rename from legacy/editor/ScriptCompilerAPI.cpp
rename to editor/ScriptCompilerAPI.cpp
diff --git a/legacy/editor/ScriptCompilerAPI.h b/editor/ScriptCompilerAPI.h
similarity index 100%
rename from legacy/editor/ScriptCompilerAPI.h
rename to editor/ScriptCompilerAPI.h
diff --git a/legacy/editor/ScriptEditorDlg.cpp b/editor/ScriptEditorDlg.cpp
similarity index 100%
rename from legacy/editor/ScriptEditorDlg.cpp
rename to editor/ScriptEditorDlg.cpp
diff --git a/legacy/editor/ScriptEditorDlg.h b/editor/ScriptEditorDlg.h
similarity index 100%
rename from legacy/editor/ScriptEditorDlg.h
rename to editor/ScriptEditorDlg.h
diff --git a/legacy/editor/ScriptLevelInterface.cpp b/editor/ScriptLevelInterface.cpp
similarity index 100%
rename from legacy/editor/ScriptLevelInterface.cpp
rename to editor/ScriptLevelInterface.cpp
diff --git a/legacy/editor/ScriptLevelInterface.h b/editor/ScriptLevelInterface.h
similarity index 100%
rename from legacy/editor/ScriptLevelInterface.h
rename to editor/ScriptLevelInterface.h
diff --git a/legacy/editor/ScriptMassCompile.cpp b/editor/ScriptMassCompile.cpp
similarity index 100%
rename from legacy/editor/ScriptMassCompile.cpp
rename to editor/ScriptMassCompile.cpp
diff --git a/legacy/editor/ScriptMassCompile.h b/editor/ScriptMassCompile.h
similarity index 100%
rename from legacy/editor/ScriptMassCompile.h
rename to editor/ScriptMassCompile.h
diff --git a/legacy/editor/ScriptParmDialog.cpp b/editor/ScriptParmDialog.cpp
similarity index 100%
rename from legacy/editor/ScriptParmDialog.cpp
rename to editor/ScriptParmDialog.cpp
diff --git a/legacy/editor/ScriptParmDialog.h b/editor/ScriptParmDialog.h
similarity index 100%
rename from legacy/editor/ScriptParmDialog.h
rename to editor/ScriptParmDialog.h
diff --git a/legacy/editor/ScriptSelect.cpp b/editor/ScriptSelect.cpp
similarity index 100%
rename from legacy/editor/ScriptSelect.cpp
rename to editor/ScriptSelect.cpp
diff --git a/legacy/editor/ScriptSelect.h b/editor/ScriptSelect.h
similarity index 100%
rename from legacy/editor/ScriptSelect.h
rename to editor/ScriptSelect.h
diff --git a/legacy/editor/ScriptStudio.cpp b/editor/ScriptStudio.cpp
similarity index 100%
rename from legacy/editor/ScriptStudio.cpp
rename to editor/ScriptStudio.cpp
diff --git a/legacy/editor/ScriptStudio.h b/editor/ScriptStudio.h
similarity index 100%
rename from legacy/editor/ScriptStudio.h
rename to editor/ScriptStudio.h
diff --git a/legacy/editor/ScriptSyncDialog.cpp b/editor/ScriptSyncDialog.cpp
similarity index 100%
rename from legacy/editor/ScriptSyncDialog.cpp
rename to editor/ScriptSyncDialog.cpp
diff --git a/legacy/editor/ScriptSyncDialog.h b/editor/ScriptSyncDialog.h
similarity index 100%
rename from legacy/editor/ScriptSyncDialog.h
rename to editor/ScriptSyncDialog.h
diff --git a/legacy/editor/ScriptWizard.cpp b/editor/ScriptWizard.cpp
similarity index 100%
rename from legacy/editor/ScriptWizard.cpp
rename to editor/ScriptWizard.cpp
diff --git a/legacy/editor/ScriptWizard.h b/editor/ScriptWizard.h
similarity index 100%
rename from legacy/editor/ScriptWizard.h
rename to editor/ScriptWizard.h
diff --git a/legacy/editor/SelManager.cpp b/editor/SelManager.cpp
similarity index 100%
rename from legacy/editor/SelManager.cpp
rename to editor/SelManager.cpp
diff --git a/legacy/editor/SelManager.h b/editor/SelManager.h
similarity index 100%
rename from legacy/editor/SelManager.h
rename to editor/SelManager.h
diff --git a/legacy/editor/SelectRangeDialog.cpp b/editor/SelectRangeDialog.cpp
similarity index 100%
rename from legacy/editor/SelectRangeDialog.cpp
rename to editor/SelectRangeDialog.cpp
diff --git a/legacy/editor/SelectRangeDialog.h b/editor/SelectRangeDialog.h
similarity index 100%
rename from legacy/editor/SelectRangeDialog.h
rename to editor/SelectRangeDialog.h
diff --git a/legacy/editor/SoundListCombo.cpp b/editor/SoundListCombo.cpp
similarity index 100%
rename from legacy/editor/SoundListCombo.cpp
rename to editor/SoundListCombo.cpp
diff --git a/legacy/editor/SoundListCombo.h b/editor/SoundListCombo.h
similarity index 100%
rename from legacy/editor/SoundListCombo.h
rename to editor/SoundListCombo.h
diff --git a/legacy/editor/SoundSourceDialog.cpp b/editor/SoundSourceDialog.cpp
similarity index 100%
rename from legacy/editor/SoundSourceDialog.cpp
rename to editor/SoundSourceDialog.cpp
diff --git a/legacy/editor/SoundSourceDialog.h b/editor/SoundSourceDialog.h
similarity index 100%
rename from legacy/editor/SoundSourceDialog.h
rename to editor/SoundSourceDialog.h
diff --git a/legacy/editor/SrvrItem.cpp b/editor/SrvrItem.cpp
similarity index 100%
rename from legacy/editor/SrvrItem.cpp
rename to editor/SrvrItem.cpp
diff --git a/legacy/editor/SrvrItem.h b/editor/SrvrItem.h
similarity index 100%
rename from legacy/editor/SrvrItem.h
rename to editor/SrvrItem.h
diff --git a/legacy/editor/StatusDlg.cpp b/editor/StatusDlg.cpp
similarity index 100%
rename from legacy/editor/StatusDlg.cpp
rename to editor/StatusDlg.cpp
diff --git a/legacy/editor/StatusDlg.h b/editor/StatusDlg.h
similarity index 100%
rename from legacy/editor/StatusDlg.h
rename to editor/StatusDlg.h
diff --git a/legacy/editor/StdAfx.cpp b/editor/StdAfx.cpp
similarity index 100%
rename from legacy/editor/StdAfx.cpp
rename to editor/StdAfx.cpp
diff --git a/legacy/editor/StdAfx.h b/editor/StdAfx.h
similarity index 97%
rename from legacy/editor/StdAfx.h
rename to editor/StdAfx.h
index 49431f65..b8358303 100644
--- a/legacy/editor/StdAfx.h
+++ b/editor/StdAfx.h
@@ -21,6 +21,8 @@
 //      are changed infrequently
 //
 
+#pragma once
+
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
 #include <afxwin.h>         // MFC core and standard components
@@ -30,7 +32,5 @@
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
 #include <afxole.h>			// MFC OLE support (ADDED BY SAMIR)
-
-
-
+#include <windows.h>
 
diff --git a/legacy/editor/TableFileEdit.cpp b/editor/TableFileEdit.cpp
similarity index 100%
rename from legacy/editor/TableFileEdit.cpp
rename to editor/TableFileEdit.cpp
diff --git a/legacy/editor/TableFileEdit.h b/editor/TableFileEdit.h
similarity index 100%
rename from legacy/editor/TableFileEdit.h
rename to editor/TableFileEdit.h
diff --git a/legacy/editor/TableFileFilter.cpp b/editor/TableFileFilter.cpp
similarity index 100%
rename from legacy/editor/TableFileFilter.cpp
rename to editor/TableFileFilter.cpp
diff --git a/legacy/editor/TableFileFilter.h b/editor/TableFileFilter.h
similarity index 100%
rename from legacy/editor/TableFileFilter.h
rename to editor/TableFileFilter.h
diff --git a/legacy/editor/TableFileFilterAddDlg.cpp b/editor/TableFileFilterAddDlg.cpp
similarity index 100%
rename from legacy/editor/TableFileFilterAddDlg.cpp
rename to editor/TableFileFilterAddDlg.cpp
diff --git a/legacy/editor/TableFileFilterAddDlg.h b/editor/TableFileFilterAddDlg.h
similarity index 100%
rename from legacy/editor/TableFileFilterAddDlg.h
rename to editor/TableFileFilterAddDlg.h
diff --git a/legacy/editor/TableFileFilterMng.cpp b/editor/TableFileFilterMng.cpp
similarity index 100%
rename from legacy/editor/TableFileFilterMng.cpp
rename to editor/TableFileFilterMng.cpp
diff --git a/legacy/editor/TableFileFilterMng.h b/editor/TableFileFilterMng.h
similarity index 100%
rename from legacy/editor/TableFileFilterMng.h
rename to editor/TableFileFilterMng.h
diff --git a/legacy/editor/TableManage.cpp b/editor/TableManage.cpp
similarity index 100%
rename from legacy/editor/TableManage.cpp
rename to editor/TableManage.cpp
diff --git a/legacy/editor/TableManage.h b/editor/TableManage.h
similarity index 100%
rename from legacy/editor/TableManage.h
rename to editor/TableManage.h
diff --git a/legacy/editor/TerrainDialog.cpp b/editor/TerrainDialog.cpp
similarity index 100%
rename from legacy/editor/TerrainDialog.cpp
rename to editor/TerrainDialog.cpp
diff --git a/legacy/editor/TerrainDialog.h b/editor/TerrainDialog.h
similarity index 100%
rename from legacy/editor/TerrainDialog.h
rename to editor/TerrainDialog.h
diff --git a/legacy/editor/TerrainSoundDialog.cpp b/editor/TerrainSoundDialog.cpp
similarity index 100%
rename from legacy/editor/TerrainSoundDialog.cpp
rename to editor/TerrainSoundDialog.cpp
diff --git a/legacy/editor/TerrainSoundDialog.h b/editor/TerrainSoundDialog.h
similarity index 100%
rename from legacy/editor/TerrainSoundDialog.h
rename to editor/TerrainSoundDialog.h
diff --git a/legacy/editor/TextureDialog.cpp b/editor/TextureDialog.cpp
similarity index 100%
rename from legacy/editor/TextureDialog.cpp
rename to editor/TextureDialog.cpp
diff --git a/legacy/editor/TextureDialog.h b/editor/TextureDialog.h
similarity index 100%
rename from legacy/editor/TextureDialog.h
rename to editor/TextureDialog.h
diff --git a/legacy/editor/TextureGrWnd.cpp b/editor/TextureGrWnd.cpp
similarity index 100%
rename from legacy/editor/TextureGrWnd.cpp
rename to editor/TextureGrWnd.cpp
diff --git a/legacy/editor/TextureGrWnd.h b/editor/TextureGrWnd.h
similarity index 100%
rename from legacy/editor/TextureGrWnd.h
rename to editor/TextureGrWnd.h
diff --git a/legacy/editor/TriggerDialog.cpp b/editor/TriggerDialog.cpp
similarity index 100%
rename from legacy/editor/TriggerDialog.cpp
rename to editor/TriggerDialog.cpp
diff --git a/legacy/editor/TriggerDialog.h b/editor/TriggerDialog.h
similarity index 100%
rename from legacy/editor/TriggerDialog.h
rename to editor/TriggerDialog.h
diff --git a/legacy/editor/TriggerListCombo.cpp b/editor/TriggerListCombo.cpp
similarity index 100%
rename from legacy/editor/TriggerListCombo.cpp
rename to editor/TriggerListCombo.cpp
diff --git a/legacy/editor/TriggerListCombo.h b/editor/TriggerListCombo.h
similarity index 100%
rename from legacy/editor/TriggerListCombo.h
rename to editor/TriggerListCombo.h
diff --git a/legacy/editor/ViewerPropDlg.cpp b/editor/ViewerPropDlg.cpp
similarity index 100%
rename from legacy/editor/ViewerPropDlg.cpp
rename to editor/ViewerPropDlg.cpp
diff --git a/legacy/editor/ViewerPropDlg.h b/editor/ViewerPropDlg.h
similarity index 100%
rename from legacy/editor/ViewerPropDlg.h
rename to editor/ViewerPropDlg.h
diff --git a/legacy/editor/VirtualCompilerConfig.cpp b/editor/VirtualCompilerConfig.cpp
similarity index 100%
rename from legacy/editor/VirtualCompilerConfig.cpp
rename to editor/VirtualCompilerConfig.cpp
diff --git a/legacy/editor/VirtualCompilerConfig.h b/editor/VirtualCompilerConfig.h
similarity index 100%
rename from legacy/editor/VirtualCompilerConfig.h
rename to editor/VirtualCompilerConfig.h
diff --git a/legacy/editor/WaterProceduralDialog.cpp b/editor/WaterProceduralDialog.cpp
similarity index 100%
rename from legacy/editor/WaterProceduralDialog.cpp
rename to editor/WaterProceduralDialog.cpp
diff --git a/legacy/editor/WaterProceduralDialog.h b/editor/WaterProceduralDialog.h
similarity index 100%
rename from legacy/editor/WaterProceduralDialog.h
rename to editor/WaterProceduralDialog.h
diff --git a/legacy/editor/WireframeGrWnd.cpp b/editor/WireframeGrWnd.cpp
similarity index 100%
rename from legacy/editor/WireframeGrWnd.cpp
rename to editor/WireframeGrWnd.cpp
diff --git a/legacy/editor/WireframeGrWnd.h b/editor/WireframeGrWnd.h
similarity index 100%
rename from legacy/editor/WireframeGrWnd.h
rename to editor/WireframeGrWnd.h
diff --git a/legacy/editor/WorldObjectsDoorDialog.cpp b/editor/WorldObjectsDoorDialog.cpp
similarity index 100%
rename from legacy/editor/WorldObjectsDoorDialog.cpp
rename to editor/WorldObjectsDoorDialog.cpp
diff --git a/legacy/editor/WorldObjectsDoorDialog.h b/editor/WorldObjectsDoorDialog.h
similarity index 100%
rename from legacy/editor/WorldObjectsDoorDialog.h
rename to editor/WorldObjectsDoorDialog.h
diff --git a/legacy/editor/WorldObjectsGenericDialog.cpp b/editor/WorldObjectsGenericDialog.cpp
similarity index 100%
rename from legacy/editor/WorldObjectsGenericDialog.cpp
rename to editor/WorldObjectsGenericDialog.cpp
diff --git a/legacy/editor/WorldObjectsGenericDialog.h b/editor/WorldObjectsGenericDialog.h
similarity index 100%
rename from legacy/editor/WorldObjectsGenericDialog.h
rename to editor/WorldObjectsGenericDialog.h
diff --git a/legacy/editor/WorldObjectsLightDialog.cpp b/editor/WorldObjectsLightDialog.cpp
similarity index 100%
rename from legacy/editor/WorldObjectsLightDialog.cpp
rename to editor/WorldObjectsLightDialog.cpp
diff --git a/legacy/editor/WorldObjectsLightDialog.h b/editor/WorldObjectsLightDialog.h
similarity index 100%
rename from legacy/editor/WorldObjectsLightDialog.h
rename to editor/WorldObjectsLightDialog.h
diff --git a/legacy/editor/WorldObjectsPlayerDialog.cpp b/editor/WorldObjectsPlayerDialog.cpp
similarity index 100%
rename from legacy/editor/WorldObjectsPlayerDialog.cpp
rename to editor/WorldObjectsPlayerDialog.cpp
diff --git a/legacy/editor/WorldObjectsPlayerDialog.h b/editor/WorldObjectsPlayerDialog.h
similarity index 100%
rename from legacy/editor/WorldObjectsPlayerDialog.h
rename to editor/WorldObjectsPlayerDialog.h
diff --git a/legacy/editor/WorldObjectsPowerupDialog.cpp b/editor/WorldObjectsPowerupDialog.cpp
similarity index 100%
rename from legacy/editor/WorldObjectsPowerupDialog.cpp
rename to editor/WorldObjectsPowerupDialog.cpp
diff --git a/legacy/editor/WorldObjectsPowerupDialog.h b/editor/WorldObjectsPowerupDialog.h
similarity index 100%
rename from legacy/editor/WorldObjectsPowerupDialog.h
rename to editor/WorldObjectsPowerupDialog.h
diff --git a/legacy/editor/WorldObjectsRobotDialog.cpp b/editor/WorldObjectsRobotDialog.cpp
similarity index 100%
rename from legacy/editor/WorldObjectsRobotDialog.cpp
rename to editor/WorldObjectsRobotDialog.cpp
diff --git a/legacy/editor/WorldObjectsRobotDialog.h b/editor/WorldObjectsRobotDialog.h
similarity index 100%
rename from legacy/editor/WorldObjectsRobotDialog.h
rename to editor/WorldObjectsRobotDialog.h
diff --git a/legacy/editor/WorldSoundsDialog.cpp b/editor/WorldSoundsDialog.cpp
similarity index 100%
rename from legacy/editor/WorldSoundsDialog.cpp
rename to editor/WorldSoundsDialog.cpp
diff --git a/legacy/editor/WorldSoundsDialog.h b/editor/WorldSoundsDialog.h
similarity index 100%
rename from legacy/editor/WorldSoundsDialog.h
rename to editor/WorldSoundsDialog.h
diff --git a/legacy/editor/WorldTexturesDialog.cpp b/editor/WorldTexturesDialog.cpp
similarity index 100%
rename from legacy/editor/WorldTexturesDialog.cpp
rename to editor/WorldTexturesDialog.cpp
diff --git a/legacy/editor/WorldTexturesDialog.h b/editor/WorldTexturesDialog.h
similarity index 100%
rename from legacy/editor/WorldTexturesDialog.h
rename to editor/WorldTexturesDialog.h
diff --git a/legacy/editor/WorldWeaponsDialog.cpp b/editor/WorldWeaponsDialog.cpp
similarity index 100%
rename from legacy/editor/WorldWeaponsDialog.cpp
rename to editor/WorldWeaponsDialog.cpp
diff --git a/legacy/editor/WorldWeaponsDialog.h b/editor/WorldWeaponsDialog.h
similarity index 100%
rename from legacy/editor/WorldWeaponsDialog.h
rename to editor/WorldWeaponsDialog.h
diff --git a/legacy/editor/christest.cpp b/editor/christest.cpp
similarity index 100%
rename from legacy/editor/christest.cpp
rename to editor/christest.cpp
diff --git a/legacy/editor/d3edit.h b/editor/d3edit.h
similarity index 100%
rename from legacy/editor/d3edit.h
rename to editor/d3edit.h
diff --git a/legacy/editor/drawworld.cpp b/editor/drawworld.cpp
similarity index 100%
rename from legacy/editor/drawworld.cpp
rename to editor/drawworld.cpp
diff --git a/legacy/editor/drawworld.h b/editor/drawworld.h
similarity index 100%
rename from legacy/editor/drawworld.h
rename to editor/drawworld.h
diff --git a/legacy/editor/ebnode.cpp b/editor/ebnode.cpp
similarity index 100%
rename from legacy/editor/ebnode.cpp
rename to editor/ebnode.cpp
diff --git a/legacy/editor/ebnode.h b/editor/ebnode.h
similarity index 100%
rename from legacy/editor/ebnode.h
rename to editor/ebnode.h
diff --git a/legacy/editor/editor.cpp b/editor/editor.cpp
similarity index 100%
rename from legacy/editor/editor.cpp
rename to editor/editor.cpp
diff --git a/legacy/editor/editor.h b/editor/editor.h
similarity index 100%
rename from legacy/editor/editor.h
rename to editor/editor.h
diff --git a/legacy/editor/editor.rc b/editor/editor.rc
similarity index 100%
rename from legacy/editor/editor.rc
rename to editor/editor.rc
diff --git a/legacy/editor/editorDoc.cpp b/editor/editorDoc.cpp
similarity index 100%
rename from legacy/editor/editorDoc.cpp
rename to editor/editorDoc.cpp
diff --git a/legacy/editor/editorDoc.h b/editor/editorDoc.h
similarity index 100%
rename from legacy/editor/editorDoc.h
rename to editor/editorDoc.h
diff --git a/legacy/editor/editorView.cpp b/editor/editorView.cpp
similarity index 100%
rename from legacy/editor/editorView.cpp
rename to editor/editorView.cpp
diff --git a/legacy/editor/editorView.h b/editor/editorView.h
similarity index 100%
rename from legacy/editor/editorView.h
rename to editor/editorView.h
diff --git a/legacy/editor/editor_lighting.cpp b/editor/editor_lighting.cpp
similarity index 100%
rename from legacy/editor/editor_lighting.cpp
rename to editor/editor_lighting.cpp
diff --git a/legacy/editor/editor_lighting.h b/editor/editor_lighting.h
similarity index 100%
rename from legacy/editor/editor_lighting.h
rename to editor/editor_lighting.h
diff --git a/legacy/editor/editor_object_lighting.cpp b/editor/editor_object_lighting.cpp
similarity index 100%
rename from legacy/editor/editor_object_lighting.cpp
rename to editor/editor_object_lighting.cpp
diff --git a/legacy/editor/edoors.cpp b/editor/edoors.cpp
similarity index 100%
rename from legacy/editor/edoors.cpp
rename to editor/edoors.cpp
diff --git a/legacy/editor/edoors.h b/editor/edoors.h
similarity index 100%
rename from legacy/editor/edoors.h
rename to editor/edoors.h
diff --git a/legacy/editor/gameeditor.cpp b/editor/gameeditor.cpp
similarity index 100%
rename from legacy/editor/gameeditor.cpp
rename to editor/gameeditor.cpp
diff --git a/legacy/editor/group.h b/editor/group.h
similarity index 100%
rename from legacy/editor/group.h
rename to editor/group.h
diff --git a/legacy/editor/hemicube.h b/editor/hemicube.h
similarity index 100%
rename from legacy/editor/hemicube.h
rename to editor/hemicube.h
diff --git a/legacy/editor/jaytest.cpp b/editor/jaytest.cpp
similarity index 100%
rename from legacy/editor/jaytest.cpp
rename to editor/jaytest.cpp
diff --git a/legacy/editor/levelkeypad.cpp b/editor/levelkeypad.cpp
similarity index 100%
rename from legacy/editor/levelkeypad.cpp
rename to editor/levelkeypad.cpp
diff --git a/legacy/editor/levelkeypad.h b/editor/levelkeypad.h
similarity index 100%
rename from legacy/editor/levelkeypad.h
rename to editor/levelkeypad.h
diff --git a/legacy/editor/matcenkeypad.cpp b/editor/matcenkeypad.cpp
similarity index 100%
rename from legacy/editor/matcenkeypad.cpp
rename to editor/matcenkeypad.cpp
diff --git a/legacy/editor/matcenkeypad.h b/editor/matcenkeypad.h
similarity index 100%
rename from legacy/editor/matcenkeypad.h
rename to editor/matcenkeypad.h
diff --git a/legacy/editor/mmlkjalskdhhlglakh.asp b/editor/mmlkjalskdhhlglakh.asp
similarity index 100%
rename from legacy/editor/mmlkjalskdhhlglakh.asp
rename to editor/mmlkjalskdhhlglakh.asp
diff --git a/legacy/editor/moveworld.cpp b/editor/moveworld.cpp
similarity index 100%
rename from legacy/editor/moveworld.cpp
rename to editor/moveworld.cpp
diff --git a/legacy/editor/moveworld.h b/editor/moveworld.h
similarity index 100%
rename from legacy/editor/moveworld.h
rename to editor/moveworld.h
diff --git a/legacy/editor/rad_cast.cpp b/editor/rad_cast.cpp
similarity index 100%
rename from legacy/editor/rad_cast.cpp
rename to editor/rad_cast.cpp
diff --git a/legacy/editor/rad_cast.h b/editor/rad_cast.h
similarity index 100%
rename from legacy/editor/rad_cast.h
rename to editor/rad_cast.h
diff --git a/legacy/editor/rad_hemicube.cpp b/editor/rad_hemicube.cpp
similarity index 100%
rename from legacy/editor/rad_hemicube.cpp
rename to editor/rad_hemicube.cpp
diff --git a/legacy/editor/rad_init.cpp b/editor/rad_init.cpp
similarity index 100%
rename from legacy/editor/rad_init.cpp
rename to editor/rad_init.cpp
diff --git a/legacy/editor/radiosity.h b/editor/radiosity.h
similarity index 100%
rename from legacy/editor/radiosity.h
rename to editor/radiosity.h
diff --git a/legacy/editor/radscan_leftedge.h b/editor/radscan_leftedge.h
similarity index 100%
rename from legacy/editor/radscan_leftedge.h
rename to editor/radscan_leftedge.h
diff --git a/legacy/editor/radscan_rightedge.h b/editor/radscan_rightedge.h
similarity index 100%
rename from legacy/editor/radscan_rightedge.h
rename to editor/radscan_rightedge.h
diff --git a/legacy/editor/read3ds.h b/editor/read3ds.h
similarity index 100%
rename from legacy/editor/read3ds.h
rename to editor/read3ds.h
diff --git a/legacy/editor/res/D3.bmp b/editor/res/D3.bmp
similarity index 100%
rename from legacy/editor/res/D3.bmp
rename to editor/res/D3.bmp
diff --git a/legacy/editor/res/DallasTreeIcons.bmp b/editor/res/DallasTreeIcons.bmp
similarity index 100%
rename from legacy/editor/res/DallasTreeIcons.bmp
rename to editor/res/DallasTreeIcons.bmp
diff --git a/legacy/editor/res/IToolbar.bmp b/editor/res/IToolbar.bmp
similarity index 100%
rename from legacy/editor/res/IToolbar.bmp
rename to editor/res/IToolbar.bmp
diff --git a/legacy/editor/res/Matt2.bmp b/editor/res/Matt2.bmp
similarity index 100%
rename from legacy/editor/res/Matt2.bmp
rename to editor/res/Matt2.bmp
diff --git a/legacy/editor/res/Toolbar.bmp b/editor/res/Toolbar.bmp
similarity index 100%
rename from legacy/editor/res/Toolbar.bmp
rename to editor/res/Toolbar.bmp
diff --git a/legacy/editor/res/east.bmp b/editor/res/east.bmp
similarity index 100%
rename from legacy/editor/res/east.bmp
rename to editor/res/east.bmp
diff --git a/legacy/editor/res/editor.ico b/editor/res/editor.ico
similarity index 100%
rename from legacy/editor/res/editor.ico
rename to editor/res/editor.ico
diff --git a/legacy/editor/res/editor.rc2 b/editor/res/editor.rc2
similarity index 100%
rename from legacy/editor/res/editor.rc2
rename to editor/res/editor.rc2
diff --git a/legacy/editor/res/editorDoc.ico b/editor/res/editorDoc.ico
similarity index 100%
rename from legacy/editor/res/editorDoc.ico
rename to editor/res/editorDoc.ico
diff --git a/legacy/editor/res/inarrow.bmp b/editor/res/inarrow.bmp
similarity index 100%
rename from legacy/editor/res/inarrow.bmp
rename to editor/res/inarrow.bmp
diff --git a/legacy/editor/res/neast.bmp b/editor/res/neast.bmp
similarity index 100%
rename from legacy/editor/res/neast.bmp
rename to editor/res/neast.bmp
diff --git a/legacy/editor/res/north.bmp b/editor/res/north.bmp
similarity index 100%
rename from legacy/editor/res/north.bmp
rename to editor/res/north.bmp
diff --git a/legacy/editor/res/nwest.bmp b/editor/res/nwest.bmp
similarity index 100%
rename from legacy/editor/res/nwest.bmp
rename to editor/res/nwest.bmp
diff --git a/legacy/editor/res/orphremo.bmp b/editor/res/orphremo.bmp
similarity index 100%
rename from legacy/editor/res/orphremo.bmp
rename to editor/res/orphremo.bmp
diff --git a/legacy/editor/res/outarrow.bmp b/editor/res/outarrow.bmp
similarity index 100%
rename from legacy/editor/res/outarrow.bmp
rename to editor/res/outarrow.bmp
diff --git a/legacy/editor/res/rotleft.bmp b/editor/res/rotleft.bmp
similarity index 100%
rename from legacy/editor/res/rotleft.bmp
rename to editor/res/rotleft.bmp
diff --git a/legacy/editor/res/rotright.bmp b/editor/res/rotright.bmp
similarity index 100%
rename from legacy/editor/res/rotright.bmp
rename to editor/res/rotright.bmp
diff --git a/legacy/editor/res/seast.bmp b/editor/res/seast.bmp
similarity index 100%
rename from legacy/editor/res/seast.bmp
rename to editor/res/seast.bmp
diff --git a/legacy/editor/res/south.bmp b/editor/res/south.bmp
similarity index 100%
rename from legacy/editor/res/south.bmp
rename to editor/res/south.bmp
diff --git a/legacy/editor/res/swest.bmp b/editor/res/swest.bmp
similarity index 100%
rename from legacy/editor/res/swest.bmp
rename to editor/res/swest.bmp
diff --git a/legacy/editor/res/west.bmp b/editor/res/west.bmp
similarity index 100%
rename from legacy/editor/res/west.bmp
rename to editor/res/west.bmp
diff --git a/legacy/editor/resource.h b/editor/resource.h
similarity index 100%
rename from legacy/editor/resource.h
rename to editor/resource.h
diff --git a/legacy/editor/resource.hm b/editor/resource.hm
similarity index 100%
rename from legacy/editor/resource.hm
rename to editor/resource.hm
diff --git a/legacy/editor/roomkeypaddialog.cpp b/editor/roomkeypaddialog.cpp
similarity index 100%
rename from legacy/editor/roomkeypaddialog.cpp
rename to editor/roomkeypaddialog.cpp
diff --git a/legacy/editor/roomkeypaddialog.h b/editor/roomkeypaddialog.h
similarity index 100%
rename from legacy/editor/roomkeypaddialog.h
rename to editor/roomkeypaddialog.h
diff --git a/legacy/editor/rotateroom.cpp b/editor/rotateroom.cpp
similarity index 100%
rename from legacy/editor/rotateroom.cpp
rename to editor/rotateroom.cpp
diff --git a/legacy/editor/rotateroom.h b/editor/rotateroom.h
similarity index 100%
rename from legacy/editor/rotateroom.h
rename to editor/rotateroom.h
diff --git a/legacy/editor/selectedroom.cpp b/editor/selectedroom.cpp
similarity index 100%
rename from legacy/editor/selectedroom.cpp
rename to editor/selectedroom.cpp
diff --git a/legacy/editor/selectedroom.h b/editor/selectedroom.h
similarity index 100%
rename from legacy/editor/selectedroom.h
rename to editor/selectedroom.h
diff --git a/lib/renderer.h b/lib/renderer.h
index 6a44552e..3ce315d5 100644
--- a/lib/renderer.h
+++ b/lib/renderer.h
@@ -317,6 +317,8 @@ extern int Triangles_drawn;
 
 // Is this hardware or software rendered?
 enum renderer_type {
+  RENDERER_SOFTWARE_8BIT,
+  RENDERER_SOFTWARE_16BIT,
   RENDERER_OPENGL = 2,
   RENDERER_DIRECT3D = 3,
   RENDERER_GLIDE = 4,