diff --git a/mp/game/mod_hl2mp/cfg/skill.cfg b/game/mod_hl2mp/cfg/skill.cfg
similarity index 100%
rename from mp/game/mod_hl2mp/cfg/skill.cfg
rename to game/mod_hl2mp/cfg/skill.cfg
diff --git a/mp/game/mod_hl2mp/cfg/skill_manifest.cfg b/game/mod_hl2mp/cfg/skill_manifest.cfg
similarity index 100%
rename from mp/game/mod_hl2mp/cfg/skill_manifest.cfg
rename to game/mod_hl2mp/cfg/skill_manifest.cfg
diff --git a/mp/game/mod_hl2mp/gameinfo.txt b/game/mod_hl2mp/gameinfo.txt
similarity index 100%
rename from mp/game/mod_hl2mp/gameinfo.txt
rename to game/mod_hl2mp/gameinfo.txt
diff --git a/mp/game/mod_hl2mp/maps/dm_lockdown.bsp b/game/mod_hl2mp/maps/dm_lockdown.bsp
similarity index 100%
rename from mp/game/mod_hl2mp/maps/dm_lockdown.bsp
rename to game/mod_hl2mp/maps/dm_lockdown.bsp
diff --git a/mp/game/mod_hl2mp/materials/example_model_material.vmt b/game/mod_hl2mp/materials/example_model_material.vmt
similarity index 100%
rename from mp/game/mod_hl2mp/materials/example_model_material.vmt
rename to game/mod_hl2mp/materials/example_model_material.vmt
diff --git a/mp/game/mod_hl2mp/resource/ClientScheme.res b/game/mod_hl2mp/resource/ClientScheme.res
similarity index 100%
rename from mp/game/mod_hl2mp/resource/ClientScheme.res
rename to game/mod_hl2mp/resource/ClientScheme.res
diff --git a/mp/game/mod_hl2mp/resource/GameMenu.res b/game/mod_hl2mp/resource/GameMenu.res
similarity index 100%
rename from mp/game/mod_hl2mp/resource/GameMenu.res
rename to game/mod_hl2mp/resource/GameMenu.res
diff --git a/mp/game/mod_hl2mp/resource/ObjectControlPanelScheme.res b/game/mod_hl2mp/resource/ObjectControlPanelScheme.res
similarity index 100%
rename from mp/game/mod_hl2mp/resource/ObjectControlPanelScheme.res
rename to game/mod_hl2mp/resource/ObjectControlPanelScheme.res
diff --git a/mp/game/mod_hl2mp/resource/PDAControlPanelScheme.res b/game/mod_hl2mp/resource/PDAControlPanelScheme.res
similarity index 100%
rename from mp/game/mod_hl2mp/resource/PDAControlPanelScheme.res
rename to game/mod_hl2mp/resource/PDAControlPanelScheme.res
diff --git a/mp/game/mod_hl2mp/resource/mod_hl2mp_english.txt b/game/mod_hl2mp/resource/mod_hl2mp_english.txt
similarity index 100%
rename from mp/game/mod_hl2mp/resource/mod_hl2mp_english.txt
rename to game/mod_hl2mp/resource/mod_hl2mp_english.txt
diff --git a/mp/game/mod_hl2mp/resource/modevents.res b/game/mod_hl2mp/resource/modevents.res
similarity index 100%
rename from mp/game/mod_hl2mp/resource/modevents.res
rename to game/mod_hl2mp/resource/modevents.res
diff --git a/mp/game/mod_hl2mp/scripts/ChapterBackgrounds.txt b/game/mod_hl2mp/scripts/ChapterBackgrounds.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/ChapterBackgrounds.txt
rename to game/mod_hl2mp/scripts/ChapterBackgrounds.txt
diff --git a/mp/game/mod_hl2mp/scripts/HudAnimations.txt b/game/mod_hl2mp/scripts/HudAnimations.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/HudAnimations.txt
rename to game/mod_hl2mp/scripts/HudAnimations.txt
diff --git a/mp/game/mod_hl2mp/scripts/HudLayout.res b/game/mod_hl2mp/scripts/HudLayout.res
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/HudLayout.res
rename to game/mod_hl2mp/scripts/HudLayout.res
diff --git a/mp/game/mod_hl2mp/scripts/LauncherScheme.res b/game/mod_hl2mp/scripts/LauncherScheme.res
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/LauncherScheme.res
rename to game/mod_hl2mp/scripts/LauncherScheme.res
diff --git a/mp/game/mod_hl2mp/scripts/game.txt b/game/mod_hl2mp/scripts/game.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/game.txt
rename to game/mod_hl2mp/scripts/game.txt
diff --git a/mp/game/mod_hl2mp/scripts/game_sounds_player.txt b/game/mod_hl2mp/scripts/game_sounds_player.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/game_sounds_player.txt
rename to game/mod_hl2mp/scripts/game_sounds_player.txt
diff --git a/mp/game/mod_hl2mp/scripts/game_sounds_weapons.txt b/game/mod_hl2mp/scripts/game_sounds_weapons.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/game_sounds_weapons.txt
rename to game/mod_hl2mp/scripts/game_sounds_weapons.txt
diff --git a/mp/game/mod_hl2mp/scripts/kb_act.lst b/game/mod_hl2mp/scripts/kb_act.lst
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/kb_act.lst
rename to game/mod_hl2mp/scripts/kb_act.lst
diff --git a/mp/game/mod_hl2mp/scripts/kb_def.lst b/game/mod_hl2mp/scripts/kb_def.lst
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/kb_def.lst
rename to game/mod_hl2mp/scripts/kb_def.lst
diff --git a/mp/game/mod_hl2mp/scripts/kb_keys.lst b/game/mod_hl2mp/scripts/kb_keys.lst
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/kb_keys.lst
rename to game/mod_hl2mp/scripts/kb_keys.lst
diff --git a/mp/game/mod_hl2mp/scripts/launcher.txt b/game/mod_hl2mp/scripts/launcher.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/launcher.txt
rename to game/mod_hl2mp/scripts/launcher.txt
diff --git a/mp/game/mod_hl2mp/scripts/mod_textures.txt b/game/mod_hl2mp/scripts/mod_textures.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/mod_textures.txt
rename to game/mod_hl2mp/scripts/mod_textures.txt
diff --git a/mp/game/mod_hl2mp/scripts/soundscapes_labs.txt b/game/mod_hl2mp/scripts/soundscapes_labs.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/soundscapes_labs.txt
rename to game/mod_hl2mp/scripts/soundscapes_labs.txt
diff --git a/mp/game/mod_hl2mp/scripts/soundscapes_manifest.txt b/game/mod_hl2mp/scripts/soundscapes_manifest.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/soundscapes_manifest.txt
rename to game/mod_hl2mp/scripts/soundscapes_manifest.txt
diff --git a/mp/game/mod_hl2mp/scripts/soundscapes_streetwar.txt b/game/mod_hl2mp/scripts/soundscapes_streetwar.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/soundscapes_streetwar.txt
rename to game/mod_hl2mp/scripts/soundscapes_streetwar.txt
diff --git a/mp/game/mod_hl2mp/scripts/soundscapes_strike.txt b/game/mod_hl2mp/scripts/soundscapes_strike.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/soundscapes_strike.txt
rename to game/mod_hl2mp/scripts/soundscapes_strike.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_357.txt b/game/mod_hl2mp/scripts/weapon_357.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_357.txt
rename to game/mod_hl2mp/scripts/weapon_357.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_ar2.txt b/game/mod_hl2mp/scripts/weapon_ar2.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_ar2.txt
rename to game/mod_hl2mp/scripts/weapon_ar2.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_crossbow.txt b/game/mod_hl2mp/scripts/weapon_crossbow.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_crossbow.txt
rename to game/mod_hl2mp/scripts/weapon_crossbow.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_crowbar.txt b/game/mod_hl2mp/scripts/weapon_crowbar.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_crowbar.txt
rename to game/mod_hl2mp/scripts/weapon_crowbar.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_cubemap.txt b/game/mod_hl2mp/scripts/weapon_cubemap.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_cubemap.txt
rename to game/mod_hl2mp/scripts/weapon_cubemap.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_frag.txt b/game/mod_hl2mp/scripts/weapon_frag.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_frag.txt
rename to game/mod_hl2mp/scripts/weapon_frag.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_physcannon.txt b/game/mod_hl2mp/scripts/weapon_physcannon.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_physcannon.txt
rename to game/mod_hl2mp/scripts/weapon_physcannon.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_pistol.txt b/game/mod_hl2mp/scripts/weapon_pistol.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_pistol.txt
rename to game/mod_hl2mp/scripts/weapon_pistol.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_rpg.txt b/game/mod_hl2mp/scripts/weapon_rpg.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_rpg.txt
rename to game/mod_hl2mp/scripts/weapon_rpg.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_shotgun.txt b/game/mod_hl2mp/scripts/weapon_shotgun.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_shotgun.txt
rename to game/mod_hl2mp/scripts/weapon_shotgun.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_slam.txt b/game/mod_hl2mp/scripts/weapon_slam.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_slam.txt
rename to game/mod_hl2mp/scripts/weapon_slam.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_smg1.txt b/game/mod_hl2mp/scripts/weapon_smg1.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_smg1.txt
rename to game/mod_hl2mp/scripts/weapon_smg1.txt
diff --git a/mp/game/mod_hl2mp/scripts/weapon_stunstick.txt b/game/mod_hl2mp/scripts/weapon_stunstick.txt
similarity index 100%
rename from mp/game/mod_hl2mp/scripts/weapon_stunstick.txt
rename to game/mod_hl2mp/scripts/weapon_stunstick.txt
diff --git a/mp/game/mod_hl2mp/shaders/fxc/example_model_ps20b.vcs b/game/mod_hl2mp/shaders/fxc/example_model_ps20b.vcs
similarity index 100%
rename from mp/game/mod_hl2mp/shaders/fxc/example_model_ps20b.vcs
rename to game/mod_hl2mp/shaders/fxc/example_model_ps20b.vcs
diff --git a/mp/game/mod_hl2mp/shaders/fxc/example_model_vs20.vcs b/game/mod_hl2mp/shaders/fxc/example_model_vs20.vcs
similarity index 100%
rename from mp/game/mod_hl2mp/shaders/fxc/example_model_vs20.vcs
rename to game/mod_hl2mp/shaders/fxc/example_model_vs20.vcs
diff --git a/mp/game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20.vcs b/game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20.vcs
similarity index 100%
rename from mp/game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20.vcs
rename to game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20.vcs
diff --git a/mp/game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20b.vcs b/game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20b.vcs
similarity index 100%
rename from mp/game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20b.vcs
rename to game/mod_hl2mp/shaders/fxc/sdk_bloom_ps20b.vcs
diff --git a/mp/game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20.vcs b/game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20.vcs
similarity index 100%
rename from mp/game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20.vcs
rename to game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20.vcs
diff --git a/mp/game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20b.vcs b/game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20b.vcs
similarity index 100%
rename from mp/game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20b.vcs
rename to game/mod_hl2mp/shaders/fxc/sdk_bloomadd_ps20b.vcs
diff --git a/mp/game/mod_hl2mp/shaders/fxc/sdk_screenspaceeffect_vs20.vcs b/game/mod_hl2mp/shaders/fxc/sdk_screenspaceeffect_vs20.vcs
similarity index 100%
rename from mp/game/mod_hl2mp/shaders/fxc/sdk_screenspaceeffect_vs20.vcs
rename to game/mod_hl2mp/shaders/fxc/sdk_screenspaceeffect_vs20.vcs
diff --git a/mp/src/common/GameUI/IGameUI.h b/src/common/GameUI/IGameUI.h
similarity index 100%
rename from mp/src/common/GameUI/IGameUI.h
rename to src/common/GameUI/IGameUI.h
diff --git a/mp/src/common/SteamCommon.h b/src/common/SteamCommon.h
similarity index 100%
rename from mp/src/common/SteamCommon.h
rename to src/common/SteamCommon.h
diff --git a/mp/src/common/compiledcaptionswap.cpp b/src/common/compiledcaptionswap.cpp
similarity index 100%
rename from mp/src/common/compiledcaptionswap.cpp
rename to src/common/compiledcaptionswap.cpp
diff --git a/mp/src/common/hl2orange.spa.h b/src/common/hl2orange.spa.h
similarity index 100%
rename from mp/src/common/hl2orange.spa.h
rename to src/common/hl2orange.spa.h
diff --git a/mp/src/common/language.cpp b/src/common/language.cpp
similarity index 100%
rename from mp/src/common/language.cpp
rename to src/common/language.cpp
diff --git a/mp/src/common/language.h b/src/common/language.h
similarity index 100%
rename from mp/src/common/language.h
rename to src/common/language.h
diff --git a/mp/src/common/lzma/lzma.h b/src/common/lzma/lzma.h
similarity index 100%
rename from mp/src/common/lzma/lzma.h
rename to src/common/lzma/lzma.h
diff --git a/mp/src/common/proto_version.h b/src/common/proto_version.h
similarity index 100%
rename from mp/src/common/proto_version.h
rename to src/common/proto_version.h
diff --git a/mp/src/common/qlimits.h b/src/common/qlimits.h
similarity index 100%
rename from mp/src/common/qlimits.h
rename to src/common/qlimits.h
diff --git a/mp/src/common/randoverride.cpp b/src/common/randoverride.cpp
similarity index 100%
rename from mp/src/common/randoverride.cpp
rename to src/common/randoverride.cpp
diff --git a/mp/src/common/replay/basereplayserializeable.h b/src/common/replay/basereplayserializeable.h
similarity index 100%
rename from mp/src/common/replay/basereplayserializeable.h
rename to src/common/replay/basereplayserializeable.h
diff --git a/mp/src/common/replay/iclientreplay.h b/src/common/replay/iclientreplay.h
similarity index 100%
rename from mp/src/common/replay/iclientreplay.h
rename to src/common/replay/iclientreplay.h
diff --git a/mp/src/common/replay/iclientreplaycontext.h b/src/common/replay/iclientreplaycontext.h
similarity index 100%
rename from mp/src/common/replay/iclientreplaycontext.h
rename to src/common/replay/iclientreplaycontext.h
diff --git a/mp/src/common/replay/iclientreplayhistorymanager.h b/src/common/replay/iclientreplayhistorymanager.h
similarity index 100%
rename from mp/src/common/replay/iclientreplayhistorymanager.h
rename to src/common/replay/iclientreplayhistorymanager.h
diff --git a/mp/src/common/replay/ienginereplay.h b/src/common/replay/ienginereplay.h
similarity index 100%
rename from mp/src/common/replay/ienginereplay.h
rename to src/common/replay/ienginereplay.h
diff --git a/mp/src/common/replay/iqueryablereplayitem.h b/src/common/replay/iqueryablereplayitem.h
similarity index 100%
rename from mp/src/common/replay/iqueryablereplayitem.h
rename to src/common/replay/iqueryablereplayitem.h
diff --git a/mp/src/common/replay/irecordingsession.h b/src/common/replay/irecordingsession.h
similarity index 100%
rename from mp/src/common/replay/irecordingsession.h
rename to src/common/replay/irecordingsession.h
diff --git a/mp/src/common/replay/irecordingsessionblockmanager.h b/src/common/replay/irecordingsessionblockmanager.h
similarity index 100%
rename from mp/src/common/replay/irecordingsessionblockmanager.h
rename to src/common/replay/irecordingsessionblockmanager.h
diff --git a/mp/src/common/replay/irecordingsessionmanager.h b/src/common/replay/irecordingsessionmanager.h
similarity index 100%
rename from mp/src/common/replay/irecordingsessionmanager.h
rename to src/common/replay/irecordingsessionmanager.h
diff --git a/mp/src/common/replay/ireplaycamera.h b/src/common/replay/ireplaycamera.h
similarity index 100%
rename from mp/src/common/replay/ireplaycamera.h
rename to src/common/replay/ireplaycamera.h
diff --git a/mp/src/common/replay/ireplaycontext.h b/src/common/replay/ireplaycontext.h
similarity index 100%
rename from mp/src/common/replay/ireplaycontext.h
rename to src/common/replay/ireplaycontext.h
diff --git a/mp/src/common/replay/ireplaydemoplayer.h b/src/common/replay/ireplaydemoplayer.h
similarity index 100%
rename from mp/src/common/replay/ireplaydemoplayer.h
rename to src/common/replay/ireplaydemoplayer.h
diff --git a/mp/src/common/replay/ireplayerrorsystem.h b/src/common/replay/ireplayerrorsystem.h
similarity index 100%
rename from mp/src/common/replay/ireplayerrorsystem.h
rename to src/common/replay/ireplayerrorsystem.h
diff --git a/mp/src/common/replay/ireplayfactory.h b/src/common/replay/ireplayfactory.h
similarity index 100%
rename from mp/src/common/replay/ireplayfactory.h
rename to src/common/replay/ireplayfactory.h
diff --git a/mp/src/common/replay/ireplaymanager.h b/src/common/replay/ireplaymanager.h
similarity index 100%
rename from mp/src/common/replay/ireplaymanager.h
rename to src/common/replay/ireplaymanager.h
diff --git a/mp/src/common/replay/ireplaymovie.h b/src/common/replay/ireplaymovie.h
similarity index 100%
rename from mp/src/common/replay/ireplaymovie.h
rename to src/common/replay/ireplaymovie.h
diff --git a/mp/src/common/replay/ireplaymoviemanager.h b/src/common/replay/ireplaymoviemanager.h
similarity index 100%
rename from mp/src/common/replay/ireplaymoviemanager.h
rename to src/common/replay/ireplaymoviemanager.h
diff --git a/mp/src/common/replay/ireplaymovierenderer.h b/src/common/replay/ireplaymovierenderer.h
similarity index 100%
rename from mp/src/common/replay/ireplaymovierenderer.h
rename to src/common/replay/ireplaymovierenderer.h
diff --git a/mp/src/common/replay/ireplayperformancecontroller.h b/src/common/replay/ireplayperformancecontroller.h
similarity index 100%
rename from mp/src/common/replay/ireplayperformancecontroller.h
rename to src/common/replay/ireplayperformancecontroller.h
diff --git a/mp/src/common/replay/ireplayperformanceeditor.h b/src/common/replay/ireplayperformanceeditor.h
similarity index 100%
rename from mp/src/common/replay/ireplayperformanceeditor.h
rename to src/common/replay/ireplayperformanceeditor.h
diff --git a/mp/src/common/replay/ireplayperformancemanager.h b/src/common/replay/ireplayperformancemanager.h
similarity index 100%
rename from mp/src/common/replay/ireplayperformancemanager.h
rename to src/common/replay/ireplayperformancemanager.h
diff --git a/mp/src/common/replay/ireplayperformanceplaybackhandler.h b/src/common/replay/ireplayperformanceplaybackhandler.h
similarity index 100%
rename from mp/src/common/replay/ireplayperformanceplaybackhandler.h
rename to src/common/replay/ireplayperformanceplaybackhandler.h
diff --git a/mp/src/common/replay/ireplayperformanceplayer.h b/src/common/replay/ireplayperformanceplayer.h
similarity index 100%
rename from mp/src/common/replay/ireplayperformanceplayer.h
rename to src/common/replay/ireplayperformanceplayer.h
diff --git a/mp/src/common/replay/ireplayperformancerecorder.h b/src/common/replay/ireplayperformancerecorder.h
similarity index 100%
rename from mp/src/common/replay/ireplayperformancerecorder.h
rename to src/common/replay/ireplayperformancerecorder.h
diff --git a/mp/src/common/replay/ireplayplayercache.h b/src/common/replay/ireplayplayercache.h
similarity index 100%
rename from mp/src/common/replay/ireplayplayercache.h
rename to src/common/replay/ireplayplayercache.h
diff --git a/mp/src/common/replay/ireplayrenderqueue.h b/src/common/replay/ireplayrenderqueue.h
similarity index 100%
rename from mp/src/common/replay/ireplayrenderqueue.h
rename to src/common/replay/ireplayrenderqueue.h
diff --git a/mp/src/common/replay/ireplayscreenshotmanager.h b/src/common/replay/ireplayscreenshotmanager.h
similarity index 100%
rename from mp/src/common/replay/ireplayscreenshotmanager.h
rename to src/common/replay/ireplayscreenshotmanager.h
diff --git a/mp/src/common/replay/ireplayscreenshotsystem.h b/src/common/replay/ireplayscreenshotsystem.h
similarity index 100%
rename from mp/src/common/replay/ireplayscreenshotsystem.h
rename to src/common/replay/ireplayscreenshotsystem.h
diff --git a/mp/src/common/replay/ireplayserializeable.h b/src/common/replay/ireplayserializeable.h
similarity index 100%
rename from mp/src/common/replay/ireplayserializeable.h
rename to src/common/replay/ireplayserializeable.h
diff --git a/mp/src/common/replay/ireplayserver.h b/src/common/replay/ireplayserver.h
similarity index 100%
rename from mp/src/common/replay/ireplayserver.h
rename to src/common/replay/ireplayserver.h
diff --git a/mp/src/common/replay/ireplaysessionrecorder.h b/src/common/replay/ireplaysessionrecorder.h
similarity index 100%
rename from mp/src/common/replay/ireplaysessionrecorder.h
rename to src/common/replay/ireplaysessionrecorder.h
diff --git a/mp/src/common/replay/ireplaysystem.h b/src/common/replay/ireplaysystem.h
similarity index 100%
rename from mp/src/common/replay/ireplaysystem.h
rename to src/common/replay/ireplaysystem.h
diff --git a/mp/src/common/replay/iserverengine.h b/src/common/replay/iserverengine.h
similarity index 100%
rename from mp/src/common/replay/iserverengine.h
rename to src/common/replay/iserverengine.h
diff --git a/mp/src/common/replay/iserverreplay.h b/src/common/replay/iserverreplay.h
similarity index 100%
rename from mp/src/common/replay/iserverreplay.h
rename to src/common/replay/iserverreplay.h
diff --git a/mp/src/common/replay/iserverreplaycontext.h b/src/common/replay/iserverreplaycontext.h
similarity index 100%
rename from mp/src/common/replay/iserverreplaycontext.h
rename to src/common/replay/iserverreplaycontext.h
diff --git a/mp/src/common/replay/performance.h b/src/common/replay/performance.h
similarity index 100%
rename from mp/src/common/replay/performance.h
rename to src/common/replay/performance.h
diff --git a/mp/src/common/replay/rendermovieparams.h b/src/common/replay/rendermovieparams.h
similarity index 100%
rename from mp/src/common/replay/rendermovieparams.h
rename to src/common/replay/rendermovieparams.h
diff --git a/mp/src/common/replay/replay.h b/src/common/replay/replay.h
similarity index 100%
rename from mp/src/common/replay/replay.h
rename to src/common/replay/replay.h
diff --git a/mp/src/common/replay/replayhandle.h b/src/common/replay/replayhandle.h
similarity index 100%
rename from mp/src/common/replay/replayhandle.h
rename to src/common/replay/replayhandle.h
diff --git a/mp/src/common/replay/replaylib.h b/src/common/replay/replaylib.h
similarity index 100%
rename from mp/src/common/replay/replaylib.h
rename to src/common/replay/replaylib.h
diff --git a/mp/src/common/replay/replaytime.h b/src/common/replay/replaytime.h
similarity index 100%
rename from mp/src/common/replay/replaytime.h
rename to src/common/replay/replaytime.h
diff --git a/mp/src/common/replay/replayutils.h b/src/common/replay/replayutils.h
similarity index 100%
rename from mp/src/common/replay/replayutils.h
rename to src/common/replay/replayutils.h
diff --git a/mp/src/common/replay/screenshot.h b/src/common/replay/screenshot.h
similarity index 100%
rename from mp/src/common/replay/screenshot.h
rename to src/common/replay/screenshot.h
diff --git a/mp/src/common/replay/shared_defs.h b/src/common/replay/shared_defs.h
similarity index 100%
rename from mp/src/common/replay/shared_defs.h
rename to src/common/replay/shared_defs.h
diff --git a/mp/src/common/studiobyteswap.cpp b/src/common/studiobyteswap.cpp
similarity index 100%
rename from mp/src/common/studiobyteswap.cpp
rename to src/common/studiobyteswap.cpp
diff --git a/mp/src/common/studiobyteswap.h b/src/common/studiobyteswap.h
similarity index 100%
rename from mp/src/common/studiobyteswap.h
rename to src/common/studiobyteswap.h
diff --git a/mp/src/common/userid.h b/src/common/userid.h
similarity index 100%
rename from mp/src/common/userid.h
rename to src/common/userid.h
diff --git a/mp/src/common/xbox/xboxstubs.h b/src/common/xbox/xboxstubs.h
similarity index 100%
rename from mp/src/common/xbox/xboxstubs.h
rename to src/common/xbox/xboxstubs.h
diff --git a/mp/src/createallprojects b/src/createallprojects
similarity index 100%
rename from mp/src/createallprojects
rename to src/createallprojects
diff --git a/mp/src/createallprojects.bat b/src/createallprojects.bat
similarity index 100%
rename from mp/src/createallprojects.bat
rename to src/createallprojects.bat
diff --git a/mp/src/creategameprojects b/src/creategameprojects
similarity index 100%
rename from mp/src/creategameprojects
rename to src/creategameprojects
diff --git a/mp/src/creategameprojects.bat b/src/creategameprojects.bat
similarity index 100%
rename from mp/src/creategameprojects.bat
rename to src/creategameprojects.bat
diff --git a/mp/src/devtools/base.xcconfig b/src/devtools/base.xcconfig
similarity index 100%
rename from mp/src/devtools/base.xcconfig
rename to src/devtools/base.xcconfig
diff --git a/mp/src/devtools/bin/buildshaderlist.pl b/src/devtools/bin/buildshaderlist.pl
similarity index 100%
rename from mp/src/devtools/bin/buildshaderlist.pl
rename to src/devtools/bin/buildshaderlist.pl
diff --git a/mp/src/devtools/bin/checkshaderchecksums.pl b/src/devtools/bin/checkshaderchecksums.pl
similarity index 100%
rename from mp/src/devtools/bin/checkshaderchecksums.pl
rename to src/devtools/bin/checkshaderchecksums.pl
diff --git a/mp/src/devtools/bin/copyshaderincfiles.pl b/src/devtools/bin/copyshaderincfiles.pl
similarity index 100%
rename from mp/src/devtools/bin/copyshaderincfiles.pl
rename to src/devtools/bin/copyshaderincfiles.pl
diff --git a/mp/src/devtools/bin/copyshaders.pl b/src/devtools/bin/copyshaders.pl
similarity index 100%
rename from mp/src/devtools/bin/copyshaders.pl
rename to src/devtools/bin/copyshaders.pl
diff --git a/mp/src/devtools/bin/d3dx9_33.dll b/src/devtools/bin/d3dx9_33.dll
similarity index 100%
rename from mp/src/devtools/bin/d3dx9_33.dll
rename to src/devtools/bin/d3dx9_33.dll
diff --git a/mp/src/devtools/bin/fix_particle_operator_names.pl b/src/devtools/bin/fix_particle_operator_names.pl
similarity index 100%
rename from mp/src/devtools/bin/fix_particle_operator_names.pl
rename to src/devtools/bin/fix_particle_operator_names.pl
diff --git a/mp/src/devtools/bin/fxc_prep.pl b/src/devtools/bin/fxc_prep.pl
similarity index 100%
rename from mp/src/devtools/bin/fxc_prep.pl
rename to src/devtools/bin/fxc_prep.pl
diff --git a/mp/src/devtools/bin/linux/ccache b/src/devtools/bin/linux/ccache
similarity index 100%
rename from mp/src/devtools/bin/linux/ccache
rename to src/devtools/bin/linux/ccache
diff --git a/mp/src/devtools/bin/osx32/ccache b/src/devtools/bin/osx32/ccache
similarity index 100%
rename from mp/src/devtools/bin/osx32/ccache
rename to src/devtools/bin/osx32/ccache
diff --git a/mp/src/devtools/bin/osx32/protoc b/src/devtools/bin/osx32/protoc
similarity index 100%
rename from mp/src/devtools/bin/osx32/protoc
rename to src/devtools/bin/osx32/protoc
diff --git a/mp/src/devtools/bin/osx32/xcode_ccache_wrapper b/src/devtools/bin/osx32/xcode_ccache_wrapper
similarity index 100%
rename from mp/src/devtools/bin/osx32/xcode_ccache_wrapper
rename to src/devtools/bin/osx32/xcode_ccache_wrapper
diff --git a/mp/src/devtools/bin/psh_prep.pl b/src/devtools/bin/psh_prep.pl
similarity index 100%
rename from mp/src/devtools/bin/psh_prep.pl
rename to src/devtools/bin/psh_prep.pl
diff --git a/mp/src/devtools/bin/shaderinfo.pl b/src/devtools/bin/shaderinfo.pl
similarity index 100%
rename from mp/src/devtools/bin/shaderinfo.pl
rename to src/devtools/bin/shaderinfo.pl
diff --git a/mp/src/devtools/bin/splitdiff3.pl b/src/devtools/bin/splitdiff3.pl
similarity index 100%
rename from mp/src/devtools/bin/splitdiff3.pl
rename to src/devtools/bin/splitdiff3.pl
diff --git a/mp/src/devtools/bin/uniqifylist.pl b/src/devtools/bin/uniqifylist.pl
similarity index 100%
rename from mp/src/devtools/bin/uniqifylist.pl
rename to src/devtools/bin/uniqifylist.pl
diff --git a/mp/src/devtools/bin/updateshaders.pl b/src/devtools/bin/updateshaders.pl
similarity index 100%
rename from mp/src/devtools/bin/updateshaders.pl
rename to src/devtools/bin/updateshaders.pl
diff --git a/mp/src/devtools/bin/valve_perl_helpers.pl b/src/devtools/bin/valve_perl_helpers.pl
similarity index 100%
rename from mp/src/devtools/bin/valve_perl_helpers.pl
rename to src/devtools/bin/valve_perl_helpers.pl
diff --git a/mp/src/devtools/bin/vpc b/src/devtools/bin/vpc
similarity index 100%
rename from mp/src/devtools/bin/vpc
rename to src/devtools/bin/vpc
diff --git a/mp/src/devtools/bin/vpc.exe b/src/devtools/bin/vpc.exe
similarity index 100%
rename from mp/src/devtools/bin/vpc.exe
rename to src/devtools/bin/vpc.exe
diff --git a/mp/src/devtools/bin/vpc_linux b/src/devtools/bin/vpc_linux
similarity index 100%
rename from mp/src/devtools/bin/vpc_linux
rename to src/devtools/bin/vpc_linux
diff --git a/mp/src/devtools/bin/vpc_osx b/src/devtools/bin/vpc_osx
similarity index 100%
rename from mp/src/devtools/bin/vpc_osx
rename to src/devtools/bin/vpc_osx
diff --git a/mp/src/devtools/bin/vpccrccheck.exe b/src/devtools/bin/vpccrccheck.exe
similarity index 100%
rename from mp/src/devtools/bin/vpccrccheck.exe
rename to src/devtools/bin/vpccrccheck.exe
diff --git a/mp/src/devtools/bin/vsh_prep.pl b/src/devtools/bin/vsh_prep.pl
similarity index 100%
rename from mp/src/devtools/bin/vsh_prep.pl
rename to src/devtools/bin/vsh_prep.pl
diff --git a/mp/src/devtools/debug.xcconfig b/src/devtools/debug.xcconfig
similarity index 100%
rename from mp/src/devtools/debug.xcconfig
rename to src/devtools/debug.xcconfig
diff --git a/mp/src/devtools/gendbg.sh b/src/devtools/gendbg.sh
similarity index 100%
rename from mp/src/devtools/gendbg.sh
rename to src/devtools/gendbg.sh
diff --git a/mp/src/devtools/makefile_base_posix.mak b/src/devtools/makefile_base_posix.mak
similarity index 100%
rename from mp/src/devtools/makefile_base_posix.mak
rename to src/devtools/makefile_base_posix.mak
diff --git a/mp/src/devtools/release.xcconfig b/src/devtools/release.xcconfig
similarity index 100%
rename from mp/src/devtools/release.xcconfig
rename to src/devtools/release.xcconfig
diff --git a/mp/src/devtools/sourcesdk_def.mak b/src/devtools/sourcesdk_def.mak
similarity index 100%
rename from mp/src/devtools/sourcesdk_def.mak
rename to src/devtools/sourcesdk_def.mak
diff --git a/mp/src/devtools/version_script.linux.txt b/src/devtools/version_script.linux.txt
similarity index 100%
rename from mp/src/devtools/version_script.linux.txt
rename to src/devtools/version_script.linux.txt
diff --git a/mp/src/dx10sdk/Utilities/dx9_30/dx_proxy.dll b/src/dx10sdk/Utilities/dx9_30/dx_proxy.dll
similarity index 100%
rename from mp/src/dx10sdk/Utilities/dx9_30/dx_proxy.dll
rename to src/dx10sdk/Utilities/dx9_30/dx_proxy.dll
diff --git a/mp/src/dx9sdk/utilities/dx_proxy.dll b/src/dx9sdk/utilities/dx_proxy.dll
similarity index 100%
rename from mp/src/dx9sdk/utilities/dx_proxy.dll
rename to src/dx9sdk/utilities/dx_proxy.dll
diff --git a/mp/src/fgdlib/fgdlib.vpc b/src/fgdlib/fgdlib.vpc
similarity index 100%
rename from mp/src/fgdlib/fgdlib.vpc
rename to src/fgdlib/fgdlib.vpc
diff --git a/mp/src/fgdlib/gamedata.cpp b/src/fgdlib/gamedata.cpp
similarity index 100%
rename from mp/src/fgdlib/gamedata.cpp
rename to src/fgdlib/gamedata.cpp
diff --git a/mp/src/fgdlib/gdclass.cpp b/src/fgdlib/gdclass.cpp
similarity index 100%
rename from mp/src/fgdlib/gdclass.cpp
rename to src/fgdlib/gdclass.cpp
diff --git a/mp/src/fgdlib/gdvar.cpp b/src/fgdlib/gdvar.cpp
similarity index 100%
rename from mp/src/fgdlib/gdvar.cpp
rename to src/fgdlib/gdvar.cpp
diff --git a/mp/src/fgdlib/inputoutput.cpp b/src/fgdlib/inputoutput.cpp
similarity index 100%
rename from mp/src/fgdlib/inputoutput.cpp
rename to src/fgdlib/inputoutput.cpp
diff --git a/mp/src/fgdlib/wckeyvalues.cpp b/src/fgdlib/wckeyvalues.cpp
similarity index 100%
rename from mp/src/fgdlib/wckeyvalues.cpp
rename to src/fgdlib/wckeyvalues.cpp
diff --git a/mp/src/game/client/AnimateSpecificTextureProxy.cpp b/src/game/client/AnimateSpecificTextureProxy.cpp
similarity index 100%
rename from mp/src/game/client/AnimateSpecificTextureProxy.cpp
rename to src/game/client/AnimateSpecificTextureProxy.cpp
diff --git a/mp/src/game/client/C_Env_Projected_Texture.h b/src/game/client/C_Env_Projected_Texture.h
similarity index 100%
rename from mp/src/game/client/C_Env_Projected_Texture.h
rename to src/game/client/C_Env_Projected_Texture.h
diff --git a/mp/src/game/client/C_MaterialModifyControl.cpp b/src/game/client/C_MaterialModifyControl.cpp
similarity index 100%
rename from mp/src/game/client/C_MaterialModifyControl.cpp
rename to src/game/client/C_MaterialModifyControl.cpp
diff --git a/mp/src/game/client/C_WaterLODControl.cpp b/src/game/client/C_WaterLODControl.cpp
similarity index 100%
rename from mp/src/game/client/C_WaterLODControl.cpp
rename to src/game/client/C_WaterLODControl.cpp
diff --git a/mp/src/game/client/EffectsClient.cpp b/src/game/client/EffectsClient.cpp
similarity index 100%
rename from mp/src/game/client/EffectsClient.cpp
rename to src/game/client/EffectsClient.cpp
diff --git a/mp/src/game/client/IsNPCProxy.cpp b/src/game/client/IsNPCProxy.cpp
similarity index 100%
rename from mp/src/game/client/IsNPCProxy.cpp
rename to src/game/client/IsNPCProxy.cpp
diff --git a/mp/src/game/client/MonitorMaterialProxy.cpp b/src/game/client/MonitorMaterialProxy.cpp
similarity index 100%
rename from mp/src/game/client/MonitorMaterialProxy.cpp
rename to src/game/client/MonitorMaterialProxy.cpp
diff --git a/mp/src/game/client/ProxyHealth.cpp b/src/game/client/ProxyHealth.cpp
similarity index 100%
rename from mp/src/game/client/ProxyHealth.cpp
rename to src/game/client/ProxyHealth.cpp
diff --git a/mp/src/game/client/ScreenSpaceEffects.cpp b/src/game/client/ScreenSpaceEffects.cpp
similarity index 100%
rename from mp/src/game/client/ScreenSpaceEffects.cpp
rename to src/game/client/ScreenSpaceEffects.cpp
diff --git a/mp/src/game/client/ScreenSpaceEffects.h b/src/game/client/ScreenSpaceEffects.h
similarity index 100%
rename from mp/src/game/client/ScreenSpaceEffects.h
rename to src/game/client/ScreenSpaceEffects.h
diff --git a/mp/src/game/client/TeamBitmapImage.cpp b/src/game/client/TeamBitmapImage.cpp
similarity index 100%
rename from mp/src/game/client/TeamBitmapImage.cpp
rename to src/game/client/TeamBitmapImage.cpp
diff --git a/mp/src/game/client/TeamBitmapImage.h b/src/game/client/TeamBitmapImage.h
similarity index 100%
rename from mp/src/game/client/TeamBitmapImage.h
rename to src/game/client/TeamBitmapImage.h
diff --git a/mp/src/game/client/ViewConeImage.cpp b/src/game/client/ViewConeImage.cpp
similarity index 100%
rename from mp/src/game/client/ViewConeImage.cpp
rename to src/game/client/ViewConeImage.cpp
diff --git a/mp/src/game/client/ViewConeImage.h b/src/game/client/ViewConeImage.h
similarity index 100%
rename from mp/src/game/client/ViewConeImage.h
rename to src/game/client/ViewConeImage.h
diff --git a/mp/src/game/client/WaterLODMaterialProxy.cpp b/src/game/client/WaterLODMaterialProxy.cpp
similarity index 100%
rename from mp/src/game/client/WaterLODMaterialProxy.cpp
rename to src/game/client/WaterLODMaterialProxy.cpp
diff --git a/mp/src/game/client/WorldDimsProxy.cpp b/src/game/client/WorldDimsProxy.cpp
similarity index 100%
rename from mp/src/game/client/WorldDimsProxy.cpp
rename to src/game/client/WorldDimsProxy.cpp
diff --git a/mp/src/game/client/achievement_notification_panel.cpp b/src/game/client/achievement_notification_panel.cpp
similarity index 100%
rename from mp/src/game/client/achievement_notification_panel.cpp
rename to src/game/client/achievement_notification_panel.cpp
diff --git a/mp/src/game/client/achievement_notification_panel.h b/src/game/client/achievement_notification_panel.h
similarity index 100%
rename from mp/src/game/client/achievement_notification_panel.h
rename to src/game/client/achievement_notification_panel.h
diff --git a/mp/src/game/client/alphamaterialproxy.cpp b/src/game/client/alphamaterialproxy.cpp
similarity index 100%
rename from mp/src/game/client/alphamaterialproxy.cpp
rename to src/game/client/alphamaterialproxy.cpp
diff --git a/mp/src/game/client/animatedentitytextureproxy.cpp b/src/game/client/animatedentitytextureproxy.cpp
similarity index 100%
rename from mp/src/game/client/animatedentitytextureproxy.cpp
rename to src/game/client/animatedentitytextureproxy.cpp
diff --git a/mp/src/game/client/animatedoffsettextureproxy.cpp b/src/game/client/animatedoffsettextureproxy.cpp
similarity index 100%
rename from mp/src/game/client/animatedoffsettextureproxy.cpp
rename to src/game/client/animatedoffsettextureproxy.cpp
diff --git a/mp/src/game/client/animatedtextureproxy.cpp b/src/game/client/animatedtextureproxy.cpp
similarity index 100%
rename from mp/src/game/client/animatedtextureproxy.cpp
rename to src/game/client/animatedtextureproxy.cpp
diff --git a/mp/src/game/client/animationlayer.h b/src/game/client/animationlayer.h
similarity index 100%
rename from mp/src/game/client/animationlayer.h
rename to src/game/client/animationlayer.h
diff --git a/mp/src/game/client/baseanimatedtextureproxy.cpp b/src/game/client/baseanimatedtextureproxy.cpp
similarity index 100%
rename from mp/src/game/client/baseanimatedtextureproxy.cpp
rename to src/game/client/baseanimatedtextureproxy.cpp
diff --git a/mp/src/game/client/baseanimatedtextureproxy.h b/src/game/client/baseanimatedtextureproxy.h
similarity index 100%
rename from mp/src/game/client/baseanimatedtextureproxy.h
rename to src/game/client/baseanimatedtextureproxy.h
diff --git a/mp/src/game/client/baseclientrendertargets.cpp b/src/game/client/baseclientrendertargets.cpp
similarity index 100%
rename from mp/src/game/client/baseclientrendertargets.cpp
rename to src/game/client/baseclientrendertargets.cpp
diff --git a/mp/src/game/client/baseclientrendertargets.h b/src/game/client/baseclientrendertargets.h
similarity index 100%
rename from mp/src/game/client/baseclientrendertargets.h
rename to src/game/client/baseclientrendertargets.h
diff --git a/mp/src/game/client/basepresence.cpp b/src/game/client/basepresence.cpp
similarity index 100%
rename from mp/src/game/client/basepresence.cpp
rename to src/game/client/basepresence.cpp
diff --git a/mp/src/game/client/basepresence.h b/src/game/client/basepresence.h
similarity index 100%
rename from mp/src/game/client/basepresence.h
rename to src/game/client/basepresence.h
diff --git a/mp/src/game/client/basepresence_xbox.cpp b/src/game/client/basepresence_xbox.cpp
similarity index 100%
rename from mp/src/game/client/basepresence_xbox.cpp
rename to src/game/client/basepresence_xbox.cpp
diff --git a/mp/src/game/client/beamdraw.cpp b/src/game/client/beamdraw.cpp
similarity index 100%
rename from mp/src/game/client/beamdraw.cpp
rename to src/game/client/beamdraw.cpp
diff --git a/mp/src/game/client/beamdraw.h b/src/game/client/beamdraw.h
similarity index 100%
rename from mp/src/game/client/beamdraw.h
rename to src/game/client/beamdraw.h
diff --git a/mp/src/game/client/bone_merge_cache.cpp b/src/game/client/bone_merge_cache.cpp
similarity index 100%
rename from mp/src/game/client/bone_merge_cache.cpp
rename to src/game/client/bone_merge_cache.cpp
diff --git a/mp/src/game/client/bone_merge_cache.h b/src/game/client/bone_merge_cache.h
similarity index 100%
rename from mp/src/game/client/bone_merge_cache.h
rename to src/game/client/bone_merge_cache.h
diff --git a/mp/src/game/client/bonetoworldarray.h b/src/game/client/bonetoworldarray.h
similarity index 100%
rename from mp/src/game/client/bonetoworldarray.h
rename to src/game/client/bonetoworldarray.h
diff --git a/mp/src/game/client/bsp_utils.cpp b/src/game/client/bsp_utils.cpp
similarity index 100%
rename from mp/src/game/client/bsp_utils.cpp
rename to src/game/client/bsp_utils.cpp
diff --git a/mp/src/game/client/bsp_utils.h b/src/game/client/bsp_utils.h
similarity index 100%
rename from mp/src/game/client/bsp_utils.h
rename to src/game/client/bsp_utils.h
diff --git a/mp/src/game/client/c_ai_basehumanoid.cpp b/src/game/client/c_ai_basehumanoid.cpp
similarity index 100%
rename from mp/src/game/client/c_ai_basehumanoid.cpp
rename to src/game/client/c_ai_basehumanoid.cpp
diff --git a/mp/src/game/client/c_ai_basenpc.cpp b/src/game/client/c_ai_basenpc.cpp
similarity index 100%
rename from mp/src/game/client/c_ai_basenpc.cpp
rename to src/game/client/c_ai_basenpc.cpp
diff --git a/mp/src/game/client/c_ai_basenpc.h b/src/game/client/c_ai_basenpc.h
similarity index 100%
rename from mp/src/game/client/c_ai_basenpc.h
rename to src/game/client/c_ai_basenpc.h
diff --git a/mp/src/game/client/c_baseanimating.cpp b/src/game/client/c_baseanimating.cpp
similarity index 100%
rename from mp/src/game/client/c_baseanimating.cpp
rename to src/game/client/c_baseanimating.cpp
diff --git a/mp/src/game/client/c_baseanimating.h b/src/game/client/c_baseanimating.h
similarity index 100%
rename from mp/src/game/client/c_baseanimating.h
rename to src/game/client/c_baseanimating.h
diff --git a/mp/src/game/client/c_baseanimatingoverlay.cpp b/src/game/client/c_baseanimatingoverlay.cpp
similarity index 100%
rename from mp/src/game/client/c_baseanimatingoverlay.cpp
rename to src/game/client/c_baseanimatingoverlay.cpp
diff --git a/mp/src/game/client/c_baseanimatingoverlay.h b/src/game/client/c_baseanimatingoverlay.h
similarity index 100%
rename from mp/src/game/client/c_baseanimatingoverlay.h
rename to src/game/client/c_baseanimatingoverlay.h
diff --git a/mp/src/game/client/c_basecombatcharacter.cpp b/src/game/client/c_basecombatcharacter.cpp
similarity index 100%
rename from mp/src/game/client/c_basecombatcharacter.cpp
rename to src/game/client/c_basecombatcharacter.cpp
diff --git a/mp/src/game/client/c_basecombatcharacter.h b/src/game/client/c_basecombatcharacter.h
similarity index 100%
rename from mp/src/game/client/c_basecombatcharacter.h
rename to src/game/client/c_basecombatcharacter.h
diff --git a/mp/src/game/client/c_basecombatweapon.cpp b/src/game/client/c_basecombatweapon.cpp
similarity index 100%
rename from mp/src/game/client/c_basecombatweapon.cpp
rename to src/game/client/c_basecombatweapon.cpp
diff --git a/mp/src/game/client/c_basecombatweapon.h b/src/game/client/c_basecombatweapon.h
similarity index 100%
rename from mp/src/game/client/c_basecombatweapon.h
rename to src/game/client/c_basecombatweapon.h
diff --git a/mp/src/game/client/c_basedoor.cpp b/src/game/client/c_basedoor.cpp
similarity index 100%
rename from mp/src/game/client/c_basedoor.cpp
rename to src/game/client/c_basedoor.cpp
diff --git a/mp/src/game/client/c_basedoor.h b/src/game/client/c_basedoor.h
similarity index 100%
rename from mp/src/game/client/c_basedoor.h
rename to src/game/client/c_basedoor.h
diff --git a/mp/src/game/client/c_baseentity.cpp b/src/game/client/c_baseentity.cpp
similarity index 100%
rename from mp/src/game/client/c_baseentity.cpp
rename to src/game/client/c_baseentity.cpp
diff --git a/mp/src/game/client/c_baseentity.h b/src/game/client/c_baseentity.h
similarity index 100%
rename from mp/src/game/client/c_baseentity.h
rename to src/game/client/c_baseentity.h
diff --git a/mp/src/game/client/c_baseflex.cpp b/src/game/client/c_baseflex.cpp
similarity index 100%
rename from mp/src/game/client/c_baseflex.cpp
rename to src/game/client/c_baseflex.cpp
diff --git a/mp/src/game/client/c_baseflex.h b/src/game/client/c_baseflex.h
similarity index 100%
rename from mp/src/game/client/c_baseflex.h
rename to src/game/client/c_baseflex.h
diff --git a/mp/src/game/client/c_baseplayer.cpp b/src/game/client/c_baseplayer.cpp
similarity index 100%
rename from mp/src/game/client/c_baseplayer.cpp
rename to src/game/client/c_baseplayer.cpp
diff --git a/mp/src/game/client/c_baseplayer.h b/src/game/client/c_baseplayer.h
similarity index 100%
rename from mp/src/game/client/c_baseplayer.h
rename to src/game/client/c_baseplayer.h
diff --git a/mp/src/game/client/c_basetempentity.cpp b/src/game/client/c_basetempentity.cpp
similarity index 100%
rename from mp/src/game/client/c_basetempentity.cpp
rename to src/game/client/c_basetempentity.cpp
diff --git a/mp/src/game/client/c_basetempentity.h b/src/game/client/c_basetempentity.h
similarity index 100%
rename from mp/src/game/client/c_basetempentity.h
rename to src/game/client/c_basetempentity.h
diff --git a/mp/src/game/client/c_baseviewmodel.cpp b/src/game/client/c_baseviewmodel.cpp
similarity index 100%
rename from mp/src/game/client/c_baseviewmodel.cpp
rename to src/game/client/c_baseviewmodel.cpp
diff --git a/mp/src/game/client/c_baseviewmodel.h b/src/game/client/c_baseviewmodel.h
similarity index 100%
rename from mp/src/game/client/c_baseviewmodel.h
rename to src/game/client/c_baseviewmodel.h
diff --git a/mp/src/game/client/c_breakableprop.cpp b/src/game/client/c_breakableprop.cpp
similarity index 100%
rename from mp/src/game/client/c_breakableprop.cpp
rename to src/game/client/c_breakableprop.cpp
diff --git a/mp/src/game/client/c_breakableprop.h b/src/game/client/c_breakableprop.h
similarity index 100%
rename from mp/src/game/client/c_breakableprop.h
rename to src/game/client/c_breakableprop.h
diff --git a/mp/src/game/client/c_colorcorrection.cpp b/src/game/client/c_colorcorrection.cpp
similarity index 100%
rename from mp/src/game/client/c_colorcorrection.cpp
rename to src/game/client/c_colorcorrection.cpp
diff --git a/mp/src/game/client/c_colorcorrectionvolume.cpp b/src/game/client/c_colorcorrectionvolume.cpp
similarity index 100%
rename from mp/src/game/client/c_colorcorrectionvolume.cpp
rename to src/game/client/c_colorcorrectionvolume.cpp
diff --git a/mp/src/game/client/c_dynamiclight.cpp b/src/game/client/c_dynamiclight.cpp
similarity index 100%
rename from mp/src/game/client/c_dynamiclight.cpp
rename to src/game/client/c_dynamiclight.cpp
diff --git a/mp/src/game/client/c_effects.cpp b/src/game/client/c_effects.cpp
similarity index 100%
rename from mp/src/game/client/c_effects.cpp
rename to src/game/client/c_effects.cpp
diff --git a/mp/src/game/client/c_effects.h b/src/game/client/c_effects.h
similarity index 100%
rename from mp/src/game/client/c_effects.h
rename to src/game/client/c_effects.h
diff --git a/mp/src/game/client/c_entitydissolve.cpp b/src/game/client/c_entitydissolve.cpp
similarity index 100%
rename from mp/src/game/client/c_entitydissolve.cpp
rename to src/game/client/c_entitydissolve.cpp
diff --git a/mp/src/game/client/c_entitydissolve.h b/src/game/client/c_entitydissolve.h
similarity index 100%
rename from mp/src/game/client/c_entitydissolve.h
rename to src/game/client/c_entitydissolve.h
diff --git a/mp/src/game/client/c_entityparticletrail.cpp b/src/game/client/c_entityparticletrail.cpp
similarity index 100%
rename from mp/src/game/client/c_entityparticletrail.cpp
rename to src/game/client/c_entityparticletrail.cpp
diff --git a/mp/src/game/client/c_env_fog_controller.cpp b/src/game/client/c_env_fog_controller.cpp
similarity index 100%
rename from mp/src/game/client/c_env_fog_controller.cpp
rename to src/game/client/c_env_fog_controller.cpp
diff --git a/mp/src/game/client/c_env_fog_controller.h b/src/game/client/c_env_fog_controller.h
similarity index 100%
rename from mp/src/game/client/c_env_fog_controller.h
rename to src/game/client/c_env_fog_controller.h
diff --git a/mp/src/game/client/c_env_particlescript.cpp b/src/game/client/c_env_particlescript.cpp
similarity index 100%
rename from mp/src/game/client/c_env_particlescript.cpp
rename to src/game/client/c_env_particlescript.cpp
diff --git a/mp/src/game/client/c_env_projectedtexture.cpp b/src/game/client/c_env_projectedtexture.cpp
similarity index 100%
rename from mp/src/game/client/c_env_projectedtexture.cpp
rename to src/game/client/c_env_projectedtexture.cpp
diff --git a/mp/src/game/client/c_env_screenoverlay.cpp b/src/game/client/c_env_screenoverlay.cpp
similarity index 100%
rename from mp/src/game/client/c_env_screenoverlay.cpp
rename to src/game/client/c_env_screenoverlay.cpp
diff --git a/mp/src/game/client/c_env_tonemap_controller.cpp b/src/game/client/c_env_tonemap_controller.cpp
similarity index 100%
rename from mp/src/game/client/c_env_tonemap_controller.cpp
rename to src/game/client/c_env_tonemap_controller.cpp
diff --git a/mp/src/game/client/c_fire_smoke.cpp b/src/game/client/c_fire_smoke.cpp
similarity index 100%
rename from mp/src/game/client/c_fire_smoke.cpp
rename to src/game/client/c_fire_smoke.cpp
diff --git a/mp/src/game/client/c_fire_smoke.h b/src/game/client/c_fire_smoke.h
similarity index 100%
rename from mp/src/game/client/c_fire_smoke.h
rename to src/game/client/c_fire_smoke.h
diff --git a/mp/src/game/client/c_fish.cpp b/src/game/client/c_fish.cpp
similarity index 100%
rename from mp/src/game/client/c_fish.cpp
rename to src/game/client/c_fish.cpp
diff --git a/mp/src/game/client/c_forcefeedback.cpp b/src/game/client/c_forcefeedback.cpp
similarity index 100%
rename from mp/src/game/client/c_forcefeedback.cpp
rename to src/game/client/c_forcefeedback.cpp
diff --git a/mp/src/game/client/c_func_areaportalwindow.cpp b/src/game/client/c_func_areaportalwindow.cpp
similarity index 100%
rename from mp/src/game/client/c_func_areaportalwindow.cpp
rename to src/game/client/c_func_areaportalwindow.cpp
diff --git a/mp/src/game/client/c_func_breakablesurf.cpp b/src/game/client/c_func_breakablesurf.cpp
similarity index 100%
rename from mp/src/game/client/c_func_breakablesurf.cpp
rename to src/game/client/c_func_breakablesurf.cpp
diff --git a/mp/src/game/client/c_func_conveyor.cpp b/src/game/client/c_func_conveyor.cpp
similarity index 100%
rename from mp/src/game/client/c_func_conveyor.cpp
rename to src/game/client/c_func_conveyor.cpp
diff --git a/mp/src/game/client/c_func_dust.cpp b/src/game/client/c_func_dust.cpp
similarity index 100%
rename from mp/src/game/client/c_func_dust.cpp
rename to src/game/client/c_func_dust.cpp
diff --git a/mp/src/game/client/c_func_dust.h b/src/game/client/c_func_dust.h
similarity index 100%
rename from mp/src/game/client/c_func_dust.h
rename to src/game/client/c_func_dust.h
diff --git a/mp/src/game/client/c_func_lod.cpp b/src/game/client/c_func_lod.cpp
similarity index 100%
rename from mp/src/game/client/c_func_lod.cpp
rename to src/game/client/c_func_lod.cpp
diff --git a/mp/src/game/client/c_func_occluder.cpp b/src/game/client/c_func_occluder.cpp
similarity index 100%
rename from mp/src/game/client/c_func_occluder.cpp
rename to src/game/client/c_func_occluder.cpp
diff --git a/mp/src/game/client/c_func_reflective_glass.cpp b/src/game/client/c_func_reflective_glass.cpp
similarity index 100%
rename from mp/src/game/client/c_func_reflective_glass.cpp
rename to src/game/client/c_func_reflective_glass.cpp
diff --git a/mp/src/game/client/c_func_reflective_glass.h b/src/game/client/c_func_reflective_glass.h
similarity index 100%
rename from mp/src/game/client/c_func_reflective_glass.h
rename to src/game/client/c_func_reflective_glass.h
diff --git a/mp/src/game/client/c_func_rotating.cpp b/src/game/client/c_func_rotating.cpp
similarity index 100%
rename from mp/src/game/client/c_func_rotating.cpp
rename to src/game/client/c_func_rotating.cpp
diff --git a/mp/src/game/client/c_func_smokevolume.cpp b/src/game/client/c_func_smokevolume.cpp
similarity index 100%
rename from mp/src/game/client/c_func_smokevolume.cpp
rename to src/game/client/c_func_smokevolume.cpp
diff --git a/mp/src/game/client/c_func_tracktrain.cpp b/src/game/client/c_func_tracktrain.cpp
similarity index 100%
rename from mp/src/game/client/c_func_tracktrain.cpp
rename to src/game/client/c_func_tracktrain.cpp
diff --git a/mp/src/game/client/c_gib.cpp b/src/game/client/c_gib.cpp
similarity index 100%
rename from mp/src/game/client/c_gib.cpp
rename to src/game/client/c_gib.cpp
diff --git a/mp/src/game/client/c_gib.h b/src/game/client/c_gib.h
similarity index 100%
rename from mp/src/game/client/c_gib.h
rename to src/game/client/c_gib.h
diff --git a/mp/src/game/client/c_hairball.cpp b/src/game/client/c_hairball.cpp
similarity index 100%
rename from mp/src/game/client/c_hairball.cpp
rename to src/game/client/c_hairball.cpp
diff --git a/mp/src/game/client/c_impact_effects.cpp b/src/game/client/c_impact_effects.cpp
similarity index 100%
rename from mp/src/game/client/c_impact_effects.cpp
rename to src/game/client/c_impact_effects.cpp
diff --git a/mp/src/game/client/c_impact_effects.h b/src/game/client/c_impact_effects.h
similarity index 100%
rename from mp/src/game/client/c_impact_effects.h
rename to src/game/client/c_impact_effects.h
diff --git a/mp/src/game/client/c_info_overlay_accessor.cpp b/src/game/client/c_info_overlay_accessor.cpp
similarity index 100%
rename from mp/src/game/client/c_info_overlay_accessor.cpp
rename to src/game/client/c_info_overlay_accessor.cpp
diff --git a/mp/src/game/client/c_lightglow.cpp b/src/game/client/c_lightglow.cpp
similarity index 100%
rename from mp/src/game/client/c_lightglow.cpp
rename to src/game/client/c_lightglow.cpp
diff --git a/mp/src/game/client/c_movie_explosion.cpp b/src/game/client/c_movie_explosion.cpp
similarity index 100%
rename from mp/src/game/client/c_movie_explosion.cpp
rename to src/game/client/c_movie_explosion.cpp
diff --git a/mp/src/game/client/c_particle_fire.cpp b/src/game/client/c_particle_fire.cpp
similarity index 100%
rename from mp/src/game/client/c_particle_fire.cpp
rename to src/game/client/c_particle_fire.cpp
diff --git a/mp/src/game/client/c_particle_smokegrenade.cpp b/src/game/client/c_particle_smokegrenade.cpp
similarity index 100%
rename from mp/src/game/client/c_particle_smokegrenade.cpp
rename to src/game/client/c_particle_smokegrenade.cpp
diff --git a/mp/src/game/client/c_particle_system.cpp b/src/game/client/c_particle_system.cpp
similarity index 100%
rename from mp/src/game/client/c_particle_system.cpp
rename to src/game/client/c_particle_system.cpp
diff --git a/mp/src/game/client/c_physbox.cpp b/src/game/client/c_physbox.cpp
similarity index 100%
rename from mp/src/game/client/c_physbox.cpp
rename to src/game/client/c_physbox.cpp
diff --git a/mp/src/game/client/c_physbox.h b/src/game/client/c_physbox.h
similarity index 100%
rename from mp/src/game/client/c_physbox.h
rename to src/game/client/c_physbox.h
diff --git a/mp/src/game/client/c_physicsprop.cpp b/src/game/client/c_physicsprop.cpp
similarity index 100%
rename from mp/src/game/client/c_physicsprop.cpp
rename to src/game/client/c_physicsprop.cpp
diff --git a/mp/src/game/client/c_physicsprop.h b/src/game/client/c_physicsprop.h
similarity index 100%
rename from mp/src/game/client/c_physicsprop.h
rename to src/game/client/c_physicsprop.h
diff --git a/mp/src/game/client/c_physmagnet.cpp b/src/game/client/c_physmagnet.cpp
similarity index 100%
rename from mp/src/game/client/c_physmagnet.cpp
rename to src/game/client/c_physmagnet.cpp
diff --git a/mp/src/game/client/c_pixel_visibility.cpp b/src/game/client/c_pixel_visibility.cpp
similarity index 100%
rename from mp/src/game/client/c_pixel_visibility.cpp
rename to src/game/client/c_pixel_visibility.cpp
diff --git a/mp/src/game/client/c_pixel_visibility.h b/src/game/client/c_pixel_visibility.h
similarity index 100%
rename from mp/src/game/client/c_pixel_visibility.h
rename to src/game/client/c_pixel_visibility.h
diff --git a/mp/src/game/client/c_plasma.cpp b/src/game/client/c_plasma.cpp
similarity index 100%
rename from mp/src/game/client/c_plasma.cpp
rename to src/game/client/c_plasma.cpp
diff --git a/mp/src/game/client/c_playerlocaldata.h b/src/game/client/c_playerlocaldata.h
similarity index 100%
rename from mp/src/game/client/c_playerlocaldata.h
rename to src/game/client/c_playerlocaldata.h
diff --git a/mp/src/game/client/c_playerresource.cpp b/src/game/client/c_playerresource.cpp
similarity index 100%
rename from mp/src/game/client/c_playerresource.cpp
rename to src/game/client/c_playerresource.cpp
diff --git a/mp/src/game/client/c_playerresource.h b/src/game/client/c_playerresource.h
similarity index 100%
rename from mp/src/game/client/c_playerresource.h
rename to src/game/client/c_playerresource.h
diff --git a/mp/src/game/client/c_point_camera.cpp b/src/game/client/c_point_camera.cpp
similarity index 100%
rename from mp/src/game/client/c_point_camera.cpp
rename to src/game/client/c_point_camera.cpp
diff --git a/mp/src/game/client/c_point_camera.h b/src/game/client/c_point_camera.h
similarity index 100%
rename from mp/src/game/client/c_point_camera.h
rename to src/game/client/c_point_camera.h
diff --git a/mp/src/game/client/c_point_commentary_node.cpp b/src/game/client/c_point_commentary_node.cpp
similarity index 100%
rename from mp/src/game/client/c_point_commentary_node.cpp
rename to src/game/client/c_point_commentary_node.cpp
diff --git a/mp/src/game/client/c_prop_vehicle.cpp b/src/game/client/c_prop_vehicle.cpp
similarity index 100%
rename from mp/src/game/client/c_prop_vehicle.cpp
rename to src/game/client/c_prop_vehicle.cpp
diff --git a/mp/src/game/client/c_prop_vehicle.h b/src/game/client/c_prop_vehicle.h
similarity index 100%
rename from mp/src/game/client/c_prop_vehicle.h
rename to src/game/client/c_prop_vehicle.h
diff --git a/mp/src/game/client/c_props.cpp b/src/game/client/c_props.cpp
similarity index 100%
rename from mp/src/game/client/c_props.cpp
rename to src/game/client/c_props.cpp
diff --git a/mp/src/game/client/c_props.h b/src/game/client/c_props.h
similarity index 100%
rename from mp/src/game/client/c_props.h
rename to src/game/client/c_props.h
diff --git a/mp/src/game/client/c_ragdoll_manager.cpp b/src/game/client/c_ragdoll_manager.cpp
similarity index 100%
rename from mp/src/game/client/c_ragdoll_manager.cpp
rename to src/game/client/c_ragdoll_manager.cpp
diff --git a/mp/src/game/client/c_recipientfilter.cpp b/src/game/client/c_recipientfilter.cpp
similarity index 100%
rename from mp/src/game/client/c_recipientfilter.cpp
rename to src/game/client/c_recipientfilter.cpp
diff --git a/mp/src/game/client/c_recipientfilter.h b/src/game/client/c_recipientfilter.h
similarity index 100%
rename from mp/src/game/client/c_recipientfilter.h
rename to src/game/client/c_recipientfilter.h
diff --git a/mp/src/game/client/c_rope.cpp b/src/game/client/c_rope.cpp
similarity index 100%
rename from mp/src/game/client/c_rope.cpp
rename to src/game/client/c_rope.cpp
diff --git a/mp/src/game/client/c_rope.h b/src/game/client/c_rope.h
similarity index 100%
rename from mp/src/game/client/c_rope.h
rename to src/game/client/c_rope.h
diff --git a/mp/src/game/client/c_rumble.cpp b/src/game/client/c_rumble.cpp
similarity index 100%
rename from mp/src/game/client/c_rumble.cpp
rename to src/game/client/c_rumble.cpp
diff --git a/mp/src/game/client/c_rumble.h b/src/game/client/c_rumble.h
similarity index 100%
rename from mp/src/game/client/c_rumble.h
rename to src/game/client/c_rumble.h
diff --git a/mp/src/game/client/c_sceneentity.cpp b/src/game/client/c_sceneentity.cpp
similarity index 100%
rename from mp/src/game/client/c_sceneentity.cpp
rename to src/game/client/c_sceneentity.cpp
diff --git a/mp/src/game/client/c_sceneentity.h b/src/game/client/c_sceneentity.h
similarity index 100%
rename from mp/src/game/client/c_sceneentity.h
rename to src/game/client/c_sceneentity.h
diff --git a/mp/src/game/client/c_shadowcontrol.cpp b/src/game/client/c_shadowcontrol.cpp
similarity index 100%
rename from mp/src/game/client/c_shadowcontrol.cpp
rename to src/game/client/c_shadowcontrol.cpp
diff --git a/mp/src/game/client/c_slideshow_display.cpp b/src/game/client/c_slideshow_display.cpp
similarity index 100%
rename from mp/src/game/client/c_slideshow_display.cpp
rename to src/game/client/c_slideshow_display.cpp
diff --git a/mp/src/game/client/c_slideshow_display.h b/src/game/client/c_slideshow_display.h
similarity index 100%
rename from mp/src/game/client/c_slideshow_display.h
rename to src/game/client/c_slideshow_display.h
diff --git a/mp/src/game/client/c_smoke_trail.cpp b/src/game/client/c_smoke_trail.cpp
similarity index 100%
rename from mp/src/game/client/c_smoke_trail.cpp
rename to src/game/client/c_smoke_trail.cpp
diff --git a/mp/src/game/client/c_smoke_trail.h b/src/game/client/c_smoke_trail.h
similarity index 100%
rename from mp/src/game/client/c_smoke_trail.h
rename to src/game/client/c_smoke_trail.h
diff --git a/mp/src/game/client/c_smokestack.cpp b/src/game/client/c_smokestack.cpp
similarity index 100%
rename from mp/src/game/client/c_smokestack.cpp
rename to src/game/client/c_smokestack.cpp
diff --git a/mp/src/game/client/c_soundscape.cpp b/src/game/client/c_soundscape.cpp
similarity index 100%
rename from mp/src/game/client/c_soundscape.cpp
rename to src/game/client/c_soundscape.cpp
diff --git a/mp/src/game/client/c_soundscape.h b/src/game/client/c_soundscape.h
similarity index 100%
rename from mp/src/game/client/c_soundscape.h
rename to src/game/client/c_soundscape.h
diff --git a/mp/src/game/client/c_spotlight_end.cpp b/src/game/client/c_spotlight_end.cpp
similarity index 100%
rename from mp/src/game/client/c_spotlight_end.cpp
rename to src/game/client/c_spotlight_end.cpp
diff --git a/mp/src/game/client/c_sprite.cpp b/src/game/client/c_sprite.cpp
similarity index 100%
rename from mp/src/game/client/c_sprite.cpp
rename to src/game/client/c_sprite.cpp
diff --git a/mp/src/game/client/c_sprite.h b/src/game/client/c_sprite.h
similarity index 100%
rename from mp/src/game/client/c_sprite.h
rename to src/game/client/c_sprite.h
diff --git a/mp/src/game/client/c_sprite_perfmonitor.cpp b/src/game/client/c_sprite_perfmonitor.cpp
similarity index 100%
rename from mp/src/game/client/c_sprite_perfmonitor.cpp
rename to src/game/client/c_sprite_perfmonitor.cpp
diff --git a/mp/src/game/client/c_steamjet.cpp b/src/game/client/c_steamjet.cpp
similarity index 100%
rename from mp/src/game/client/c_steamjet.cpp
rename to src/game/client/c_steamjet.cpp
diff --git a/mp/src/game/client/c_stickybolt.cpp b/src/game/client/c_stickybolt.cpp
similarity index 100%
rename from mp/src/game/client/c_stickybolt.cpp
rename to src/game/client/c_stickybolt.cpp
diff --git a/mp/src/game/client/c_sun.cpp b/src/game/client/c_sun.cpp
similarity index 100%
rename from mp/src/game/client/c_sun.cpp
rename to src/game/client/c_sun.cpp
diff --git a/mp/src/game/client/c_sun.h b/src/game/client/c_sun.h
similarity index 100%
rename from mp/src/game/client/c_sun.h
rename to src/game/client/c_sun.h
diff --git a/mp/src/game/client/c_te.cpp b/src/game/client/c_te.cpp
similarity index 100%
rename from mp/src/game/client/c_te.cpp
rename to src/game/client/c_te.cpp
diff --git a/mp/src/game/client/c_te_armorricochet.cpp b/src/game/client/c_te_armorricochet.cpp
similarity index 100%
rename from mp/src/game/client/c_te_armorricochet.cpp
rename to src/game/client/c_te_armorricochet.cpp
diff --git a/mp/src/game/client/c_te_basebeam.cpp b/src/game/client/c_te_basebeam.cpp
similarity index 100%
rename from mp/src/game/client/c_te_basebeam.cpp
rename to src/game/client/c_te_basebeam.cpp
diff --git a/mp/src/game/client/c_te_basebeam.h b/src/game/client/c_te_basebeam.h
similarity index 100%
rename from mp/src/game/client/c_te_basebeam.h
rename to src/game/client/c_te_basebeam.h
diff --git a/mp/src/game/client/c_te_beamentpoint.cpp b/src/game/client/c_te_beamentpoint.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beamentpoint.cpp
rename to src/game/client/c_te_beamentpoint.cpp
diff --git a/mp/src/game/client/c_te_beaments.cpp b/src/game/client/c_te_beaments.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beaments.cpp
rename to src/game/client/c_te_beaments.cpp
diff --git a/mp/src/game/client/c_te_beamfollow.cpp b/src/game/client/c_te_beamfollow.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beamfollow.cpp
rename to src/game/client/c_te_beamfollow.cpp
diff --git a/mp/src/game/client/c_te_beamlaser.cpp b/src/game/client/c_te_beamlaser.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beamlaser.cpp
rename to src/game/client/c_te_beamlaser.cpp
diff --git a/mp/src/game/client/c_te_beampoints.cpp b/src/game/client/c_te_beampoints.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beampoints.cpp
rename to src/game/client/c_te_beampoints.cpp
diff --git a/mp/src/game/client/c_te_beamring.cpp b/src/game/client/c_te_beamring.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beamring.cpp
rename to src/game/client/c_te_beamring.cpp
diff --git a/mp/src/game/client/c_te_beamringpoint.cpp b/src/game/client/c_te_beamringpoint.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beamringpoint.cpp
rename to src/game/client/c_te_beamringpoint.cpp
diff --git a/mp/src/game/client/c_te_beamspline.cpp b/src/game/client/c_te_beamspline.cpp
similarity index 100%
rename from mp/src/game/client/c_te_beamspline.cpp
rename to src/game/client/c_te_beamspline.cpp
diff --git a/mp/src/game/client/c_te_bloodsprite.cpp b/src/game/client/c_te_bloodsprite.cpp
similarity index 100%
rename from mp/src/game/client/c_te_bloodsprite.cpp
rename to src/game/client/c_te_bloodsprite.cpp
diff --git a/mp/src/game/client/c_te_bloodstream.cpp b/src/game/client/c_te_bloodstream.cpp
similarity index 100%
rename from mp/src/game/client/c_te_bloodstream.cpp
rename to src/game/client/c_te_bloodstream.cpp
diff --git a/mp/src/game/client/c_te_breakmodel.cpp b/src/game/client/c_te_breakmodel.cpp
similarity index 100%
rename from mp/src/game/client/c_te_breakmodel.cpp
rename to src/game/client/c_te_breakmodel.cpp
diff --git a/mp/src/game/client/c_te_bspdecal.cpp b/src/game/client/c_te_bspdecal.cpp
similarity index 100%
rename from mp/src/game/client/c_te_bspdecal.cpp
rename to src/game/client/c_te_bspdecal.cpp
diff --git a/mp/src/game/client/c_te_bubbles.cpp b/src/game/client/c_te_bubbles.cpp
similarity index 100%
rename from mp/src/game/client/c_te_bubbles.cpp
rename to src/game/client/c_te_bubbles.cpp
diff --git a/mp/src/game/client/c_te_bubbletrail.cpp b/src/game/client/c_te_bubbletrail.cpp
similarity index 100%
rename from mp/src/game/client/c_te_bubbletrail.cpp
rename to src/game/client/c_te_bubbletrail.cpp
diff --git a/mp/src/game/client/c_te_clientprojectile.cpp b/src/game/client/c_te_clientprojectile.cpp
similarity index 100%
rename from mp/src/game/client/c_te_clientprojectile.cpp
rename to src/game/client/c_te_clientprojectile.cpp
diff --git a/mp/src/game/client/c_te_decal.cpp b/src/game/client/c_te_decal.cpp
similarity index 100%
rename from mp/src/game/client/c_te_decal.cpp
rename to src/game/client/c_te_decal.cpp
diff --git a/mp/src/game/client/c_te_dynamiclight.cpp b/src/game/client/c_te_dynamiclight.cpp
similarity index 100%
rename from mp/src/game/client/c_te_dynamiclight.cpp
rename to src/game/client/c_te_dynamiclight.cpp
diff --git a/mp/src/game/client/c_te_effect_dispatch.cpp b/src/game/client/c_te_effect_dispatch.cpp
similarity index 100%
rename from mp/src/game/client/c_te_effect_dispatch.cpp
rename to src/game/client/c_te_effect_dispatch.cpp
diff --git a/mp/src/game/client/c_te_effect_dispatch.h b/src/game/client/c_te_effect_dispatch.h
similarity index 100%
rename from mp/src/game/client/c_te_effect_dispatch.h
rename to src/game/client/c_te_effect_dispatch.h
diff --git a/mp/src/game/client/c_te_energysplash.cpp b/src/game/client/c_te_energysplash.cpp
similarity index 100%
rename from mp/src/game/client/c_te_energysplash.cpp
rename to src/game/client/c_te_energysplash.cpp
diff --git a/mp/src/game/client/c_te_explosion.cpp b/src/game/client/c_te_explosion.cpp
similarity index 100%
rename from mp/src/game/client/c_te_explosion.cpp
rename to src/game/client/c_te_explosion.cpp
diff --git a/mp/src/game/client/c_te_fizz.cpp b/src/game/client/c_te_fizz.cpp
similarity index 100%
rename from mp/src/game/client/c_te_fizz.cpp
rename to src/game/client/c_te_fizz.cpp
diff --git a/mp/src/game/client/c_te_footprint.cpp b/src/game/client/c_te_footprint.cpp
similarity index 100%
rename from mp/src/game/client/c_te_footprint.cpp
rename to src/game/client/c_te_footprint.cpp
diff --git a/mp/src/game/client/c_te_glassshatter.cpp b/src/game/client/c_te_glassshatter.cpp
similarity index 100%
rename from mp/src/game/client/c_te_glassshatter.cpp
rename to src/game/client/c_te_glassshatter.cpp
diff --git a/mp/src/game/client/c_te_glowsprite.cpp b/src/game/client/c_te_glowsprite.cpp
similarity index 100%
rename from mp/src/game/client/c_te_glowsprite.cpp
rename to src/game/client/c_te_glowsprite.cpp
diff --git a/mp/src/game/client/c_te_impact.cpp b/src/game/client/c_te_impact.cpp
similarity index 100%
rename from mp/src/game/client/c_te_impact.cpp
rename to src/game/client/c_te_impact.cpp
diff --git a/mp/src/game/client/c_te_killplayerattachments.cpp b/src/game/client/c_te_killplayerattachments.cpp
similarity index 100%
rename from mp/src/game/client/c_te_killplayerattachments.cpp
rename to src/game/client/c_te_killplayerattachments.cpp
diff --git a/mp/src/game/client/c_te_largefunnel.cpp b/src/game/client/c_te_largefunnel.cpp
similarity index 100%
rename from mp/src/game/client/c_te_largefunnel.cpp
rename to src/game/client/c_te_largefunnel.cpp
diff --git a/mp/src/game/client/c_te_legacytempents.cpp b/src/game/client/c_te_legacytempents.cpp
similarity index 100%
rename from mp/src/game/client/c_te_legacytempents.cpp
rename to src/game/client/c_te_legacytempents.cpp
diff --git a/mp/src/game/client/c_te_legacytempents.h b/src/game/client/c_te_legacytempents.h
similarity index 100%
rename from mp/src/game/client/c_te_legacytempents.h
rename to src/game/client/c_te_legacytempents.h
diff --git a/mp/src/game/client/c_te_muzzleflash.cpp b/src/game/client/c_te_muzzleflash.cpp
similarity index 100%
rename from mp/src/game/client/c_te_muzzleflash.cpp
rename to src/game/client/c_te_muzzleflash.cpp
diff --git a/mp/src/game/client/c_te_particlesystem.cpp b/src/game/client/c_te_particlesystem.cpp
similarity index 100%
rename from mp/src/game/client/c_te_particlesystem.cpp
rename to src/game/client/c_te_particlesystem.cpp
diff --git a/mp/src/game/client/c_te_particlesystem.h b/src/game/client/c_te_particlesystem.h
similarity index 100%
rename from mp/src/game/client/c_te_particlesystem.h
rename to src/game/client/c_te_particlesystem.h
diff --git a/mp/src/game/client/c_te_physicsprop.cpp b/src/game/client/c_te_physicsprop.cpp
similarity index 100%
rename from mp/src/game/client/c_te_physicsprop.cpp
rename to src/game/client/c_te_physicsprop.cpp
diff --git a/mp/src/game/client/c_te_playerdecal.cpp b/src/game/client/c_te_playerdecal.cpp
similarity index 100%
rename from mp/src/game/client/c_te_playerdecal.cpp
rename to src/game/client/c_te_playerdecal.cpp
diff --git a/mp/src/game/client/c_te_projecteddecal.cpp b/src/game/client/c_te_projecteddecal.cpp
similarity index 100%
rename from mp/src/game/client/c_te_projecteddecal.cpp
rename to src/game/client/c_te_projecteddecal.cpp
diff --git a/mp/src/game/client/c_te_showline.cpp b/src/game/client/c_te_showline.cpp
similarity index 100%
rename from mp/src/game/client/c_te_showline.cpp
rename to src/game/client/c_te_showline.cpp
diff --git a/mp/src/game/client/c_te_smoke.cpp b/src/game/client/c_te_smoke.cpp
similarity index 100%
rename from mp/src/game/client/c_te_smoke.cpp
rename to src/game/client/c_te_smoke.cpp
diff --git a/mp/src/game/client/c_te_sparks.cpp b/src/game/client/c_te_sparks.cpp
similarity index 100%
rename from mp/src/game/client/c_te_sparks.cpp
rename to src/game/client/c_te_sparks.cpp
diff --git a/mp/src/game/client/c_te_sprite.cpp b/src/game/client/c_te_sprite.cpp
similarity index 100%
rename from mp/src/game/client/c_te_sprite.cpp
rename to src/game/client/c_te_sprite.cpp
diff --git a/mp/src/game/client/c_te_spritespray.cpp b/src/game/client/c_te_spritespray.cpp
similarity index 100%
rename from mp/src/game/client/c_te_spritespray.cpp
rename to src/game/client/c_te_spritespray.cpp
diff --git a/mp/src/game/client/c_te_worlddecal.cpp b/src/game/client/c_te_worlddecal.cpp
similarity index 100%
rename from mp/src/game/client/c_te_worlddecal.cpp
rename to src/game/client/c_te_worlddecal.cpp
diff --git a/mp/src/game/client/c_team.cpp b/src/game/client/c_team.cpp
similarity index 100%
rename from mp/src/game/client/c_team.cpp
rename to src/game/client/c_team.cpp
diff --git a/mp/src/game/client/c_team.h b/src/game/client/c_team.h
similarity index 100%
rename from mp/src/game/client/c_team.h
rename to src/game/client/c_team.h
diff --git a/mp/src/game/client/c_team_objectiveresource.cpp b/src/game/client/c_team_objectiveresource.cpp
similarity index 100%
rename from mp/src/game/client/c_team_objectiveresource.cpp
rename to src/game/client/c_team_objectiveresource.cpp
diff --git a/mp/src/game/client/c_team_objectiveresource.h b/src/game/client/c_team_objectiveresource.h
similarity index 100%
rename from mp/src/game/client/c_team_objectiveresource.h
rename to src/game/client/c_team_objectiveresource.h
diff --git a/mp/src/game/client/c_team_train_watcher.cpp b/src/game/client/c_team_train_watcher.cpp
similarity index 100%
rename from mp/src/game/client/c_team_train_watcher.cpp
rename to src/game/client/c_team_train_watcher.cpp
diff --git a/mp/src/game/client/c_team_train_watcher.h b/src/game/client/c_team_train_watcher.h
similarity index 100%
rename from mp/src/game/client/c_team_train_watcher.h
rename to src/game/client/c_team_train_watcher.h
diff --git a/mp/src/game/client/c_tesla.cpp b/src/game/client/c_tesla.cpp
similarity index 100%
rename from mp/src/game/client/c_tesla.cpp
rename to src/game/client/c_tesla.cpp
diff --git a/mp/src/game/client/c_tesla.h b/src/game/client/c_tesla.h
similarity index 100%
rename from mp/src/game/client/c_tesla.h
rename to src/game/client/c_tesla.h
diff --git a/mp/src/game/client/c_test_proxytoggle.cpp b/src/game/client/c_test_proxytoggle.cpp
similarity index 100%
rename from mp/src/game/client/c_test_proxytoggle.cpp
rename to src/game/client/c_test_proxytoggle.cpp
diff --git a/mp/src/game/client/c_testtraceline.cpp b/src/game/client/c_testtraceline.cpp
similarity index 100%
rename from mp/src/game/client/c_testtraceline.cpp
rename to src/game/client/c_testtraceline.cpp
diff --git a/mp/src/game/client/c_tracer.cpp b/src/game/client/c_tracer.cpp
similarity index 100%
rename from mp/src/game/client/c_tracer.cpp
rename to src/game/client/c_tracer.cpp
diff --git a/mp/src/game/client/c_tracer.h b/src/game/client/c_tracer.h
similarity index 100%
rename from mp/src/game/client/c_tracer.h
rename to src/game/client/c_tracer.h
diff --git a/mp/src/game/client/c_user_message_register.cpp b/src/game/client/c_user_message_register.cpp
similarity index 100%
rename from mp/src/game/client/c_user_message_register.cpp
rename to src/game/client/c_user_message_register.cpp
diff --git a/mp/src/game/client/c_user_message_register.h b/src/game/client/c_user_message_register.h
similarity index 100%
rename from mp/src/game/client/c_user_message_register.h
rename to src/game/client/c_user_message_register.h
diff --git a/mp/src/game/client/c_vehicle_choreo_generic.cpp b/src/game/client/c_vehicle_choreo_generic.cpp
similarity index 100%
rename from mp/src/game/client/c_vehicle_choreo_generic.cpp
rename to src/game/client/c_vehicle_choreo_generic.cpp
diff --git a/mp/src/game/client/c_vehicle_jeep.cpp b/src/game/client/c_vehicle_jeep.cpp
similarity index 100%
rename from mp/src/game/client/c_vehicle_jeep.cpp
rename to src/game/client/c_vehicle_jeep.cpp
diff --git a/mp/src/game/client/c_vehicle_jeep.h b/src/game/client/c_vehicle_jeep.h
similarity index 100%
rename from mp/src/game/client/c_vehicle_jeep.h
rename to src/game/client/c_vehicle_jeep.h
diff --git a/mp/src/game/client/c_vguiscreen.cpp b/src/game/client/c_vguiscreen.cpp
similarity index 100%
rename from mp/src/game/client/c_vguiscreen.cpp
rename to src/game/client/c_vguiscreen.cpp
diff --git a/mp/src/game/client/c_vguiscreen.h b/src/game/client/c_vguiscreen.h
similarity index 100%
rename from mp/src/game/client/c_vguiscreen.h
rename to src/game/client/c_vguiscreen.h
diff --git a/mp/src/game/client/c_vote_controller.cpp b/src/game/client/c_vote_controller.cpp
similarity index 100%
rename from mp/src/game/client/c_vote_controller.cpp
rename to src/game/client/c_vote_controller.cpp
diff --git a/mp/src/game/client/c_vote_controller.h b/src/game/client/c_vote_controller.h
similarity index 100%
rename from mp/src/game/client/c_vote_controller.h
rename to src/game/client/c_vote_controller.h
diff --git a/mp/src/game/client/c_weapon__stubs.h b/src/game/client/c_weapon__stubs.h
similarity index 100%
rename from mp/src/game/client/c_weapon__stubs.h
rename to src/game/client/c_weapon__stubs.h
diff --git a/mp/src/game/client/c_world.cpp b/src/game/client/c_world.cpp
similarity index 100%
rename from mp/src/game/client/c_world.cpp
rename to src/game/client/c_world.cpp
diff --git a/mp/src/game/client/c_world.h b/src/game/client/c_world.h
similarity index 100%
rename from mp/src/game/client/c_world.h
rename to src/game/client/c_world.h
diff --git a/mp/src/game/client/camomaterialproxy.cpp b/src/game/client/camomaterialproxy.cpp
similarity index 100%
rename from mp/src/game/client/camomaterialproxy.cpp
rename to src/game/client/camomaterialproxy.cpp
diff --git a/mp/src/game/client/cbase.h b/src/game/client/cbase.h
similarity index 100%
rename from mp/src/game/client/cbase.h
rename to src/game/client/cbase.h
diff --git a/mp/src/game/client/cdll_bounded_cvars.cpp b/src/game/client/cdll_bounded_cvars.cpp
similarity index 100%
rename from mp/src/game/client/cdll_bounded_cvars.cpp
rename to src/game/client/cdll_bounded_cvars.cpp
diff --git a/mp/src/game/client/cdll_bounded_cvars.h b/src/game/client/cdll_bounded_cvars.h
similarity index 100%
rename from mp/src/game/client/cdll_bounded_cvars.h
rename to src/game/client/cdll_bounded_cvars.h
diff --git a/mp/src/game/client/cdll_client_int.cpp b/src/game/client/cdll_client_int.cpp
similarity index 100%
rename from mp/src/game/client/cdll_client_int.cpp
rename to src/game/client/cdll_client_int.cpp
diff --git a/mp/src/game/client/cdll_client_int.h b/src/game/client/cdll_client_int.h
similarity index 100%
rename from mp/src/game/client/cdll_client_int.h
rename to src/game/client/cdll_client_int.h
diff --git a/mp/src/game/client/cdll_util.cpp b/src/game/client/cdll_util.cpp
similarity index 100%
rename from mp/src/game/client/cdll_util.cpp
rename to src/game/client/cdll_util.cpp
diff --git a/mp/src/game/client/cdll_util.h b/src/game/client/cdll_util.h
similarity index 100%
rename from mp/src/game/client/cdll_util.h
rename to src/game/client/cdll_util.h
diff --git a/mp/src/game/client/cl_animevent.h b/src/game/client/cl_animevent.h
similarity index 100%
rename from mp/src/game/client/cl_animevent.h
rename to src/game/client/cl_animevent.h
diff --git a/mp/src/game/client/cl_mat_stub.cpp b/src/game/client/cl_mat_stub.cpp
similarity index 100%
rename from mp/src/game/client/cl_mat_stub.cpp
rename to src/game/client/cl_mat_stub.cpp
diff --git a/mp/src/game/client/cl_mat_stub.h b/src/game/client/cl_mat_stub.h
similarity index 100%
rename from mp/src/game/client/cl_mat_stub.h
rename to src/game/client/cl_mat_stub.h
diff --git a/mp/src/game/client/classmap.cpp b/src/game/client/classmap.cpp
similarity index 100%
rename from mp/src/game/client/classmap.cpp
rename to src/game/client/classmap.cpp
diff --git a/mp/src/game/client/client_base.vpc b/src/game/client/client_base.vpc
similarity index 100%
rename from mp/src/game/client/client_base.vpc
rename to src/game/client/client_base.vpc
diff --git a/mp/src/game/client/client_factorylist.cpp b/src/game/client/client_factorylist.cpp
similarity index 100%
rename from mp/src/game/client/client_factorylist.cpp
rename to src/game/client/client_factorylist.cpp
diff --git a/mp/src/game/client/client_factorylist.h b/src/game/client/client_factorylist.h
similarity index 100%
rename from mp/src/game/client/client_factorylist.h
rename to src/game/client/client_factorylist.h
diff --git a/mp/src/game/client/client_hl2mp.vpc b/src/game/client/client_hl2mp.vpc
similarity index 100%
rename from mp/src/game/client/client_hl2mp.vpc
rename to src/game/client/client_hl2mp.vpc
diff --git a/mp/src/game/client/client_thinklist.cpp b/src/game/client/client_thinklist.cpp
similarity index 100%
rename from mp/src/game/client/client_thinklist.cpp
rename to src/game/client/client_thinklist.cpp
diff --git a/mp/src/game/client/client_thinklist.h b/src/game/client/client_thinklist.h
similarity index 100%
rename from mp/src/game/client/client_thinklist.h
rename to src/game/client/client_thinklist.h
diff --git a/mp/src/game/client/client_virtualreality.cpp b/src/game/client/client_virtualreality.cpp
similarity index 100%
rename from mp/src/game/client/client_virtualreality.cpp
rename to src/game/client/client_virtualreality.cpp
diff --git a/mp/src/game/client/client_virtualreality.h b/src/game/client/client_virtualreality.h
similarity index 100%
rename from mp/src/game/client/client_virtualreality.h
rename to src/game/client/client_virtualreality.h
diff --git a/mp/src/game/client/clienteffectprecachesystem.cpp b/src/game/client/clienteffectprecachesystem.cpp
similarity index 100%
rename from mp/src/game/client/clienteffectprecachesystem.cpp
rename to src/game/client/clienteffectprecachesystem.cpp
diff --git a/mp/src/game/client/clienteffectprecachesystem.h b/src/game/client/clienteffectprecachesystem.h
similarity index 100%
rename from mp/src/game/client/clienteffectprecachesystem.h
rename to src/game/client/clienteffectprecachesystem.h
diff --git a/mp/src/game/client/cliententitylist.cpp b/src/game/client/cliententitylist.cpp
similarity index 100%
rename from mp/src/game/client/cliententitylist.cpp
rename to src/game/client/cliententitylist.cpp
diff --git a/mp/src/game/client/cliententitylist.h b/src/game/client/cliententitylist.h
similarity index 100%
rename from mp/src/game/client/cliententitylist.h
rename to src/game/client/cliententitylist.h
diff --git a/mp/src/game/client/clientleafsystem.cpp b/src/game/client/clientleafsystem.cpp
similarity index 100%
rename from mp/src/game/client/clientleafsystem.cpp
rename to src/game/client/clientleafsystem.cpp
diff --git a/mp/src/game/client/clientleafsystem.h b/src/game/client/clientleafsystem.h
similarity index 100%
rename from mp/src/game/client/clientleafsystem.h
rename to src/game/client/clientleafsystem.h
diff --git a/mp/src/game/client/clientmode.h b/src/game/client/clientmode.h
similarity index 100%
rename from mp/src/game/client/clientmode.h
rename to src/game/client/clientmode.h
diff --git a/mp/src/game/client/clientmode_normal.cpp b/src/game/client/clientmode_normal.cpp
similarity index 100%
rename from mp/src/game/client/clientmode_normal.cpp
rename to src/game/client/clientmode_normal.cpp
diff --git a/mp/src/game/client/clientmode_normal.h b/src/game/client/clientmode_normal.h
similarity index 100%
rename from mp/src/game/client/clientmode_normal.h
rename to src/game/client/clientmode_normal.h
diff --git a/mp/src/game/client/clientmode_shared.cpp b/src/game/client/clientmode_shared.cpp
similarity index 100%
rename from mp/src/game/client/clientmode_shared.cpp
rename to src/game/client/clientmode_shared.cpp
diff --git a/mp/src/game/client/clientmode_shared.h b/src/game/client/clientmode_shared.h
similarity index 100%
rename from mp/src/game/client/clientmode_shared.h
rename to src/game/client/clientmode_shared.h
diff --git a/mp/src/game/client/clientshadowmgr.cpp b/src/game/client/clientshadowmgr.cpp
similarity index 100%
rename from mp/src/game/client/clientshadowmgr.cpp
rename to src/game/client/clientshadowmgr.cpp
diff --git a/mp/src/game/client/clientsideeffects.cpp b/src/game/client/clientsideeffects.cpp
similarity index 100%
rename from mp/src/game/client/clientsideeffects.cpp
rename to src/game/client/clientsideeffects.cpp
diff --git a/mp/src/game/client/clientsideeffects.h b/src/game/client/clientsideeffects.h
similarity index 100%
rename from mp/src/game/client/clientsideeffects.h
rename to src/game/client/clientsideeffects.h
diff --git a/mp/src/game/client/clientsideeffects_test.cpp b/src/game/client/clientsideeffects_test.cpp
similarity index 100%
rename from mp/src/game/client/clientsideeffects_test.cpp
rename to src/game/client/clientsideeffects_test.cpp
diff --git a/mp/src/game/client/clientsteamcontext.cpp b/src/game/client/clientsteamcontext.cpp
similarity index 100%
rename from mp/src/game/client/clientsteamcontext.cpp
rename to src/game/client/clientsteamcontext.cpp
diff --git a/mp/src/game/client/clientsteamcontext.h b/src/game/client/clientsteamcontext.h
similarity index 100%
rename from mp/src/game/client/clientsteamcontext.h
rename to src/game/client/clientsteamcontext.h
diff --git a/mp/src/game/client/colorcorrectionmgr.cpp b/src/game/client/colorcorrectionmgr.cpp
similarity index 100%
rename from mp/src/game/client/colorcorrectionmgr.cpp
rename to src/game/client/colorcorrectionmgr.cpp
diff --git a/mp/src/game/client/colorcorrectionmgr.h b/src/game/client/colorcorrectionmgr.h
similarity index 100%
rename from mp/src/game/client/colorcorrectionmgr.h
rename to src/game/client/colorcorrectionmgr.h
diff --git a/mp/src/game/client/commentary_modelviewer.cpp b/src/game/client/commentary_modelviewer.cpp
similarity index 100%
rename from mp/src/game/client/commentary_modelviewer.cpp
rename to src/game/client/commentary_modelviewer.cpp
diff --git a/mp/src/game/client/commentary_modelviewer.h b/src/game/client/commentary_modelviewer.h
similarity index 100%
rename from mp/src/game/client/commentary_modelviewer.h
rename to src/game/client/commentary_modelviewer.h
diff --git a/mp/src/game/client/death.cpp b/src/game/client/death.cpp
similarity index 100%
rename from mp/src/game/client/death.cpp
rename to src/game/client/death.cpp
diff --git a/mp/src/game/client/detailobjectsystem.cpp b/src/game/client/detailobjectsystem.cpp
similarity index 100%
rename from mp/src/game/client/detailobjectsystem.cpp
rename to src/game/client/detailobjectsystem.cpp
diff --git a/mp/src/game/client/detailobjectsystem.h b/src/game/client/detailobjectsystem.h
similarity index 100%
rename from mp/src/game/client/detailobjectsystem.h
rename to src/game/client/detailobjectsystem.h
diff --git a/mp/src/game/client/dummyproxy.cpp b/src/game/client/dummyproxy.cpp
similarity index 100%
rename from mp/src/game/client/dummyproxy.cpp
rename to src/game/client/dummyproxy.cpp
diff --git a/mp/src/game/client/enginesprite.h b/src/game/client/enginesprite.h
similarity index 100%
rename from mp/src/game/client/enginesprite.h
rename to src/game/client/enginesprite.h
diff --git a/mp/src/game/client/entity_client_tools.cpp b/src/game/client/entity_client_tools.cpp
similarity index 100%
rename from mp/src/game/client/entity_client_tools.cpp
rename to src/game/client/entity_client_tools.cpp
diff --git a/mp/src/game/client/entityoriginmaterialproxy.cpp b/src/game/client/entityoriginmaterialproxy.cpp
similarity index 100%
rename from mp/src/game/client/entityoriginmaterialproxy.cpp
rename to src/game/client/entityoriginmaterialproxy.cpp
diff --git a/mp/src/game/client/episodic/c_npc_advisor.cpp b/src/game/client/episodic/c_npc_advisor.cpp
similarity index 100%
rename from mp/src/game/client/episodic/c_npc_advisor.cpp
rename to src/game/client/episodic/c_npc_advisor.cpp
diff --git a/mp/src/game/client/episodic/c_npc_puppet.cpp b/src/game/client/episodic/c_npc_puppet.cpp
similarity index 100%
rename from mp/src/game/client/episodic/c_npc_puppet.cpp
rename to src/game/client/episodic/c_npc_puppet.cpp
diff --git a/mp/src/game/client/episodic/c_prop_coreball.cpp b/src/game/client/episodic/c_prop_coreball.cpp
similarity index 100%
rename from mp/src/game/client/episodic/c_prop_coreball.cpp
rename to src/game/client/episodic/c_prop_coreball.cpp
diff --git a/mp/src/game/client/episodic/c_prop_scalable.cpp b/src/game/client/episodic/c_prop_scalable.cpp
similarity index 100%
rename from mp/src/game/client/episodic/c_prop_scalable.cpp
rename to src/game/client/episodic/c_prop_scalable.cpp
diff --git a/mp/src/game/client/episodic/c_vehicle_jeep_episodic.cpp b/src/game/client/episodic/c_vehicle_jeep_episodic.cpp
similarity index 100%
rename from mp/src/game/client/episodic/c_vehicle_jeep_episodic.cpp
rename to src/game/client/episodic/c_vehicle_jeep_episodic.cpp
diff --git a/mp/src/game/client/episodic/c_vort_charge_token.cpp b/src/game/client/episodic/c_vort_charge_token.cpp
similarity index 100%
rename from mp/src/game/client/episodic/c_vort_charge_token.cpp
rename to src/game/client/episodic/c_vort_charge_token.cpp
diff --git a/mp/src/game/client/episodic/c_weapon_hopwire.cpp b/src/game/client/episodic/c_weapon_hopwire.cpp
similarity index 100%
rename from mp/src/game/client/episodic/c_weapon_hopwire.cpp
rename to src/game/client/episodic/c_weapon_hopwire.cpp
diff --git a/mp/src/game/client/episodic/episodic_screenspaceeffects.cpp b/src/game/client/episodic/episodic_screenspaceeffects.cpp
similarity index 100%
rename from mp/src/game/client/episodic/episodic_screenspaceeffects.cpp
rename to src/game/client/episodic/episodic_screenspaceeffects.cpp
diff --git a/mp/src/game/client/episodic/episodic_screenspaceeffects.h b/src/game/client/episodic/episodic_screenspaceeffects.h
similarity index 100%
rename from mp/src/game/client/episodic/episodic_screenspaceeffects.h
rename to src/game/client/episodic/episodic_screenspaceeffects.h
diff --git a/mp/src/game/client/episodic/flesh_internal_material_proxy.cpp b/src/game/client/episodic/flesh_internal_material_proxy.cpp
similarity index 100%
rename from mp/src/game/client/episodic/flesh_internal_material_proxy.cpp
rename to src/game/client/episodic/flesh_internal_material_proxy.cpp
diff --git a/mp/src/game/client/flashlighteffect.cpp b/src/game/client/flashlighteffect.cpp
similarity index 100%
rename from mp/src/game/client/flashlighteffect.cpp
rename to src/game/client/flashlighteffect.cpp
diff --git a/mp/src/game/client/flashlighteffect.h b/src/game/client/flashlighteffect.h
similarity index 100%
rename from mp/src/game/client/flashlighteffect.h
rename to src/game/client/flashlighteffect.h
diff --git a/mp/src/game/client/fontabc.h b/src/game/client/fontabc.h
similarity index 100%
rename from mp/src/game/client/fontabc.h
rename to src/game/client/fontabc.h
diff --git a/mp/src/game/client/functionproxy.cpp b/src/game/client/functionproxy.cpp
similarity index 100%
rename from mp/src/game/client/functionproxy.cpp
rename to src/game/client/functionproxy.cpp
diff --git a/mp/src/game/client/functionproxy.h b/src/game/client/functionproxy.h
similarity index 100%
rename from mp/src/game/client/functionproxy.h
rename to src/game/client/functionproxy.h
diff --git a/mp/src/game/client/fx.cpp b/src/game/client/fx.cpp
similarity index 100%
rename from mp/src/game/client/fx.cpp
rename to src/game/client/fx.cpp
diff --git a/mp/src/game/client/fx.h b/src/game/client/fx.h
similarity index 100%
rename from mp/src/game/client/fx.h
rename to src/game/client/fx.h
diff --git a/mp/src/game/client/fx_blood.cpp b/src/game/client/fx_blood.cpp
similarity index 100%
rename from mp/src/game/client/fx_blood.cpp
rename to src/game/client/fx_blood.cpp
diff --git a/mp/src/game/client/fx_blood.h b/src/game/client/fx_blood.h
similarity index 100%
rename from mp/src/game/client/fx_blood.h
rename to src/game/client/fx_blood.h
diff --git a/mp/src/game/client/fx_cube.cpp b/src/game/client/fx_cube.cpp
similarity index 100%
rename from mp/src/game/client/fx_cube.cpp
rename to src/game/client/fx_cube.cpp
diff --git a/mp/src/game/client/fx_discreetline.cpp b/src/game/client/fx_discreetline.cpp
similarity index 100%
rename from mp/src/game/client/fx_discreetline.cpp
rename to src/game/client/fx_discreetline.cpp
diff --git a/mp/src/game/client/fx_discreetline.h b/src/game/client/fx_discreetline.h
similarity index 100%
rename from mp/src/game/client/fx_discreetline.h
rename to src/game/client/fx_discreetline.h
diff --git a/mp/src/game/client/fx_envelope.cpp b/src/game/client/fx_envelope.cpp
similarity index 100%
rename from mp/src/game/client/fx_envelope.cpp
rename to src/game/client/fx_envelope.cpp
diff --git a/mp/src/game/client/fx_envelope.h b/src/game/client/fx_envelope.h
similarity index 100%
rename from mp/src/game/client/fx_envelope.h
rename to src/game/client/fx_envelope.h
diff --git a/mp/src/game/client/fx_explosion.cpp b/src/game/client/fx_explosion.cpp
similarity index 100%
rename from mp/src/game/client/fx_explosion.cpp
rename to src/game/client/fx_explosion.cpp
diff --git a/mp/src/game/client/fx_explosion.h b/src/game/client/fx_explosion.h
similarity index 100%
rename from mp/src/game/client/fx_explosion.h
rename to src/game/client/fx_explosion.h
diff --git a/mp/src/game/client/fx_fleck.cpp b/src/game/client/fx_fleck.cpp
similarity index 100%
rename from mp/src/game/client/fx_fleck.cpp
rename to src/game/client/fx_fleck.cpp
diff --git a/mp/src/game/client/fx_fleck.h b/src/game/client/fx_fleck.h
similarity index 100%
rename from mp/src/game/client/fx_fleck.h
rename to src/game/client/fx_fleck.h
diff --git a/mp/src/game/client/fx_impact.cpp b/src/game/client/fx_impact.cpp
similarity index 100%
rename from mp/src/game/client/fx_impact.cpp
rename to src/game/client/fx_impact.cpp
diff --git a/mp/src/game/client/fx_impact.h b/src/game/client/fx_impact.h
similarity index 100%
rename from mp/src/game/client/fx_impact.h
rename to src/game/client/fx_impact.h
diff --git a/mp/src/game/client/fx_interpvalue.cpp b/src/game/client/fx_interpvalue.cpp
similarity index 100%
rename from mp/src/game/client/fx_interpvalue.cpp
rename to src/game/client/fx_interpvalue.cpp
diff --git a/mp/src/game/client/fx_interpvalue.h b/src/game/client/fx_interpvalue.h
similarity index 100%
rename from mp/src/game/client/fx_interpvalue.h
rename to src/game/client/fx_interpvalue.h
diff --git a/mp/src/game/client/fx_line.cpp b/src/game/client/fx_line.cpp
similarity index 100%
rename from mp/src/game/client/fx_line.cpp
rename to src/game/client/fx_line.cpp
diff --git a/mp/src/game/client/fx_line.h b/src/game/client/fx_line.h
similarity index 100%
rename from mp/src/game/client/fx_line.h
rename to src/game/client/fx_line.h
diff --git a/mp/src/game/client/fx_quad.cpp b/src/game/client/fx_quad.cpp
similarity index 100%
rename from mp/src/game/client/fx_quad.cpp
rename to src/game/client/fx_quad.cpp
diff --git a/mp/src/game/client/fx_quad.h b/src/game/client/fx_quad.h
similarity index 100%
rename from mp/src/game/client/fx_quad.h
rename to src/game/client/fx_quad.h
diff --git a/mp/src/game/client/fx_shelleject.cpp b/src/game/client/fx_shelleject.cpp
similarity index 100%
rename from mp/src/game/client/fx_shelleject.cpp
rename to src/game/client/fx_shelleject.cpp
diff --git a/mp/src/game/client/fx_sparks.cpp b/src/game/client/fx_sparks.cpp
similarity index 100%
rename from mp/src/game/client/fx_sparks.cpp
rename to src/game/client/fx_sparks.cpp
diff --git a/mp/src/game/client/fx_sparks.h b/src/game/client/fx_sparks.h
similarity index 100%
rename from mp/src/game/client/fx_sparks.h
rename to src/game/client/fx_sparks.h
diff --git a/mp/src/game/client/fx_staticline.cpp b/src/game/client/fx_staticline.cpp
similarity index 100%
rename from mp/src/game/client/fx_staticline.cpp
rename to src/game/client/fx_staticline.cpp
diff --git a/mp/src/game/client/fx_staticline.h b/src/game/client/fx_staticline.h
similarity index 100%
rename from mp/src/game/client/fx_staticline.h
rename to src/game/client/fx_staticline.h
diff --git a/mp/src/game/client/fx_tracer.cpp b/src/game/client/fx_tracer.cpp
similarity index 100%
rename from mp/src/game/client/fx_tracer.cpp
rename to src/game/client/fx_tracer.cpp
diff --git a/mp/src/game/client/fx_trail.cpp b/src/game/client/fx_trail.cpp
similarity index 100%
rename from mp/src/game/client/fx_trail.cpp
rename to src/game/client/fx_trail.cpp
diff --git a/mp/src/game/client/fx_trail.h b/src/game/client/fx_trail.h
similarity index 100%
rename from mp/src/game/client/fx_trail.h
rename to src/game/client/fx_trail.h
diff --git a/mp/src/game/client/fx_water.cpp b/src/game/client/fx_water.cpp
similarity index 100%
rename from mp/src/game/client/fx_water.cpp
rename to src/game/client/fx_water.cpp
diff --git a/mp/src/game/client/fx_water.h b/src/game/client/fx_water.h
similarity index 100%
rename from mp/src/game/client/fx_water.h
rename to src/game/client/fx_water.h
diff --git a/mp/src/game/client/game_controls/ClientScoreBoardDialog.cpp b/src/game/client/game_controls/ClientScoreBoardDialog.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/ClientScoreBoardDialog.cpp
rename to src/game/client/game_controls/ClientScoreBoardDialog.cpp
diff --git a/mp/src/game/client/game_controls/IconPanel.cpp b/src/game/client/game_controls/IconPanel.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/IconPanel.cpp
rename to src/game/client/game_controls/IconPanel.cpp
diff --git a/mp/src/game/client/game_controls/IconPanel.h b/src/game/client/game_controls/IconPanel.h
similarity index 100%
rename from mp/src/game/client/game_controls/IconPanel.h
rename to src/game/client/game_controls/IconPanel.h
diff --git a/mp/src/game/client/game_controls/MapOverview.cpp b/src/game/client/game_controls/MapOverview.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/MapOverview.cpp
rename to src/game/client/game_controls/MapOverview.cpp
diff --git a/mp/src/game/client/game_controls/NavProgress.cpp b/src/game/client/game_controls/NavProgress.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/NavProgress.cpp
rename to src/game/client/game_controls/NavProgress.cpp
diff --git a/mp/src/game/client/game_controls/NavProgress.h b/src/game/client/game_controls/NavProgress.h
similarity index 100%
rename from mp/src/game/client/game_controls/NavProgress.h
rename to src/game/client/game_controls/NavProgress.h
diff --git a/mp/src/game/client/game_controls/SpectatorGUI.cpp b/src/game/client/game_controls/SpectatorGUI.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/SpectatorGUI.cpp
rename to src/game/client/game_controls/SpectatorGUI.cpp
diff --git a/mp/src/game/client/game_controls/basemodel_panel.cpp b/src/game/client/game_controls/basemodel_panel.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/basemodel_panel.cpp
rename to src/game/client/game_controls/basemodel_panel.cpp
diff --git a/mp/src/game/client/game_controls/basemodel_panel.h b/src/game/client/game_controls/basemodel_panel.h
similarity index 100%
rename from mp/src/game/client/game_controls/basemodel_panel.h
rename to src/game/client/game_controls/basemodel_panel.h
diff --git a/mp/src/game/client/game_controls/basemodelpanel.cpp b/src/game/client/game_controls/basemodelpanel.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/basemodelpanel.cpp
rename to src/game/client/game_controls/basemodelpanel.cpp
diff --git a/mp/src/game/client/game_controls/basemodelpanel.h b/src/game/client/game_controls/basemodelpanel.h
similarity index 100%
rename from mp/src/game/client/game_controls/basemodelpanel.h
rename to src/game/client/game_controls/basemodelpanel.h
diff --git a/mp/src/game/client/game_controls/baseviewport.cpp b/src/game/client/game_controls/baseviewport.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/baseviewport.cpp
rename to src/game/client/game_controls/baseviewport.cpp
diff --git a/mp/src/game/client/game_controls/baseviewport.h b/src/game/client/game_controls/baseviewport.h
similarity index 100%
rename from mp/src/game/client/game_controls/baseviewport.h
rename to src/game/client/game_controls/baseviewport.h
diff --git a/mp/src/game/client/game_controls/buymenu.cpp b/src/game/client/game_controls/buymenu.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/buymenu.cpp
rename to src/game/client/game_controls/buymenu.cpp
diff --git a/mp/src/game/client/game_controls/buymenu.h b/src/game/client/game_controls/buymenu.h
similarity index 100%
rename from mp/src/game/client/game_controls/buymenu.h
rename to src/game/client/game_controls/buymenu.h
diff --git a/mp/src/game/client/game_controls/buysubmenu.cpp b/src/game/client/game_controls/buysubmenu.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/buysubmenu.cpp
rename to src/game/client/game_controls/buysubmenu.cpp
diff --git a/mp/src/game/client/game_controls/buysubmenu.h b/src/game/client/game_controls/buysubmenu.h
similarity index 100%
rename from mp/src/game/client/game_controls/buysubmenu.h
rename to src/game/client/game_controls/buysubmenu.h
diff --git a/mp/src/game/client/game_controls/classmenu.cpp b/src/game/client/game_controls/classmenu.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/classmenu.cpp
rename to src/game/client/game_controls/classmenu.cpp
diff --git a/mp/src/game/client/game_controls/classmenu.h b/src/game/client/game_controls/classmenu.h
similarity index 100%
rename from mp/src/game/client/game_controls/classmenu.h
rename to src/game/client/game_controls/classmenu.h
diff --git a/mp/src/game/client/game_controls/clientscoreboarddialog.h b/src/game/client/game_controls/clientscoreboarddialog.h
similarity index 100%
rename from mp/src/game/client/game_controls/clientscoreboarddialog.h
rename to src/game/client/game_controls/clientscoreboarddialog.h
diff --git a/mp/src/game/client/game_controls/commandmenu.cpp b/src/game/client/game_controls/commandmenu.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/commandmenu.cpp
rename to src/game/client/game_controls/commandmenu.cpp
diff --git a/mp/src/game/client/game_controls/commandmenu.h b/src/game/client/game_controls/commandmenu.h
similarity index 100%
rename from mp/src/game/client/game_controls/commandmenu.h
rename to src/game/client/game_controls/commandmenu.h
diff --git a/mp/src/game/client/game_controls/imagemouseoverbutton.h b/src/game/client/game_controls/imagemouseoverbutton.h
similarity index 100%
rename from mp/src/game/client/game_controls/imagemouseoverbutton.h
rename to src/game/client/game_controls/imagemouseoverbutton.h
diff --git a/mp/src/game/client/game_controls/intromenu.cpp b/src/game/client/game_controls/intromenu.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/intromenu.cpp
rename to src/game/client/game_controls/intromenu.cpp
diff --git a/mp/src/game/client/game_controls/intromenu.h b/src/game/client/game_controls/intromenu.h
similarity index 100%
rename from mp/src/game/client/game_controls/intromenu.h
rename to src/game/client/game_controls/intromenu.h
diff --git a/mp/src/game/client/game_controls/mapoverview.h b/src/game/client/game_controls/mapoverview.h
similarity index 100%
rename from mp/src/game/client/game_controls/mapoverview.h
rename to src/game/client/game_controls/mapoverview.h
diff --git a/mp/src/game/client/game_controls/mouseoverhtmlbutton.h b/src/game/client/game_controls/mouseoverhtmlbutton.h
similarity index 100%
rename from mp/src/game/client/game_controls/mouseoverhtmlbutton.h
rename to src/game/client/game_controls/mouseoverhtmlbutton.h
diff --git a/mp/src/game/client/game_controls/mouseoverpanelbutton.h b/src/game/client/game_controls/mouseoverpanelbutton.h
similarity index 100%
rename from mp/src/game/client/game_controls/mouseoverpanelbutton.h
rename to src/game/client/game_controls/mouseoverpanelbutton.h
diff --git a/mp/src/game/client/game_controls/spectatorgui.h b/src/game/client/game_controls/spectatorgui.h
similarity index 100%
rename from mp/src/game/client/game_controls/spectatorgui.h
rename to src/game/client/game_controls/spectatorgui.h
diff --git a/mp/src/game/client/game_controls/teammenu.cpp b/src/game/client/game_controls/teammenu.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/teammenu.cpp
rename to src/game/client/game_controls/teammenu.cpp
diff --git a/mp/src/game/client/game_controls/teammenu.h b/src/game/client/game_controls/teammenu.h
similarity index 100%
rename from mp/src/game/client/game_controls/teammenu.h
rename to src/game/client/game_controls/teammenu.h
diff --git a/mp/src/game/client/game_controls/vguitextwindow.cpp b/src/game/client/game_controls/vguitextwindow.cpp
similarity index 100%
rename from mp/src/game/client/game_controls/vguitextwindow.cpp
rename to src/game/client/game_controls/vguitextwindow.cpp
diff --git a/mp/src/game/client/game_controls/vguitextwindow.h b/src/game/client/game_controls/vguitextwindow.h
similarity index 100%
rename from mp/src/game/client/game_controls/vguitextwindow.h
rename to src/game/client/game_controls/vguitextwindow.h
diff --git a/mp/src/game/client/gametrace_client.cpp b/src/game/client/gametrace_client.cpp
similarity index 100%
rename from mp/src/game/client/gametrace_client.cpp
rename to src/game/client/gametrace_client.cpp
diff --git a/mp/src/game/client/geiger.cpp b/src/game/client/geiger.cpp
similarity index 100%
rename from mp/src/game/client/geiger.cpp
rename to src/game/client/geiger.cpp
diff --git a/mp/src/game/client/glow_outline_effect.cpp b/src/game/client/glow_outline_effect.cpp
similarity index 100%
rename from mp/src/game/client/glow_outline_effect.cpp
rename to src/game/client/glow_outline_effect.cpp
diff --git a/mp/src/game/client/glow_outline_effect.h b/src/game/client/glow_outline_effect.h
similarity index 100%
rename from mp/src/game/client/glow_outline_effect.h
rename to src/game/client/glow_outline_effect.h
diff --git a/mp/src/game/client/glow_overlay.cpp b/src/game/client/glow_overlay.cpp
similarity index 100%
rename from mp/src/game/client/glow_overlay.cpp
rename to src/game/client/glow_overlay.cpp
diff --git a/mp/src/game/client/glow_overlay.h b/src/game/client/glow_overlay.h
similarity index 100%
rename from mp/src/game/client/glow_overlay.h
rename to src/game/client/glow_overlay.h
diff --git a/mp/src/game/client/history_resource.cpp b/src/game/client/history_resource.cpp
similarity index 100%
rename from mp/src/game/client/history_resource.cpp
rename to src/game/client/history_resource.cpp
diff --git a/mp/src/game/client/history_resource.h b/src/game/client/history_resource.h
similarity index 100%
rename from mp/src/game/client/history_resource.h
rename to src/game/client/history_resource.h
diff --git a/mp/src/game/client/hl2/C_Func_Monitor.cpp b/src/game/client/hl2/C_Func_Monitor.cpp
similarity index 100%
rename from mp/src/game/client/hl2/C_Func_Monitor.cpp
rename to src/game/client/hl2/C_Func_Monitor.cpp
diff --git a/mp/src/game/client/hl2/c_antlion_dust.cpp b/src/game/client/hl2/c_antlion_dust.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_antlion_dust.cpp
rename to src/game/client/hl2/c_antlion_dust.cpp
diff --git a/mp/src/game/client/hl2/c_ar2_explosion.cpp b/src/game/client/hl2/c_ar2_explosion.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_ar2_explosion.cpp
rename to src/game/client/hl2/c_ar2_explosion.cpp
diff --git a/mp/src/game/client/hl2/c_barnacle.cpp b/src/game/client/hl2/c_barnacle.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_barnacle.cpp
rename to src/game/client/hl2/c_barnacle.cpp
diff --git a/mp/src/game/client/hl2/c_barney.cpp b/src/game/client/hl2/c_barney.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_barney.cpp
rename to src/game/client/hl2/c_barney.cpp
diff --git a/mp/src/game/client/hl2/c_basehelicopter.cpp b/src/game/client/hl2/c_basehelicopter.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_basehelicopter.cpp
rename to src/game/client/hl2/c_basehelicopter.cpp
diff --git a/mp/src/game/client/hl2/c_basehelicopter.h b/src/game/client/hl2/c_basehelicopter.h
similarity index 100%
rename from mp/src/game/client/hl2/c_basehelicopter.h
rename to src/game/client/hl2/c_basehelicopter.h
diff --git a/mp/src/game/client/hl2/c_basehlcombatweapon.cpp b/src/game/client/hl2/c_basehlcombatweapon.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_basehlcombatweapon.cpp
rename to src/game/client/hl2/c_basehlcombatweapon.cpp
diff --git a/mp/src/game/client/hl2/c_basehlcombatweapon.h b/src/game/client/hl2/c_basehlcombatweapon.h
similarity index 100%
rename from mp/src/game/client/hl2/c_basehlcombatweapon.h
rename to src/game/client/hl2/c_basehlcombatweapon.h
diff --git a/mp/src/game/client/hl2/c_basehlplayer.cpp b/src/game/client/hl2/c_basehlplayer.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_basehlplayer.cpp
rename to src/game/client/hl2/c_basehlplayer.cpp
diff --git a/mp/src/game/client/hl2/c_basehlplayer.h b/src/game/client/hl2/c_basehlplayer.h
similarity index 100%
rename from mp/src/game/client/hl2/c_basehlplayer.h
rename to src/game/client/hl2/c_basehlplayer.h
diff --git a/mp/src/game/client/hl2/c_citadel_effects.cpp b/src/game/client/hl2/c_citadel_effects.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_citadel_effects.cpp
rename to src/game/client/hl2/c_citadel_effects.cpp
diff --git a/mp/src/game/client/hl2/c_corpse.cpp b/src/game/client/hl2/c_corpse.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_corpse.cpp
rename to src/game/client/hl2/c_corpse.cpp
diff --git a/mp/src/game/client/hl2/c_corpse.h b/src/game/client/hl2/c_corpse.h
similarity index 100%
rename from mp/src/game/client/hl2/c_corpse.h
rename to src/game/client/hl2/c_corpse.h
diff --git a/mp/src/game/client/hl2/c_energy_wave.cpp b/src/game/client/hl2/c_energy_wave.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_energy_wave.cpp
rename to src/game/client/hl2/c_energy_wave.cpp
diff --git a/mp/src/game/client/hl2/c_env_alyxtemp.cpp b/src/game/client/hl2/c_env_alyxtemp.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_env_alyxtemp.cpp
rename to src/game/client/hl2/c_env_alyxtemp.cpp
diff --git a/mp/src/game/client/hl2/c_env_headcrabcanister.cpp b/src/game/client/hl2/c_env_headcrabcanister.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_env_headcrabcanister.cpp
rename to src/game/client/hl2/c_env_headcrabcanister.cpp
diff --git a/mp/src/game/client/hl2/c_env_starfield.cpp b/src/game/client/hl2/c_env_starfield.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_env_starfield.cpp
rename to src/game/client/hl2/c_env_starfield.cpp
diff --git a/mp/src/game/client/hl2/c_extinguisher.cpp b/src/game/client/hl2/c_extinguisher.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_extinguisher.cpp
rename to src/game/client/hl2/c_extinguisher.cpp
diff --git a/mp/src/game/client/hl2/c_func_tankmortar.cpp b/src/game/client/hl2/c_func_tankmortar.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_func_tankmortar.cpp
rename to src/game/client/hl2/c_func_tankmortar.cpp
diff --git a/mp/src/game/client/hl2/c_hl2_playerlocaldata.cpp b/src/game/client/hl2/c_hl2_playerlocaldata.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_hl2_playerlocaldata.cpp
rename to src/game/client/hl2/c_hl2_playerlocaldata.cpp
diff --git a/mp/src/game/client/hl2/c_hl2_playerlocaldata.h b/src/game/client/hl2/c_hl2_playerlocaldata.h
similarity index 100%
rename from mp/src/game/client/hl2/c_hl2_playerlocaldata.h
rename to src/game/client/hl2/c_hl2_playerlocaldata.h
diff --git a/mp/src/game/client/hl2/c_info_teleporter_countdown.cpp b/src/game/client/hl2/c_info_teleporter_countdown.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_info_teleporter_countdown.cpp
rename to src/game/client/hl2/c_info_teleporter_countdown.cpp
diff --git a/mp/src/game/client/hl2/c_npc_antlionguard.cpp b/src/game/client/hl2/c_npc_antlionguard.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_npc_antlionguard.cpp
rename to src/game/client/hl2/c_npc_antlionguard.cpp
diff --git a/mp/src/game/client/hl2/c_npc_combinegunship.cpp b/src/game/client/hl2/c_npc_combinegunship.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_npc_combinegunship.cpp
rename to src/game/client/hl2/c_npc_combinegunship.cpp
diff --git a/mp/src/game/client/hl2/c_npc_hydra.cpp b/src/game/client/hl2/c_npc_hydra.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_npc_hydra.cpp
rename to src/game/client/hl2/c_npc_hydra.cpp
diff --git a/mp/src/game/client/hl2/c_npc_manhack.cpp b/src/game/client/hl2/c_npc_manhack.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_npc_manhack.cpp
rename to src/game/client/hl2/c_npc_manhack.cpp
diff --git a/mp/src/game/client/hl2/c_npc_rollermine.cpp b/src/game/client/hl2/c_npc_rollermine.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_npc_rollermine.cpp
rename to src/game/client/hl2/c_npc_rollermine.cpp
diff --git a/mp/src/game/client/hl2/c_plasma_beam_node.cpp b/src/game/client/hl2/c_plasma_beam_node.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_plasma_beam_node.cpp
rename to src/game/client/hl2/c_plasma_beam_node.cpp
diff --git a/mp/src/game/client/hl2/c_prop_combine_ball.cpp b/src/game/client/hl2/c_prop_combine_ball.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_prop_combine_ball.cpp
rename to src/game/client/hl2/c_prop_combine_ball.cpp
diff --git a/mp/src/game/client/hl2/c_prop_combine_ball.h b/src/game/client/hl2/c_prop_combine_ball.h
similarity index 100%
rename from mp/src/game/client/hl2/c_prop_combine_ball.h
rename to src/game/client/hl2/c_prop_combine_ball.h
diff --git a/mp/src/game/client/hl2/c_rotorwash.cpp b/src/game/client/hl2/c_rotorwash.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_rotorwash.cpp
rename to src/game/client/hl2/c_rotorwash.cpp
diff --git a/mp/src/game/client/hl2/c_script_intro.cpp b/src/game/client/hl2/c_script_intro.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_script_intro.cpp
rename to src/game/client/hl2/c_script_intro.cpp
diff --git a/mp/src/game/client/hl2/c_strider.cpp b/src/game/client/hl2/c_strider.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_strider.cpp
rename to src/game/client/hl2/c_strider.cpp
diff --git a/mp/src/game/client/hl2/c_te_concussiveexplosion.cpp b/src/game/client/hl2/c_te_concussiveexplosion.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_te_concussiveexplosion.cpp
rename to src/game/client/hl2/c_te_concussiveexplosion.cpp
diff --git a/mp/src/game/client/hl2/c_te_flare.cpp b/src/game/client/hl2/c_te_flare.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_te_flare.cpp
rename to src/game/client/hl2/c_te_flare.cpp
diff --git a/mp/src/game/client/hl2/c_thumper_dust.cpp b/src/game/client/hl2/c_thumper_dust.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_thumper_dust.cpp
rename to src/game/client/hl2/c_thumper_dust.cpp
diff --git a/mp/src/game/client/hl2/c_vehicle_airboat.cpp b/src/game/client/hl2/c_vehicle_airboat.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_vehicle_airboat.cpp
rename to src/game/client/hl2/c_vehicle_airboat.cpp
diff --git a/mp/src/game/client/hl2/c_vehicle_cannon.cpp b/src/game/client/hl2/c_vehicle_cannon.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_vehicle_cannon.cpp
rename to src/game/client/hl2/c_vehicle_cannon.cpp
diff --git a/mp/src/game/client/hl2/c_vehicle_crane.cpp b/src/game/client/hl2/c_vehicle_crane.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_vehicle_crane.cpp
rename to src/game/client/hl2/c_vehicle_crane.cpp
diff --git a/mp/src/game/client/hl2/c_vehicle_crane.h b/src/game/client/hl2/c_vehicle_crane.h
similarity index 100%
rename from mp/src/game/client/hl2/c_vehicle_crane.h
rename to src/game/client/hl2/c_vehicle_crane.h
diff --git a/mp/src/game/client/hl2/c_vehicle_prisoner_pod.cpp b/src/game/client/hl2/c_vehicle_prisoner_pod.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_vehicle_prisoner_pod.cpp
rename to src/game/client/hl2/c_vehicle_prisoner_pod.cpp
diff --git a/mp/src/game/client/hl2/c_waterbullet.cpp b/src/game/client/hl2/c_waterbullet.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_waterbullet.cpp
rename to src/game/client/hl2/c_waterbullet.cpp
diff --git a/mp/src/game/client/hl2/c_weapon__stubs_hl2.cpp b/src/game/client/hl2/c_weapon__stubs_hl2.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_weapon__stubs_hl2.cpp
rename to src/game/client/hl2/c_weapon__stubs_hl2.cpp
diff --git a/mp/src/game/client/hl2/c_weapon_crossbow.cpp b/src/game/client/hl2/c_weapon_crossbow.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_weapon_crossbow.cpp
rename to src/game/client/hl2/c_weapon_crossbow.cpp
diff --git a/mp/src/game/client/hl2/c_weapon_gravitygun.cpp b/src/game/client/hl2/c_weapon_gravitygun.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_weapon_gravitygun.cpp
rename to src/game/client/hl2/c_weapon_gravitygun.cpp
diff --git a/mp/src/game/client/hl2/c_weapon_physcannon.cpp b/src/game/client/hl2/c_weapon_physcannon.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_weapon_physcannon.cpp
rename to src/game/client/hl2/c_weapon_physcannon.cpp
diff --git a/mp/src/game/client/hl2/c_weapon_stunstick.cpp b/src/game/client/hl2/c_weapon_stunstick.cpp
similarity index 100%
rename from mp/src/game/client/hl2/c_weapon_stunstick.cpp
rename to src/game/client/hl2/c_weapon_stunstick.cpp
diff --git a/mp/src/game/client/hl2/clientmode_hlnormal.cpp b/src/game/client/hl2/clientmode_hlnormal.cpp
similarity index 100%
rename from mp/src/game/client/hl2/clientmode_hlnormal.cpp
rename to src/game/client/hl2/clientmode_hlnormal.cpp
diff --git a/mp/src/game/client/hl2/clientmode_hlnormal.h b/src/game/client/hl2/clientmode_hlnormal.h
similarity index 100%
rename from mp/src/game/client/hl2/clientmode_hlnormal.h
rename to src/game/client/hl2/clientmode_hlnormal.h
diff --git a/mp/src/game/client/hl2/fx_antlion.cpp b/src/game/client/hl2/fx_antlion.cpp
similarity index 100%
rename from mp/src/game/client/hl2/fx_antlion.cpp
rename to src/game/client/hl2/fx_antlion.cpp
diff --git a/mp/src/game/client/hl2/fx_bugbait.cpp b/src/game/client/hl2/fx_bugbait.cpp
similarity index 100%
rename from mp/src/game/client/hl2/fx_bugbait.cpp
rename to src/game/client/hl2/fx_bugbait.cpp
diff --git a/mp/src/game/client/hl2/fx_hl2_impacts.cpp b/src/game/client/hl2/fx_hl2_impacts.cpp
similarity index 100%
rename from mp/src/game/client/hl2/fx_hl2_impacts.cpp
rename to src/game/client/hl2/fx_hl2_impacts.cpp
diff --git a/mp/src/game/client/hl2/fx_hl2_tracers.cpp b/src/game/client/hl2/fx_hl2_tracers.cpp
similarity index 100%
rename from mp/src/game/client/hl2/fx_hl2_tracers.cpp
rename to src/game/client/hl2/fx_hl2_tracers.cpp
diff --git a/mp/src/game/client/hl2/hl2_clientmode.cpp b/src/game/client/hl2/hl2_clientmode.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hl2_clientmode.cpp
rename to src/game/client/hl2/hl2_clientmode.cpp
diff --git a/mp/src/game/client/hl2/hl_in_main.cpp b/src/game/client/hl2/hl_in_main.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hl_in_main.cpp
rename to src/game/client/hl2/hl_in_main.cpp
diff --git a/mp/src/game/client/hl2/hl_prediction.cpp b/src/game/client/hl2/hl_prediction.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hl_prediction.cpp
rename to src/game/client/hl2/hl_prediction.cpp
diff --git a/mp/src/game/client/hl2/hud_ammo.cpp b/src/game/client/hl2/hud_ammo.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_ammo.cpp
rename to src/game/client/hl2/hud_ammo.cpp
diff --git a/mp/src/game/client/hl2/hud_autoaim.cpp b/src/game/client/hl2/hud_autoaim.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_autoaim.cpp
rename to src/game/client/hl2/hud_autoaim.cpp
diff --git a/mp/src/game/client/hl2/hud_battery.cpp b/src/game/client/hl2/hud_battery.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_battery.cpp
rename to src/game/client/hl2/hud_battery.cpp
diff --git a/mp/src/game/client/hl2/hud_blood.cpp b/src/game/client/hl2/hud_blood.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_blood.cpp
rename to src/game/client/hl2/hud_blood.cpp
diff --git a/mp/src/game/client/hl2/hud_bonusprogress.cpp b/src/game/client/hl2/hud_bonusprogress.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_bonusprogress.cpp
rename to src/game/client/hl2/hud_bonusprogress.cpp
diff --git a/mp/src/game/client/hl2/hud_credits.cpp b/src/game/client/hl2/hud_credits.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_credits.cpp
rename to src/game/client/hl2/hud_credits.cpp
diff --git a/mp/src/game/client/hl2/hud_damageindicator.cpp b/src/game/client/hl2/hud_damageindicator.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_damageindicator.cpp
rename to src/game/client/hl2/hud_damageindicator.cpp
diff --git a/mp/src/game/client/hl2/hud_filmdemo.cpp b/src/game/client/hl2/hud_filmdemo.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_filmdemo.cpp
rename to src/game/client/hl2/hud_filmdemo.cpp
diff --git a/mp/src/game/client/hl2/hud_flashlight.cpp b/src/game/client/hl2/hud_flashlight.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_flashlight.cpp
rename to src/game/client/hl2/hud_flashlight.cpp
diff --git a/mp/src/game/client/hl2/hud_hdrdemo.cpp b/src/game/client/hl2/hud_hdrdemo.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_hdrdemo.cpp
rename to src/game/client/hl2/hud_hdrdemo.cpp
diff --git a/mp/src/game/client/hl2/hud_health.cpp b/src/game/client/hl2/hud_health.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_health.cpp
rename to src/game/client/hl2/hud_health.cpp
diff --git a/mp/src/game/client/hl2/hud_locator.cpp b/src/game/client/hl2/hud_locator.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_locator.cpp
rename to src/game/client/hl2/hud_locator.cpp
diff --git a/mp/src/game/client/hl2/hud_poisondamageindicator.cpp b/src/game/client/hl2/hud_poisondamageindicator.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_poisondamageindicator.cpp
rename to src/game/client/hl2/hud_poisondamageindicator.cpp
diff --git a/mp/src/game/client/hl2/hud_quickinfo.cpp b/src/game/client/hl2/hud_quickinfo.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_quickinfo.cpp
rename to src/game/client/hl2/hud_quickinfo.cpp
diff --git a/mp/src/game/client/hl2/hud_radar.cpp b/src/game/client/hl2/hud_radar.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_radar.cpp
rename to src/game/client/hl2/hud_radar.cpp
diff --git a/mp/src/game/client/hl2/hud_radar.h b/src/game/client/hl2/hud_radar.h
similarity index 100%
rename from mp/src/game/client/hl2/hud_radar.h
rename to src/game/client/hl2/hud_radar.h
diff --git a/mp/src/game/client/hl2/hud_suitpower.cpp b/src/game/client/hl2/hud_suitpower.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_suitpower.cpp
rename to src/game/client/hl2/hud_suitpower.cpp
diff --git a/mp/src/game/client/hl2/hud_suitpower.h b/src/game/client/hl2/hud_suitpower.h
similarity index 100%
rename from mp/src/game/client/hl2/hud_suitpower.h
rename to src/game/client/hl2/hud_suitpower.h
diff --git a/mp/src/game/client/hl2/hud_weaponselection.cpp b/src/game/client/hl2/hud_weaponselection.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_weaponselection.cpp
rename to src/game/client/hl2/hud_weaponselection.cpp
diff --git a/mp/src/game/client/hl2/hud_zoom.cpp b/src/game/client/hl2/hud_zoom.cpp
similarity index 100%
rename from mp/src/game/client/hl2/hud_zoom.cpp
rename to src/game/client/hl2/hud_zoom.cpp
diff --git a/mp/src/game/client/hl2/shieldproxy.cpp b/src/game/client/hl2/shieldproxy.cpp
similarity index 100%
rename from mp/src/game/client/hl2/shieldproxy.cpp
rename to src/game/client/hl2/shieldproxy.cpp
diff --git a/mp/src/game/client/hl2/vgui_rootpanel_hl2.cpp b/src/game/client/hl2/vgui_rootpanel_hl2.cpp
similarity index 100%
rename from mp/src/game/client/hl2/vgui_rootpanel_hl2.cpp
rename to src/game/client/hl2/vgui_rootpanel_hl2.cpp
diff --git a/mp/src/game/client/hl2mp/c_hl2mp_player.cpp b/src/game/client/hl2mp/c_hl2mp_player.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/c_hl2mp_player.cpp
rename to src/game/client/hl2mp/c_hl2mp_player.cpp
diff --git a/mp/src/game/client/hl2mp/c_hl2mp_player.h b/src/game/client/hl2mp/c_hl2mp_player.h
similarity index 100%
rename from mp/src/game/client/hl2mp/c_hl2mp_player.h
rename to src/game/client/hl2mp/c_hl2mp_player.h
diff --git a/mp/src/game/client/hl2mp/c_te_hl2mp_shotgun_shot.cpp b/src/game/client/hl2mp/c_te_hl2mp_shotgun_shot.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/c_te_hl2mp_shotgun_shot.cpp
rename to src/game/client/hl2mp/c_te_hl2mp_shotgun_shot.cpp
diff --git a/mp/src/game/client/hl2mp/clientmode_hl2mpnormal.cpp b/src/game/client/hl2mp/clientmode_hl2mpnormal.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/clientmode_hl2mpnormal.cpp
rename to src/game/client/hl2mp/clientmode_hl2mpnormal.cpp
diff --git a/mp/src/game/client/hl2mp/clientmode_hl2mpnormal.h b/src/game/client/hl2mp/clientmode_hl2mpnormal.h
similarity index 100%
rename from mp/src/game/client/hl2mp/clientmode_hl2mpnormal.h
rename to src/game/client/hl2mp/clientmode_hl2mpnormal.h
diff --git a/mp/src/game/client/hl2mp/hl2mp_hud_chat.cpp b/src/game/client/hl2mp/hl2mp_hud_chat.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/hl2mp_hud_chat.cpp
rename to src/game/client/hl2mp/hl2mp_hud_chat.cpp
diff --git a/mp/src/game/client/hl2mp/hl2mp_hud_chat.h b/src/game/client/hl2mp/hl2mp_hud_chat.h
similarity index 100%
rename from mp/src/game/client/hl2mp/hl2mp_hud_chat.h
rename to src/game/client/hl2mp/hl2mp_hud_chat.h
diff --git a/mp/src/game/client/hl2mp/hl2mp_hud_target_id.cpp b/src/game/client/hl2mp/hl2mp_hud_target_id.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/hl2mp_hud_target_id.cpp
rename to src/game/client/hl2mp/hl2mp_hud_target_id.cpp
diff --git a/mp/src/game/client/hl2mp/hl2mp_hud_team.cpp b/src/game/client/hl2mp/hl2mp_hud_team.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/hl2mp_hud_team.cpp
rename to src/game/client/hl2mp/hl2mp_hud_team.cpp
diff --git a/mp/src/game/client/hl2mp/hud_deathnotice.cpp b/src/game/client/hl2mp/hud_deathnotice.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/hud_deathnotice.cpp
rename to src/game/client/hl2mp/hud_deathnotice.cpp
diff --git a/mp/src/game/client/hl2mp/ui/backgroundpanel.cpp b/src/game/client/hl2mp/ui/backgroundpanel.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/ui/backgroundpanel.cpp
rename to src/game/client/hl2mp/ui/backgroundpanel.cpp
diff --git a/mp/src/game/client/hl2mp/ui/backgroundpanel.h b/src/game/client/hl2mp/ui/backgroundpanel.h
similarity index 100%
rename from mp/src/game/client/hl2mp/ui/backgroundpanel.h
rename to src/game/client/hl2mp/ui/backgroundpanel.h
diff --git a/mp/src/game/client/hl2mp/ui/hl2mpclientscoreboard.cpp b/src/game/client/hl2mp/ui/hl2mpclientscoreboard.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/ui/hl2mpclientscoreboard.cpp
rename to src/game/client/hl2mp/ui/hl2mpclientscoreboard.cpp
diff --git a/mp/src/game/client/hl2mp/ui/hl2mpclientscoreboard.h b/src/game/client/hl2mp/ui/hl2mpclientscoreboard.h
similarity index 100%
rename from mp/src/game/client/hl2mp/ui/hl2mpclientscoreboard.h
rename to src/game/client/hl2mp/ui/hl2mpclientscoreboard.h
diff --git a/mp/src/game/client/hl2mp/ui/hl2mptextwindow.cpp b/src/game/client/hl2mp/ui/hl2mptextwindow.cpp
similarity index 100%
rename from mp/src/game/client/hl2mp/ui/hl2mptextwindow.cpp
rename to src/game/client/hl2mp/ui/hl2mptextwindow.cpp
diff --git a/mp/src/game/client/hl2mp/ui/hl2mptextwindow.h b/src/game/client/hl2mp/ui/hl2mptextwindow.h
similarity index 100%
rename from mp/src/game/client/hl2mp/ui/hl2mptextwindow.h
rename to src/game/client/hl2mp/ui/hl2mptextwindow.h
diff --git a/mp/src/game/client/hltvcamera.cpp b/src/game/client/hltvcamera.cpp
similarity index 100%
rename from mp/src/game/client/hltvcamera.cpp
rename to src/game/client/hltvcamera.cpp
diff --git a/mp/src/game/client/hltvcamera.h b/src/game/client/hltvcamera.h
similarity index 100%
rename from mp/src/game/client/hltvcamera.h
rename to src/game/client/hltvcamera.h
diff --git a/mp/src/game/client/hud.cpp b/src/game/client/hud.cpp
similarity index 100%
rename from mp/src/game/client/hud.cpp
rename to src/game/client/hud.cpp
diff --git a/mp/src/game/client/hud.h b/src/game/client/hud.h
similarity index 100%
rename from mp/src/game/client/hud.h
rename to src/game/client/hud.h
diff --git a/mp/src/game/client/hud_animationinfo.cpp b/src/game/client/hud_animationinfo.cpp
similarity index 100%
rename from mp/src/game/client/hud_animationinfo.cpp
rename to src/game/client/hud_animationinfo.cpp
diff --git a/mp/src/game/client/hud_base_account.cpp b/src/game/client/hud_base_account.cpp
similarity index 100%
rename from mp/src/game/client/hud_base_account.cpp
rename to src/game/client/hud_base_account.cpp
diff --git a/mp/src/game/client/hud_base_account.h b/src/game/client/hud_base_account.h
similarity index 100%
rename from mp/src/game/client/hud_base_account.h
rename to src/game/client/hud_base_account.h
diff --git a/mp/src/game/client/hud_basechat.cpp b/src/game/client/hud_basechat.cpp
similarity index 100%
rename from mp/src/game/client/hud_basechat.cpp
rename to src/game/client/hud_basechat.cpp
diff --git a/mp/src/game/client/hud_basechat.h b/src/game/client/hud_basechat.h
similarity index 100%
rename from mp/src/game/client/hud_basechat.h
rename to src/game/client/hud_basechat.h
diff --git a/mp/src/game/client/hud_basedeathnotice.cpp b/src/game/client/hud_basedeathnotice.cpp
similarity index 100%
rename from mp/src/game/client/hud_basedeathnotice.cpp
rename to src/game/client/hud_basedeathnotice.cpp
diff --git a/mp/src/game/client/hud_basedeathnotice.h b/src/game/client/hud_basedeathnotice.h
similarity index 100%
rename from mp/src/game/client/hud_basedeathnotice.h
rename to src/game/client/hud_basedeathnotice.h
diff --git a/mp/src/game/client/hud_basetimer.cpp b/src/game/client/hud_basetimer.cpp
similarity index 100%
rename from mp/src/game/client/hud_basetimer.cpp
rename to src/game/client/hud_basetimer.cpp
diff --git a/mp/src/game/client/hud_basetimer.h b/src/game/client/hud_basetimer.h
similarity index 100%
rename from mp/src/game/client/hud_basetimer.h
rename to src/game/client/hud_basetimer.h
diff --git a/mp/src/game/client/hud_bitmapnumericdisplay.cpp b/src/game/client/hud_bitmapnumericdisplay.cpp
similarity index 100%
rename from mp/src/game/client/hud_bitmapnumericdisplay.cpp
rename to src/game/client/hud_bitmapnumericdisplay.cpp
diff --git a/mp/src/game/client/hud_bitmapnumericdisplay.h b/src/game/client/hud_bitmapnumericdisplay.h
similarity index 100%
rename from mp/src/game/client/hud_bitmapnumericdisplay.h
rename to src/game/client/hud_bitmapnumericdisplay.h
diff --git a/mp/src/game/client/hud_chat.cpp b/src/game/client/hud_chat.cpp
similarity index 100%
rename from mp/src/game/client/hud_chat.cpp
rename to src/game/client/hud_chat.cpp
diff --git a/mp/src/game/client/hud_chat.h b/src/game/client/hud_chat.h
similarity index 100%
rename from mp/src/game/client/hud_chat.h
rename to src/game/client/hud_chat.h
diff --git a/mp/src/game/client/hud_closecaption.cpp b/src/game/client/hud_closecaption.cpp
similarity index 100%
rename from mp/src/game/client/hud_closecaption.cpp
rename to src/game/client/hud_closecaption.cpp
diff --git a/mp/src/game/client/hud_closecaption.h b/src/game/client/hud_closecaption.h
similarity index 100%
rename from mp/src/game/client/hud_closecaption.h
rename to src/game/client/hud_closecaption.h
diff --git a/mp/src/game/client/hud_controlpointicons.cpp b/src/game/client/hud_controlpointicons.cpp
similarity index 100%
rename from mp/src/game/client/hud_controlpointicons.cpp
rename to src/game/client/hud_controlpointicons.cpp
diff --git a/mp/src/game/client/hud_controlpointicons.h b/src/game/client/hud_controlpointicons.h
similarity index 100%
rename from mp/src/game/client/hud_controlpointicons.h
rename to src/game/client/hud_controlpointicons.h
diff --git a/mp/src/game/client/hud_controlpointpanel.cpp b/src/game/client/hud_controlpointpanel.cpp
similarity index 100%
rename from mp/src/game/client/hud_controlpointpanel.cpp
rename to src/game/client/hud_controlpointpanel.cpp
diff --git a/mp/src/game/client/hud_crosshair.cpp b/src/game/client/hud_crosshair.cpp
similarity index 100%
rename from mp/src/game/client/hud_crosshair.cpp
rename to src/game/client/hud_crosshair.cpp
diff --git a/mp/src/game/client/hud_crosshair.h b/src/game/client/hud_crosshair.h
similarity index 100%
rename from mp/src/game/client/hud_crosshair.h
rename to src/game/client/hud_crosshair.h
diff --git a/mp/src/game/client/hud_element_helper.cpp b/src/game/client/hud_element_helper.cpp
similarity index 100%
rename from mp/src/game/client/hud_element_helper.cpp
rename to src/game/client/hud_element_helper.cpp
diff --git a/mp/src/game/client/hud_element_helper.h b/src/game/client/hud_element_helper.h
similarity index 100%
rename from mp/src/game/client/hud_element_helper.h
rename to src/game/client/hud_element_helper.h
diff --git a/mp/src/game/client/hud_hintdisplay.cpp b/src/game/client/hud_hintdisplay.cpp
similarity index 100%
rename from mp/src/game/client/hud_hintdisplay.cpp
rename to src/game/client/hud_hintdisplay.cpp
diff --git a/mp/src/game/client/hud_lcd.cpp b/src/game/client/hud_lcd.cpp
similarity index 100%
rename from mp/src/game/client/hud_lcd.cpp
rename to src/game/client/hud_lcd.cpp
diff --git a/mp/src/game/client/hud_lcd.h b/src/game/client/hud_lcd.h
similarity index 100%
rename from mp/src/game/client/hud_lcd.h
rename to src/game/client/hud_lcd.h
diff --git a/mp/src/game/client/hud_macros.h b/src/game/client/hud_macros.h
similarity index 100%
rename from mp/src/game/client/hud_macros.h
rename to src/game/client/hud_macros.h
diff --git a/mp/src/game/client/hud_msg.cpp b/src/game/client/hud_msg.cpp
similarity index 100%
rename from mp/src/game/client/hud_msg.cpp
rename to src/game/client/hud_msg.cpp
diff --git a/mp/src/game/client/hud_numericdisplay.cpp b/src/game/client/hud_numericdisplay.cpp
similarity index 100%
rename from mp/src/game/client/hud_numericdisplay.cpp
rename to src/game/client/hud_numericdisplay.cpp
diff --git a/mp/src/game/client/hud_numericdisplay.h b/src/game/client/hud_numericdisplay.h
similarity index 100%
rename from mp/src/game/client/hud_numericdisplay.h
rename to src/game/client/hud_numericdisplay.h
diff --git a/mp/src/game/client/hud_pdump.cpp b/src/game/client/hud_pdump.cpp
similarity index 100%
rename from mp/src/game/client/hud_pdump.cpp
rename to src/game/client/hud_pdump.cpp
diff --git a/mp/src/game/client/hud_pdump.h b/src/game/client/hud_pdump.h
similarity index 100%
rename from mp/src/game/client/hud_pdump.h
rename to src/game/client/hud_pdump.h
diff --git a/mp/src/game/client/hud_posture.cpp b/src/game/client/hud_posture.cpp
similarity index 100%
rename from mp/src/game/client/hud_posture.cpp
rename to src/game/client/hud_posture.cpp
diff --git a/mp/src/game/client/hud_redraw.cpp b/src/game/client/hud_redraw.cpp
similarity index 100%
rename from mp/src/game/client/hud_redraw.cpp
rename to src/game/client/hud_redraw.cpp
diff --git a/mp/src/game/client/hud_squadstatus.cpp b/src/game/client/hud_squadstatus.cpp
similarity index 100%
rename from mp/src/game/client/hud_squadstatus.cpp
rename to src/game/client/hud_squadstatus.cpp
diff --git a/mp/src/game/client/hud_vehicle.cpp b/src/game/client/hud_vehicle.cpp
similarity index 100%
rename from mp/src/game/client/hud_vehicle.cpp
rename to src/game/client/hud_vehicle.cpp
diff --git a/mp/src/game/client/hud_vehicle.h b/src/game/client/hud_vehicle.h
similarity index 100%
rename from mp/src/game/client/hud_vehicle.h
rename to src/game/client/hud_vehicle.h
diff --git a/mp/src/game/client/hud_vguiscreencursor.cpp b/src/game/client/hud_vguiscreencursor.cpp
similarity index 100%
rename from mp/src/game/client/hud_vguiscreencursor.cpp
rename to src/game/client/hud_vguiscreencursor.cpp
diff --git a/mp/src/game/client/hud_voicestatus.cpp b/src/game/client/hud_voicestatus.cpp
similarity index 100%
rename from mp/src/game/client/hud_voicestatus.cpp
rename to src/game/client/hud_voicestatus.cpp
diff --git a/mp/src/game/client/hud_vote.cpp b/src/game/client/hud_vote.cpp
similarity index 100%
rename from mp/src/game/client/hud_vote.cpp
rename to src/game/client/hud_vote.cpp
diff --git a/mp/src/game/client/hud_vote.h b/src/game/client/hud_vote.h
similarity index 100%
rename from mp/src/game/client/hud_vote.h
rename to src/game/client/hud_vote.h
diff --git a/mp/src/game/client/hud_weapon.cpp b/src/game/client/hud_weapon.cpp
similarity index 100%
rename from mp/src/game/client/hud_weapon.cpp
rename to src/game/client/hud_weapon.cpp
diff --git a/mp/src/game/client/hudelement.h b/src/game/client/hudelement.h
similarity index 100%
rename from mp/src/game/client/hudelement.h
rename to src/game/client/hudelement.h
diff --git a/mp/src/game/client/hudtexturehandle.h b/src/game/client/hudtexturehandle.h
similarity index 100%
rename from mp/src/game/client/hudtexturehandle.h
rename to src/game/client/hudtexturehandle.h
diff --git a/mp/src/game/client/iclassmap.h b/src/game/client/iclassmap.h
similarity index 100%
rename from mp/src/game/client/iclassmap.h
rename to src/game/client/iclassmap.h
diff --git a/mp/src/game/client/icliententityinternal.h b/src/game/client/icliententityinternal.h
similarity index 100%
rename from mp/src/game/client/icliententityinternal.h
rename to src/game/client/icliententityinternal.h
diff --git a/mp/src/game/client/iclientmode.h b/src/game/client/iclientmode.h
similarity index 100%
rename from mp/src/game/client/iclientmode.h
rename to src/game/client/iclientmode.h
diff --git a/mp/src/game/client/iclientshadowmgr.h b/src/game/client/iclientshadowmgr.h
similarity index 100%
rename from mp/src/game/client/iclientshadowmgr.h
rename to src/game/client/iclientshadowmgr.h
diff --git a/mp/src/game/client/iclientvehicle.h b/src/game/client/iclientvehicle.h
similarity index 100%
rename from mp/src/game/client/iclientvehicle.h
rename to src/game/client/iclientvehicle.h
diff --git a/mp/src/game/client/iconsole.h b/src/game/client/iconsole.h
similarity index 100%
rename from mp/src/game/client/iconsole.h
rename to src/game/client/iconsole.h
diff --git a/mp/src/game/client/idebugoverlaypanel.h b/src/game/client/idebugoverlaypanel.h
similarity index 100%
rename from mp/src/game/client/idebugoverlaypanel.h
rename to src/game/client/idebugoverlaypanel.h
diff --git a/mp/src/game/client/ifpspanel.h b/src/game/client/ifpspanel.h
similarity index 100%
rename from mp/src/game/client/ifpspanel.h
rename to src/game/client/ifpspanel.h
diff --git a/mp/src/game/client/ihudlcd.h b/src/game/client/ihudlcd.h
similarity index 100%
rename from mp/src/game/client/ihudlcd.h
rename to src/game/client/ihudlcd.h
diff --git a/mp/src/game/client/iinput.h b/src/game/client/iinput.h
similarity index 100%
rename from mp/src/game/client/iinput.h
rename to src/game/client/iinput.h
diff --git a/mp/src/game/client/iloadingdisc.h b/src/game/client/iloadingdisc.h
similarity index 100%
rename from mp/src/game/client/iloadingdisc.h
rename to src/game/client/iloadingdisc.h
diff --git a/mp/src/game/client/imessagechars.h b/src/game/client/imessagechars.h
similarity index 100%
rename from mp/src/game/client/imessagechars.h
rename to src/game/client/imessagechars.h
diff --git a/mp/src/game/client/in_camera.cpp b/src/game/client/in_camera.cpp
similarity index 100%
rename from mp/src/game/client/in_camera.cpp
rename to src/game/client/in_camera.cpp
diff --git a/mp/src/game/client/in_forcefeedback.cpp b/src/game/client/in_forcefeedback.cpp
similarity index 100%
rename from mp/src/game/client/in_forcefeedback.cpp
rename to src/game/client/in_forcefeedback.cpp
diff --git a/mp/src/game/client/in_joystick.cpp b/src/game/client/in_joystick.cpp
similarity index 100%
rename from mp/src/game/client/in_joystick.cpp
rename to src/game/client/in_joystick.cpp
diff --git a/mp/src/game/client/in_main.cpp b/src/game/client/in_main.cpp
similarity index 100%
rename from mp/src/game/client/in_main.cpp
rename to src/game/client/in_main.cpp
diff --git a/mp/src/game/client/in_main.h b/src/game/client/in_main.h
similarity index 100%
rename from mp/src/game/client/in_main.h
rename to src/game/client/in_main.h
diff --git a/mp/src/game/client/in_mouse.cpp b/src/game/client/in_mouse.cpp
similarity index 100%
rename from mp/src/game/client/in_mouse.cpp
rename to src/game/client/in_mouse.cpp
diff --git a/mp/src/game/client/inetgraphpanel.h b/src/game/client/inetgraphpanel.h
similarity index 100%
rename from mp/src/game/client/inetgraphpanel.h
rename to src/game/client/inetgraphpanel.h
diff --git a/mp/src/game/client/initializer.cpp b/src/game/client/initializer.cpp
similarity index 100%
rename from mp/src/game/client/initializer.cpp
rename to src/game/client/initializer.cpp
diff --git a/mp/src/game/client/initializer.h b/src/game/client/initializer.h
similarity index 100%
rename from mp/src/game/client/initializer.h
rename to src/game/client/initializer.h
diff --git a/mp/src/game/client/input.h b/src/game/client/input.h
similarity index 100%
rename from mp/src/game/client/input.h
rename to src/game/client/input.h
diff --git a/mp/src/game/client/interpolatedvar.cpp b/src/game/client/interpolatedvar.cpp
similarity index 100%
rename from mp/src/game/client/interpolatedvar.cpp
rename to src/game/client/interpolatedvar.cpp
diff --git a/mp/src/game/client/interpolatedvar.h b/src/game/client/interpolatedvar.h
similarity index 100%
rename from mp/src/game/client/interpolatedvar.h
rename to src/game/client/interpolatedvar.h
diff --git a/mp/src/game/client/ipresence.h b/src/game/client/ipresence.h
similarity index 100%
rename from mp/src/game/client/ipresence.h
rename to src/game/client/ipresence.h
diff --git a/mp/src/game/client/iprofiling.h b/src/game/client/iprofiling.h
similarity index 100%
rename from mp/src/game/client/iprofiling.h
rename to src/game/client/iprofiling.h
diff --git a/mp/src/game/client/itextmessage.h b/src/game/client/itextmessage.h
similarity index 100%
rename from mp/src/game/client/itextmessage.h
rename to src/game/client/itextmessage.h
diff --git a/mp/src/game/client/ivieweffects.h b/src/game/client/ivieweffects.h
similarity index 100%
rename from mp/src/game/client/ivieweffects.h
rename to src/game/client/ivieweffects.h
diff --git a/mp/src/game/client/iviewrender.h b/src/game/client/iviewrender.h
similarity index 100%
rename from mp/src/game/client/iviewrender.h
rename to src/game/client/iviewrender.h
diff --git a/mp/src/game/client/iviewrender_beams.h b/src/game/client/iviewrender_beams.h
similarity index 100%
rename from mp/src/game/client/iviewrender_beams.h
rename to src/game/client/iviewrender_beams.h
diff --git a/mp/src/game/client/ivmodemanager.h b/src/game/client/ivmodemanager.h
similarity index 100%
rename from mp/src/game/client/ivmodemanager.h
rename to src/game/client/ivmodemanager.h
diff --git a/mp/src/game/client/kbutton.h b/src/game/client/kbutton.h
similarity index 100%
rename from mp/src/game/client/kbutton.h
rename to src/game/client/kbutton.h
diff --git a/mp/src/game/client/lampbeamproxy.cpp b/src/game/client/lampbeamproxy.cpp
similarity index 100%
rename from mp/src/game/client/lampbeamproxy.cpp
rename to src/game/client/lampbeamproxy.cpp
diff --git a/mp/src/game/client/lamphaloproxy.cpp b/src/game/client/lamphaloproxy.cpp
similarity index 100%
rename from mp/src/game/client/lamphaloproxy.cpp
rename to src/game/client/lamphaloproxy.cpp
diff --git a/mp/src/game/client/lerp_functions.h b/src/game/client/lerp_functions.h
similarity index 100%
rename from mp/src/game/client/lerp_functions.h
rename to src/game/client/lerp_functions.h
diff --git a/mp/src/game/client/mathproxy.cpp b/src/game/client/mathproxy.cpp
similarity index 100%
rename from mp/src/game/client/mathproxy.cpp
rename to src/game/client/mathproxy.cpp
diff --git a/mp/src/game/client/matrixproxy.cpp b/src/game/client/matrixproxy.cpp
similarity index 100%
rename from mp/src/game/client/matrixproxy.cpp
rename to src/game/client/matrixproxy.cpp
diff --git a/mp/src/game/client/menu.cpp b/src/game/client/menu.cpp
similarity index 100%
rename from mp/src/game/client/menu.cpp
rename to src/game/client/menu.cpp
diff --git a/mp/src/game/client/menu.h b/src/game/client/menu.h
similarity index 100%
rename from mp/src/game/client/menu.h
rename to src/game/client/menu.h
diff --git a/mp/src/game/client/message.cpp b/src/game/client/message.cpp
similarity index 100%
rename from mp/src/game/client/message.cpp
rename to src/game/client/message.cpp
diff --git a/mp/src/game/client/movehelper_client.cpp b/src/game/client/movehelper_client.cpp
similarity index 100%
rename from mp/src/game/client/movehelper_client.cpp
rename to src/game/client/movehelper_client.cpp
diff --git a/mp/src/game/client/movehelper_client.h b/src/game/client/movehelper_client.h
similarity index 100%
rename from mp/src/game/client/movehelper_client.h
rename to src/game/client/movehelper_client.h
diff --git a/mp/src/game/client/mp3player.cpp b/src/game/client/mp3player.cpp
similarity index 100%
rename from mp/src/game/client/mp3player.cpp
rename to src/game/client/mp3player.cpp
diff --git a/mp/src/game/client/mp3player.h b/src/game/client/mp3player.h
similarity index 100%
rename from mp/src/game/client/mp3player.h
rename to src/game/client/mp3player.h
diff --git a/mp/src/game/client/mumble.cpp b/src/game/client/mumble.cpp
similarity index 100%
rename from mp/src/game/client/mumble.cpp
rename to src/game/client/mumble.cpp
diff --git a/mp/src/game/client/mumble.h b/src/game/client/mumble.h
similarity index 100%
rename from mp/src/game/client/mumble.h
rename to src/game/client/mumble.h
diff --git a/mp/src/game/client/networkstringtable_clientdll.h b/src/game/client/networkstringtable_clientdll.h
similarity index 100%
rename from mp/src/game/client/networkstringtable_clientdll.h
rename to src/game/client/networkstringtable_clientdll.h
diff --git a/mp/src/game/client/panelmetaclassmgr.cpp b/src/game/client/panelmetaclassmgr.cpp
similarity index 100%
rename from mp/src/game/client/panelmetaclassmgr.cpp
rename to src/game/client/panelmetaclassmgr.cpp
diff --git a/mp/src/game/client/panelmetaclassmgr.h b/src/game/client/panelmetaclassmgr.h
similarity index 100%
rename from mp/src/game/client/panelmetaclassmgr.h
rename to src/game/client/panelmetaclassmgr.h
diff --git a/mp/src/game/client/particle_collision.cpp b/src/game/client/particle_collision.cpp
similarity index 100%
rename from mp/src/game/client/particle_collision.cpp
rename to src/game/client/particle_collision.cpp
diff --git a/mp/src/game/client/particle_collision.h b/src/game/client/particle_collision.h
similarity index 100%
rename from mp/src/game/client/particle_collision.h
rename to src/game/client/particle_collision.h
diff --git a/mp/src/game/client/particle_iterators.h b/src/game/client/particle_iterators.h
similarity index 100%
rename from mp/src/game/client/particle_iterators.h
rename to src/game/client/particle_iterators.h
diff --git a/mp/src/game/client/particle_litsmokeemitter.cpp b/src/game/client/particle_litsmokeemitter.cpp
similarity index 100%
rename from mp/src/game/client/particle_litsmokeemitter.cpp
rename to src/game/client/particle_litsmokeemitter.cpp
diff --git a/mp/src/game/client/particle_litsmokeemitter.h b/src/game/client/particle_litsmokeemitter.h
similarity index 100%
rename from mp/src/game/client/particle_litsmokeemitter.h
rename to src/game/client/particle_litsmokeemitter.h
diff --git a/mp/src/game/client/particle_prototype.cpp b/src/game/client/particle_prototype.cpp
similarity index 100%
rename from mp/src/game/client/particle_prototype.cpp
rename to src/game/client/particle_prototype.cpp
diff --git a/mp/src/game/client/particle_prototype.h b/src/game/client/particle_prototype.h
similarity index 100%
rename from mp/src/game/client/particle_prototype.h
rename to src/game/client/particle_prototype.h
diff --git a/mp/src/game/client/particle_proxies.cpp b/src/game/client/particle_proxies.cpp
similarity index 100%
rename from mp/src/game/client/particle_proxies.cpp
rename to src/game/client/particle_proxies.cpp
diff --git a/mp/src/game/client/particle_simple3d.cpp b/src/game/client/particle_simple3d.cpp
similarity index 100%
rename from mp/src/game/client/particle_simple3d.cpp
rename to src/game/client/particle_simple3d.cpp
diff --git a/mp/src/game/client/particle_simple3d.h b/src/game/client/particle_simple3d.h
similarity index 100%
rename from mp/src/game/client/particle_simple3d.h
rename to src/game/client/particle_simple3d.h
diff --git a/mp/src/game/client/particle_util.h b/src/game/client/particle_util.h
similarity index 100%
rename from mp/src/game/client/particle_util.h
rename to src/game/client/particle_util.h
diff --git a/mp/src/game/client/particledraw.h b/src/game/client/particledraw.h
similarity index 100%
rename from mp/src/game/client/particledraw.h
rename to src/game/client/particledraw.h
diff --git a/mp/src/game/client/particlemgr.cpp b/src/game/client/particlemgr.cpp
similarity index 100%
rename from mp/src/game/client/particlemgr.cpp
rename to src/game/client/particlemgr.cpp
diff --git a/mp/src/game/client/particlemgr.h b/src/game/client/particlemgr.h
similarity index 100%
rename from mp/src/game/client/particlemgr.h
rename to src/game/client/particlemgr.h
diff --git a/mp/src/game/client/particles_attractor.cpp b/src/game/client/particles_attractor.cpp
similarity index 100%
rename from mp/src/game/client/particles_attractor.cpp
rename to src/game/client/particles_attractor.cpp
diff --git a/mp/src/game/client/particles_attractor.h b/src/game/client/particles_attractor.h
similarity index 100%
rename from mp/src/game/client/particles_attractor.h
rename to src/game/client/particles_attractor.h
diff --git a/mp/src/game/client/particles_ez.cpp b/src/game/client/particles_ez.cpp
similarity index 100%
rename from mp/src/game/client/particles_ez.cpp
rename to src/game/client/particles_ez.cpp
diff --git a/mp/src/game/client/particles_ez.h b/src/game/client/particles_ez.h
similarity index 100%
rename from mp/src/game/client/particles_ez.h
rename to src/game/client/particles_ez.h
diff --git a/mp/src/game/client/particles_localspace.cpp b/src/game/client/particles_localspace.cpp
similarity index 100%
rename from mp/src/game/client/particles_localspace.cpp
rename to src/game/client/particles_localspace.cpp
diff --git a/mp/src/game/client/particles_localspace.h b/src/game/client/particles_localspace.h
similarity index 100%
rename from mp/src/game/client/particles_localspace.h
rename to src/game/client/particles_localspace.h
diff --git a/mp/src/game/client/particles_new.cpp b/src/game/client/particles_new.cpp
similarity index 100%
rename from mp/src/game/client/particles_new.cpp
rename to src/game/client/particles_new.cpp
diff --git a/mp/src/game/client/particles_new.h b/src/game/client/particles_new.h
similarity index 100%
rename from mp/src/game/client/particles_new.h
rename to src/game/client/particles_new.h
diff --git a/mp/src/game/client/particles_simple.cpp b/src/game/client/particles_simple.cpp
similarity index 100%
rename from mp/src/game/client/particles_simple.cpp
rename to src/game/client/particles_simple.cpp
diff --git a/mp/src/game/client/particles_simple.h b/src/game/client/particles_simple.h
similarity index 100%
rename from mp/src/game/client/particles_simple.h
rename to src/game/client/particles_simple.h
diff --git a/mp/src/game/client/particlesphererenderer.cpp b/src/game/client/particlesphererenderer.cpp
similarity index 100%
rename from mp/src/game/client/particlesphererenderer.cpp
rename to src/game/client/particlesphererenderer.cpp
diff --git a/mp/src/game/client/particlesphererenderer.h b/src/game/client/particlesphererenderer.h
similarity index 100%
rename from mp/src/game/client/particlesphererenderer.h
rename to src/game/client/particlesphererenderer.h
diff --git a/mp/src/game/client/perfvisualbenchmark.cpp b/src/game/client/perfvisualbenchmark.cpp
similarity index 100%
rename from mp/src/game/client/perfvisualbenchmark.cpp
rename to src/game/client/perfvisualbenchmark.cpp
diff --git a/mp/src/game/client/perfvisualbenchmark.h b/src/game/client/perfvisualbenchmark.h
similarity index 100%
rename from mp/src/game/client/perfvisualbenchmark.h
rename to src/game/client/perfvisualbenchmark.h
diff --git a/mp/src/game/client/physics.cpp b/src/game/client/physics.cpp
similarity index 100%
rename from mp/src/game/client/physics.cpp
rename to src/game/client/physics.cpp
diff --git a/mp/src/game/client/physics.h b/src/game/client/physics.h
similarity index 100%
rename from mp/src/game/client/physics.h
rename to src/game/client/physics.h
diff --git a/mp/src/game/client/physics_main_client.cpp b/src/game/client/physics_main_client.cpp
similarity index 100%
rename from mp/src/game/client/physics_main_client.cpp
rename to src/game/client/physics_main_client.cpp
diff --git a/mp/src/game/client/physpropclientside.cpp b/src/game/client/physpropclientside.cpp
similarity index 100%
rename from mp/src/game/client/physpropclientside.cpp
rename to src/game/client/physpropclientside.cpp
diff --git a/mp/src/game/client/physpropclientside.h b/src/game/client/physpropclientside.h
similarity index 100%
rename from mp/src/game/client/physpropclientside.h
rename to src/game/client/physpropclientside.h
diff --git a/mp/src/game/client/playerandobjectenumerator.cpp b/src/game/client/playerandobjectenumerator.cpp
similarity index 100%
rename from mp/src/game/client/playerandobjectenumerator.cpp
rename to src/game/client/playerandobjectenumerator.cpp
diff --git a/mp/src/game/client/playerandobjectenumerator.h b/src/game/client/playerandobjectenumerator.h
similarity index 100%
rename from mp/src/game/client/playerandobjectenumerator.h
rename to src/game/client/playerandobjectenumerator.h
diff --git a/mp/src/game/client/playerenumerator.h b/src/game/client/playerenumerator.h
similarity index 100%
rename from mp/src/game/client/playerenumerator.h
rename to src/game/client/playerenumerator.h
diff --git a/mp/src/game/client/playerspawncache.cpp b/src/game/client/playerspawncache.cpp
similarity index 100%
rename from mp/src/game/client/playerspawncache.cpp
rename to src/game/client/playerspawncache.cpp
diff --git a/mp/src/game/client/playerspawncache.h b/src/game/client/playerspawncache.h
similarity index 100%
rename from mp/src/game/client/playerspawncache.h
rename to src/game/client/playerspawncache.h
diff --git a/mp/src/game/client/prediction.cpp b/src/game/client/prediction.cpp
similarity index 100%
rename from mp/src/game/client/prediction.cpp
rename to src/game/client/prediction.cpp
diff --git a/mp/src/game/client/prediction.h b/src/game/client/prediction.h
similarity index 100%
rename from mp/src/game/client/prediction.h
rename to src/game/client/prediction.h
diff --git a/mp/src/game/client/prediction_private.h b/src/game/client/prediction_private.h
similarity index 100%
rename from mp/src/game/client/prediction_private.h
rename to src/game/client/prediction_private.h
diff --git a/mp/src/game/client/proxyentity.cpp b/src/game/client/proxyentity.cpp
similarity index 100%
rename from mp/src/game/client/proxyentity.cpp
rename to src/game/client/proxyentity.cpp
diff --git a/mp/src/game/client/proxyentity.h b/src/game/client/proxyentity.h
similarity index 100%
rename from mp/src/game/client/proxyentity.h
rename to src/game/client/proxyentity.h
diff --git a/mp/src/game/client/proxyplayer.cpp b/src/game/client/proxyplayer.cpp
similarity index 100%
rename from mp/src/game/client/proxyplayer.cpp
rename to src/game/client/proxyplayer.cpp
diff --git a/mp/src/game/client/proxypupil.cpp b/src/game/client/proxypupil.cpp
similarity index 100%
rename from mp/src/game/client/proxypupil.cpp
rename to src/game/client/proxypupil.cpp
diff --git a/mp/src/game/client/ragdoll.cpp b/src/game/client/ragdoll.cpp
similarity index 100%
rename from mp/src/game/client/ragdoll.cpp
rename to src/game/client/ragdoll.cpp
diff --git a/mp/src/game/client/ragdoll.h b/src/game/client/ragdoll.h
similarity index 100%
rename from mp/src/game/client/ragdoll.h
rename to src/game/client/ragdoll.h
diff --git a/mp/src/game/client/ragdollexplosionenumerator.h b/src/game/client/ragdollexplosionenumerator.h
similarity index 100%
rename from mp/src/game/client/ragdollexplosionenumerator.h
rename to src/game/client/ragdollexplosionenumerator.h
diff --git a/mp/src/game/client/recvproxy.cpp b/src/game/client/recvproxy.cpp
similarity index 100%
rename from mp/src/game/client/recvproxy.cpp
rename to src/game/client/recvproxy.cpp
diff --git a/mp/src/game/client/recvproxy.h b/src/game/client/recvproxy.h
similarity index 100%
rename from mp/src/game/client/recvproxy.h
rename to src/game/client/recvproxy.h
diff --git a/mp/src/game/client/rendertexture.cpp b/src/game/client/rendertexture.cpp
similarity index 100%
rename from mp/src/game/client/rendertexture.cpp
rename to src/game/client/rendertexture.cpp
diff --git a/mp/src/game/client/rendertexture.h b/src/game/client/rendertexture.h
similarity index 100%
rename from mp/src/game/client/rendertexture.h
rename to src/game/client/rendertexture.h
diff --git a/mp/src/game/client/replay/cdll_replay.cpp b/src/game/client/replay/cdll_replay.cpp
similarity index 100%
rename from mp/src/game/client/replay/cdll_replay.cpp
rename to src/game/client/replay/cdll_replay.cpp
diff --git a/mp/src/game/client/replay/cdll_replay.h b/src/game/client/replay/cdll_replay.h
similarity index 100%
rename from mp/src/game/client/replay/cdll_replay.h
rename to src/game/client/replay/cdll_replay.h
diff --git a/mp/src/game/client/replay/gamedefs.cpp b/src/game/client/replay/gamedefs.cpp
similarity index 100%
rename from mp/src/game/client/replay/gamedefs.cpp
rename to src/game/client/replay/gamedefs.cpp
diff --git a/mp/src/game/client/replay/gamedefs.h b/src/game/client/replay/gamedefs.h
similarity index 100%
rename from mp/src/game/client/replay/gamedefs.h
rename to src/game/client/replay/gamedefs.h
diff --git a/mp/src/game/client/replay/genericclassbased_replay.cpp b/src/game/client/replay/genericclassbased_replay.cpp
similarity index 100%
rename from mp/src/game/client/replay/genericclassbased_replay.cpp
rename to src/game/client/replay/genericclassbased_replay.cpp
diff --git a/mp/src/game/client/replay/genericclassbased_replay.h b/src/game/client/replay/genericclassbased_replay.h
similarity index 100%
rename from mp/src/game/client/replay/genericclassbased_replay.h
rename to src/game/client/replay/genericclassbased_replay.h
diff --git a/mp/src/game/client/replay/replay_ragdoll.cpp b/src/game/client/replay/replay_ragdoll.cpp
similarity index 100%
rename from mp/src/game/client/replay/replay_ragdoll.cpp
rename to src/game/client/replay/replay_ragdoll.cpp
diff --git a/mp/src/game/client/replay/replay_ragdoll.h b/src/game/client/replay/replay_ragdoll.h
similarity index 100%
rename from mp/src/game/client/replay/replay_ragdoll.h
rename to src/game/client/replay/replay_ragdoll.h
diff --git a/mp/src/game/client/replay/replay_screenshot.cpp b/src/game/client/replay/replay_screenshot.cpp
similarity index 100%
rename from mp/src/game/client/replay/replay_screenshot.cpp
rename to src/game/client/replay/replay_screenshot.cpp
diff --git a/mp/src/game/client/replay/replay_screenshot.h b/src/game/client/replay/replay_screenshot.h
similarity index 100%
rename from mp/src/game/client/replay/replay_screenshot.h
rename to src/game/client/replay/replay_screenshot.h
diff --git a/mp/src/game/client/replay/replaycamera.cpp b/src/game/client/replay/replaycamera.cpp
similarity index 100%
rename from mp/src/game/client/replay/replaycamera.cpp
rename to src/game/client/replay/replaycamera.cpp
diff --git a/mp/src/game/client/replay/replaycamera.h b/src/game/client/replay/replaycamera.h
similarity index 100%
rename from mp/src/game/client/replay/replaycamera.h
rename to src/game/client/replay/replaycamera.h
diff --git a/mp/src/game/client/replay/replayperformanceplaybackhandler.cpp b/src/game/client/replay/replayperformanceplaybackhandler.cpp
similarity index 100%
rename from mp/src/game/client/replay/replayperformanceplaybackhandler.cpp
rename to src/game/client/replay/replayperformanceplaybackhandler.cpp
diff --git a/mp/src/game/client/replay/replayperformanceplaybackhandler.h b/src/game/client/replay/replayperformanceplaybackhandler.h
similarity index 100%
rename from mp/src/game/client/replay/replayperformanceplaybackhandler.h
rename to src/game/client/replay/replayperformanceplaybackhandler.h
diff --git a/mp/src/game/client/replay/replayrenderer.cpp b/src/game/client/replay/replayrenderer.cpp
similarity index 100%
rename from mp/src/game/client/replay/replayrenderer.cpp
rename to src/game/client/replay/replayrenderer.cpp
diff --git a/mp/src/game/client/replay/replayrenderer.h b/src/game/client/replay/replayrenderer.h
similarity index 100%
rename from mp/src/game/client/replay/replayrenderer.h
rename to src/game/client/replay/replayrenderer.h
diff --git a/mp/src/game/client/replay/replayvideo.cpp b/src/game/client/replay/replayvideo.cpp
similarity index 100%
rename from mp/src/game/client/replay/replayvideo.cpp
rename to src/game/client/replay/replayvideo.cpp
diff --git a/mp/src/game/client/replay/replayvideo.h b/src/game/client/replay/replayvideo.h
similarity index 100%
rename from mp/src/game/client/replay/replayvideo.h
rename to src/game/client/replay/replayvideo.h
diff --git a/mp/src/game/client/replay/replayyoutubeapi.cpp b/src/game/client/replay/replayyoutubeapi.cpp
similarity index 100%
rename from mp/src/game/client/replay/replayyoutubeapi.cpp
rename to src/game/client/replay/replayyoutubeapi.cpp
diff --git a/mp/src/game/client/replay/replayyoutubeapi.h b/src/game/client/replay/replayyoutubeapi.h
similarity index 100%
rename from mp/src/game/client/replay/replayyoutubeapi.h
rename to src/game/client/replay/replayyoutubeapi.h
diff --git a/mp/src/game/client/replay/replayyoutubeapi_key_sdk.cpp b/src/game/client/replay/replayyoutubeapi_key_sdk.cpp
similarity index 100%
rename from mp/src/game/client/replay/replayyoutubeapi_key_sdk.cpp
rename to src/game/client/replay/replayyoutubeapi_key_sdk.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserbasepage.cpp b/src/game/client/replay/vgui/replaybrowserbasepage.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserbasepage.cpp
rename to src/game/client/replay/vgui/replaybrowserbasepage.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserbasepage.h b/src/game/client/replay/vgui/replaybrowserbasepage.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserbasepage.h
rename to src/game/client/replay/vgui/replaybrowserbasepage.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowserbasepanel.cpp b/src/game/client/replay/vgui/replaybrowserbasepanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserbasepanel.cpp
rename to src/game/client/replay/vgui/replaybrowserbasepanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserbasepanel.h b/src/game/client/replay/vgui/replaybrowserbasepanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserbasepanel.h
rename to src/game/client/replay/vgui/replaybrowserbasepanel.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowserdetailspanel.cpp b/src/game/client/replay/vgui/replaybrowserdetailspanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserdetailspanel.cpp
rename to src/game/client/replay/vgui/replaybrowserdetailspanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserdetailspanel.h b/src/game/client/replay/vgui/replaybrowserdetailspanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserdetailspanel.h
rename to src/game/client/replay/vgui/replaybrowserdetailspanel.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowseritemmanager.cpp b/src/game/client/replay/vgui/replaybrowseritemmanager.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowseritemmanager.cpp
rename to src/game/client/replay/vgui/replaybrowseritemmanager.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowseritemmanager.h b/src/game/client/replay/vgui/replaybrowseritemmanager.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowseritemmanager.h
rename to src/game/client/replay/vgui/replaybrowseritemmanager.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowserlistitempanel.cpp b/src/game/client/replay/vgui/replaybrowserlistitempanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserlistitempanel.cpp
rename to src/game/client/replay/vgui/replaybrowserlistitempanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserlistitempanel.h b/src/game/client/replay/vgui/replaybrowserlistitempanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserlistitempanel.h
rename to src/game/client/replay/vgui/replaybrowserlistitempanel.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowserlistpanel.cpp b/src/game/client/replay/vgui/replaybrowserlistpanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserlistpanel.cpp
rename to src/game/client/replay/vgui/replaybrowserlistpanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserlistpanel.h b/src/game/client/replay/vgui/replaybrowserlistpanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserlistpanel.h
rename to src/game/client/replay/vgui/replaybrowserlistpanel.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowsermainpanel.cpp b/src/game/client/replay/vgui/replaybrowsermainpanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowsermainpanel.cpp
rename to src/game/client/replay/vgui/replaybrowsermainpanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowsermainpanel.h b/src/game/client/replay/vgui/replaybrowsermainpanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowsermainpanel.h
rename to src/game/client/replay/vgui/replaybrowsermainpanel.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowsermovieplayerpanel.cpp b/src/game/client/replay/vgui/replaybrowsermovieplayerpanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowsermovieplayerpanel.cpp
rename to src/game/client/replay/vgui/replaybrowsermovieplayerpanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowsermovieplayerpanel.h b/src/game/client/replay/vgui/replaybrowsermovieplayerpanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowsermovieplayerpanel.h
rename to src/game/client/replay/vgui/replaybrowsermovieplayerpanel.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowserpreviewpanel.cpp b/src/game/client/replay/vgui/replaybrowserpreviewpanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserpreviewpanel.cpp
rename to src/game/client/replay/vgui/replaybrowserpreviewpanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserpreviewpanel.h b/src/game/client/replay/vgui/replaybrowserpreviewpanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserpreviewpanel.h
rename to src/game/client/replay/vgui/replaybrowserpreviewpanel.h
diff --git a/mp/src/game/client/replay/vgui/replaybrowserrenderdialog.cpp b/src/game/client/replay/vgui/replaybrowserrenderdialog.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserrenderdialog.cpp
rename to src/game/client/replay/vgui/replaybrowserrenderdialog.cpp
diff --git a/mp/src/game/client/replay/vgui/replaybrowserrenderdialog.h b/src/game/client/replay/vgui/replaybrowserrenderdialog.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaybrowserrenderdialog.h
rename to src/game/client/replay/vgui/replaybrowserrenderdialog.h
diff --git a/mp/src/game/client/replay/vgui/replayconfirmquitdlg.cpp b/src/game/client/replay/vgui/replayconfirmquitdlg.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayconfirmquitdlg.cpp
rename to src/game/client/replay/vgui/replayconfirmquitdlg.cpp
diff --git a/mp/src/game/client/replay/vgui/replayconfirmquitdlg.h b/src/game/client/replay/vgui/replayconfirmquitdlg.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayconfirmquitdlg.h
rename to src/game/client/replay/vgui/replayconfirmquitdlg.h
diff --git a/mp/src/game/client/replay/vgui/replayinputpanel.cpp b/src/game/client/replay/vgui/replayinputpanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayinputpanel.cpp
rename to src/game/client/replay/vgui/replayinputpanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replayinputpanel.h b/src/game/client/replay/vgui/replayinputpanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayinputpanel.h
rename to src/game/client/replay/vgui/replayinputpanel.h
diff --git a/mp/src/game/client/replay/vgui/replaymessagepanel.cpp b/src/game/client/replay/vgui/replaymessagepanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaymessagepanel.cpp
rename to src/game/client/replay/vgui/replaymessagepanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replaymessagepanel.h b/src/game/client/replay/vgui/replaymessagepanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replaymessagepanel.h
rename to src/game/client/replay/vgui/replaymessagepanel.h
diff --git a/mp/src/game/client/replay/vgui/replayperformanceeditor.cpp b/src/game/client/replay/vgui/replayperformanceeditor.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayperformanceeditor.cpp
rename to src/game/client/replay/vgui/replayperformanceeditor.cpp
diff --git a/mp/src/game/client/replay/vgui/replayperformanceeditor.h b/src/game/client/replay/vgui/replayperformanceeditor.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayperformanceeditor.h
rename to src/game/client/replay/vgui/replayperformanceeditor.h
diff --git a/mp/src/game/client/replay/vgui/replayperformancesavedlg.cpp b/src/game/client/replay/vgui/replayperformancesavedlg.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayperformancesavedlg.cpp
rename to src/game/client/replay/vgui/replayperformancesavedlg.cpp
diff --git a/mp/src/game/client/replay/vgui/replayperformancesavedlg.h b/src/game/client/replay/vgui/replayperformancesavedlg.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayperformancesavedlg.h
rename to src/game/client/replay/vgui/replayperformancesavedlg.h
diff --git a/mp/src/game/client/replay/vgui/replayreminderpanel.cpp b/src/game/client/replay/vgui/replayreminderpanel.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayreminderpanel.cpp
rename to src/game/client/replay/vgui/replayreminderpanel.cpp
diff --git a/mp/src/game/client/replay/vgui/replayreminderpanel.h b/src/game/client/replay/vgui/replayreminderpanel.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayreminderpanel.h
rename to src/game/client/replay/vgui/replayreminderpanel.h
diff --git a/mp/src/game/client/replay/vgui/replayrenderoverlay.cpp b/src/game/client/replay/vgui/replayrenderoverlay.cpp
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayrenderoverlay.cpp
rename to src/game/client/replay/vgui/replayrenderoverlay.cpp
diff --git a/mp/src/game/client/replay/vgui/replayrenderoverlay.h b/src/game/client/replay/vgui/replayrenderoverlay.h
similarity index 100%
rename from mp/src/game/client/replay/vgui/replayrenderoverlay.h
rename to src/game/client/replay/vgui/replayrenderoverlay.h
diff --git a/mp/src/game/client/sdk/c_sdk_env_sparkler.cpp b/src/game/client/sdk/c_sdk_env_sparkler.cpp
similarity index 100%
rename from mp/src/game/client/sdk/c_sdk_env_sparkler.cpp
rename to src/game/client/sdk/c_sdk_env_sparkler.cpp
diff --git a/mp/src/game/client/sdk/c_sdk_player.cpp b/src/game/client/sdk/c_sdk_player.cpp
similarity index 100%
rename from mp/src/game/client/sdk/c_sdk_player.cpp
rename to src/game/client/sdk/c_sdk_player.cpp
diff --git a/mp/src/game/client/sdk/c_sdk_player.h b/src/game/client/sdk/c_sdk_player.h
similarity index 100%
rename from mp/src/game/client/sdk/c_sdk_player.h
rename to src/game/client/sdk/c_sdk_player.h
diff --git a/mp/src/game/client/sdk/c_sdk_team.cpp b/src/game/client/sdk/c_sdk_team.cpp
similarity index 100%
rename from mp/src/game/client/sdk/c_sdk_team.cpp
rename to src/game/client/sdk/c_sdk_team.cpp
diff --git a/mp/src/game/client/sdk/c_sdk_team.h b/src/game/client/sdk/c_sdk_team.h
similarity index 100%
rename from mp/src/game/client/sdk/c_sdk_team.h
rename to src/game/client/sdk/c_sdk_team.h
diff --git a/mp/src/game/client/sdk/c_te_firebullets.cpp b/src/game/client/sdk/c_te_firebullets.cpp
similarity index 100%
rename from mp/src/game/client/sdk/c_te_firebullets.cpp
rename to src/game/client/sdk/c_te_firebullets.cpp
diff --git a/mp/src/game/client/sdk/clientmode_sdk.cpp b/src/game/client/sdk/clientmode_sdk.cpp
similarity index 100%
rename from mp/src/game/client/sdk/clientmode_sdk.cpp
rename to src/game/client/sdk/clientmode_sdk.cpp
diff --git a/mp/src/game/client/sdk/clientmode_sdk.h b/src/game/client/sdk/clientmode_sdk.h
similarity index 100%
rename from mp/src/game/client/sdk/clientmode_sdk.h
rename to src/game/client/sdk/clientmode_sdk.h
diff --git a/mp/src/game/client/sdk/sdk_fx_impacts.cpp b/src/game/client/sdk/sdk_fx_impacts.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_fx_impacts.cpp
rename to src/game/client/sdk/sdk_fx_impacts.cpp
diff --git a/mp/src/game/client/sdk/sdk_fx_weaponfx.cpp b/src/game/client/sdk/sdk_fx_weaponfx.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_fx_weaponfx.cpp
rename to src/game/client/sdk/sdk_fx_weaponfx.cpp
diff --git a/mp/src/game/client/sdk/sdk_hud_ammo.cpp b/src/game/client/sdk/sdk_hud_ammo.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_hud_ammo.cpp
rename to src/game/client/sdk/sdk_hud_ammo.cpp
diff --git a/mp/src/game/client/sdk/sdk_hud_chat.cpp b/src/game/client/sdk/sdk_hud_chat.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_hud_chat.cpp
rename to src/game/client/sdk/sdk_hud_chat.cpp
diff --git a/mp/src/game/client/sdk/sdk_hud_chat.h b/src/game/client/sdk/sdk_hud_chat.h
similarity index 100%
rename from mp/src/game/client/sdk/sdk_hud_chat.h
rename to src/game/client/sdk/sdk_hud_chat.h
diff --git a/mp/src/game/client/sdk/sdk_hud_health.cpp b/src/game/client/sdk/sdk_hud_health.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_hud_health.cpp
rename to src/game/client/sdk/sdk_hud_health.cpp
diff --git a/mp/src/game/client/sdk/sdk_hud_message.cpp b/src/game/client/sdk/sdk_hud_message.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_hud_message.cpp
rename to src/game/client/sdk/sdk_hud_message.cpp
diff --git a/mp/src/game/client/sdk/sdk_hud_weaponselection.cpp b/src/game/client/sdk/sdk_hud_weaponselection.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_hud_weaponselection.cpp
rename to src/game/client/sdk/sdk_hud_weaponselection.cpp
diff --git a/mp/src/game/client/sdk/sdk_in_main.cpp b/src/game/client/sdk/sdk_in_main.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_in_main.cpp
rename to src/game/client/sdk/sdk_in_main.cpp
diff --git a/mp/src/game/client/sdk/sdk_prediction.cpp b/src/game/client/sdk/sdk_prediction.cpp
similarity index 100%
rename from mp/src/game/client/sdk/sdk_prediction.cpp
rename to src/game/client/sdk/sdk_prediction.cpp
diff --git a/mp/src/game/client/sdk/vgui/sdkviewport.cpp b/src/game/client/sdk/vgui/sdkviewport.cpp
similarity index 100%
rename from mp/src/game/client/sdk/vgui/sdkviewport.cpp
rename to src/game/client/sdk/vgui/sdkviewport.cpp
diff --git a/mp/src/game/client/sdk/vgui/sdkviewport.h b/src/game/client/sdk/vgui/sdkviewport.h
similarity index 100%
rename from mp/src/game/client/sdk/vgui/sdkviewport.h
rename to src/game/client/sdk/vgui/sdkviewport.h
diff --git a/mp/src/game/client/sdk/vgui/vgui_rootpanel_sdk.cpp b/src/game/client/sdk/vgui/vgui_rootpanel_sdk.cpp
similarity index 100%
rename from mp/src/game/client/sdk/vgui/vgui_rootpanel_sdk.cpp
rename to src/game/client/sdk/vgui/vgui_rootpanel_sdk.cpp
diff --git a/mp/src/game/client/sdk/vgui/vgui_rootpanel_sdk.h b/src/game/client/sdk/vgui/vgui_rootpanel_sdk.h
similarity index 100%
rename from mp/src/game/client/sdk/vgui/vgui_rootpanel_sdk.h
rename to src/game/client/sdk/vgui/vgui_rootpanel_sdk.h
diff --git a/mp/src/game/client/simple_keys.cpp b/src/game/client/simple_keys.cpp
similarity index 100%
rename from mp/src/game/client/simple_keys.cpp
rename to src/game/client/simple_keys.cpp
diff --git a/mp/src/game/client/simple_keys.h b/src/game/client/simple_keys.h
similarity index 100%
rename from mp/src/game/client/simple_keys.h
rename to src/game/client/simple_keys.h
diff --git a/mp/src/game/client/sixense/in_sixense.cpp b/src/game/client/sixense/in_sixense.cpp
similarity index 100%
rename from mp/src/game/client/sixense/in_sixense.cpp
rename to src/game/client/sixense/in_sixense.cpp
diff --git a/mp/src/game/client/sixense/in_sixense.h b/src/game/client/sixense/in_sixense.h
similarity index 100%
rename from mp/src/game/client/sixense/in_sixense.h
rename to src/game/client/sixense/in_sixense.h
diff --git a/mp/src/game/client/sixense/in_sixense_gesture_bindings.cpp b/src/game/client/sixense/in_sixense_gesture_bindings.cpp
similarity index 100%
rename from mp/src/game/client/sixense/in_sixense_gesture_bindings.cpp
rename to src/game/client/sixense/in_sixense_gesture_bindings.cpp
diff --git a/mp/src/game/client/sixense/in_sixense_gesture_bindings.h b/src/game/client/sixense/in_sixense_gesture_bindings.h
similarity index 100%
rename from mp/src/game/client/sixense/in_sixense_gesture_bindings.h
rename to src/game/client/sixense/in_sixense_gesture_bindings.h
diff --git a/mp/src/game/client/smoke_fog_overlay.cpp b/src/game/client/smoke_fog_overlay.cpp
similarity index 100%
rename from mp/src/game/client/smoke_fog_overlay.cpp
rename to src/game/client/smoke_fog_overlay.cpp
diff --git a/mp/src/game/client/smoke_fog_overlay.h b/src/game/client/smoke_fog_overlay.h
similarity index 100%
rename from mp/src/game/client/smoke_fog_overlay.h
rename to src/game/client/smoke_fog_overlay.h
diff --git a/mp/src/game/client/splinepatch.cpp b/src/game/client/splinepatch.cpp
similarity index 100%
rename from mp/src/game/client/splinepatch.cpp
rename to src/game/client/splinepatch.cpp
diff --git a/mp/src/game/client/splinepatch.h b/src/game/client/splinepatch.h
similarity index 100%
rename from mp/src/game/client/splinepatch.h
rename to src/game/client/splinepatch.h
diff --git a/mp/src/game/client/spritemodel.cpp b/src/game/client/spritemodel.cpp
similarity index 100%
rename from mp/src/game/client/spritemodel.cpp
rename to src/game/client/spritemodel.cpp
diff --git a/mp/src/game/client/stdafx.cpp b/src/game/client/stdafx.cpp
similarity index 100%
rename from mp/src/game/client/stdafx.cpp
rename to src/game/client/stdafx.cpp
diff --git a/mp/src/game/client/studio_stats.cpp b/src/game/client/studio_stats.cpp
similarity index 100%
rename from mp/src/game/client/studio_stats.cpp
rename to src/game/client/studio_stats.cpp
diff --git a/mp/src/game/client/studio_stats.h b/src/game/client/studio_stats.h
similarity index 100%
rename from mp/src/game/client/studio_stats.h
rename to src/game/client/studio_stats.h
diff --git a/mp/src/game/client/tempent.h b/src/game/client/tempent.h
similarity index 100%
rename from mp/src/game/client/tempent.h
rename to src/game/client/tempent.h
diff --git a/mp/src/game/client/text_message.cpp b/src/game/client/text_message.cpp
similarity index 100%
rename from mp/src/game/client/text_message.cpp
rename to src/game/client/text_message.cpp
diff --git a/mp/src/game/client/text_message.h b/src/game/client/text_message.h
similarity index 100%
rename from mp/src/game/client/text_message.h
rename to src/game/client/text_message.h
diff --git a/mp/src/game/client/texturescrollmaterialproxy.cpp b/src/game/client/texturescrollmaterialproxy.cpp
similarity index 100%
rename from mp/src/game/client/texturescrollmaterialproxy.cpp
rename to src/game/client/texturescrollmaterialproxy.cpp
diff --git a/mp/src/game/client/thermalmaterialproxy.cpp b/src/game/client/thermalmaterialproxy.cpp
similarity index 100%
rename from mp/src/game/client/thermalmaterialproxy.cpp
rename to src/game/client/thermalmaterialproxy.cpp
diff --git a/mp/src/game/client/timedevent.h b/src/game/client/timedevent.h
similarity index 100%
rename from mp/src/game/client/timedevent.h
rename to src/game/client/timedevent.h
diff --git a/mp/src/game/client/timematerialproxy.cpp b/src/game/client/timematerialproxy.cpp
similarity index 100%
rename from mp/src/game/client/timematerialproxy.cpp
rename to src/game/client/timematerialproxy.cpp
diff --git a/mp/src/game/client/toggletextureproxy.cpp b/src/game/client/toggletextureproxy.cpp
similarity index 100%
rename from mp/src/game/client/toggletextureproxy.cpp
rename to src/game/client/toggletextureproxy.cpp
diff --git a/mp/src/game/client/toggletextureproxy.h b/src/game/client/toggletextureproxy.h
similarity index 100%
rename from mp/src/game/client/toggletextureproxy.h
rename to src/game/client/toggletextureproxy.h
diff --git a/mp/src/game/client/toolframework_client.cpp b/src/game/client/toolframework_client.cpp
similarity index 100%
rename from mp/src/game/client/toolframework_client.cpp
rename to src/game/client/toolframework_client.cpp
diff --git a/mp/src/game/client/toolframework_client.h b/src/game/client/toolframework_client.h
similarity index 100%
rename from mp/src/game/client/toolframework_client.h
rename to src/game/client/toolframework_client.h
diff --git a/mp/src/game/client/train.cpp b/src/game/client/train.cpp
similarity index 100%
rename from mp/src/game/client/train.cpp
rename to src/game/client/train.cpp
diff --git a/mp/src/game/client/vgui_avatarimage.cpp b/src/game/client/vgui_avatarimage.cpp
similarity index 100%
rename from mp/src/game/client/vgui_avatarimage.cpp
rename to src/game/client/vgui_avatarimage.cpp
diff --git a/mp/src/game/client/vgui_avatarimage.h b/src/game/client/vgui_avatarimage.h
similarity index 100%
rename from mp/src/game/client/vgui_avatarimage.h
rename to src/game/client/vgui_avatarimage.h
diff --git a/mp/src/game/client/vgui_basepanel.cpp b/src/game/client/vgui_basepanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_basepanel.cpp
rename to src/game/client/vgui_basepanel.cpp
diff --git a/mp/src/game/client/vgui_basepanel.h b/src/game/client/vgui_basepanel.h
similarity index 100%
rename from mp/src/game/client/vgui_basepanel.h
rename to src/game/client/vgui_basepanel.h
diff --git a/mp/src/game/client/vgui_bitmapbutton.cpp b/src/game/client/vgui_bitmapbutton.cpp
similarity index 100%
rename from mp/src/game/client/vgui_bitmapbutton.cpp
rename to src/game/client/vgui_bitmapbutton.cpp
diff --git a/mp/src/game/client/vgui_bitmapbutton.h b/src/game/client/vgui_bitmapbutton.h
similarity index 100%
rename from mp/src/game/client/vgui_bitmapbutton.h
rename to src/game/client/vgui_bitmapbutton.h
diff --git a/mp/src/game/client/vgui_bitmapimage.cpp b/src/game/client/vgui_bitmapimage.cpp
similarity index 100%
rename from mp/src/game/client/vgui_bitmapimage.cpp
rename to src/game/client/vgui_bitmapimage.cpp
diff --git a/mp/src/game/client/vgui_bitmapimage.h b/src/game/client/vgui_bitmapimage.h
similarity index 100%
rename from mp/src/game/client/vgui_bitmapimage.h
rename to src/game/client/vgui_bitmapimage.h
diff --git a/mp/src/game/client/vgui_bitmappanel.cpp b/src/game/client/vgui_bitmappanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_bitmappanel.cpp
rename to src/game/client/vgui_bitmappanel.cpp
diff --git a/mp/src/game/client/vgui_bitmappanel.h b/src/game/client/vgui_bitmappanel.h
similarity index 100%
rename from mp/src/game/client/vgui_bitmappanel.h
rename to src/game/client/vgui_bitmappanel.h
diff --git a/mp/src/game/client/vgui_centerstringpanel.cpp b/src/game/client/vgui_centerstringpanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_centerstringpanel.cpp
rename to src/game/client/vgui_centerstringpanel.cpp
diff --git a/mp/src/game/client/vgui_consolepanel.cpp b/src/game/client/vgui_consolepanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_consolepanel.cpp
rename to src/game/client/vgui_consolepanel.cpp
diff --git a/mp/src/game/client/vgui_debugoverlaypanel.cpp b/src/game/client/vgui_debugoverlaypanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_debugoverlaypanel.cpp
rename to src/game/client/vgui_debugoverlaypanel.cpp
diff --git a/mp/src/game/client/vgui_entityimagepanel.cpp b/src/game/client/vgui_entityimagepanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_entityimagepanel.cpp
rename to src/game/client/vgui_entityimagepanel.cpp
diff --git a/mp/src/game/client/vgui_entityimagepanel.h b/src/game/client/vgui_entityimagepanel.h
similarity index 100%
rename from mp/src/game/client/vgui_entityimagepanel.h
rename to src/game/client/vgui_entityimagepanel.h
diff --git a/mp/src/game/client/vgui_entitypanel.cpp b/src/game/client/vgui_entitypanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_entitypanel.cpp
rename to src/game/client/vgui_entitypanel.cpp
diff --git a/mp/src/game/client/vgui_entitypanel.h b/src/game/client/vgui_entitypanel.h
similarity index 100%
rename from mp/src/game/client/vgui_entitypanel.h
rename to src/game/client/vgui_entitypanel.h
diff --git a/mp/src/game/client/vgui_fpspanel.cpp b/src/game/client/vgui_fpspanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_fpspanel.cpp
rename to src/game/client/vgui_fpspanel.cpp
diff --git a/mp/src/game/client/vgui_game_viewport.cpp b/src/game/client/vgui_game_viewport.cpp
similarity index 100%
rename from mp/src/game/client/vgui_game_viewport.cpp
rename to src/game/client/vgui_game_viewport.cpp
diff --git a/mp/src/game/client/vgui_game_viewport.h b/src/game/client/vgui_game_viewport.h
similarity index 100%
rename from mp/src/game/client/vgui_game_viewport.h
rename to src/game/client/vgui_game_viewport.h
diff --git a/mp/src/game/client/vgui_grid.cpp b/src/game/client/vgui_grid.cpp
similarity index 100%
rename from mp/src/game/client/vgui_grid.cpp
rename to src/game/client/vgui_grid.cpp
diff --git a/mp/src/game/client/vgui_grid.h b/src/game/client/vgui_grid.h
similarity index 100%
rename from mp/src/game/client/vgui_grid.h
rename to src/game/client/vgui_grid.h
diff --git a/mp/src/game/client/vgui_helpers.h b/src/game/client/vgui_helpers.h
similarity index 100%
rename from mp/src/game/client/vgui_helpers.h
rename to src/game/client/vgui_helpers.h
diff --git a/mp/src/game/client/vgui_imagehealthpanel.cpp b/src/game/client/vgui_imagehealthpanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_imagehealthpanel.cpp
rename to src/game/client/vgui_imagehealthpanel.cpp
diff --git a/mp/src/game/client/vgui_imagehealthpanel.h b/src/game/client/vgui_imagehealthpanel.h
similarity index 100%
rename from mp/src/game/client/vgui_imagehealthpanel.h
rename to src/game/client/vgui_imagehealthpanel.h
diff --git a/mp/src/game/client/vgui_int.cpp b/src/game/client/vgui_int.cpp
similarity index 100%
rename from mp/src/game/client/vgui_int.cpp
rename to src/game/client/vgui_int.cpp
diff --git a/mp/src/game/client/vgui_int.h b/src/game/client/vgui_int.h
similarity index 100%
rename from mp/src/game/client/vgui_int.h
rename to src/game/client/vgui_int.h
diff --git a/mp/src/game/client/vgui_loadingdiscpanel.cpp b/src/game/client/vgui_loadingdiscpanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_loadingdiscpanel.cpp
rename to src/game/client/vgui_loadingdiscpanel.cpp
diff --git a/mp/src/game/client/vgui_messagechars.cpp b/src/game/client/vgui_messagechars.cpp
similarity index 100%
rename from mp/src/game/client/vgui_messagechars.cpp
rename to src/game/client/vgui_messagechars.cpp
diff --git a/mp/src/game/client/vgui_netgraphpanel.cpp b/src/game/client/vgui_netgraphpanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_netgraphpanel.cpp
rename to src/game/client/vgui_netgraphpanel.cpp
diff --git a/mp/src/game/client/vgui_schemevisualizer.cpp b/src/game/client/vgui_schemevisualizer.cpp
similarity index 100%
rename from mp/src/game/client/vgui_schemevisualizer.cpp
rename to src/game/client/vgui_schemevisualizer.cpp
diff --git a/mp/src/game/client/vgui_schemevisualizer.h b/src/game/client/vgui_schemevisualizer.h
similarity index 100%
rename from mp/src/game/client/vgui_schemevisualizer.h
rename to src/game/client/vgui_schemevisualizer.h
diff --git a/mp/src/game/client/vgui_slideshow_display_screen.cpp b/src/game/client/vgui_slideshow_display_screen.cpp
similarity index 100%
rename from mp/src/game/client/vgui_slideshow_display_screen.cpp
rename to src/game/client/vgui_slideshow_display_screen.cpp
diff --git a/mp/src/game/client/vgui_textmessagepanel.cpp b/src/game/client/vgui_textmessagepanel.cpp
similarity index 100%
rename from mp/src/game/client/vgui_textmessagepanel.cpp
rename to src/game/client/vgui_textmessagepanel.cpp
diff --git a/mp/src/game/client/vgui_video.cpp b/src/game/client/vgui_video.cpp
similarity index 100%
rename from mp/src/game/client/vgui_video.cpp
rename to src/game/client/vgui_video.cpp
diff --git a/mp/src/game/client/vgui_video.h b/src/game/client/vgui_video.h
similarity index 100%
rename from mp/src/game/client/vgui_video.h
rename to src/game/client/vgui_video.h
diff --git a/mp/src/game/client/vgui_video_player.cpp b/src/game/client/vgui_video_player.cpp
similarity index 100%
rename from mp/src/game/client/vgui_video_player.cpp
rename to src/game/client/vgui_video_player.cpp
diff --git a/mp/src/game/client/vgui_video_player.h b/src/game/client/vgui_video_player.h
similarity index 100%
rename from mp/src/game/client/vgui_video_player.h
rename to src/game/client/vgui_video_player.h
diff --git a/mp/src/game/client/vguicenterprint.h b/src/game/client/vguicenterprint.h
similarity index 100%
rename from mp/src/game/client/vguicenterprint.h
rename to src/game/client/vguicenterprint.h
diff --git a/mp/src/game/client/view.cpp b/src/game/client/view.cpp
similarity index 100%
rename from mp/src/game/client/view.cpp
rename to src/game/client/view.cpp
diff --git a/mp/src/game/client/view.h b/src/game/client/view.h
similarity index 100%
rename from mp/src/game/client/view.h
rename to src/game/client/view.h
diff --git a/mp/src/game/client/view_beams.cpp b/src/game/client/view_beams.cpp
similarity index 100%
rename from mp/src/game/client/view_beams.cpp
rename to src/game/client/view_beams.cpp
diff --git a/mp/src/game/client/view_effects.cpp b/src/game/client/view_effects.cpp
similarity index 100%
rename from mp/src/game/client/view_effects.cpp
rename to src/game/client/view_effects.cpp
diff --git a/mp/src/game/client/view_scene.cpp b/src/game/client/view_scene.cpp
similarity index 100%
rename from mp/src/game/client/view_scene.cpp
rename to src/game/client/view_scene.cpp
diff --git a/mp/src/game/client/view_scene.h b/src/game/client/view_scene.h
similarity index 100%
rename from mp/src/game/client/view_scene.h
rename to src/game/client/view_scene.h
diff --git a/mp/src/game/client/viewangleanim.cpp b/src/game/client/viewangleanim.cpp
similarity index 100%
rename from mp/src/game/client/viewangleanim.cpp
rename to src/game/client/viewangleanim.cpp
diff --git a/mp/src/game/client/viewangleanim.h b/src/game/client/viewangleanim.h
similarity index 100%
rename from mp/src/game/client/viewangleanim.h
rename to src/game/client/viewangleanim.h
diff --git a/mp/src/game/client/viewdebug.cpp b/src/game/client/viewdebug.cpp
similarity index 100%
rename from mp/src/game/client/viewdebug.cpp
rename to src/game/client/viewdebug.cpp
diff --git a/mp/src/game/client/viewdebug.h b/src/game/client/viewdebug.h
similarity index 100%
rename from mp/src/game/client/viewdebug.h
rename to src/game/client/viewdebug.h
diff --git a/mp/src/game/client/viewpostprocess.cpp b/src/game/client/viewpostprocess.cpp
similarity index 100%
rename from mp/src/game/client/viewpostprocess.cpp
rename to src/game/client/viewpostprocess.cpp
diff --git a/mp/src/game/client/viewpostprocess.h b/src/game/client/viewpostprocess.h
similarity index 100%
rename from mp/src/game/client/viewpostprocess.h
rename to src/game/client/viewpostprocess.h
diff --git a/mp/src/game/client/viewrender.cpp b/src/game/client/viewrender.cpp
similarity index 100%
rename from mp/src/game/client/viewrender.cpp
rename to src/game/client/viewrender.cpp
diff --git a/mp/src/game/client/viewrender.h b/src/game/client/viewrender.h
similarity index 100%
rename from mp/src/game/client/viewrender.h
rename to src/game/client/viewrender.h
diff --git a/mp/src/game/client/voice_menu.cpp b/src/game/client/voice_menu.cpp
similarity index 100%
rename from mp/src/game/client/voice_menu.cpp
rename to src/game/client/voice_menu.cpp
diff --git a/mp/src/game/client/warp_overlay.cpp b/src/game/client/warp_overlay.cpp
similarity index 100%
rename from mp/src/game/client/warp_overlay.cpp
rename to src/game/client/warp_overlay.cpp
diff --git a/mp/src/game/client/weapon_selection.cpp b/src/game/client/weapon_selection.cpp
similarity index 100%
rename from mp/src/game/client/weapon_selection.cpp
rename to src/game/client/weapon_selection.cpp
diff --git a/mp/src/game/client/weapon_selection.h b/src/game/client/weapon_selection.h
similarity index 100%
rename from mp/src/game/client/weapon_selection.h
rename to src/game/client/weapon_selection.h
diff --git a/mp/src/game/client/weapons_resource.cpp b/src/game/client/weapons_resource.cpp
similarity index 100%
rename from mp/src/game/client/weapons_resource.cpp
rename to src/game/client/weapons_resource.cpp
diff --git a/mp/src/game/client/weapons_resource.h b/src/game/client/weapons_resource.h
similarity index 100%
rename from mp/src/game/client/weapons_resource.h
rename to src/game/client/weapons_resource.h
diff --git a/mp/src/game/protobuf_include.vpc b/src/game/protobuf_include.vpc
similarity index 100%
rename from mp/src/game/protobuf_include.vpc
rename to src/game/protobuf_include.vpc
diff --git a/mp/src/game/server/AI_Criteria.cpp b/src/game/server/AI_Criteria.cpp
similarity index 100%
rename from mp/src/game/server/AI_Criteria.cpp
rename to src/game/server/AI_Criteria.cpp
diff --git a/mp/src/game/server/AI_Criteria.h b/src/game/server/AI_Criteria.h
similarity index 100%
rename from mp/src/game/server/AI_Criteria.h
rename to src/game/server/AI_Criteria.h
diff --git a/mp/src/game/server/AI_Interest_Target.cpp b/src/game/server/AI_Interest_Target.cpp
similarity index 100%
rename from mp/src/game/server/AI_Interest_Target.cpp
rename to src/game/server/AI_Interest_Target.cpp
diff --git a/mp/src/game/server/AI_Interest_Target.h b/src/game/server/AI_Interest_Target.h
similarity index 100%
rename from mp/src/game/server/AI_Interest_Target.h
rename to src/game/server/AI_Interest_Target.h
diff --git a/mp/src/game/server/AI_ResponseSystem.cpp b/src/game/server/AI_ResponseSystem.cpp
similarity index 100%
rename from mp/src/game/server/AI_ResponseSystem.cpp
rename to src/game/server/AI_ResponseSystem.cpp
diff --git a/mp/src/game/server/AI_ResponseSystem.h b/src/game/server/AI_ResponseSystem.h
similarity index 100%
rename from mp/src/game/server/AI_ResponseSystem.h
rename to src/game/server/AI_ResponseSystem.h
diff --git a/mp/src/game/server/BaseAnimatingOverlay.cpp b/src/game/server/BaseAnimatingOverlay.cpp
similarity index 100%
rename from mp/src/game/server/BaseAnimatingOverlay.cpp
rename to src/game/server/BaseAnimatingOverlay.cpp
diff --git a/mp/src/game/server/BaseAnimatingOverlay.h b/src/game/server/BaseAnimatingOverlay.h
similarity index 100%
rename from mp/src/game/server/BaseAnimatingOverlay.h
rename to src/game/server/BaseAnimatingOverlay.h
diff --git a/mp/src/game/server/BasePropDoor.h b/src/game/server/BasePropDoor.h
similarity index 100%
rename from mp/src/game/server/BasePropDoor.h
rename to src/game/server/BasePropDoor.h
diff --git a/mp/src/game/server/CRagdollMagnet.cpp b/src/game/server/CRagdollMagnet.cpp
similarity index 100%
rename from mp/src/game/server/CRagdollMagnet.cpp
rename to src/game/server/CRagdollMagnet.cpp
diff --git a/mp/src/game/server/CRagdollMagnet.h b/src/game/server/CRagdollMagnet.h
similarity index 100%
rename from mp/src/game/server/CRagdollMagnet.h
rename to src/game/server/CRagdollMagnet.h
diff --git a/mp/src/game/server/CommentarySystem.cpp b/src/game/server/CommentarySystem.cpp
similarity index 100%
rename from mp/src/game/server/CommentarySystem.cpp
rename to src/game/server/CommentarySystem.cpp
diff --git a/mp/src/game/server/EffectsServer.cpp b/src/game/server/EffectsServer.cpp
similarity index 100%
rename from mp/src/game/server/EffectsServer.cpp
rename to src/game/server/EffectsServer.cpp
diff --git a/mp/src/game/server/EntityDissolve.cpp b/src/game/server/EntityDissolve.cpp
similarity index 100%
rename from mp/src/game/server/EntityDissolve.cpp
rename to src/game/server/EntityDissolve.cpp
diff --git a/mp/src/game/server/EntityDissolve.h b/src/game/server/EntityDissolve.h
similarity index 100%
rename from mp/src/game/server/EntityDissolve.h
rename to src/game/server/EntityDissolve.h
diff --git a/mp/src/game/server/EntityFlame.cpp b/src/game/server/EntityFlame.cpp
similarity index 100%
rename from mp/src/game/server/EntityFlame.cpp
rename to src/game/server/EntityFlame.cpp
diff --git a/mp/src/game/server/EntityFlame.h b/src/game/server/EntityFlame.h
similarity index 100%
rename from mp/src/game/server/EntityFlame.h
rename to src/game/server/EntityFlame.h
diff --git a/mp/src/game/server/EntityParticleTrail.cpp b/src/game/server/EntityParticleTrail.cpp
similarity index 100%
rename from mp/src/game/server/EntityParticleTrail.cpp
rename to src/game/server/EntityParticleTrail.cpp
diff --git a/mp/src/game/server/EntityParticleTrail.h b/src/game/server/EntityParticleTrail.h
similarity index 100%
rename from mp/src/game/server/EntityParticleTrail.h
rename to src/game/server/EntityParticleTrail.h
diff --git a/mp/src/game/server/EnvBeam.cpp b/src/game/server/EnvBeam.cpp
similarity index 100%
rename from mp/src/game/server/EnvBeam.cpp
rename to src/game/server/EnvBeam.cpp
diff --git a/mp/src/game/server/EnvFade.cpp b/src/game/server/EnvFade.cpp
similarity index 100%
rename from mp/src/game/server/EnvFade.cpp
rename to src/game/server/EnvFade.cpp
diff --git a/mp/src/game/server/EnvHudHint.cpp b/src/game/server/EnvHudHint.cpp
similarity index 100%
rename from mp/src/game/server/EnvHudHint.cpp
rename to src/game/server/EnvHudHint.cpp
diff --git a/mp/src/game/server/EnvLaser.cpp b/src/game/server/EnvLaser.cpp
similarity index 100%
rename from mp/src/game/server/EnvLaser.cpp
rename to src/game/server/EnvLaser.cpp
diff --git a/mp/src/game/server/EnvLaser.h b/src/game/server/EnvLaser.h
similarity index 100%
rename from mp/src/game/server/EnvLaser.h
rename to src/game/server/EnvLaser.h
diff --git a/mp/src/game/server/EnvMessage.cpp b/src/game/server/EnvMessage.cpp
similarity index 100%
rename from mp/src/game/server/EnvMessage.cpp
rename to src/game/server/EnvMessage.cpp
diff --git a/mp/src/game/server/EnvMessage.h b/src/game/server/EnvMessage.h
similarity index 100%
rename from mp/src/game/server/EnvMessage.h
rename to src/game/server/EnvMessage.h
diff --git a/mp/src/game/server/EnvShake.cpp b/src/game/server/EnvShake.cpp
similarity index 100%
rename from mp/src/game/server/EnvShake.cpp
rename to src/game/server/EnvShake.cpp
diff --git a/mp/src/game/server/EnvSpark.cpp b/src/game/server/EnvSpark.cpp
similarity index 100%
rename from mp/src/game/server/EnvSpark.cpp
rename to src/game/server/EnvSpark.cpp
diff --git a/mp/src/game/server/EventLog.cpp b/src/game/server/EventLog.cpp
similarity index 100%
rename from mp/src/game/server/EventLog.cpp
rename to src/game/server/EventLog.cpp
diff --git a/mp/src/game/server/EventLog.h b/src/game/server/EventLog.h
similarity index 100%
rename from mp/src/game/server/EventLog.h
rename to src/game/server/EventLog.h
diff --git a/mp/src/game/server/GameStats.cpp b/src/game/server/GameStats.cpp
similarity index 100%
rename from mp/src/game/server/GameStats.cpp
rename to src/game/server/GameStats.cpp
diff --git a/mp/src/game/server/GameStats_BasicStatsFunctions.cpp b/src/game/server/GameStats_BasicStatsFunctions.cpp
similarity index 100%
rename from mp/src/game/server/GameStats_BasicStatsFunctions.cpp
rename to src/game/server/GameStats_BasicStatsFunctions.cpp
diff --git a/mp/src/game/server/MaterialModifyControl.cpp b/src/game/server/MaterialModifyControl.cpp
similarity index 100%
rename from mp/src/game/server/MaterialModifyControl.cpp
rename to src/game/server/MaterialModifyControl.cpp
diff --git a/mp/src/game/server/PointAngularVelocitySensor.cpp b/src/game/server/PointAngularVelocitySensor.cpp
similarity index 100%
rename from mp/src/game/server/PointAngularVelocitySensor.cpp
rename to src/game/server/PointAngularVelocitySensor.cpp
diff --git a/mp/src/game/server/RagdollBoogie.cpp b/src/game/server/RagdollBoogie.cpp
similarity index 100%
rename from mp/src/game/server/RagdollBoogie.cpp
rename to src/game/server/RagdollBoogie.cpp
diff --git a/mp/src/game/server/RagdollBoogie.h b/src/game/server/RagdollBoogie.h
similarity index 100%
rename from mp/src/game/server/RagdollBoogie.h
rename to src/game/server/RagdollBoogie.h
diff --git a/mp/src/game/server/ServerNetworkProperty.cpp b/src/game/server/ServerNetworkProperty.cpp
similarity index 100%
rename from mp/src/game/server/ServerNetworkProperty.cpp
rename to src/game/server/ServerNetworkProperty.cpp
diff --git a/mp/src/game/server/ServerNetworkProperty.h b/src/game/server/ServerNetworkProperty.h
similarity index 100%
rename from mp/src/game/server/ServerNetworkProperty.h
rename to src/game/server/ServerNetworkProperty.h
diff --git a/mp/src/game/server/SkyCamera.cpp b/src/game/server/SkyCamera.cpp
similarity index 100%
rename from mp/src/game/server/SkyCamera.cpp
rename to src/game/server/SkyCamera.cpp
diff --git a/mp/src/game/server/SkyCamera.h b/src/game/server/SkyCamera.h
similarity index 100%
rename from mp/src/game/server/SkyCamera.h
rename to src/game/server/SkyCamera.h
diff --git a/mp/src/game/server/TemplateEntities.cpp b/src/game/server/TemplateEntities.cpp
similarity index 100%
rename from mp/src/game/server/TemplateEntities.cpp
rename to src/game/server/TemplateEntities.cpp
diff --git a/mp/src/game/server/TemplateEntities.h b/src/game/server/TemplateEntities.h
similarity index 100%
rename from mp/src/game/server/TemplateEntities.h
rename to src/game/server/TemplateEntities.h
diff --git a/mp/src/game/server/WaterLODControl.cpp b/src/game/server/WaterLODControl.cpp
similarity index 100%
rename from mp/src/game/server/WaterLODControl.cpp
rename to src/game/server/WaterLODControl.cpp
diff --git a/mp/src/game/server/actanimating.cpp b/src/game/server/actanimating.cpp
similarity index 100%
rename from mp/src/game/server/actanimating.cpp
rename to src/game/server/actanimating.cpp
diff --git a/mp/src/game/server/actanimating.h b/src/game/server/actanimating.h
similarity index 100%
rename from mp/src/game/server/actanimating.h
rename to src/game/server/actanimating.h
diff --git a/mp/src/game/server/ai_activity.cpp b/src/game/server/ai_activity.cpp
similarity index 100%
rename from mp/src/game/server/ai_activity.cpp
rename to src/game/server/ai_activity.cpp
diff --git a/mp/src/game/server/ai_baseactor.cpp b/src/game/server/ai_baseactor.cpp
similarity index 100%
rename from mp/src/game/server/ai_baseactor.cpp
rename to src/game/server/ai_baseactor.cpp
diff --git a/mp/src/game/server/ai_baseactor.h b/src/game/server/ai_baseactor.h
similarity index 100%
rename from mp/src/game/server/ai_baseactor.h
rename to src/game/server/ai_baseactor.h
diff --git a/mp/src/game/server/ai_basehumanoid.cpp b/src/game/server/ai_basehumanoid.cpp
similarity index 100%
rename from mp/src/game/server/ai_basehumanoid.cpp
rename to src/game/server/ai_basehumanoid.cpp
diff --git a/mp/src/game/server/ai_basehumanoid.h b/src/game/server/ai_basehumanoid.h
similarity index 100%
rename from mp/src/game/server/ai_basehumanoid.h
rename to src/game/server/ai_basehumanoid.h
diff --git a/mp/src/game/server/ai_basenpc.cpp b/src/game/server/ai_basenpc.cpp
similarity index 100%
rename from mp/src/game/server/ai_basenpc.cpp
rename to src/game/server/ai_basenpc.cpp
diff --git a/mp/src/game/server/ai_basenpc.h b/src/game/server/ai_basenpc.h
similarity index 100%
rename from mp/src/game/server/ai_basenpc.h
rename to src/game/server/ai_basenpc.h
diff --git a/mp/src/game/server/ai_basenpc_flyer.cpp b/src/game/server/ai_basenpc_flyer.cpp
similarity index 100%
rename from mp/src/game/server/ai_basenpc_flyer.cpp
rename to src/game/server/ai_basenpc_flyer.cpp
diff --git a/mp/src/game/server/ai_basenpc_flyer.h b/src/game/server/ai_basenpc_flyer.h
similarity index 100%
rename from mp/src/game/server/ai_basenpc_flyer.h
rename to src/game/server/ai_basenpc_flyer.h
diff --git a/mp/src/game/server/ai_basenpc_flyer_new.cpp b/src/game/server/ai_basenpc_flyer_new.cpp
similarity index 100%
rename from mp/src/game/server/ai_basenpc_flyer_new.cpp
rename to src/game/server/ai_basenpc_flyer_new.cpp
diff --git a/mp/src/game/server/ai_basenpc_flyer_new.h b/src/game/server/ai_basenpc_flyer_new.h
similarity index 100%
rename from mp/src/game/server/ai_basenpc_flyer_new.h
rename to src/game/server/ai_basenpc_flyer_new.h
diff --git a/mp/src/game/server/ai_basenpc_movement.cpp b/src/game/server/ai_basenpc_movement.cpp
similarity index 100%
rename from mp/src/game/server/ai_basenpc_movement.cpp
rename to src/game/server/ai_basenpc_movement.cpp
diff --git a/mp/src/game/server/ai_basenpc_physicsflyer.cpp b/src/game/server/ai_basenpc_physicsflyer.cpp
similarity index 100%
rename from mp/src/game/server/ai_basenpc_physicsflyer.cpp
rename to src/game/server/ai_basenpc_physicsflyer.cpp
diff --git a/mp/src/game/server/ai_basenpc_physicsflyer.h b/src/game/server/ai_basenpc_physicsflyer.h
similarity index 100%
rename from mp/src/game/server/ai_basenpc_physicsflyer.h
rename to src/game/server/ai_basenpc_physicsflyer.h
diff --git a/mp/src/game/server/ai_basenpc_schedule.cpp b/src/game/server/ai_basenpc_schedule.cpp
similarity index 100%
rename from mp/src/game/server/ai_basenpc_schedule.cpp
rename to src/game/server/ai_basenpc_schedule.cpp
diff --git a/mp/src/game/server/ai_basenpc_squad.cpp b/src/game/server/ai_basenpc_squad.cpp
similarity index 100%
rename from mp/src/game/server/ai_basenpc_squad.cpp
rename to src/game/server/ai_basenpc_squad.cpp
diff --git a/mp/src/game/server/ai_behavior.cpp b/src/game/server/ai_behavior.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior.cpp
rename to src/game/server/ai_behavior.cpp
diff --git a/mp/src/game/server/ai_behavior.h b/src/game/server/ai_behavior.h
similarity index 100%
rename from mp/src/game/server/ai_behavior.h
rename to src/game/server/ai_behavior.h
diff --git a/mp/src/game/server/ai_behavior_assault.cpp b/src/game/server/ai_behavior_assault.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior_assault.cpp
rename to src/game/server/ai_behavior_assault.cpp
diff --git a/mp/src/game/server/ai_behavior_assault.h b/src/game/server/ai_behavior_assault.h
similarity index 100%
rename from mp/src/game/server/ai_behavior_assault.h
rename to src/game/server/ai_behavior_assault.h
diff --git a/mp/src/game/server/ai_behavior_fear.cpp b/src/game/server/ai_behavior_fear.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior_fear.cpp
rename to src/game/server/ai_behavior_fear.cpp
diff --git a/mp/src/game/server/ai_behavior_fear.h b/src/game/server/ai_behavior_fear.h
similarity index 100%
rename from mp/src/game/server/ai_behavior_fear.h
rename to src/game/server/ai_behavior_fear.h
diff --git a/mp/src/game/server/ai_behavior_follow.cpp b/src/game/server/ai_behavior_follow.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior_follow.cpp
rename to src/game/server/ai_behavior_follow.cpp
diff --git a/mp/src/game/server/ai_behavior_follow.h b/src/game/server/ai_behavior_follow.h
similarity index 100%
rename from mp/src/game/server/ai_behavior_follow.h
rename to src/game/server/ai_behavior_follow.h
diff --git a/mp/src/game/server/ai_behavior_lead.cpp b/src/game/server/ai_behavior_lead.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior_lead.cpp
rename to src/game/server/ai_behavior_lead.cpp
diff --git a/mp/src/game/server/ai_behavior_lead.h b/src/game/server/ai_behavior_lead.h
similarity index 100%
rename from mp/src/game/server/ai_behavior_lead.h
rename to src/game/server/ai_behavior_lead.h
diff --git a/mp/src/game/server/ai_behavior_passenger.cpp b/src/game/server/ai_behavior_passenger.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior_passenger.cpp
rename to src/game/server/ai_behavior_passenger.cpp
diff --git a/mp/src/game/server/ai_behavior_passenger.h b/src/game/server/ai_behavior_passenger.h
similarity index 100%
rename from mp/src/game/server/ai_behavior_passenger.h
rename to src/game/server/ai_behavior_passenger.h
diff --git a/mp/src/game/server/ai_behavior_rappel.cpp b/src/game/server/ai_behavior_rappel.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior_rappel.cpp
rename to src/game/server/ai_behavior_rappel.cpp
diff --git a/mp/src/game/server/ai_behavior_rappel.h b/src/game/server/ai_behavior_rappel.h
similarity index 100%
rename from mp/src/game/server/ai_behavior_rappel.h
rename to src/game/server/ai_behavior_rappel.h
diff --git a/mp/src/game/server/ai_behavior_standoff.cpp b/src/game/server/ai_behavior_standoff.cpp
similarity index 100%
rename from mp/src/game/server/ai_behavior_standoff.cpp
rename to src/game/server/ai_behavior_standoff.cpp
diff --git a/mp/src/game/server/ai_behavior_standoff.h b/src/game/server/ai_behavior_standoff.h
similarity index 100%
rename from mp/src/game/server/ai_behavior_standoff.h
rename to src/game/server/ai_behavior_standoff.h
diff --git a/mp/src/game/server/ai_blended_movement.cpp b/src/game/server/ai_blended_movement.cpp
similarity index 100%
rename from mp/src/game/server/ai_blended_movement.cpp
rename to src/game/server/ai_blended_movement.cpp
diff --git a/mp/src/game/server/ai_blended_movement.h b/src/game/server/ai_blended_movement.h
similarity index 100%
rename from mp/src/game/server/ai_blended_movement.h
rename to src/game/server/ai_blended_movement.h
diff --git a/mp/src/game/server/ai_component.h b/src/game/server/ai_component.h
similarity index 100%
rename from mp/src/game/server/ai_component.h
rename to src/game/server/ai_component.h
diff --git a/mp/src/game/server/ai_concommands.cpp b/src/game/server/ai_concommands.cpp
similarity index 100%
rename from mp/src/game/server/ai_concommands.cpp
rename to src/game/server/ai_concommands.cpp
diff --git a/mp/src/game/server/ai_condition.cpp b/src/game/server/ai_condition.cpp
similarity index 100%
rename from mp/src/game/server/ai_condition.cpp
rename to src/game/server/ai_condition.cpp
diff --git a/mp/src/game/server/ai_condition.h b/src/game/server/ai_condition.h
similarity index 100%
rename from mp/src/game/server/ai_condition.h
rename to src/game/server/ai_condition.h
diff --git a/mp/src/game/server/ai_debug.h b/src/game/server/ai_debug.h
similarity index 100%
rename from mp/src/game/server/ai_debug.h
rename to src/game/server/ai_debug.h
diff --git a/mp/src/game/server/ai_default.cpp b/src/game/server/ai_default.cpp
similarity index 100%
rename from mp/src/game/server/ai_default.cpp
rename to src/game/server/ai_default.cpp
diff --git a/mp/src/game/server/ai_default.h b/src/game/server/ai_default.h
similarity index 100%
rename from mp/src/game/server/ai_default.h
rename to src/game/server/ai_default.h
diff --git a/mp/src/game/server/ai_dynamiclink.cpp b/src/game/server/ai_dynamiclink.cpp
similarity index 100%
rename from mp/src/game/server/ai_dynamiclink.cpp
rename to src/game/server/ai_dynamiclink.cpp
diff --git a/mp/src/game/server/ai_dynamiclink.h b/src/game/server/ai_dynamiclink.h
similarity index 100%
rename from mp/src/game/server/ai_dynamiclink.h
rename to src/game/server/ai_dynamiclink.h
diff --git a/mp/src/game/server/ai_event.cpp b/src/game/server/ai_event.cpp
similarity index 100%
rename from mp/src/game/server/ai_event.cpp
rename to src/game/server/ai_event.cpp
diff --git a/mp/src/game/server/ai_eventresponse.cpp b/src/game/server/ai_eventresponse.cpp
similarity index 100%
rename from mp/src/game/server/ai_eventresponse.cpp
rename to src/game/server/ai_eventresponse.cpp
diff --git a/mp/src/game/server/ai_eventresponse.h b/src/game/server/ai_eventresponse.h
similarity index 100%
rename from mp/src/game/server/ai_eventresponse.h
rename to src/game/server/ai_eventresponse.h
diff --git a/mp/src/game/server/ai_goalentity.cpp b/src/game/server/ai_goalentity.cpp
similarity index 100%
rename from mp/src/game/server/ai_goalentity.cpp
rename to src/game/server/ai_goalentity.cpp
diff --git a/mp/src/game/server/ai_goalentity.h b/src/game/server/ai_goalentity.h
similarity index 100%
rename from mp/src/game/server/ai_goalentity.h
rename to src/game/server/ai_goalentity.h
diff --git a/mp/src/game/server/ai_hint.cpp b/src/game/server/ai_hint.cpp
similarity index 100%
rename from mp/src/game/server/ai_hint.cpp
rename to src/game/server/ai_hint.cpp
diff --git a/mp/src/game/server/ai_hint.h b/src/game/server/ai_hint.h
similarity index 100%
rename from mp/src/game/server/ai_hint.h
rename to src/game/server/ai_hint.h
diff --git a/mp/src/game/server/ai_hull.cpp b/src/game/server/ai_hull.cpp
similarity index 100%
rename from mp/src/game/server/ai_hull.cpp
rename to src/game/server/ai_hull.cpp
diff --git a/mp/src/game/server/ai_hull.h b/src/game/server/ai_hull.h
similarity index 100%
rename from mp/src/game/server/ai_hull.h
rename to src/game/server/ai_hull.h
diff --git a/mp/src/game/server/ai_initutils.cpp b/src/game/server/ai_initutils.cpp
similarity index 100%
rename from mp/src/game/server/ai_initutils.cpp
rename to src/game/server/ai_initutils.cpp
diff --git a/mp/src/game/server/ai_initutils.h b/src/game/server/ai_initutils.h
similarity index 100%
rename from mp/src/game/server/ai_initutils.h
rename to src/game/server/ai_initutils.h
diff --git a/mp/src/game/server/ai_link.cpp b/src/game/server/ai_link.cpp
similarity index 100%
rename from mp/src/game/server/ai_link.cpp
rename to src/game/server/ai_link.cpp
diff --git a/mp/src/game/server/ai_link.h b/src/game/server/ai_link.h
similarity index 100%
rename from mp/src/game/server/ai_link.h
rename to src/game/server/ai_link.h
diff --git a/mp/src/game/server/ai_localnavigator.cpp b/src/game/server/ai_localnavigator.cpp
similarity index 100%
rename from mp/src/game/server/ai_localnavigator.cpp
rename to src/game/server/ai_localnavigator.cpp
diff --git a/mp/src/game/server/ai_localnavigator.h b/src/game/server/ai_localnavigator.h
similarity index 100%
rename from mp/src/game/server/ai_localnavigator.h
rename to src/game/server/ai_localnavigator.h
diff --git a/mp/src/game/server/ai_looktarget.cpp b/src/game/server/ai_looktarget.cpp
similarity index 100%
rename from mp/src/game/server/ai_looktarget.cpp
rename to src/game/server/ai_looktarget.cpp
diff --git a/mp/src/game/server/ai_looktarget.h b/src/game/server/ai_looktarget.h
similarity index 100%
rename from mp/src/game/server/ai_looktarget.h
rename to src/game/server/ai_looktarget.h
diff --git a/mp/src/game/server/ai_memory.cpp b/src/game/server/ai_memory.cpp
similarity index 100%
rename from mp/src/game/server/ai_memory.cpp
rename to src/game/server/ai_memory.cpp
diff --git a/mp/src/game/server/ai_memory.h b/src/game/server/ai_memory.h
similarity index 100%
rename from mp/src/game/server/ai_memory.h
rename to src/game/server/ai_memory.h
diff --git a/mp/src/game/server/ai_motor.cpp b/src/game/server/ai_motor.cpp
similarity index 100%
rename from mp/src/game/server/ai_motor.cpp
rename to src/game/server/ai_motor.cpp
diff --git a/mp/src/game/server/ai_motor.h b/src/game/server/ai_motor.h
similarity index 100%
rename from mp/src/game/server/ai_motor.h
rename to src/game/server/ai_motor.h
diff --git a/mp/src/game/server/ai_moveprobe.cpp b/src/game/server/ai_moveprobe.cpp
similarity index 100%
rename from mp/src/game/server/ai_moveprobe.cpp
rename to src/game/server/ai_moveprobe.cpp
diff --git a/mp/src/game/server/ai_moveprobe.h b/src/game/server/ai_moveprobe.h
similarity index 100%
rename from mp/src/game/server/ai_moveprobe.h
rename to src/game/server/ai_moveprobe.h
diff --git a/mp/src/game/server/ai_moveshoot.cpp b/src/game/server/ai_moveshoot.cpp
similarity index 100%
rename from mp/src/game/server/ai_moveshoot.cpp
rename to src/game/server/ai_moveshoot.cpp
diff --git a/mp/src/game/server/ai_moveshoot.h b/src/game/server/ai_moveshoot.h
similarity index 100%
rename from mp/src/game/server/ai_moveshoot.h
rename to src/game/server/ai_moveshoot.h
diff --git a/mp/src/game/server/ai_movesolver.cpp b/src/game/server/ai_movesolver.cpp
similarity index 100%
rename from mp/src/game/server/ai_movesolver.cpp
rename to src/game/server/ai_movesolver.cpp
diff --git a/mp/src/game/server/ai_movesolver.h b/src/game/server/ai_movesolver.h
similarity index 100%
rename from mp/src/game/server/ai_movesolver.h
rename to src/game/server/ai_movesolver.h
diff --git a/mp/src/game/server/ai_movetypes.h b/src/game/server/ai_movetypes.h
similarity index 100%
rename from mp/src/game/server/ai_movetypes.h
rename to src/game/server/ai_movetypes.h
diff --git a/mp/src/game/server/ai_namespaces.cpp b/src/game/server/ai_namespaces.cpp
similarity index 100%
rename from mp/src/game/server/ai_namespaces.cpp
rename to src/game/server/ai_namespaces.cpp
diff --git a/mp/src/game/server/ai_namespaces.h b/src/game/server/ai_namespaces.h
similarity index 100%
rename from mp/src/game/server/ai_namespaces.h
rename to src/game/server/ai_namespaces.h
diff --git a/mp/src/game/server/ai_navgoaltype.h b/src/game/server/ai_navgoaltype.h
similarity index 100%
rename from mp/src/game/server/ai_navgoaltype.h
rename to src/game/server/ai_navgoaltype.h
diff --git a/mp/src/game/server/ai_navigator.cpp b/src/game/server/ai_navigator.cpp
similarity index 100%
rename from mp/src/game/server/ai_navigator.cpp
rename to src/game/server/ai_navigator.cpp
diff --git a/mp/src/game/server/ai_navigator.h b/src/game/server/ai_navigator.h
similarity index 100%
rename from mp/src/game/server/ai_navigator.h
rename to src/game/server/ai_navigator.h
diff --git a/mp/src/game/server/ai_navtype.h b/src/game/server/ai_navtype.h
similarity index 100%
rename from mp/src/game/server/ai_navtype.h
rename to src/game/server/ai_navtype.h
diff --git a/mp/src/game/server/ai_network.cpp b/src/game/server/ai_network.cpp
similarity index 100%
rename from mp/src/game/server/ai_network.cpp
rename to src/game/server/ai_network.cpp
diff --git a/mp/src/game/server/ai_network.h b/src/game/server/ai_network.h
similarity index 100%
rename from mp/src/game/server/ai_network.h
rename to src/game/server/ai_network.h
diff --git a/mp/src/game/server/ai_networkmanager.cpp b/src/game/server/ai_networkmanager.cpp
similarity index 100%
rename from mp/src/game/server/ai_networkmanager.cpp
rename to src/game/server/ai_networkmanager.cpp
diff --git a/mp/src/game/server/ai_networkmanager.h b/src/game/server/ai_networkmanager.h
similarity index 100%
rename from mp/src/game/server/ai_networkmanager.h
rename to src/game/server/ai_networkmanager.h
diff --git a/mp/src/game/server/ai_node.cpp b/src/game/server/ai_node.cpp
similarity index 100%
rename from mp/src/game/server/ai_node.cpp
rename to src/game/server/ai_node.cpp
diff --git a/mp/src/game/server/ai_node.h b/src/game/server/ai_node.h
similarity index 100%
rename from mp/src/game/server/ai_node.h
rename to src/game/server/ai_node.h
diff --git a/mp/src/game/server/ai_npcstate.h b/src/game/server/ai_npcstate.h
similarity index 100%
rename from mp/src/game/server/ai_npcstate.h
rename to src/game/server/ai_npcstate.h
diff --git a/mp/src/game/server/ai_obstacle_type.h b/src/game/server/ai_obstacle_type.h
similarity index 100%
rename from mp/src/game/server/ai_obstacle_type.h
rename to src/game/server/ai_obstacle_type.h
diff --git a/mp/src/game/server/ai_pathfinder.cpp b/src/game/server/ai_pathfinder.cpp
similarity index 100%
rename from mp/src/game/server/ai_pathfinder.cpp
rename to src/game/server/ai_pathfinder.cpp
diff --git a/mp/src/game/server/ai_pathfinder.h b/src/game/server/ai_pathfinder.h
similarity index 100%
rename from mp/src/game/server/ai_pathfinder.h
rename to src/game/server/ai_pathfinder.h
diff --git a/mp/src/game/server/ai_planesolver.cpp b/src/game/server/ai_planesolver.cpp
similarity index 100%
rename from mp/src/game/server/ai_planesolver.cpp
rename to src/game/server/ai_planesolver.cpp
diff --git a/mp/src/game/server/ai_planesolver.h b/src/game/server/ai_planesolver.h
similarity index 100%
rename from mp/src/game/server/ai_planesolver.h
rename to src/game/server/ai_planesolver.h
diff --git a/mp/src/game/server/ai_playerally.cpp b/src/game/server/ai_playerally.cpp
similarity index 100%
rename from mp/src/game/server/ai_playerally.cpp
rename to src/game/server/ai_playerally.cpp
diff --git a/mp/src/game/server/ai_playerally.h b/src/game/server/ai_playerally.h
similarity index 100%
rename from mp/src/game/server/ai_playerally.h
rename to src/game/server/ai_playerally.h
diff --git a/mp/src/game/server/ai_relationship.cpp b/src/game/server/ai_relationship.cpp
similarity index 100%
rename from mp/src/game/server/ai_relationship.cpp
rename to src/game/server/ai_relationship.cpp
diff --git a/mp/src/game/server/ai_route.cpp b/src/game/server/ai_route.cpp
similarity index 100%
rename from mp/src/game/server/ai_route.cpp
rename to src/game/server/ai_route.cpp
diff --git a/mp/src/game/server/ai_route.h b/src/game/server/ai_route.h
similarity index 100%
rename from mp/src/game/server/ai_route.h
rename to src/game/server/ai_route.h
diff --git a/mp/src/game/server/ai_routedist.h b/src/game/server/ai_routedist.h
similarity index 100%
rename from mp/src/game/server/ai_routedist.h
rename to src/game/server/ai_routedist.h
diff --git a/mp/src/game/server/ai_saverestore.cpp b/src/game/server/ai_saverestore.cpp
similarity index 100%
rename from mp/src/game/server/ai_saverestore.cpp
rename to src/game/server/ai_saverestore.cpp
diff --git a/mp/src/game/server/ai_saverestore.h b/src/game/server/ai_saverestore.h
similarity index 100%
rename from mp/src/game/server/ai_saverestore.h
rename to src/game/server/ai_saverestore.h
diff --git a/mp/src/game/server/ai_schedule.cpp b/src/game/server/ai_schedule.cpp
similarity index 100%
rename from mp/src/game/server/ai_schedule.cpp
rename to src/game/server/ai_schedule.cpp
diff --git a/mp/src/game/server/ai_schedule.h b/src/game/server/ai_schedule.h
similarity index 100%
rename from mp/src/game/server/ai_schedule.h
rename to src/game/server/ai_schedule.h
diff --git a/mp/src/game/server/ai_scriptconditions.cpp b/src/game/server/ai_scriptconditions.cpp
similarity index 100%
rename from mp/src/game/server/ai_scriptconditions.cpp
rename to src/game/server/ai_scriptconditions.cpp
diff --git a/mp/src/game/server/ai_scriptconditions.h b/src/game/server/ai_scriptconditions.h
similarity index 100%
rename from mp/src/game/server/ai_scriptconditions.h
rename to src/game/server/ai_scriptconditions.h
diff --git a/mp/src/game/server/ai_senses.cpp b/src/game/server/ai_senses.cpp
similarity index 100%
rename from mp/src/game/server/ai_senses.cpp
rename to src/game/server/ai_senses.cpp
diff --git a/mp/src/game/server/ai_senses.h b/src/game/server/ai_senses.h
similarity index 100%
rename from mp/src/game/server/ai_senses.h
rename to src/game/server/ai_senses.h
diff --git a/mp/src/game/server/ai_sentence.cpp b/src/game/server/ai_sentence.cpp
similarity index 100%
rename from mp/src/game/server/ai_sentence.cpp
rename to src/game/server/ai_sentence.cpp
diff --git a/mp/src/game/server/ai_sentence.h b/src/game/server/ai_sentence.h
similarity index 100%
rename from mp/src/game/server/ai_sentence.h
rename to src/game/server/ai_sentence.h
diff --git a/mp/src/game/server/ai_speech.cpp b/src/game/server/ai_speech.cpp
similarity index 100%
rename from mp/src/game/server/ai_speech.cpp
rename to src/game/server/ai_speech.cpp
diff --git a/mp/src/game/server/ai_speech.h b/src/game/server/ai_speech.h
similarity index 100%
rename from mp/src/game/server/ai_speech.h
rename to src/game/server/ai_speech.h
diff --git a/mp/src/game/server/ai_speechfilter.cpp b/src/game/server/ai_speechfilter.cpp
similarity index 100%
rename from mp/src/game/server/ai_speechfilter.cpp
rename to src/game/server/ai_speechfilter.cpp
diff --git a/mp/src/game/server/ai_speechfilter.h b/src/game/server/ai_speechfilter.h
similarity index 100%
rename from mp/src/game/server/ai_speechfilter.h
rename to src/game/server/ai_speechfilter.h
diff --git a/mp/src/game/server/ai_squad.cpp b/src/game/server/ai_squad.cpp
similarity index 100%
rename from mp/src/game/server/ai_squad.cpp
rename to src/game/server/ai_squad.cpp
diff --git a/mp/src/game/server/ai_squad.h b/src/game/server/ai_squad.h
similarity index 100%
rename from mp/src/game/server/ai_squad.h
rename to src/game/server/ai_squad.h
diff --git a/mp/src/game/server/ai_squadslot.cpp b/src/game/server/ai_squadslot.cpp
similarity index 100%
rename from mp/src/game/server/ai_squadslot.cpp
rename to src/game/server/ai_squadslot.cpp
diff --git a/mp/src/game/server/ai_squadslot.h b/src/game/server/ai_squadslot.h
similarity index 100%
rename from mp/src/game/server/ai_squadslot.h
rename to src/game/server/ai_squadslot.h
diff --git a/mp/src/game/server/ai_tacticalservices.cpp b/src/game/server/ai_tacticalservices.cpp
similarity index 100%
rename from mp/src/game/server/ai_tacticalservices.cpp
rename to src/game/server/ai_tacticalservices.cpp
diff --git a/mp/src/game/server/ai_tacticalservices.h b/src/game/server/ai_tacticalservices.h
similarity index 100%
rename from mp/src/game/server/ai_tacticalservices.h
rename to src/game/server/ai_tacticalservices.h
diff --git a/mp/src/game/server/ai_task.cpp b/src/game/server/ai_task.cpp
similarity index 100%
rename from mp/src/game/server/ai_task.cpp
rename to src/game/server/ai_task.cpp
diff --git a/mp/src/game/server/ai_task.h b/src/game/server/ai_task.h
similarity index 100%
rename from mp/src/game/server/ai_task.h
rename to src/game/server/ai_task.h
diff --git a/mp/src/game/server/ai_trackpather.cpp b/src/game/server/ai_trackpather.cpp
similarity index 100%
rename from mp/src/game/server/ai_trackpather.cpp
rename to src/game/server/ai_trackpather.cpp
diff --git a/mp/src/game/server/ai_trackpather.h b/src/game/server/ai_trackpather.h
similarity index 100%
rename from mp/src/game/server/ai_trackpather.h
rename to src/game/server/ai_trackpather.h
diff --git a/mp/src/game/server/ai_utils.cpp b/src/game/server/ai_utils.cpp
similarity index 100%
rename from mp/src/game/server/ai_utils.cpp
rename to src/game/server/ai_utils.cpp
diff --git a/mp/src/game/server/ai_utils.h b/src/game/server/ai_utils.h
similarity index 100%
rename from mp/src/game/server/ai_utils.h
rename to src/game/server/ai_utils.h
diff --git a/mp/src/game/server/ai_waypoint.cpp b/src/game/server/ai_waypoint.cpp
similarity index 100%
rename from mp/src/game/server/ai_waypoint.cpp
rename to src/game/server/ai_waypoint.cpp
diff --git a/mp/src/game/server/ai_waypoint.h b/src/game/server/ai_waypoint.h
similarity index 100%
rename from mp/src/game/server/ai_waypoint.h
rename to src/game/server/ai_waypoint.h
diff --git a/mp/src/game/server/base_gameinterface.cpp b/src/game/server/base_gameinterface.cpp
similarity index 100%
rename from mp/src/game/server/base_gameinterface.cpp
rename to src/game/server/base_gameinterface.cpp
diff --git a/mp/src/game/server/base_transmit_proxy.cpp b/src/game/server/base_transmit_proxy.cpp
similarity index 100%
rename from mp/src/game/server/base_transmit_proxy.cpp
rename to src/game/server/base_transmit_proxy.cpp
diff --git a/mp/src/game/server/base_transmit_proxy.h b/src/game/server/base_transmit_proxy.h
similarity index 100%
rename from mp/src/game/server/base_transmit_proxy.h
rename to src/game/server/base_transmit_proxy.h
diff --git a/mp/src/game/server/baseanimating.cpp b/src/game/server/baseanimating.cpp
similarity index 100%
rename from mp/src/game/server/baseanimating.cpp
rename to src/game/server/baseanimating.cpp
diff --git a/mp/src/game/server/baseanimating.h b/src/game/server/baseanimating.h
similarity index 100%
rename from mp/src/game/server/baseanimating.h
rename to src/game/server/baseanimating.h
diff --git a/mp/src/game/server/basebludgeonweapon.cpp b/src/game/server/basebludgeonweapon.cpp
similarity index 100%
rename from mp/src/game/server/basebludgeonweapon.cpp
rename to src/game/server/basebludgeonweapon.cpp
diff --git a/mp/src/game/server/basebludgeonweapon.h b/src/game/server/basebludgeonweapon.h
similarity index 100%
rename from mp/src/game/server/basebludgeonweapon.h
rename to src/game/server/basebludgeonweapon.h
diff --git a/mp/src/game/server/basecombatcharacter.cpp b/src/game/server/basecombatcharacter.cpp
similarity index 100%
rename from mp/src/game/server/basecombatcharacter.cpp
rename to src/game/server/basecombatcharacter.cpp
diff --git a/mp/src/game/server/basecombatcharacter.h b/src/game/server/basecombatcharacter.h
similarity index 100%
rename from mp/src/game/server/basecombatcharacter.h
rename to src/game/server/basecombatcharacter.h
diff --git a/mp/src/game/server/basecombatweapon.cpp b/src/game/server/basecombatweapon.cpp
similarity index 100%
rename from mp/src/game/server/basecombatweapon.cpp
rename to src/game/server/basecombatweapon.cpp
diff --git a/mp/src/game/server/basecombatweapon.h b/src/game/server/basecombatweapon.h
similarity index 100%
rename from mp/src/game/server/basecombatweapon.h
rename to src/game/server/basecombatweapon.h
diff --git a/mp/src/game/server/baseentity.cpp b/src/game/server/baseentity.cpp
similarity index 100%
rename from mp/src/game/server/baseentity.cpp
rename to src/game/server/baseentity.cpp
diff --git a/mp/src/game/server/baseentity.h b/src/game/server/baseentity.h
similarity index 100%
rename from mp/src/game/server/baseentity.h
rename to src/game/server/baseentity.h
diff --git a/mp/src/game/server/baseflex.cpp b/src/game/server/baseflex.cpp
similarity index 100%
rename from mp/src/game/server/baseflex.cpp
rename to src/game/server/baseflex.cpp
diff --git a/mp/src/game/server/baseflex.h b/src/game/server/baseflex.h
similarity index 100%
rename from mp/src/game/server/baseflex.h
rename to src/game/server/baseflex.h
diff --git a/mp/src/game/server/basegrenade_concussion.cpp b/src/game/server/basegrenade_concussion.cpp
similarity index 100%
rename from mp/src/game/server/basegrenade_concussion.cpp
rename to src/game/server/basegrenade_concussion.cpp
diff --git a/mp/src/game/server/basegrenade_contact.cpp b/src/game/server/basegrenade_contact.cpp
similarity index 100%
rename from mp/src/game/server/basegrenade_contact.cpp
rename to src/game/server/basegrenade_contact.cpp
diff --git a/mp/src/game/server/basegrenade_timed.cpp b/src/game/server/basegrenade_timed.cpp
similarity index 100%
rename from mp/src/game/server/basegrenade_timed.cpp
rename to src/game/server/basegrenade_timed.cpp
diff --git a/mp/src/game/server/basemultiplayerplayer.cpp b/src/game/server/basemultiplayerplayer.cpp
similarity index 100%
rename from mp/src/game/server/basemultiplayerplayer.cpp
rename to src/game/server/basemultiplayerplayer.cpp
diff --git a/mp/src/game/server/basemultiplayerplayer.h b/src/game/server/basemultiplayerplayer.h
similarity index 100%
rename from mp/src/game/server/basemultiplayerplayer.h
rename to src/game/server/basemultiplayerplayer.h
diff --git a/mp/src/game/server/basetempentity.cpp b/src/game/server/basetempentity.cpp
similarity index 100%
rename from mp/src/game/server/basetempentity.cpp
rename to src/game/server/basetempentity.cpp
diff --git a/mp/src/game/server/basetempentity.h b/src/game/server/basetempentity.h
similarity index 100%
rename from mp/src/game/server/basetempentity.h
rename to src/game/server/basetempentity.h
diff --git a/mp/src/game/server/basetoggle.h b/src/game/server/basetoggle.h
similarity index 100%
rename from mp/src/game/server/basetoggle.h
rename to src/game/server/basetoggle.h
diff --git a/mp/src/game/server/baseviewmodel.cpp b/src/game/server/baseviewmodel.cpp
similarity index 100%
rename from mp/src/game/server/baseviewmodel.cpp
rename to src/game/server/baseviewmodel.cpp
diff --git a/mp/src/game/server/baseviewmodel.h b/src/game/server/baseviewmodel.h
similarity index 100%
rename from mp/src/game/server/baseviewmodel.h
rename to src/game/server/baseviewmodel.h
diff --git a/mp/src/game/server/bitstring.cpp b/src/game/server/bitstring.cpp
similarity index 100%
rename from mp/src/game/server/bitstring.cpp
rename to src/game/server/bitstring.cpp
diff --git a/mp/src/game/server/bitstring.h b/src/game/server/bitstring.h
similarity index 100%
rename from mp/src/game/server/bitstring.h
rename to src/game/server/bitstring.h
diff --git a/mp/src/game/server/bmodels.cpp b/src/game/server/bmodels.cpp
similarity index 100%
rename from mp/src/game/server/bmodels.cpp
rename to src/game/server/bmodels.cpp
diff --git a/mp/src/game/server/buttons.cpp b/src/game/server/buttons.cpp
similarity index 100%
rename from mp/src/game/server/buttons.cpp
rename to src/game/server/buttons.cpp
diff --git a/mp/src/game/server/buttons.h b/src/game/server/buttons.h
similarity index 100%
rename from mp/src/game/server/buttons.h
rename to src/game/server/buttons.h
diff --git a/mp/src/game/server/cbase.cpp b/src/game/server/cbase.cpp
similarity index 100%
rename from mp/src/game/server/cbase.cpp
rename to src/game/server/cbase.cpp
diff --git a/mp/src/game/server/cbase.h b/src/game/server/cbase.h
similarity index 100%
rename from mp/src/game/server/cbase.h
rename to src/game/server/cbase.h
diff --git a/mp/src/game/server/client.cpp b/src/game/server/client.cpp
similarity index 100%
rename from mp/src/game/server/client.cpp
rename to src/game/server/client.cpp
diff --git a/mp/src/game/server/client.h b/src/game/server/client.h
similarity index 100%
rename from mp/src/game/server/client.h
rename to src/game/server/client.h
diff --git a/mp/src/game/server/colorcorrection.cpp b/src/game/server/colorcorrection.cpp
similarity index 100%
rename from mp/src/game/server/colorcorrection.cpp
rename to src/game/server/colorcorrection.cpp
diff --git a/mp/src/game/server/colorcorrectionvolume.cpp b/src/game/server/colorcorrectionvolume.cpp
similarity index 100%
rename from mp/src/game/server/colorcorrectionvolume.cpp
rename to src/game/server/colorcorrectionvolume.cpp
diff --git a/mp/src/game/server/controlentities.cpp b/src/game/server/controlentities.cpp
similarity index 100%
rename from mp/src/game/server/controlentities.cpp
rename to src/game/server/controlentities.cpp
diff --git a/mp/src/game/server/cplane.cpp b/src/game/server/cplane.cpp
similarity index 100%
rename from mp/src/game/server/cplane.cpp
rename to src/game/server/cplane.cpp
diff --git a/mp/src/game/server/cplane.h b/src/game/server/cplane.h
similarity index 100%
rename from mp/src/game/server/cplane.h
rename to src/game/server/cplane.h
diff --git a/mp/src/game/server/damagemodifier.cpp b/src/game/server/damagemodifier.cpp
similarity index 100%
rename from mp/src/game/server/damagemodifier.cpp
rename to src/game/server/damagemodifier.cpp
diff --git a/mp/src/game/server/damagemodifier.h b/src/game/server/damagemodifier.h
similarity index 100%
rename from mp/src/game/server/damagemodifier.h
rename to src/game/server/damagemodifier.h
diff --git a/mp/src/game/server/data_collector.cpp b/src/game/server/data_collector.cpp
similarity index 100%
rename from mp/src/game/server/data_collector.cpp
rename to src/game/server/data_collector.cpp
diff --git a/mp/src/game/server/data_collector.h b/src/game/server/data_collector.h
similarity index 100%
rename from mp/src/game/server/data_collector.h
rename to src/game/server/data_collector.h
diff --git a/mp/src/game/server/doors.cpp b/src/game/server/doors.cpp
similarity index 100%
rename from mp/src/game/server/doors.cpp
rename to src/game/server/doors.cpp
diff --git a/mp/src/game/server/doors.h b/src/game/server/doors.h
similarity index 100%
rename from mp/src/game/server/doors.h
rename to src/game/server/doors.h
diff --git a/mp/src/game/server/dynamiclight.cpp b/src/game/server/dynamiclight.cpp
similarity index 100%
rename from mp/src/game/server/dynamiclight.cpp
rename to src/game/server/dynamiclight.cpp
diff --git a/mp/src/game/server/effects.cpp b/src/game/server/effects.cpp
similarity index 100%
rename from mp/src/game/server/effects.cpp
rename to src/game/server/effects.cpp
diff --git a/mp/src/game/server/effects.h b/src/game/server/effects.h
similarity index 100%
rename from mp/src/game/server/effects.h
rename to src/game/server/effects.h
diff --git a/mp/src/game/server/enginecallback.h b/src/game/server/enginecallback.h
similarity index 100%
rename from mp/src/game/server/enginecallback.h
rename to src/game/server/enginecallback.h
diff --git a/mp/src/game/server/entity_tools_server.cpp b/src/game/server/entity_tools_server.cpp
similarity index 100%
rename from mp/src/game/server/entity_tools_server.cpp
rename to src/game/server/entity_tools_server.cpp
diff --git a/mp/src/game/server/entityapi.h b/src/game/server/entityapi.h
similarity index 100%
rename from mp/src/game/server/entityapi.h
rename to src/game/server/entityapi.h
diff --git a/mp/src/game/server/entityblocker.cpp b/src/game/server/entityblocker.cpp
similarity index 100%
rename from mp/src/game/server/entityblocker.cpp
rename to src/game/server/entityblocker.cpp
diff --git a/mp/src/game/server/entityblocker.h b/src/game/server/entityblocker.h
similarity index 100%
rename from mp/src/game/server/entityblocker.h
rename to src/game/server/entityblocker.h
diff --git a/mp/src/game/server/entityinput.h b/src/game/server/entityinput.h
similarity index 100%
rename from mp/src/game/server/entityinput.h
rename to src/game/server/entityinput.h
diff --git a/mp/src/game/server/entitylist.cpp b/src/game/server/entitylist.cpp
similarity index 100%
rename from mp/src/game/server/entitylist.cpp
rename to src/game/server/entitylist.cpp
diff --git a/mp/src/game/server/entitylist.h b/src/game/server/entitylist.h
similarity index 100%
rename from mp/src/game/server/entitylist.h
rename to src/game/server/entitylist.h
diff --git a/mp/src/game/server/entityoutput.h b/src/game/server/entityoutput.h
similarity index 100%
rename from mp/src/game/server/entityoutput.h
rename to src/game/server/entityoutput.h
diff --git a/mp/src/game/server/env_debughistory.cpp b/src/game/server/env_debughistory.cpp
similarity index 100%
rename from mp/src/game/server/env_debughistory.cpp
rename to src/game/server/env_debughistory.cpp
diff --git a/mp/src/game/server/env_debughistory.h b/src/game/server/env_debughistory.h
similarity index 100%
rename from mp/src/game/server/env_debughistory.h
rename to src/game/server/env_debughistory.h
diff --git a/mp/src/game/server/env_effectsscript.cpp b/src/game/server/env_effectsscript.cpp
similarity index 100%
rename from mp/src/game/server/env_effectsscript.cpp
rename to src/game/server/env_effectsscript.cpp
diff --git a/mp/src/game/server/env_entity_maker.cpp b/src/game/server/env_entity_maker.cpp
similarity index 100%
rename from mp/src/game/server/env_entity_maker.cpp
rename to src/game/server/env_entity_maker.cpp
diff --git a/mp/src/game/server/env_particlescript.cpp b/src/game/server/env_particlescript.cpp
similarity index 100%
rename from mp/src/game/server/env_particlescript.cpp
rename to src/game/server/env_particlescript.cpp
diff --git a/mp/src/game/server/env_player_surface_trigger.cpp b/src/game/server/env_player_surface_trigger.cpp
similarity index 100%
rename from mp/src/game/server/env_player_surface_trigger.cpp
rename to src/game/server/env_player_surface_trigger.cpp
diff --git a/mp/src/game/server/env_player_surface_trigger.h b/src/game/server/env_player_surface_trigger.h
similarity index 100%
rename from mp/src/game/server/env_player_surface_trigger.h
rename to src/game/server/env_player_surface_trigger.h
diff --git a/mp/src/game/server/env_projectedtexture.cpp b/src/game/server/env_projectedtexture.cpp
similarity index 100%
rename from mp/src/game/server/env_projectedtexture.cpp
rename to src/game/server/env_projectedtexture.cpp
diff --git a/mp/src/game/server/env_screenoverlay.cpp b/src/game/server/env_screenoverlay.cpp
similarity index 100%
rename from mp/src/game/server/env_screenoverlay.cpp
rename to src/game/server/env_screenoverlay.cpp
diff --git a/mp/src/game/server/env_texturetoggle.cpp b/src/game/server/env_texturetoggle.cpp
similarity index 100%
rename from mp/src/game/server/env_texturetoggle.cpp
rename to src/game/server/env_texturetoggle.cpp
diff --git a/mp/src/game/server/env_tonemap_controller.cpp b/src/game/server/env_tonemap_controller.cpp
similarity index 100%
rename from mp/src/game/server/env_tonemap_controller.cpp
rename to src/game/server/env_tonemap_controller.cpp
diff --git a/mp/src/game/server/env_zoom.cpp b/src/game/server/env_zoom.cpp
similarity index 100%
rename from mp/src/game/server/env_zoom.cpp
rename to src/game/server/env_zoom.cpp
diff --git a/mp/src/game/server/env_zoom.h b/src/game/server/env_zoom.h
similarity index 100%
rename from mp/src/game/server/env_zoom.h
rename to src/game/server/env_zoom.h
diff --git a/mp/src/game/server/envmicrophone.cpp b/src/game/server/envmicrophone.cpp
similarity index 100%
rename from mp/src/game/server/envmicrophone.cpp
rename to src/game/server/envmicrophone.cpp
diff --git a/mp/src/game/server/envmicrophone.h b/src/game/server/envmicrophone.h
similarity index 100%
rename from mp/src/game/server/envmicrophone.h
rename to src/game/server/envmicrophone.h
diff --git a/mp/src/game/server/envspark.h b/src/game/server/envspark.h
similarity index 100%
rename from mp/src/game/server/envspark.h
rename to src/game/server/envspark.h
diff --git a/mp/src/game/server/episodic/ai_behavior_alyx_injured.cpp b/src/game/server/episodic/ai_behavior_alyx_injured.cpp
similarity index 100%
rename from mp/src/game/server/episodic/ai_behavior_alyx_injured.cpp
rename to src/game/server/episodic/ai_behavior_alyx_injured.cpp
diff --git a/mp/src/game/server/episodic/ai_behavior_alyx_injured.h b/src/game/server/episodic/ai_behavior_alyx_injured.h
similarity index 100%
rename from mp/src/game/server/episodic/ai_behavior_alyx_injured.h
rename to src/game/server/episodic/ai_behavior_alyx_injured.h
diff --git a/mp/src/game/server/episodic/ai_behavior_passenger_companion.cpp b/src/game/server/episodic/ai_behavior_passenger_companion.cpp
similarity index 100%
rename from mp/src/game/server/episodic/ai_behavior_passenger_companion.cpp
rename to src/game/server/episodic/ai_behavior_passenger_companion.cpp
diff --git a/mp/src/game/server/episodic/ai_behavior_passenger_companion.h b/src/game/server/episodic/ai_behavior_passenger_companion.h
similarity index 100%
rename from mp/src/game/server/episodic/ai_behavior_passenger_companion.h
rename to src/game/server/episodic/ai_behavior_passenger_companion.h
diff --git a/mp/src/game/server/episodic/ai_behavior_passenger_zombie.cpp b/src/game/server/episodic/ai_behavior_passenger_zombie.cpp
similarity index 100%
rename from mp/src/game/server/episodic/ai_behavior_passenger_zombie.cpp
rename to src/game/server/episodic/ai_behavior_passenger_zombie.cpp
diff --git a/mp/src/game/server/episodic/ai_behavior_passenger_zombie.h b/src/game/server/episodic/ai_behavior_passenger_zombie.h
similarity index 100%
rename from mp/src/game/server/episodic/ai_behavior_passenger_zombie.h
rename to src/game/server/episodic/ai_behavior_passenger_zombie.h
diff --git a/mp/src/game/server/episodic/ep1_gamestats.cpp b/src/game/server/episodic/ep1_gamestats.cpp
similarity index 100%
rename from mp/src/game/server/episodic/ep1_gamestats.cpp
rename to src/game/server/episodic/ep1_gamestats.cpp
diff --git a/mp/src/game/server/episodic/ep1_gamestats.h b/src/game/server/episodic/ep1_gamestats.h
similarity index 100%
rename from mp/src/game/server/episodic/ep1_gamestats.h
rename to src/game/server/episodic/ep1_gamestats.h
diff --git a/mp/src/game/server/episodic/ep2_gamestats.cpp b/src/game/server/episodic/ep2_gamestats.cpp
similarity index 100%
rename from mp/src/game/server/episodic/ep2_gamestats.cpp
rename to src/game/server/episodic/ep2_gamestats.cpp
diff --git a/mp/src/game/server/episodic/ep2_gamestats.h b/src/game/server/episodic/ep2_gamestats.h
similarity index 100%
rename from mp/src/game/server/episodic/ep2_gamestats.h
rename to src/game/server/episodic/ep2_gamestats.h
diff --git a/mp/src/game/server/episodic/grenade_hopwire.cpp b/src/game/server/episodic/grenade_hopwire.cpp
similarity index 100%
rename from mp/src/game/server/episodic/grenade_hopwire.cpp
rename to src/game/server/episodic/grenade_hopwire.cpp
diff --git a/mp/src/game/server/episodic/grenade_hopwire.h b/src/game/server/episodic/grenade_hopwire.h
similarity index 100%
rename from mp/src/game/server/episodic/grenade_hopwire.h
rename to src/game/server/episodic/grenade_hopwire.h
diff --git a/mp/src/game/server/episodic/npc_advisor.cpp b/src/game/server/episodic/npc_advisor.cpp
similarity index 100%
rename from mp/src/game/server/episodic/npc_advisor.cpp
rename to src/game/server/episodic/npc_advisor.cpp
diff --git a/mp/src/game/server/episodic/npc_combine_cannon.cpp b/src/game/server/episodic/npc_combine_cannon.cpp
similarity index 100%
rename from mp/src/game/server/episodic/npc_combine_cannon.cpp
rename to src/game/server/episodic/npc_combine_cannon.cpp
diff --git a/mp/src/game/server/episodic/npc_hunter.cpp b/src/game/server/episodic/npc_hunter.cpp
similarity index 100%
rename from mp/src/game/server/episodic/npc_hunter.cpp
rename to src/game/server/episodic/npc_hunter.cpp
diff --git a/mp/src/game/server/episodic/npc_hunter.h b/src/game/server/episodic/npc_hunter.h
similarity index 100%
rename from mp/src/game/server/episodic/npc_hunter.h
rename to src/game/server/episodic/npc_hunter.h
diff --git a/mp/src/game/server/episodic/npc_magnusson.cpp b/src/game/server/episodic/npc_magnusson.cpp
similarity index 100%
rename from mp/src/game/server/episodic/npc_magnusson.cpp
rename to src/game/server/episodic/npc_magnusson.cpp
diff --git a/mp/src/game/server/episodic/npc_puppet.cpp b/src/game/server/episodic/npc_puppet.cpp
similarity index 100%
rename from mp/src/game/server/episodic/npc_puppet.cpp
rename to src/game/server/episodic/npc_puppet.cpp
diff --git a/mp/src/game/server/episodic/prop_scalable.cpp b/src/game/server/episodic/prop_scalable.cpp
similarity index 100%
rename from mp/src/game/server/episodic/prop_scalable.cpp
rename to src/game/server/episodic/prop_scalable.cpp
diff --git a/mp/src/game/server/episodic/vehicle_jeep_episodic.cpp b/src/game/server/episodic/vehicle_jeep_episodic.cpp
similarity index 100%
rename from mp/src/game/server/episodic/vehicle_jeep_episodic.cpp
rename to src/game/server/episodic/vehicle_jeep_episodic.cpp
diff --git a/mp/src/game/server/episodic/vehicle_jeep_episodic.h b/src/game/server/episodic/vehicle_jeep_episodic.h
similarity index 100%
rename from mp/src/game/server/episodic/vehicle_jeep_episodic.h
rename to src/game/server/episodic/vehicle_jeep_episodic.h
diff --git a/mp/src/game/server/episodic/weapon_hopwire.cpp b/src/game/server/episodic/weapon_hopwire.cpp
similarity index 100%
rename from mp/src/game/server/episodic/weapon_hopwire.cpp
rename to src/game/server/episodic/weapon_hopwire.cpp
diff --git a/mp/src/game/server/episodic/weapon_oldmanharpoon.cpp b/src/game/server/episodic/weapon_oldmanharpoon.cpp
similarity index 100%
rename from mp/src/game/server/episodic/weapon_oldmanharpoon.cpp
rename to src/game/server/episodic/weapon_oldmanharpoon.cpp
diff --git a/mp/src/game/server/episodic/weapon_striderbuster.cpp b/src/game/server/episodic/weapon_striderbuster.cpp
similarity index 100%
rename from mp/src/game/server/episodic/weapon_striderbuster.cpp
rename to src/game/server/episodic/weapon_striderbuster.cpp
diff --git a/mp/src/game/server/episodic/weapon_striderbuster.h b/src/game/server/episodic/weapon_striderbuster.h
similarity index 100%
rename from mp/src/game/server/episodic/weapon_striderbuster.h
rename to src/game/server/episodic/weapon_striderbuster.h
diff --git a/mp/src/game/server/event_tempentity_tester.cpp b/src/game/server/event_tempentity_tester.cpp
similarity index 100%
rename from mp/src/game/server/event_tempentity_tester.cpp
rename to src/game/server/event_tempentity_tester.cpp
diff --git a/mp/src/game/server/event_tempentity_tester.h b/src/game/server/event_tempentity_tester.h
similarity index 100%
rename from mp/src/game/server/event_tempentity_tester.h
rename to src/game/server/event_tempentity_tester.h
diff --git a/mp/src/game/server/eventqueue.h b/src/game/server/eventqueue.h
similarity index 100%
rename from mp/src/game/server/eventqueue.h
rename to src/game/server/eventqueue.h
diff --git a/mp/src/game/server/explode.cpp b/src/game/server/explode.cpp
similarity index 100%
rename from mp/src/game/server/explode.cpp
rename to src/game/server/explode.cpp
diff --git a/mp/src/game/server/explode.h b/src/game/server/explode.h
similarity index 100%
rename from mp/src/game/server/explode.h
rename to src/game/server/explode.h
diff --git a/mp/src/game/server/filters.cpp b/src/game/server/filters.cpp
similarity index 100%
rename from mp/src/game/server/filters.cpp
rename to src/game/server/filters.cpp
diff --git a/mp/src/game/server/filters.h b/src/game/server/filters.h
similarity index 100%
rename from mp/src/game/server/filters.h
rename to src/game/server/filters.h
diff --git a/mp/src/game/server/fire.cpp b/src/game/server/fire.cpp
similarity index 100%
rename from mp/src/game/server/fire.cpp
rename to src/game/server/fire.cpp
diff --git a/mp/src/game/server/fire.h b/src/game/server/fire.h
similarity index 100%
rename from mp/src/game/server/fire.h
rename to src/game/server/fire.h
diff --git a/mp/src/game/server/fire_smoke.cpp b/src/game/server/fire_smoke.cpp
similarity index 100%
rename from mp/src/game/server/fire_smoke.cpp
rename to src/game/server/fire_smoke.cpp
diff --git a/mp/src/game/server/fire_smoke.h b/src/game/server/fire_smoke.h
similarity index 100%
rename from mp/src/game/server/fire_smoke.h
rename to src/game/server/fire_smoke.h
diff --git a/mp/src/game/server/fish.cpp b/src/game/server/fish.cpp
similarity index 100%
rename from mp/src/game/server/fish.cpp
rename to src/game/server/fish.cpp
diff --git a/mp/src/game/server/fish.h b/src/game/server/fish.h
similarity index 100%
rename from mp/src/game/server/fish.h
rename to src/game/server/fish.h
diff --git a/mp/src/game/server/fogcontroller.cpp b/src/game/server/fogcontroller.cpp
similarity index 100%
rename from mp/src/game/server/fogcontroller.cpp
rename to src/game/server/fogcontroller.cpp
diff --git a/mp/src/game/server/fogcontroller.h b/src/game/server/fogcontroller.h
similarity index 100%
rename from mp/src/game/server/fogcontroller.h
rename to src/game/server/fogcontroller.h
diff --git a/mp/src/game/server/forcefeedback.cpp b/src/game/server/forcefeedback.cpp
similarity index 100%
rename from mp/src/game/server/forcefeedback.cpp
rename to src/game/server/forcefeedback.cpp
diff --git a/mp/src/game/server/fourwheelvehiclephysics.cpp b/src/game/server/fourwheelvehiclephysics.cpp
similarity index 100%
rename from mp/src/game/server/fourwheelvehiclephysics.cpp
rename to src/game/server/fourwheelvehiclephysics.cpp
diff --git a/mp/src/game/server/fourwheelvehiclephysics.h b/src/game/server/fourwheelvehiclephysics.h
similarity index 100%
rename from mp/src/game/server/fourwheelvehiclephysics.h
rename to src/game/server/fourwheelvehiclephysics.h
diff --git a/mp/src/game/server/func_areaportal.cpp b/src/game/server/func_areaportal.cpp
similarity index 100%
rename from mp/src/game/server/func_areaportal.cpp
rename to src/game/server/func_areaportal.cpp
diff --git a/mp/src/game/server/func_areaportalbase.cpp b/src/game/server/func_areaportalbase.cpp
similarity index 100%
rename from mp/src/game/server/func_areaportalbase.cpp
rename to src/game/server/func_areaportalbase.cpp
diff --git a/mp/src/game/server/func_areaportalbase.h b/src/game/server/func_areaportalbase.h
similarity index 100%
rename from mp/src/game/server/func_areaportalbase.h
rename to src/game/server/func_areaportalbase.h
diff --git a/mp/src/game/server/func_areaportalwindow.cpp b/src/game/server/func_areaportalwindow.cpp
similarity index 100%
rename from mp/src/game/server/func_areaportalwindow.cpp
rename to src/game/server/func_areaportalwindow.cpp
diff --git a/mp/src/game/server/func_areaportalwindow.h b/src/game/server/func_areaportalwindow.h
similarity index 100%
rename from mp/src/game/server/func_areaportalwindow.h
rename to src/game/server/func_areaportalwindow.h
diff --git a/mp/src/game/server/func_break.cpp b/src/game/server/func_break.cpp
similarity index 100%
rename from mp/src/game/server/func_break.cpp
rename to src/game/server/func_break.cpp
diff --git a/mp/src/game/server/func_break.h b/src/game/server/func_break.h
similarity index 100%
rename from mp/src/game/server/func_break.h
rename to src/game/server/func_break.h
diff --git a/mp/src/game/server/func_breakablesurf.cpp b/src/game/server/func_breakablesurf.cpp
similarity index 100%
rename from mp/src/game/server/func_breakablesurf.cpp
rename to src/game/server/func_breakablesurf.cpp
diff --git a/mp/src/game/server/func_breakablesurf.h b/src/game/server/func_breakablesurf.h
similarity index 100%
rename from mp/src/game/server/func_breakablesurf.h
rename to src/game/server/func_breakablesurf.h
diff --git a/mp/src/game/server/func_dust.cpp b/src/game/server/func_dust.cpp
similarity index 100%
rename from mp/src/game/server/func_dust.cpp
rename to src/game/server/func_dust.cpp
diff --git a/mp/src/game/server/func_ladder_endpoint.cpp b/src/game/server/func_ladder_endpoint.cpp
similarity index 100%
rename from mp/src/game/server/func_ladder_endpoint.cpp
rename to src/game/server/func_ladder_endpoint.cpp
diff --git a/mp/src/game/server/func_lod.cpp b/src/game/server/func_lod.cpp
similarity index 100%
rename from mp/src/game/server/func_lod.cpp
rename to src/game/server/func_lod.cpp
diff --git a/mp/src/game/server/func_movelinear.cpp b/src/game/server/func_movelinear.cpp
similarity index 100%
rename from mp/src/game/server/func_movelinear.cpp
rename to src/game/server/func_movelinear.cpp
diff --git a/mp/src/game/server/func_movelinear.h b/src/game/server/func_movelinear.h
similarity index 100%
rename from mp/src/game/server/func_movelinear.h
rename to src/game/server/func_movelinear.h
diff --git a/mp/src/game/server/func_occluder.cpp b/src/game/server/func_occluder.cpp
similarity index 100%
rename from mp/src/game/server/func_occluder.cpp
rename to src/game/server/func_occluder.cpp
diff --git a/mp/src/game/server/func_reflective_glass.cpp b/src/game/server/func_reflective_glass.cpp
similarity index 100%
rename from mp/src/game/server/func_reflective_glass.cpp
rename to src/game/server/func_reflective_glass.cpp
diff --git a/mp/src/game/server/func_smokevolume.cpp b/src/game/server/func_smokevolume.cpp
similarity index 100%
rename from mp/src/game/server/func_smokevolume.cpp
rename to src/game/server/func_smokevolume.cpp
diff --git a/mp/src/game/server/functorutils.h b/src/game/server/functorutils.h
similarity index 100%
rename from mp/src/game/server/functorutils.h
rename to src/game/server/functorutils.h
diff --git a/mp/src/game/server/game.cpp b/src/game/server/game.cpp
similarity index 100%
rename from mp/src/game/server/game.cpp
rename to src/game/server/game.cpp
diff --git a/mp/src/game/server/game.h b/src/game/server/game.h
similarity index 100%
rename from mp/src/game/server/game.h
rename to src/game/server/game.h
diff --git a/mp/src/game/server/game_ui.cpp b/src/game/server/game_ui.cpp
similarity index 100%
rename from mp/src/game/server/game_ui.cpp
rename to src/game/server/game_ui.cpp
diff --git a/mp/src/game/server/gamedll_replay.cpp b/src/game/server/gamedll_replay.cpp
similarity index 100%
rename from mp/src/game/server/gamedll_replay.cpp
rename to src/game/server/gamedll_replay.cpp
diff --git a/mp/src/game/server/gamehandle.cpp b/src/game/server/gamehandle.cpp
similarity index 100%
rename from mp/src/game/server/gamehandle.cpp
rename to src/game/server/gamehandle.cpp
diff --git a/mp/src/game/server/gameinterface.cpp b/src/game/server/gameinterface.cpp
similarity index 100%
rename from mp/src/game/server/gameinterface.cpp
rename to src/game/server/gameinterface.cpp
diff --git a/mp/src/game/server/gameinterface.h b/src/game/server/gameinterface.h
similarity index 100%
rename from mp/src/game/server/gameinterface.h
rename to src/game/server/gameinterface.h
diff --git a/mp/src/game/server/gametrace_dll.cpp b/src/game/server/gametrace_dll.cpp
similarity index 100%
rename from mp/src/game/server/gametrace_dll.cpp
rename to src/game/server/gametrace_dll.cpp
diff --git a/mp/src/game/server/gameweaponmanager.cpp b/src/game/server/gameweaponmanager.cpp
similarity index 100%
rename from mp/src/game/server/gameweaponmanager.cpp
rename to src/game/server/gameweaponmanager.cpp
diff --git a/mp/src/game/server/gameweaponmanager.h b/src/game/server/gameweaponmanager.h
similarity index 100%
rename from mp/src/game/server/gameweaponmanager.h
rename to src/game/server/gameweaponmanager.h
diff --git a/mp/src/game/server/genericactor.cpp b/src/game/server/genericactor.cpp
similarity index 100%
rename from mp/src/game/server/genericactor.cpp
rename to src/game/server/genericactor.cpp
diff --git a/mp/src/game/server/genericmonster.cpp b/src/game/server/genericmonster.cpp
similarity index 100%
rename from mp/src/game/server/genericmonster.cpp
rename to src/game/server/genericmonster.cpp
diff --git a/mp/src/game/server/gib.cpp b/src/game/server/gib.cpp
similarity index 100%
rename from mp/src/game/server/gib.cpp
rename to src/game/server/gib.cpp
diff --git a/mp/src/game/server/gib.h b/src/game/server/gib.h
similarity index 100%
rename from mp/src/game/server/gib.h
rename to src/game/server/gib.h
diff --git a/mp/src/game/server/globals.cpp b/src/game/server/globals.cpp
similarity index 100%
rename from mp/src/game/server/globals.cpp
rename to src/game/server/globals.cpp
diff --git a/mp/src/game/server/globals.h b/src/game/server/globals.h
similarity index 100%
rename from mp/src/game/server/globals.h
rename to src/game/server/globals.h
diff --git a/mp/src/game/server/globalstate.cpp b/src/game/server/globalstate.cpp
similarity index 100%
rename from mp/src/game/server/globalstate.cpp
rename to src/game/server/globalstate.cpp
diff --git a/mp/src/game/server/globalstate.h b/src/game/server/globalstate.h
similarity index 100%
rename from mp/src/game/server/globalstate.h
rename to src/game/server/globalstate.h
diff --git a/mp/src/game/server/globalstate_private.h b/src/game/server/globalstate_private.h
similarity index 100%
rename from mp/src/game/server/globalstate_private.h
rename to src/game/server/globalstate_private.h
diff --git a/mp/src/game/server/grenadethrown.cpp b/src/game/server/grenadethrown.cpp
similarity index 100%
rename from mp/src/game/server/grenadethrown.cpp
rename to src/game/server/grenadethrown.cpp
diff --git a/mp/src/game/server/grenadethrown.h b/src/game/server/grenadethrown.h
similarity index 100%
rename from mp/src/game/server/grenadethrown.h
rename to src/game/server/grenadethrown.h
diff --git a/mp/src/game/server/guntarget.cpp b/src/game/server/guntarget.cpp
similarity index 100%
rename from mp/src/game/server/guntarget.cpp
rename to src/game/server/guntarget.cpp
diff --git a/mp/src/game/server/h_ai.cpp b/src/game/server/h_ai.cpp
similarity index 100%
rename from mp/src/game/server/h_ai.cpp
rename to src/game/server/h_ai.cpp
diff --git a/mp/src/game/server/h_cycler.cpp b/src/game/server/h_cycler.cpp
similarity index 100%
rename from mp/src/game/server/h_cycler.cpp
rename to src/game/server/h_cycler.cpp
diff --git a/mp/src/game/server/h_cycler.h b/src/game/server/h_cycler.h
similarity index 100%
rename from mp/src/game/server/h_cycler.h
rename to src/game/server/h_cycler.h
diff --git a/mp/src/game/server/h_export.cpp b/src/game/server/h_export.cpp
similarity index 100%
rename from mp/src/game/server/h_export.cpp
rename to src/game/server/h_export.cpp
diff --git a/mp/src/game/server/hierarchy.cpp b/src/game/server/hierarchy.cpp
similarity index 100%
rename from mp/src/game/server/hierarchy.cpp
rename to src/game/server/hierarchy.cpp
diff --git a/mp/src/game/server/hierarchy.h b/src/game/server/hierarchy.h
similarity index 100%
rename from mp/src/game/server/hierarchy.h
rename to src/game/server/hierarchy.h
diff --git a/mp/src/game/server/hl1_CBaseHelicopter.h b/src/game/server/hl1_CBaseHelicopter.h
similarity index 100%
rename from mp/src/game/server/hl1_CBaseHelicopter.h
rename to src/game/server/hl1_CBaseHelicopter.h
diff --git a/mp/src/game/server/hl2/Func_Monitor.cpp b/src/game/server/hl2/Func_Monitor.cpp
similarity index 100%
rename from mp/src/game/server/hl2/Func_Monitor.cpp
rename to src/game/server/hl2/Func_Monitor.cpp
diff --git a/mp/src/game/server/hl2/ai_allymanager.cpp b/src/game/server/hl2/ai_allymanager.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_allymanager.cpp
rename to src/game/server/hl2/ai_allymanager.cpp
diff --git a/mp/src/game/server/hl2/ai_behavior_actbusy.cpp b/src/game/server/hl2/ai_behavior_actbusy.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_actbusy.cpp
rename to src/game/server/hl2/ai_behavior_actbusy.cpp
diff --git a/mp/src/game/server/hl2/ai_behavior_actbusy.h b/src/game/server/hl2/ai_behavior_actbusy.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_actbusy.h
rename to src/game/server/hl2/ai_behavior_actbusy.h
diff --git a/mp/src/game/server/hl2/ai_behavior_functank.cpp b/src/game/server/hl2/ai_behavior_functank.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_functank.cpp
rename to src/game/server/hl2/ai_behavior_functank.cpp
diff --git a/mp/src/game/server/hl2/ai_behavior_functank.h b/src/game/server/hl2/ai_behavior_functank.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_functank.h
rename to src/game/server/hl2/ai_behavior_functank.h
diff --git a/mp/src/game/server/hl2/ai_behavior_holster.cpp b/src/game/server/hl2/ai_behavior_holster.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_holster.cpp
rename to src/game/server/hl2/ai_behavior_holster.cpp
diff --git a/mp/src/game/server/hl2/ai_behavior_holster.h b/src/game/server/hl2/ai_behavior_holster.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_holster.h
rename to src/game/server/hl2/ai_behavior_holster.h
diff --git a/mp/src/game/server/hl2/ai_behavior_operator.cpp b/src/game/server/hl2/ai_behavior_operator.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_operator.cpp
rename to src/game/server/hl2/ai_behavior_operator.cpp
diff --git a/mp/src/game/server/hl2/ai_behavior_operator.h b/src/game/server/hl2/ai_behavior_operator.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_operator.h
rename to src/game/server/hl2/ai_behavior_operator.h
diff --git a/mp/src/game/server/hl2/ai_behavior_police.cpp b/src/game/server/hl2/ai_behavior_police.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_police.cpp
rename to src/game/server/hl2/ai_behavior_police.cpp
diff --git a/mp/src/game/server/hl2/ai_behavior_police.h b/src/game/server/hl2/ai_behavior_police.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_behavior_police.h
rename to src/game/server/hl2/ai_behavior_police.h
diff --git a/mp/src/game/server/hl2/ai_goal_police.cpp b/src/game/server/hl2/ai_goal_police.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_goal_police.cpp
rename to src/game/server/hl2/ai_goal_police.cpp
diff --git a/mp/src/game/server/hl2/ai_goal_police.h b/src/game/server/hl2/ai_goal_police.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_goal_police.h
rename to src/game/server/hl2/ai_goal_police.h
diff --git a/mp/src/game/server/hl2/ai_interactions.h b/src/game/server/hl2/ai_interactions.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_interactions.h
rename to src/game/server/hl2/ai_interactions.h
diff --git a/mp/src/game/server/hl2/ai_spotlight.cpp b/src/game/server/hl2/ai_spotlight.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ai_spotlight.cpp
rename to src/game/server/hl2/ai_spotlight.cpp
diff --git a/mp/src/game/server/hl2/ai_spotlight.h b/src/game/server/hl2/ai_spotlight.h
similarity index 100%
rename from mp/src/game/server/hl2/ai_spotlight.h
rename to src/game/server/hl2/ai_spotlight.h
diff --git a/mp/src/game/server/hl2/antlion_dust.cpp b/src/game/server/hl2/antlion_dust.cpp
similarity index 100%
rename from mp/src/game/server/hl2/antlion_dust.cpp
rename to src/game/server/hl2/antlion_dust.cpp
diff --git a/mp/src/game/server/hl2/antlion_dust.h b/src/game/server/hl2/antlion_dust.h
similarity index 100%
rename from mp/src/game/server/hl2/antlion_dust.h
rename to src/game/server/hl2/antlion_dust.h
diff --git a/mp/src/game/server/hl2/antlion_maker.cpp b/src/game/server/hl2/antlion_maker.cpp
similarity index 100%
rename from mp/src/game/server/hl2/antlion_maker.cpp
rename to src/game/server/hl2/antlion_maker.cpp
diff --git a/mp/src/game/server/hl2/antlion_maker.h b/src/game/server/hl2/antlion_maker.h
similarity index 100%
rename from mp/src/game/server/hl2/antlion_maker.h
rename to src/game/server/hl2/antlion_maker.h
diff --git a/mp/src/game/server/hl2/ar2_explosion.cpp b/src/game/server/hl2/ar2_explosion.cpp
similarity index 100%
rename from mp/src/game/server/hl2/ar2_explosion.cpp
rename to src/game/server/hl2/ar2_explosion.cpp
diff --git a/mp/src/game/server/hl2/ar2_explosion.h b/src/game/server/hl2/ar2_explosion.h
similarity index 100%
rename from mp/src/game/server/hl2/ar2_explosion.h
rename to src/game/server/hl2/ar2_explosion.h
diff --git a/mp/src/game/server/hl2/assassin_smoke.cpp b/src/game/server/hl2/assassin_smoke.cpp
similarity index 100%
rename from mp/src/game/server/hl2/assassin_smoke.cpp
rename to src/game/server/hl2/assassin_smoke.cpp
diff --git a/mp/src/game/server/hl2/assassin_smoke.h b/src/game/server/hl2/assassin_smoke.h
similarity index 100%
rename from mp/src/game/server/hl2/assassin_smoke.h
rename to src/game/server/hl2/assassin_smoke.h
diff --git a/mp/src/game/server/hl2/basehlcombatweapon.cpp b/src/game/server/hl2/basehlcombatweapon.cpp
similarity index 100%
rename from mp/src/game/server/hl2/basehlcombatweapon.cpp
rename to src/game/server/hl2/basehlcombatweapon.cpp
diff --git a/mp/src/game/server/hl2/basehlcombatweapon.h b/src/game/server/hl2/basehlcombatweapon.h
similarity index 100%
rename from mp/src/game/server/hl2/basehlcombatweapon.h
rename to src/game/server/hl2/basehlcombatweapon.h
diff --git a/mp/src/game/server/hl2/cbasehelicopter.cpp b/src/game/server/hl2/cbasehelicopter.cpp
similarity index 100%
rename from mp/src/game/server/hl2/cbasehelicopter.cpp
rename to src/game/server/hl2/cbasehelicopter.cpp
diff --git a/mp/src/game/server/hl2/cbasehelicopter.h b/src/game/server/hl2/cbasehelicopter.h
similarity index 100%
rename from mp/src/game/server/hl2/cbasehelicopter.h
rename to src/game/server/hl2/cbasehelicopter.h
diff --git a/mp/src/game/server/hl2/cbasespriteprojectile.cpp b/src/game/server/hl2/cbasespriteprojectile.cpp
similarity index 100%
rename from mp/src/game/server/hl2/cbasespriteprojectile.cpp
rename to src/game/server/hl2/cbasespriteprojectile.cpp
diff --git a/mp/src/game/server/hl2/cbasespriteprojectile.h b/src/game/server/hl2/cbasespriteprojectile.h
similarity index 100%
rename from mp/src/game/server/hl2/cbasespriteprojectile.h
rename to src/game/server/hl2/cbasespriteprojectile.h
diff --git a/mp/src/game/server/hl2/citadel_effects.cpp b/src/game/server/hl2/citadel_effects.cpp
similarity index 100%
rename from mp/src/game/server/hl2/citadel_effects.cpp
rename to src/game/server/hl2/citadel_effects.cpp
diff --git a/mp/src/game/server/hl2/combine_mine.cpp b/src/game/server/hl2/combine_mine.cpp
similarity index 100%
rename from mp/src/game/server/hl2/combine_mine.cpp
rename to src/game/server/hl2/combine_mine.cpp
diff --git a/mp/src/game/server/hl2/combine_mine.h b/src/game/server/hl2/combine_mine.h
similarity index 100%
rename from mp/src/game/server/hl2/combine_mine.h
rename to src/game/server/hl2/combine_mine.h
diff --git a/mp/src/game/server/hl2/energy_wave.h b/src/game/server/hl2/energy_wave.h
similarity index 100%
rename from mp/src/game/server/hl2/energy_wave.h
rename to src/game/server/hl2/energy_wave.h
diff --git a/mp/src/game/server/hl2/env_alyxemp.cpp b/src/game/server/hl2/env_alyxemp.cpp
similarity index 100%
rename from mp/src/game/server/hl2/env_alyxemp.cpp
rename to src/game/server/hl2/env_alyxemp.cpp
diff --git a/mp/src/game/server/hl2/env_headcrabcanister.cpp b/src/game/server/hl2/env_headcrabcanister.cpp
similarity index 100%
rename from mp/src/game/server/hl2/env_headcrabcanister.cpp
rename to src/game/server/hl2/env_headcrabcanister.cpp
diff --git a/mp/src/game/server/hl2/env_speaker.cpp b/src/game/server/hl2/env_speaker.cpp
similarity index 100%
rename from mp/src/game/server/hl2/env_speaker.cpp
rename to src/game/server/hl2/env_speaker.cpp
diff --git a/mp/src/game/server/hl2/env_speaker.h b/src/game/server/hl2/env_speaker.h
similarity index 100%
rename from mp/src/game/server/hl2/env_speaker.h
rename to src/game/server/hl2/env_speaker.h
diff --git a/mp/src/game/server/hl2/env_starfield.cpp b/src/game/server/hl2/env_starfield.cpp
similarity index 100%
rename from mp/src/game/server/hl2/env_starfield.cpp
rename to src/game/server/hl2/env_starfield.cpp
diff --git a/mp/src/game/server/hl2/extinguisherjet.cpp b/src/game/server/hl2/extinguisherjet.cpp
similarity index 100%
rename from mp/src/game/server/hl2/extinguisherjet.cpp
rename to src/game/server/hl2/extinguisherjet.cpp
diff --git a/mp/src/game/server/hl2/extinguisherjet.h b/src/game/server/hl2/extinguisherjet.h
similarity index 100%
rename from mp/src/game/server/hl2/extinguisherjet.h
rename to src/game/server/hl2/extinguisherjet.h
diff --git a/mp/src/game/server/hl2/func_bulletshield.cpp b/src/game/server/hl2/func_bulletshield.cpp
similarity index 100%
rename from mp/src/game/server/hl2/func_bulletshield.cpp
rename to src/game/server/hl2/func_bulletshield.cpp
diff --git a/mp/src/game/server/hl2/func_bulletshield.h b/src/game/server/hl2/func_bulletshield.h
similarity index 100%
rename from mp/src/game/server/hl2/func_bulletshield.h
rename to src/game/server/hl2/func_bulletshield.h
diff --git a/mp/src/game/server/hl2/func_recharge.cpp b/src/game/server/hl2/func_recharge.cpp
similarity index 100%
rename from mp/src/game/server/hl2/func_recharge.cpp
rename to src/game/server/hl2/func_recharge.cpp
diff --git a/mp/src/game/server/hl2/func_tank.cpp b/src/game/server/hl2/func_tank.cpp
similarity index 100%
rename from mp/src/game/server/hl2/func_tank.cpp
rename to src/game/server/hl2/func_tank.cpp
diff --git a/mp/src/game/server/hl2/func_tank.h b/src/game/server/hl2/func_tank.h
similarity index 100%
rename from mp/src/game/server/hl2/func_tank.h
rename to src/game/server/hl2/func_tank.h
diff --git a/mp/src/game/server/hl2/grenade_ar2.cpp b/src/game/server/hl2/grenade_ar2.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_ar2.cpp
rename to src/game/server/hl2/grenade_ar2.cpp
diff --git a/mp/src/game/server/hl2/grenade_ar2.h b/src/game/server/hl2/grenade_ar2.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_ar2.h
rename to src/game/server/hl2/grenade_ar2.h
diff --git a/mp/src/game/server/hl2/grenade_beam.cpp b/src/game/server/hl2/grenade_beam.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_beam.cpp
rename to src/game/server/hl2/grenade_beam.cpp
diff --git a/mp/src/game/server/hl2/grenade_beam.h b/src/game/server/hl2/grenade_beam.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_beam.h
rename to src/game/server/hl2/grenade_beam.h
diff --git a/mp/src/game/server/hl2/grenade_brickbat.cpp b/src/game/server/hl2/grenade_brickbat.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_brickbat.cpp
rename to src/game/server/hl2/grenade_brickbat.cpp
diff --git a/mp/src/game/server/hl2/grenade_brickbat.h b/src/game/server/hl2/grenade_brickbat.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_brickbat.h
rename to src/game/server/hl2/grenade_brickbat.h
diff --git a/mp/src/game/server/hl2/grenade_bugbait.cpp b/src/game/server/hl2/grenade_bugbait.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_bugbait.cpp
rename to src/game/server/hl2/grenade_bugbait.cpp
diff --git a/mp/src/game/server/hl2/grenade_bugbait.h b/src/game/server/hl2/grenade_bugbait.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_bugbait.h
rename to src/game/server/hl2/grenade_bugbait.h
diff --git a/mp/src/game/server/hl2/grenade_energy.cpp b/src/game/server/hl2/grenade_energy.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_energy.cpp
rename to src/game/server/hl2/grenade_energy.cpp
diff --git a/mp/src/game/server/hl2/grenade_energy.h b/src/game/server/hl2/grenade_energy.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_energy.h
rename to src/game/server/hl2/grenade_energy.h
diff --git a/mp/src/game/server/hl2/grenade_frag.cpp b/src/game/server/hl2/grenade_frag.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_frag.cpp
rename to src/game/server/hl2/grenade_frag.cpp
diff --git a/mp/src/game/server/hl2/grenade_frag.h b/src/game/server/hl2/grenade_frag.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_frag.h
rename to src/game/server/hl2/grenade_frag.h
diff --git a/mp/src/game/server/hl2/grenade_homer.cpp b/src/game/server/hl2/grenade_homer.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_homer.cpp
rename to src/game/server/hl2/grenade_homer.cpp
diff --git a/mp/src/game/server/hl2/grenade_homer.h b/src/game/server/hl2/grenade_homer.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_homer.h
rename to src/game/server/hl2/grenade_homer.h
diff --git a/mp/src/game/server/hl2/grenade_molotov.cpp b/src/game/server/hl2/grenade_molotov.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_molotov.cpp
rename to src/game/server/hl2/grenade_molotov.cpp
diff --git a/mp/src/game/server/hl2/grenade_molotov.h b/src/game/server/hl2/grenade_molotov.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_molotov.h
rename to src/game/server/hl2/grenade_molotov.h
diff --git a/mp/src/game/server/hl2/grenade_pathfollower.cpp b/src/game/server/hl2/grenade_pathfollower.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_pathfollower.cpp
rename to src/game/server/hl2/grenade_pathfollower.cpp
diff --git a/mp/src/game/server/hl2/grenade_pathfollower.h b/src/game/server/hl2/grenade_pathfollower.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_pathfollower.h
rename to src/game/server/hl2/grenade_pathfollower.h
diff --git a/mp/src/game/server/hl2/grenade_satchel.cpp b/src/game/server/hl2/grenade_satchel.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_satchel.cpp
rename to src/game/server/hl2/grenade_satchel.cpp
diff --git a/mp/src/game/server/hl2/grenade_satchel.h b/src/game/server/hl2/grenade_satchel.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_satchel.h
rename to src/game/server/hl2/grenade_satchel.h
diff --git a/mp/src/game/server/hl2/grenade_spit.cpp b/src/game/server/hl2/grenade_spit.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_spit.cpp
rename to src/game/server/hl2/grenade_spit.cpp
diff --git a/mp/src/game/server/hl2/grenade_spit.h b/src/game/server/hl2/grenade_spit.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_spit.h
rename to src/game/server/hl2/grenade_spit.h
diff --git a/mp/src/game/server/hl2/grenade_tripmine.cpp b/src/game/server/hl2/grenade_tripmine.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_tripmine.cpp
rename to src/game/server/hl2/grenade_tripmine.cpp
diff --git a/mp/src/game/server/hl2/grenade_tripmine.h b/src/game/server/hl2/grenade_tripmine.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_tripmine.h
rename to src/game/server/hl2/grenade_tripmine.h
diff --git a/mp/src/game/server/hl2/grenade_tripwire.cpp b/src/game/server/hl2/grenade_tripwire.cpp
similarity index 100%
rename from mp/src/game/server/hl2/grenade_tripwire.cpp
rename to src/game/server/hl2/grenade_tripwire.cpp
diff --git a/mp/src/game/server/hl2/grenade_tripwire.h b/src/game/server/hl2/grenade_tripwire.h
similarity index 100%
rename from mp/src/game/server/hl2/grenade_tripwire.h
rename to src/game/server/hl2/grenade_tripwire.h
diff --git a/mp/src/game/server/hl2/hl2_ai_network.cpp b/src/game/server/hl2/hl2_ai_network.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl2_ai_network.cpp
rename to src/game/server/hl2/hl2_ai_network.cpp
diff --git a/mp/src/game/server/hl2/hl2_client.cpp b/src/game/server/hl2/hl2_client.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl2_client.cpp
rename to src/game/server/hl2/hl2_client.cpp
diff --git a/mp/src/game/server/hl2/hl2_eventlog.cpp b/src/game/server/hl2/hl2_eventlog.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl2_eventlog.cpp
rename to src/game/server/hl2/hl2_eventlog.cpp
diff --git a/mp/src/game/server/hl2/hl2_gamestats.cpp b/src/game/server/hl2/hl2_gamestats.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl2_gamestats.cpp
rename to src/game/server/hl2/hl2_gamestats.cpp
diff --git a/mp/src/game/server/hl2/hl2_gamestats.h b/src/game/server/hl2/hl2_gamestats.h
similarity index 100%
rename from mp/src/game/server/hl2/hl2_gamestats.h
rename to src/game/server/hl2/hl2_gamestats.h
diff --git a/mp/src/game/server/hl2/hl2_player.cpp b/src/game/server/hl2/hl2_player.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl2_player.cpp
rename to src/game/server/hl2/hl2_player.cpp
diff --git a/mp/src/game/server/hl2/hl2_player.h b/src/game/server/hl2/hl2_player.h
similarity index 100%
rename from mp/src/game/server/hl2/hl2_player.h
rename to src/game/server/hl2/hl2_player.h
diff --git a/mp/src/game/server/hl2/hl2_playerlocaldata.cpp b/src/game/server/hl2/hl2_playerlocaldata.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl2_playerlocaldata.cpp
rename to src/game/server/hl2/hl2_playerlocaldata.cpp
diff --git a/mp/src/game/server/hl2/hl2_playerlocaldata.h b/src/game/server/hl2/hl2_playerlocaldata.h
similarity index 100%
rename from mp/src/game/server/hl2/hl2_playerlocaldata.h
rename to src/game/server/hl2/hl2_playerlocaldata.h
diff --git a/mp/src/game/server/hl2/hl2_triggers.cpp b/src/game/server/hl2/hl2_triggers.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl2_triggers.cpp
rename to src/game/server/hl2/hl2_triggers.cpp
diff --git a/mp/src/game/server/hl2/hl_playermove.cpp b/src/game/server/hl2/hl_playermove.cpp
similarity index 100%
rename from mp/src/game/server/hl2/hl_playermove.cpp
rename to src/game/server/hl2/hl_playermove.cpp
diff --git a/mp/src/game/server/hl2/info_darknessmode_lightsource.cpp b/src/game/server/hl2/info_darknessmode_lightsource.cpp
similarity index 100%
rename from mp/src/game/server/hl2/info_darknessmode_lightsource.cpp
rename to src/game/server/hl2/info_darknessmode_lightsource.cpp
diff --git a/mp/src/game/server/hl2/info_darknessmode_lightsource.h b/src/game/server/hl2/info_darknessmode_lightsource.h
similarity index 100%
rename from mp/src/game/server/hl2/info_darknessmode_lightsource.h
rename to src/game/server/hl2/info_darknessmode_lightsource.h
diff --git a/mp/src/game/server/hl2/info_teleporter_countdown.cpp b/src/game/server/hl2/info_teleporter_countdown.cpp
similarity index 100%
rename from mp/src/game/server/hl2/info_teleporter_countdown.cpp
rename to src/game/server/hl2/info_teleporter_countdown.cpp
diff --git a/mp/src/game/server/hl2/item_ammo.cpp b/src/game/server/hl2/item_ammo.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_ammo.cpp
rename to src/game/server/hl2/item_ammo.cpp
diff --git a/mp/src/game/server/hl2/item_antidote.cpp b/src/game/server/hl2/item_antidote.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_antidote.cpp
rename to src/game/server/hl2/item_antidote.cpp
diff --git a/mp/src/game/server/hl2/item_battery.cpp b/src/game/server/hl2/item_battery.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_battery.cpp
rename to src/game/server/hl2/item_battery.cpp
diff --git a/mp/src/game/server/hl2/item_dynamic_resupply.cpp b/src/game/server/hl2/item_dynamic_resupply.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_dynamic_resupply.cpp
rename to src/game/server/hl2/item_dynamic_resupply.cpp
diff --git a/mp/src/game/server/hl2/item_dynamic_resupply.h b/src/game/server/hl2/item_dynamic_resupply.h
similarity index 100%
rename from mp/src/game/server/hl2/item_dynamic_resupply.h
rename to src/game/server/hl2/item_dynamic_resupply.h
diff --git a/mp/src/game/server/hl2/item_healthkit.cpp b/src/game/server/hl2/item_healthkit.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_healthkit.cpp
rename to src/game/server/hl2/item_healthkit.cpp
diff --git a/mp/src/game/server/hl2/item_itemcrate.cpp b/src/game/server/hl2/item_itemcrate.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_itemcrate.cpp
rename to src/game/server/hl2/item_itemcrate.cpp
diff --git a/mp/src/game/server/hl2/item_longjump.cpp b/src/game/server/hl2/item_longjump.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_longjump.cpp
rename to src/game/server/hl2/item_longjump.cpp
diff --git a/mp/src/game/server/hl2/item_security.cpp b/src/game/server/hl2/item_security.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_security.cpp
rename to src/game/server/hl2/item_security.cpp
diff --git a/mp/src/game/server/hl2/item_suit.cpp b/src/game/server/hl2/item_suit.cpp
similarity index 100%
rename from mp/src/game/server/hl2/item_suit.cpp
rename to src/game/server/hl2/item_suit.cpp
diff --git a/mp/src/game/server/hl2/look_door.cpp b/src/game/server/hl2/look_door.cpp
similarity index 100%
rename from mp/src/game/server/hl2/look_door.cpp
rename to src/game/server/hl2/look_door.cpp
diff --git a/mp/src/game/server/hl2/monster_dummy.cpp b/src/game/server/hl2/monster_dummy.cpp
similarity index 100%
rename from mp/src/game/server/hl2/monster_dummy.cpp
rename to src/game/server/hl2/monster_dummy.cpp
diff --git a/mp/src/game/server/hl2/npc_BaseZombie.cpp b/src/game/server/hl2/npc_BaseZombie.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_BaseZombie.cpp
rename to src/game/server/hl2/npc_BaseZombie.cpp
diff --git a/mp/src/game/server/hl2/npc_BaseZombie.h b/src/game/server/hl2/npc_BaseZombie.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_BaseZombie.h
rename to src/game/server/hl2/npc_BaseZombie.h
diff --git a/mp/src/game/server/hl2/npc_PoisonZombie.cpp b/src/game/server/hl2/npc_PoisonZombie.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_PoisonZombie.cpp
rename to src/game/server/hl2/npc_PoisonZombie.cpp
diff --git a/mp/src/game/server/hl2/npc_alyx.cpp b/src/game/server/hl2/npc_alyx.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_alyx.cpp
rename to src/game/server/hl2/npc_alyx.cpp
diff --git a/mp/src/game/server/hl2/npc_alyx.h b/src/game/server/hl2/npc_alyx.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_alyx.h
rename to src/game/server/hl2/npc_alyx.h
diff --git a/mp/src/game/server/hl2/npc_alyx_episodic.cpp b/src/game/server/hl2/npc_alyx_episodic.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_alyx_episodic.cpp
rename to src/game/server/hl2/npc_alyx_episodic.cpp
diff --git a/mp/src/game/server/hl2/npc_alyx_episodic.h b/src/game/server/hl2/npc_alyx_episodic.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_alyx_episodic.h
rename to src/game/server/hl2/npc_alyx_episodic.h
diff --git a/mp/src/game/server/hl2/npc_antlion.cpp b/src/game/server/hl2/npc_antlion.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_antlion.cpp
rename to src/game/server/hl2/npc_antlion.cpp
diff --git a/mp/src/game/server/hl2/npc_antlion.h b/src/game/server/hl2/npc_antlion.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_antlion.h
rename to src/game/server/hl2/npc_antlion.h
diff --git a/mp/src/game/server/hl2/npc_antliongrub.cpp b/src/game/server/hl2/npc_antliongrub.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_antliongrub.cpp
rename to src/game/server/hl2/npc_antliongrub.cpp
diff --git a/mp/src/game/server/hl2/npc_antliongrub.h b/src/game/server/hl2/npc_antliongrub.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_antliongrub.h
rename to src/game/server/hl2/npc_antliongrub.h
diff --git a/mp/src/game/server/hl2/npc_antlionguard.cpp b/src/game/server/hl2/npc_antlionguard.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_antlionguard.cpp
rename to src/game/server/hl2/npc_antlionguard.cpp
diff --git a/mp/src/game/server/hl2/npc_apcdriver.cpp b/src/game/server/hl2/npc_apcdriver.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_apcdriver.cpp
rename to src/game/server/hl2/npc_apcdriver.cpp
diff --git a/mp/src/game/server/hl2/npc_assassin.cpp b/src/game/server/hl2/npc_assassin.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_assassin.cpp
rename to src/game/server/hl2/npc_assassin.cpp
diff --git a/mp/src/game/server/hl2/npc_assassin.h b/src/game/server/hl2/npc_assassin.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_assassin.h
rename to src/game/server/hl2/npc_assassin.h
diff --git a/mp/src/game/server/hl2/npc_attackchopper.cpp b/src/game/server/hl2/npc_attackchopper.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_attackchopper.cpp
rename to src/game/server/hl2/npc_attackchopper.cpp
diff --git a/mp/src/game/server/hl2/npc_attackchopper.h b/src/game/server/hl2/npc_attackchopper.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_attackchopper.h
rename to src/game/server/hl2/npc_attackchopper.h
diff --git a/mp/src/game/server/hl2/npc_barnacle.cpp b/src/game/server/hl2/npc_barnacle.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_barnacle.cpp
rename to src/game/server/hl2/npc_barnacle.cpp
diff --git a/mp/src/game/server/hl2/npc_barnacle.h b/src/game/server/hl2/npc_barnacle.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_barnacle.h
rename to src/game/server/hl2/npc_barnacle.h
diff --git a/mp/src/game/server/hl2/npc_barney.cpp b/src/game/server/hl2/npc_barney.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_barney.cpp
rename to src/game/server/hl2/npc_barney.cpp
diff --git a/mp/src/game/server/hl2/npc_basescanner.cpp b/src/game/server/hl2/npc_basescanner.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_basescanner.cpp
rename to src/game/server/hl2/npc_basescanner.cpp
diff --git a/mp/src/game/server/hl2/npc_basescanner.h b/src/game/server/hl2/npc_basescanner.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_basescanner.h
rename to src/game/server/hl2/npc_basescanner.h
diff --git a/mp/src/game/server/hl2/npc_blob.cpp b/src/game/server/hl2/npc_blob.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_blob.cpp
rename to src/game/server/hl2/npc_blob.cpp
diff --git a/mp/src/game/server/hl2/npc_breen.cpp b/src/game/server/hl2/npc_breen.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_breen.cpp
rename to src/game/server/hl2/npc_breen.cpp
diff --git a/mp/src/game/server/hl2/npc_bullseye.cpp b/src/game/server/hl2/npc_bullseye.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_bullseye.cpp
rename to src/game/server/hl2/npc_bullseye.cpp
diff --git a/mp/src/game/server/hl2/npc_bullseye.h b/src/game/server/hl2/npc_bullseye.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_bullseye.h
rename to src/game/server/hl2/npc_bullseye.h
diff --git a/mp/src/game/server/hl2/npc_bullsquid.cpp b/src/game/server/hl2/npc_bullsquid.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_bullsquid.cpp
rename to src/game/server/hl2/npc_bullsquid.cpp
diff --git a/mp/src/game/server/hl2/npc_bullsquid.h b/src/game/server/hl2/npc_bullsquid.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_bullsquid.h
rename to src/game/server/hl2/npc_bullsquid.h
diff --git a/mp/src/game/server/hl2/npc_citizen17.cpp b/src/game/server/hl2/npc_citizen17.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_citizen17.cpp
rename to src/game/server/hl2/npc_citizen17.cpp
diff --git a/mp/src/game/server/hl2/npc_citizen17.h b/src/game/server/hl2/npc_citizen17.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_citizen17.h
rename to src/game/server/hl2/npc_citizen17.h
diff --git a/mp/src/game/server/hl2/npc_combine.cpp b/src/game/server/hl2/npc_combine.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_combine.cpp
rename to src/game/server/hl2/npc_combine.cpp
diff --git a/mp/src/game/server/hl2/npc_combine.h b/src/game/server/hl2/npc_combine.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_combine.h
rename to src/game/server/hl2/npc_combine.h
diff --git a/mp/src/game/server/hl2/npc_combinecamera.cpp b/src/game/server/hl2/npc_combinecamera.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_combinecamera.cpp
rename to src/game/server/hl2/npc_combinecamera.cpp
diff --git a/mp/src/game/server/hl2/npc_combinedropship.cpp b/src/game/server/hl2/npc_combinedropship.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_combinedropship.cpp
rename to src/game/server/hl2/npc_combinedropship.cpp
diff --git a/mp/src/game/server/hl2/npc_combinegunship.cpp b/src/game/server/hl2/npc_combinegunship.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_combinegunship.cpp
rename to src/game/server/hl2/npc_combinegunship.cpp
diff --git a/mp/src/game/server/hl2/npc_combines.cpp b/src/game/server/hl2/npc_combines.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_combines.cpp
rename to src/game/server/hl2/npc_combines.cpp
diff --git a/mp/src/game/server/hl2/npc_combines.h b/src/game/server/hl2/npc_combines.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_combines.h
rename to src/game/server/hl2/npc_combines.h
diff --git a/mp/src/game/server/hl2/npc_cranedriver.cpp b/src/game/server/hl2/npc_cranedriver.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_cranedriver.cpp
rename to src/game/server/hl2/npc_cranedriver.cpp
diff --git a/mp/src/game/server/hl2/npc_crow.cpp b/src/game/server/hl2/npc_crow.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_crow.cpp
rename to src/game/server/hl2/npc_crow.cpp
diff --git a/mp/src/game/server/hl2/npc_crow.h b/src/game/server/hl2/npc_crow.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_crow.h
rename to src/game/server/hl2/npc_crow.h
diff --git a/mp/src/game/server/hl2/npc_dog.cpp b/src/game/server/hl2/npc_dog.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_dog.cpp
rename to src/game/server/hl2/npc_dog.cpp
diff --git a/mp/src/game/server/hl2/npc_eli.cpp b/src/game/server/hl2/npc_eli.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_eli.cpp
rename to src/game/server/hl2/npc_eli.cpp
diff --git a/mp/src/game/server/hl2/npc_enemyfinder.cpp b/src/game/server/hl2/npc_enemyfinder.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_enemyfinder.cpp
rename to src/game/server/hl2/npc_enemyfinder.cpp
diff --git a/mp/src/game/server/hl2/npc_fastzombie.cpp b/src/game/server/hl2/npc_fastzombie.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_fastzombie.cpp
rename to src/game/server/hl2/npc_fastzombie.cpp
diff --git a/mp/src/game/server/hl2/npc_fisherman.cpp b/src/game/server/hl2/npc_fisherman.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_fisherman.cpp
rename to src/game/server/hl2/npc_fisherman.cpp
diff --git a/mp/src/game/server/hl2/npc_gman.cpp b/src/game/server/hl2/npc_gman.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_gman.cpp
rename to src/game/server/hl2/npc_gman.cpp
diff --git a/mp/src/game/server/hl2/npc_headcrab.cpp b/src/game/server/hl2/npc_headcrab.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_headcrab.cpp
rename to src/game/server/hl2/npc_headcrab.cpp
diff --git a/mp/src/game/server/hl2/npc_headcrab.h b/src/game/server/hl2/npc_headcrab.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_headcrab.h
rename to src/game/server/hl2/npc_headcrab.h
diff --git a/mp/src/game/server/hl2/npc_houndeye.cpp b/src/game/server/hl2/npc_houndeye.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_houndeye.cpp
rename to src/game/server/hl2/npc_houndeye.cpp
diff --git a/mp/src/game/server/hl2/npc_houndeye.h b/src/game/server/hl2/npc_houndeye.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_houndeye.h
rename to src/game/server/hl2/npc_houndeye.h
diff --git a/mp/src/game/server/hl2/npc_hydra.cpp b/src/game/server/hl2/npc_hydra.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_hydra.cpp
rename to src/game/server/hl2/npc_hydra.cpp
diff --git a/mp/src/game/server/hl2/npc_hydra.h b/src/game/server/hl2/npc_hydra.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_hydra.h
rename to src/game/server/hl2/npc_hydra.h
diff --git a/mp/src/game/server/hl2/npc_ichthyosaur.cpp b/src/game/server/hl2/npc_ichthyosaur.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_ichthyosaur.cpp
rename to src/game/server/hl2/npc_ichthyosaur.cpp
diff --git a/mp/src/game/server/hl2/npc_kleiner.cpp b/src/game/server/hl2/npc_kleiner.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_kleiner.cpp
rename to src/game/server/hl2/npc_kleiner.cpp
diff --git a/mp/src/game/server/hl2/npc_launcher.cpp b/src/game/server/hl2/npc_launcher.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_launcher.cpp
rename to src/game/server/hl2/npc_launcher.cpp
diff --git a/mp/src/game/server/hl2/npc_manhack.cpp b/src/game/server/hl2/npc_manhack.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_manhack.cpp
rename to src/game/server/hl2/npc_manhack.cpp
diff --git a/mp/src/game/server/hl2/npc_manhack.h b/src/game/server/hl2/npc_manhack.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_manhack.h
rename to src/game/server/hl2/npc_manhack.h
diff --git a/mp/src/game/server/hl2/npc_metropolice.cpp b/src/game/server/hl2/npc_metropolice.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_metropolice.cpp
rename to src/game/server/hl2/npc_metropolice.cpp
diff --git a/mp/src/game/server/hl2/npc_metropolice.h b/src/game/server/hl2/npc_metropolice.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_metropolice.h
rename to src/game/server/hl2/npc_metropolice.h
diff --git a/mp/src/game/server/hl2/npc_missiledefense.cpp b/src/game/server/hl2/npc_missiledefense.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_missiledefense.cpp
rename to src/game/server/hl2/npc_missiledefense.cpp
diff --git a/mp/src/game/server/hl2/npc_monk.cpp b/src/game/server/hl2/npc_monk.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_monk.cpp
rename to src/game/server/hl2/npc_monk.cpp
diff --git a/mp/src/game/server/hl2/npc_mossman.cpp b/src/game/server/hl2/npc_mossman.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_mossman.cpp
rename to src/game/server/hl2/npc_mossman.cpp
diff --git a/mp/src/game/server/hl2/npc_playercompanion.cpp b/src/game/server/hl2/npc_playercompanion.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_playercompanion.cpp
rename to src/game/server/hl2/npc_playercompanion.cpp
diff --git a/mp/src/game/server/hl2/npc_playercompanion.h b/src/game/server/hl2/npc_playercompanion.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_playercompanion.h
rename to src/game/server/hl2/npc_playercompanion.h
diff --git a/mp/src/game/server/hl2/npc_rollermine.cpp b/src/game/server/hl2/npc_rollermine.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_rollermine.cpp
rename to src/game/server/hl2/npc_rollermine.cpp
diff --git a/mp/src/game/server/hl2/npc_rollermine.h b/src/game/server/hl2/npc_rollermine.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_rollermine.h
rename to src/game/server/hl2/npc_rollermine.h
diff --git a/mp/src/game/server/hl2/npc_scanner.cpp b/src/game/server/hl2/npc_scanner.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_scanner.cpp
rename to src/game/server/hl2/npc_scanner.cpp
diff --git a/mp/src/game/server/hl2/npc_scanner.h b/src/game/server/hl2/npc_scanner.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_scanner.h
rename to src/game/server/hl2/npc_scanner.h
diff --git a/mp/src/game/server/hl2/npc_spotlight.cpp b/src/game/server/hl2/npc_spotlight.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_spotlight.cpp
rename to src/game/server/hl2/npc_spotlight.cpp
diff --git a/mp/src/game/server/hl2/npc_stalker.cpp b/src/game/server/hl2/npc_stalker.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_stalker.cpp
rename to src/game/server/hl2/npc_stalker.cpp
diff --git a/mp/src/game/server/hl2/npc_stalker.h b/src/game/server/hl2/npc_stalker.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_stalker.h
rename to src/game/server/hl2/npc_stalker.h
diff --git a/mp/src/game/server/hl2/npc_strider.cpp b/src/game/server/hl2/npc_strider.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_strider.cpp
rename to src/game/server/hl2/npc_strider.cpp
diff --git a/mp/src/game/server/hl2/npc_strider.h b/src/game/server/hl2/npc_strider.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_strider.h
rename to src/game/server/hl2/npc_strider.h
diff --git a/mp/src/game/server/hl2/npc_turret.cpp b/src/game/server/hl2/npc_turret.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_turret.cpp
rename to src/game/server/hl2/npc_turret.cpp
diff --git a/mp/src/game/server/hl2/npc_turret_ceiling.cpp b/src/game/server/hl2/npc_turret_ceiling.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_turret_ceiling.cpp
rename to src/game/server/hl2/npc_turret_ceiling.cpp
diff --git a/mp/src/game/server/hl2/npc_turret_floor.cpp b/src/game/server/hl2/npc_turret_floor.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_turret_floor.cpp
rename to src/game/server/hl2/npc_turret_floor.cpp
diff --git a/mp/src/game/server/hl2/npc_turret_floor.h b/src/game/server/hl2/npc_turret_floor.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_turret_floor.h
rename to src/game/server/hl2/npc_turret_floor.h
diff --git a/mp/src/game/server/hl2/npc_turret_ground.cpp b/src/game/server/hl2/npc_turret_ground.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_turret_ground.cpp
rename to src/game/server/hl2/npc_turret_ground.cpp
diff --git a/mp/src/game/server/hl2/npc_turret_ground.h b/src/game/server/hl2/npc_turret_ground.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_turret_ground.h
rename to src/game/server/hl2/npc_turret_ground.h
diff --git a/mp/src/game/server/hl2/npc_vortigaunt_episodic.cpp b/src/game/server/hl2/npc_vortigaunt_episodic.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_vortigaunt_episodic.cpp
rename to src/game/server/hl2/npc_vortigaunt_episodic.cpp
diff --git a/mp/src/game/server/hl2/npc_vortigaunt_episodic.h b/src/game/server/hl2/npc_vortigaunt_episodic.h
similarity index 100%
rename from mp/src/game/server/hl2/npc_vortigaunt_episodic.h
rename to src/game/server/hl2/npc_vortigaunt_episodic.h
diff --git a/mp/src/game/server/hl2/npc_zombie.cpp b/src/game/server/hl2/npc_zombie.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_zombie.cpp
rename to src/game/server/hl2/npc_zombie.cpp
diff --git a/mp/src/game/server/hl2/npc_zombine.cpp b/src/game/server/hl2/npc_zombine.cpp
similarity index 100%
rename from mp/src/game/server/hl2/npc_zombine.cpp
rename to src/game/server/hl2/npc_zombine.cpp
diff --git a/mp/src/game/server/hl2/point_apc_controller.cpp b/src/game/server/hl2/point_apc_controller.cpp
similarity index 100%
rename from mp/src/game/server/hl2/point_apc_controller.cpp
rename to src/game/server/hl2/point_apc_controller.cpp
diff --git a/mp/src/game/server/hl2/prop_combine_ball.cpp b/src/game/server/hl2/prop_combine_ball.cpp
similarity index 100%
rename from mp/src/game/server/hl2/prop_combine_ball.cpp
rename to src/game/server/hl2/prop_combine_ball.cpp
diff --git a/mp/src/game/server/hl2/prop_combine_ball.h b/src/game/server/hl2/prop_combine_ball.h
similarity index 100%
rename from mp/src/game/server/hl2/prop_combine_ball.h
rename to src/game/server/hl2/prop_combine_ball.h
diff --git a/mp/src/game/server/hl2/prop_thumper.cpp b/src/game/server/hl2/prop_thumper.cpp
similarity index 100%
rename from mp/src/game/server/hl2/prop_thumper.cpp
rename to src/game/server/hl2/prop_thumper.cpp
diff --git a/mp/src/game/server/hl2/proto_sniper.cpp b/src/game/server/hl2/proto_sniper.cpp
similarity index 100%
rename from mp/src/game/server/hl2/proto_sniper.cpp
rename to src/game/server/hl2/proto_sniper.cpp
diff --git a/mp/src/game/server/hl2/rotorwash.cpp b/src/game/server/hl2/rotorwash.cpp
similarity index 100%
rename from mp/src/game/server/hl2/rotorwash.cpp
rename to src/game/server/hl2/rotorwash.cpp
diff --git a/mp/src/game/server/hl2/rotorwash.h b/src/game/server/hl2/rotorwash.h
similarity index 100%
rename from mp/src/game/server/hl2/rotorwash.h
rename to src/game/server/hl2/rotorwash.h
diff --git a/mp/src/game/server/hl2/script_intro.cpp b/src/game/server/hl2/script_intro.cpp
similarity index 100%
rename from mp/src/game/server/hl2/script_intro.cpp
rename to src/game/server/hl2/script_intro.cpp
diff --git a/mp/src/game/server/hl2/script_intro.h b/src/game/server/hl2/script_intro.h
similarity index 100%
rename from mp/src/game/server/hl2/script_intro.h
rename to src/game/server/hl2/script_intro.h
diff --git a/mp/src/game/server/hl2/te_gaussexplosion.cpp b/src/game/server/hl2/te_gaussexplosion.cpp
similarity index 100%
rename from mp/src/game/server/hl2/te_gaussexplosion.cpp
rename to src/game/server/hl2/te_gaussexplosion.cpp
diff --git a/mp/src/game/server/hl2/trigger_super_armor.cpp b/src/game/server/hl2/trigger_super_armor.cpp
similarity index 100%
rename from mp/src/game/server/hl2/trigger_super_armor.cpp
rename to src/game/server/hl2/trigger_super_armor.cpp
diff --git a/mp/src/game/server/hl2/vehicle_airboat.cpp b/src/game/server/hl2/vehicle_airboat.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_airboat.cpp
rename to src/game/server/hl2/vehicle_airboat.cpp
diff --git a/mp/src/game/server/hl2/vehicle_apc.cpp b/src/game/server/hl2/vehicle_apc.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_apc.cpp
rename to src/game/server/hl2/vehicle_apc.cpp
diff --git a/mp/src/game/server/hl2/vehicle_apc.h b/src/game/server/hl2/vehicle_apc.h
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_apc.h
rename to src/game/server/hl2/vehicle_apc.h
diff --git a/mp/src/game/server/hl2/vehicle_cannon.cpp b/src/game/server/hl2/vehicle_cannon.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_cannon.cpp
rename to src/game/server/hl2/vehicle_cannon.cpp
diff --git a/mp/src/game/server/hl2/vehicle_crane.cpp b/src/game/server/hl2/vehicle_crane.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_crane.cpp
rename to src/game/server/hl2/vehicle_crane.cpp
diff --git a/mp/src/game/server/hl2/vehicle_crane.h b/src/game/server/hl2/vehicle_crane.h
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_crane.h
rename to src/game/server/hl2/vehicle_crane.h
diff --git a/mp/src/game/server/hl2/vehicle_jeep.cpp b/src/game/server/hl2/vehicle_jeep.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_jeep.cpp
rename to src/game/server/hl2/vehicle_jeep.cpp
diff --git a/mp/src/game/server/hl2/vehicle_jeep.h b/src/game/server/hl2/vehicle_jeep.h
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_jeep.h
rename to src/game/server/hl2/vehicle_jeep.h
diff --git a/mp/src/game/server/hl2/vehicle_jetski.cpp b/src/game/server/hl2/vehicle_jetski.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_jetski.cpp
rename to src/game/server/hl2/vehicle_jetski.cpp
diff --git a/mp/src/game/server/hl2/vehicle_prisoner_pod.cpp b/src/game/server/hl2/vehicle_prisoner_pod.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_prisoner_pod.cpp
rename to src/game/server/hl2/vehicle_prisoner_pod.cpp
diff --git a/mp/src/game/server/hl2/vehicle_viewcontroller.cpp b/src/game/server/hl2/vehicle_viewcontroller.cpp
similarity index 100%
rename from mp/src/game/server/hl2/vehicle_viewcontroller.cpp
rename to src/game/server/hl2/vehicle_viewcontroller.cpp
diff --git a/mp/src/game/server/hl2/weapon_357.cpp b/src/game/server/hl2/weapon_357.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_357.cpp
rename to src/game/server/hl2/weapon_357.cpp
diff --git a/mp/src/game/server/hl2/weapon_alyxgun.cpp b/src/game/server/hl2/weapon_alyxgun.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_alyxgun.cpp
rename to src/game/server/hl2/weapon_alyxgun.cpp
diff --git a/mp/src/game/server/hl2/weapon_alyxgun.h b/src/game/server/hl2/weapon_alyxgun.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_alyxgun.h
rename to src/game/server/hl2/weapon_alyxgun.h
diff --git a/mp/src/game/server/hl2/weapon_annabelle.cpp b/src/game/server/hl2/weapon_annabelle.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_annabelle.cpp
rename to src/game/server/hl2/weapon_annabelle.cpp
diff --git a/mp/src/game/server/hl2/weapon_ar1.cpp b/src/game/server/hl2/weapon_ar1.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_ar1.cpp
rename to src/game/server/hl2/weapon_ar1.cpp
diff --git a/mp/src/game/server/hl2/weapon_ar2.cpp b/src/game/server/hl2/weapon_ar2.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_ar2.cpp
rename to src/game/server/hl2/weapon_ar2.cpp
diff --git a/mp/src/game/server/hl2/weapon_ar2.h b/src/game/server/hl2/weapon_ar2.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_ar2.h
rename to src/game/server/hl2/weapon_ar2.h
diff --git a/mp/src/game/server/hl2/weapon_brickbat.cpp b/src/game/server/hl2/weapon_brickbat.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_brickbat.cpp
rename to src/game/server/hl2/weapon_brickbat.cpp
diff --git a/mp/src/game/server/hl2/weapon_brickbat.h b/src/game/server/hl2/weapon_brickbat.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_brickbat.h
rename to src/game/server/hl2/weapon_brickbat.h
diff --git a/mp/src/game/server/hl2/weapon_bugbait.cpp b/src/game/server/hl2/weapon_bugbait.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_bugbait.cpp
rename to src/game/server/hl2/weapon_bugbait.cpp
diff --git a/mp/src/game/server/hl2/weapon_cguard.cpp b/src/game/server/hl2/weapon_cguard.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_cguard.cpp
rename to src/game/server/hl2/weapon_cguard.cpp
diff --git a/mp/src/game/server/hl2/weapon_citizenpackage.cpp b/src/game/server/hl2/weapon_citizenpackage.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_citizenpackage.cpp
rename to src/game/server/hl2/weapon_citizenpackage.cpp
diff --git a/mp/src/game/server/hl2/weapon_citizenpackage.h b/src/game/server/hl2/weapon_citizenpackage.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_citizenpackage.h
rename to src/game/server/hl2/weapon_citizenpackage.h
diff --git a/mp/src/game/server/hl2/weapon_crossbow.cpp b/src/game/server/hl2/weapon_crossbow.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_crossbow.cpp
rename to src/game/server/hl2/weapon_crossbow.cpp
diff --git a/mp/src/game/server/hl2/weapon_crowbar.cpp b/src/game/server/hl2/weapon_crowbar.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_crowbar.cpp
rename to src/game/server/hl2/weapon_crowbar.cpp
diff --git a/mp/src/game/server/hl2/weapon_crowbar.h b/src/game/server/hl2/weapon_crowbar.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_crowbar.h
rename to src/game/server/hl2/weapon_crowbar.h
diff --git a/mp/src/game/server/hl2/weapon_extinguisher.cpp b/src/game/server/hl2/weapon_extinguisher.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_extinguisher.cpp
rename to src/game/server/hl2/weapon_extinguisher.cpp
diff --git a/mp/src/game/server/hl2/weapon_flaregun.cpp b/src/game/server/hl2/weapon_flaregun.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_flaregun.cpp
rename to src/game/server/hl2/weapon_flaregun.cpp
diff --git a/mp/src/game/server/hl2/weapon_flaregun.h b/src/game/server/hl2/weapon_flaregun.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_flaregun.h
rename to src/game/server/hl2/weapon_flaregun.h
diff --git a/mp/src/game/server/hl2/weapon_frag.cpp b/src/game/server/hl2/weapon_frag.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_frag.cpp
rename to src/game/server/hl2/weapon_frag.cpp
diff --git a/mp/src/game/server/hl2/weapon_gauss.h b/src/game/server/hl2/weapon_gauss.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_gauss.h
rename to src/game/server/hl2/weapon_gauss.h
diff --git a/mp/src/game/server/hl2/weapon_immolator.cpp b/src/game/server/hl2/weapon_immolator.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_immolator.cpp
rename to src/game/server/hl2/weapon_immolator.cpp
diff --git a/mp/src/game/server/hl2/weapon_irifle.cpp b/src/game/server/hl2/weapon_irifle.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_irifle.cpp
rename to src/game/server/hl2/weapon_irifle.cpp
diff --git a/mp/src/game/server/hl2/weapon_manhack.cpp b/src/game/server/hl2/weapon_manhack.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_manhack.cpp
rename to src/game/server/hl2/weapon_manhack.cpp
diff --git a/mp/src/game/server/hl2/weapon_molotov.cpp b/src/game/server/hl2/weapon_molotov.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_molotov.cpp
rename to src/game/server/hl2/weapon_molotov.cpp
diff --git a/mp/src/game/server/hl2/weapon_molotov.h b/src/game/server/hl2/weapon_molotov.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_molotov.h
rename to src/game/server/hl2/weapon_molotov.h
diff --git a/mp/src/game/server/hl2/weapon_physcannon.cpp b/src/game/server/hl2/weapon_physcannon.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_physcannon.cpp
rename to src/game/server/hl2/weapon_physcannon.cpp
diff --git a/mp/src/game/server/hl2/weapon_physcannon.h b/src/game/server/hl2/weapon_physcannon.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_physcannon.h
rename to src/game/server/hl2/weapon_physcannon.h
diff --git a/mp/src/game/server/hl2/weapon_pistol.cpp b/src/game/server/hl2/weapon_pistol.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_pistol.cpp
rename to src/game/server/hl2/weapon_pistol.cpp
diff --git a/mp/src/game/server/hl2/weapon_rpg.cpp b/src/game/server/hl2/weapon_rpg.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_rpg.cpp
rename to src/game/server/hl2/weapon_rpg.cpp
diff --git a/mp/src/game/server/hl2/weapon_rpg.h b/src/game/server/hl2/weapon_rpg.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_rpg.h
rename to src/game/server/hl2/weapon_rpg.h
diff --git a/mp/src/game/server/hl2/weapon_shotgun.cpp b/src/game/server/hl2/weapon_shotgun.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_shotgun.cpp
rename to src/game/server/hl2/weapon_shotgun.cpp
diff --git a/mp/src/game/server/hl2/weapon_slam.cpp b/src/game/server/hl2/weapon_slam.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_slam.cpp
rename to src/game/server/hl2/weapon_slam.cpp
diff --git a/mp/src/game/server/hl2/weapon_slam.h b/src/game/server/hl2/weapon_slam.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_slam.h
rename to src/game/server/hl2/weapon_slam.h
diff --git a/mp/src/game/server/hl2/weapon_smg1.cpp b/src/game/server/hl2/weapon_smg1.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_smg1.cpp
rename to src/game/server/hl2/weapon_smg1.cpp
diff --git a/mp/src/game/server/hl2/weapon_smg2.cpp b/src/game/server/hl2/weapon_smg2.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_smg2.cpp
rename to src/game/server/hl2/weapon_smg2.cpp
diff --git a/mp/src/game/server/hl2/weapon_sniperrifle.cpp b/src/game/server/hl2/weapon_sniperrifle.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_sniperrifle.cpp
rename to src/game/server/hl2/weapon_sniperrifle.cpp
diff --git a/mp/src/game/server/hl2/weapon_stunstick.cpp b/src/game/server/hl2/weapon_stunstick.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_stunstick.cpp
rename to src/game/server/hl2/weapon_stunstick.cpp
diff --git a/mp/src/game/server/hl2/weapon_stunstick.h b/src/game/server/hl2/weapon_stunstick.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_stunstick.h
rename to src/game/server/hl2/weapon_stunstick.h
diff --git a/mp/src/game/server/hl2/weapon_thumper.cpp b/src/game/server/hl2/weapon_thumper.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_thumper.cpp
rename to src/game/server/hl2/weapon_thumper.cpp
diff --git a/mp/src/game/server/hl2/weapon_tripwire.cpp b/src/game/server/hl2/weapon_tripwire.cpp
similarity index 100%
rename from mp/src/game/server/hl2/weapon_tripwire.cpp
rename to src/game/server/hl2/weapon_tripwire.cpp
diff --git a/mp/src/game/server/hl2/weapon_tripwire.h b/src/game/server/hl2/weapon_tripwire.h
similarity index 100%
rename from mp/src/game/server/hl2/weapon_tripwire.h
rename to src/game/server/hl2/weapon_tripwire.h
diff --git a/mp/src/game/server/hl2mp/grenade_satchel.cpp b/src/game/server/hl2mp/grenade_satchel.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/grenade_satchel.cpp
rename to src/game/server/hl2mp/grenade_satchel.cpp
diff --git a/mp/src/game/server/hl2mp/grenade_satchel.h b/src/game/server/hl2mp/grenade_satchel.h
similarity index 100%
rename from mp/src/game/server/hl2mp/grenade_satchel.h
rename to src/game/server/hl2mp/grenade_satchel.h
diff --git a/mp/src/game/server/hl2mp/grenade_tripmine.cpp b/src/game/server/hl2mp/grenade_tripmine.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/grenade_tripmine.cpp
rename to src/game/server/hl2mp/grenade_tripmine.cpp
diff --git a/mp/src/game/server/hl2mp/grenade_tripmine.h b/src/game/server/hl2mp/grenade_tripmine.h
similarity index 100%
rename from mp/src/game/server/hl2mp/grenade_tripmine.h
rename to src/game/server/hl2mp/grenade_tripmine.h
diff --git a/mp/src/game/server/hl2mp/hl2mp_bot_temp.cpp b/src/game/server/hl2mp/hl2mp_bot_temp.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_bot_temp.cpp
rename to src/game/server/hl2mp/hl2mp_bot_temp.cpp
diff --git a/mp/src/game/server/hl2mp/hl2mp_bot_temp.h b/src/game/server/hl2mp/hl2mp_bot_temp.h
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_bot_temp.h
rename to src/game/server/hl2mp/hl2mp_bot_temp.h
diff --git a/mp/src/game/server/hl2mp/hl2mp_client.cpp b/src/game/server/hl2mp/hl2mp_client.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_client.cpp
rename to src/game/server/hl2mp/hl2mp_client.cpp
diff --git a/mp/src/game/server/hl2mp/hl2mp_cvars.cpp b/src/game/server/hl2mp/hl2mp_cvars.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_cvars.cpp
rename to src/game/server/hl2mp/hl2mp_cvars.cpp
diff --git a/mp/src/game/server/hl2mp/hl2mp_cvars.h b/src/game/server/hl2mp/hl2mp_cvars.h
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_cvars.h
rename to src/game/server/hl2mp/hl2mp_cvars.h
diff --git a/mp/src/game/server/hl2mp/hl2mp_gameinterface.cpp b/src/game/server/hl2mp/hl2mp_gameinterface.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_gameinterface.cpp
rename to src/game/server/hl2mp/hl2mp_gameinterface.cpp
diff --git a/mp/src/game/server/hl2mp/hl2mp_gameinterface.h b/src/game/server/hl2mp/hl2mp_gameinterface.h
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_gameinterface.h
rename to src/game/server/hl2mp/hl2mp_gameinterface.h
diff --git a/mp/src/game/server/hl2mp/hl2mp_player.cpp b/src/game/server/hl2mp/hl2mp_player.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_player.cpp
rename to src/game/server/hl2mp/hl2mp_player.cpp
diff --git a/mp/src/game/server/hl2mp/hl2mp_player.h b/src/game/server/hl2mp/hl2mp_player.h
similarity index 100%
rename from mp/src/game/server/hl2mp/hl2mp_player.h
rename to src/game/server/hl2mp/hl2mp_player.h
diff --git a/mp/src/game/server/hl2mp/te_hl2mp_shotgun_shot.cpp b/src/game/server/hl2mp/te_hl2mp_shotgun_shot.cpp
similarity index 100%
rename from mp/src/game/server/hl2mp/te_hl2mp_shotgun_shot.cpp
rename to src/game/server/hl2mp/te_hl2mp_shotgun_shot.cpp
diff --git a/mp/src/game/server/hl2mp/te_hl2mp_shotgun_shot.h b/src/game/server/hl2mp/te_hl2mp_shotgun_shot.h
similarity index 100%
rename from mp/src/game/server/hl2mp/te_hl2mp_shotgun_shot.h
rename to src/game/server/hl2mp/te_hl2mp_shotgun_shot.h
diff --git a/mp/src/game/server/hltvdirector.cpp b/src/game/server/hltvdirector.cpp
similarity index 100%
rename from mp/src/game/server/hltvdirector.cpp
rename to src/game/server/hltvdirector.cpp
diff --git a/mp/src/game/server/hltvdirector.h b/src/game/server/hltvdirector.h
similarity index 100%
rename from mp/src/game/server/hltvdirector.h
rename to src/game/server/hltvdirector.h
diff --git a/mp/src/game/server/ilagcompensationmanager.h b/src/game/server/ilagcompensationmanager.h
similarity index 100%
rename from mp/src/game/server/ilagcompensationmanager.h
rename to src/game/server/ilagcompensationmanager.h
diff --git a/mp/src/game/server/info_camera_link.cpp b/src/game/server/info_camera_link.cpp
similarity index 100%
rename from mp/src/game/server/info_camera_link.cpp
rename to src/game/server/info_camera_link.cpp
diff --git a/mp/src/game/server/info_camera_link.h b/src/game/server/info_camera_link.h
similarity index 100%
rename from mp/src/game/server/info_camera_link.h
rename to src/game/server/info_camera_link.h
diff --git a/mp/src/game/server/info_overlay_accessor.cpp b/src/game/server/info_overlay_accessor.cpp
similarity index 100%
rename from mp/src/game/server/info_overlay_accessor.cpp
rename to src/game/server/info_overlay_accessor.cpp
diff --git a/mp/src/game/server/init_factory.cpp b/src/game/server/init_factory.cpp
similarity index 100%
rename from mp/src/game/server/init_factory.cpp
rename to src/game/server/init_factory.cpp
diff --git a/mp/src/game/server/init_factory.h b/src/game/server/init_factory.h
similarity index 100%
rename from mp/src/game/server/init_factory.h
rename to src/game/server/init_factory.h
diff --git a/mp/src/game/server/intermission.cpp b/src/game/server/intermission.cpp
similarity index 100%
rename from mp/src/game/server/intermission.cpp
rename to src/game/server/intermission.cpp
diff --git a/mp/src/game/server/iscorer.h b/src/game/server/iscorer.h
similarity index 100%
rename from mp/src/game/server/iscorer.h
rename to src/game/server/iscorer.h
diff --git a/mp/src/game/server/iservervehicle.h b/src/game/server/iservervehicle.h
similarity index 100%
rename from mp/src/game/server/iservervehicle.h
rename to src/game/server/iservervehicle.h
diff --git a/mp/src/game/server/item_world.cpp b/src/game/server/item_world.cpp
similarity index 100%
rename from mp/src/game/server/item_world.cpp
rename to src/game/server/item_world.cpp
diff --git a/mp/src/game/server/items.h b/src/game/server/items.h
similarity index 100%
rename from mp/src/game/server/items.h
rename to src/game/server/items.h
diff --git a/mp/src/game/server/lightglow.cpp b/src/game/server/lightglow.cpp
similarity index 100%
rename from mp/src/game/server/lightglow.cpp
rename to src/game/server/lightglow.cpp
diff --git a/mp/src/game/server/lights.cpp b/src/game/server/lights.cpp
similarity index 100%
rename from mp/src/game/server/lights.cpp
rename to src/game/server/lights.cpp
diff --git a/mp/src/game/server/lights.h b/src/game/server/lights.h
similarity index 100%
rename from mp/src/game/server/lights.h
rename to src/game/server/lights.h
diff --git a/mp/src/game/server/locksounds.h b/src/game/server/locksounds.h
similarity index 100%
rename from mp/src/game/server/locksounds.h
rename to src/game/server/locksounds.h
diff --git a/mp/src/game/server/logic_achievement.cpp b/src/game/server/logic_achievement.cpp
similarity index 100%
rename from mp/src/game/server/logic_achievement.cpp
rename to src/game/server/logic_achievement.cpp
diff --git a/mp/src/game/server/logic_measure_movement.cpp b/src/game/server/logic_measure_movement.cpp
similarity index 100%
rename from mp/src/game/server/logic_measure_movement.cpp
rename to src/game/server/logic_measure_movement.cpp
diff --git a/mp/src/game/server/logic_mirror_movement.cpp b/src/game/server/logic_mirror_movement.cpp
similarity index 100%
rename from mp/src/game/server/logic_mirror_movement.cpp
rename to src/game/server/logic_mirror_movement.cpp
diff --git a/mp/src/game/server/logic_navigation.cpp b/src/game/server/logic_navigation.cpp
similarity index 100%
rename from mp/src/game/server/logic_navigation.cpp
rename to src/game/server/logic_navigation.cpp
diff --git a/mp/src/game/server/logicauto.cpp b/src/game/server/logicauto.cpp
similarity index 100%
rename from mp/src/game/server/logicauto.cpp
rename to src/game/server/logicauto.cpp
diff --git a/mp/src/game/server/logicentities.cpp b/src/game/server/logicentities.cpp
similarity index 100%
rename from mp/src/game/server/logicentities.cpp
rename to src/game/server/logicentities.cpp
diff --git a/mp/src/game/server/logicrelay.cpp b/src/game/server/logicrelay.cpp
similarity index 100%
rename from mp/src/game/server/logicrelay.cpp
rename to src/game/server/logicrelay.cpp
diff --git a/mp/src/game/server/logicrelay.h b/src/game/server/logicrelay.h
similarity index 100%
rename from mp/src/game/server/logicrelay.h
rename to src/game/server/logicrelay.h
diff --git a/mp/src/game/server/mapentities.cpp b/src/game/server/mapentities.cpp
similarity index 100%
rename from mp/src/game/server/mapentities.cpp
rename to src/game/server/mapentities.cpp
diff --git a/mp/src/game/server/mapentities.h b/src/game/server/mapentities.h
similarity index 100%
rename from mp/src/game/server/mapentities.h
rename to src/game/server/mapentities.h
diff --git a/mp/src/game/server/maprules.cpp b/src/game/server/maprules.cpp
similarity index 100%
rename from mp/src/game/server/maprules.cpp
rename to src/game/server/maprules.cpp
diff --git a/mp/src/game/server/maprules.h b/src/game/server/maprules.h
similarity index 100%
rename from mp/src/game/server/maprules.h
rename to src/game/server/maprules.h
diff --git a/mp/src/game/server/message_entity.cpp b/src/game/server/message_entity.cpp
similarity index 100%
rename from mp/src/game/server/message_entity.cpp
rename to src/game/server/message_entity.cpp
diff --git a/mp/src/game/server/modelentities.cpp b/src/game/server/modelentities.cpp
similarity index 100%
rename from mp/src/game/server/modelentities.cpp
rename to src/game/server/modelentities.cpp
diff --git a/mp/src/game/server/modelentities.h b/src/game/server/modelentities.h
similarity index 100%
rename from mp/src/game/server/modelentities.h
rename to src/game/server/modelentities.h
diff --git a/mp/src/game/server/monstermaker.cpp b/src/game/server/monstermaker.cpp
similarity index 100%
rename from mp/src/game/server/monstermaker.cpp
rename to src/game/server/monstermaker.cpp
diff --git a/mp/src/game/server/monstermaker.h b/src/game/server/monstermaker.h
similarity index 100%
rename from mp/src/game/server/monstermaker.h
rename to src/game/server/monstermaker.h
diff --git a/mp/src/game/server/movehelper_server.cpp b/src/game/server/movehelper_server.cpp
similarity index 100%
rename from mp/src/game/server/movehelper_server.cpp
rename to src/game/server/movehelper_server.cpp
diff --git a/mp/src/game/server/movehelper_server.h b/src/game/server/movehelper_server.h
similarity index 100%
rename from mp/src/game/server/movehelper_server.h
rename to src/game/server/movehelper_server.h
diff --git a/mp/src/game/server/movement.cpp b/src/game/server/movement.cpp
similarity index 100%
rename from mp/src/game/server/movement.cpp
rename to src/game/server/movement.cpp
diff --git a/mp/src/game/server/movie_explosion.cpp b/src/game/server/movie_explosion.cpp
similarity index 100%
rename from mp/src/game/server/movie_explosion.cpp
rename to src/game/server/movie_explosion.cpp
diff --git a/mp/src/game/server/movie_explosion.h b/src/game/server/movie_explosion.h
similarity index 100%
rename from mp/src/game/server/movie_explosion.h
rename to src/game/server/movie_explosion.h
diff --git a/mp/src/game/server/nav.h b/src/game/server/nav.h
similarity index 100%
rename from mp/src/game/server/nav.h
rename to src/game/server/nav.h
diff --git a/mp/src/game/server/nav_area.cpp b/src/game/server/nav_area.cpp
similarity index 100%
rename from mp/src/game/server/nav_area.cpp
rename to src/game/server/nav_area.cpp
diff --git a/mp/src/game/server/nav_area.h b/src/game/server/nav_area.h
similarity index 100%
rename from mp/src/game/server/nav_area.h
rename to src/game/server/nav_area.h
diff --git a/mp/src/game/server/nav_colors.cpp b/src/game/server/nav_colors.cpp
similarity index 100%
rename from mp/src/game/server/nav_colors.cpp
rename to src/game/server/nav_colors.cpp
diff --git a/mp/src/game/server/nav_colors.h b/src/game/server/nav_colors.h
similarity index 100%
rename from mp/src/game/server/nav_colors.h
rename to src/game/server/nav_colors.h
diff --git a/mp/src/game/server/nav_edit.cpp b/src/game/server/nav_edit.cpp
similarity index 100%
rename from mp/src/game/server/nav_edit.cpp
rename to src/game/server/nav_edit.cpp
diff --git a/mp/src/game/server/nav_entities.cpp b/src/game/server/nav_entities.cpp
similarity index 100%
rename from mp/src/game/server/nav_entities.cpp
rename to src/game/server/nav_entities.cpp
diff --git a/mp/src/game/server/nav_entities.h b/src/game/server/nav_entities.h
similarity index 100%
rename from mp/src/game/server/nav_entities.h
rename to src/game/server/nav_entities.h
diff --git a/mp/src/game/server/nav_file.cpp b/src/game/server/nav_file.cpp
similarity index 100%
rename from mp/src/game/server/nav_file.cpp
rename to src/game/server/nav_file.cpp
diff --git a/mp/src/game/server/nav_generate.cpp b/src/game/server/nav_generate.cpp
similarity index 100%
rename from mp/src/game/server/nav_generate.cpp
rename to src/game/server/nav_generate.cpp
diff --git a/mp/src/game/server/nav_ladder.cpp b/src/game/server/nav_ladder.cpp
similarity index 100%
rename from mp/src/game/server/nav_ladder.cpp
rename to src/game/server/nav_ladder.cpp
diff --git a/mp/src/game/server/nav_ladder.h b/src/game/server/nav_ladder.h
similarity index 100%
rename from mp/src/game/server/nav_ladder.h
rename to src/game/server/nav_ladder.h
diff --git a/mp/src/game/server/nav_merge.cpp b/src/game/server/nav_merge.cpp
similarity index 100%
rename from mp/src/game/server/nav_merge.cpp
rename to src/game/server/nav_merge.cpp
diff --git a/mp/src/game/server/nav_mesh.cpp b/src/game/server/nav_mesh.cpp
similarity index 100%
rename from mp/src/game/server/nav_mesh.cpp
rename to src/game/server/nav_mesh.cpp
diff --git a/mp/src/game/server/nav_mesh.h b/src/game/server/nav_mesh.h
similarity index 100%
rename from mp/src/game/server/nav_mesh.h
rename to src/game/server/nav_mesh.h
diff --git a/mp/src/game/server/nav_mesh.vpc b/src/game/server/nav_mesh.vpc
similarity index 100%
rename from mp/src/game/server/nav_mesh.vpc
rename to src/game/server/nav_mesh.vpc
diff --git a/mp/src/game/server/nav_mesh_factory.cpp b/src/game/server/nav_mesh_factory.cpp
similarity index 100%
rename from mp/src/game/server/nav_mesh_factory.cpp
rename to src/game/server/nav_mesh_factory.cpp
diff --git a/mp/src/game/server/nav_node.cpp b/src/game/server/nav_node.cpp
similarity index 100%
rename from mp/src/game/server/nav_node.cpp
rename to src/game/server/nav_node.cpp
diff --git a/mp/src/game/server/nav_node.h b/src/game/server/nav_node.h
similarity index 100%
rename from mp/src/game/server/nav_node.h
rename to src/game/server/nav_node.h
diff --git a/mp/src/game/server/nav_pathfind.h b/src/game/server/nav_pathfind.h
similarity index 100%
rename from mp/src/game/server/nav_pathfind.h
rename to src/game/server/nav_pathfind.h
diff --git a/mp/src/game/server/nav_simplify.cpp b/src/game/server/nav_simplify.cpp
similarity index 100%
rename from mp/src/game/server/nav_simplify.cpp
rename to src/game/server/nav_simplify.cpp
diff --git a/mp/src/game/server/ndebugoverlay.cpp b/src/game/server/ndebugoverlay.cpp
similarity index 100%
rename from mp/src/game/server/ndebugoverlay.cpp
rename to src/game/server/ndebugoverlay.cpp
diff --git a/mp/src/game/server/ndebugoverlay.h b/src/game/server/ndebugoverlay.h
similarity index 100%
rename from mp/src/game/server/ndebugoverlay.h
rename to src/game/server/ndebugoverlay.h
diff --git a/mp/src/game/server/networkstringtable_gamedll.h b/src/game/server/networkstringtable_gamedll.h
similarity index 100%
rename from mp/src/game/server/networkstringtable_gamedll.h
rename to src/game/server/networkstringtable_gamedll.h
diff --git a/mp/src/game/server/npc_talker.cpp b/src/game/server/npc_talker.cpp
similarity index 100%
rename from mp/src/game/server/npc_talker.cpp
rename to src/game/server/npc_talker.cpp
diff --git a/mp/src/game/server/npc_talker.h b/src/game/server/npc_talker.h
similarity index 100%
rename from mp/src/game/server/npc_talker.h
rename to src/game/server/npc_talker.h
diff --git a/mp/src/game/server/npc_vehicledriver.cpp b/src/game/server/npc_vehicledriver.cpp
similarity index 100%
rename from mp/src/game/server/npc_vehicledriver.cpp
rename to src/game/server/npc_vehicledriver.cpp
diff --git a/mp/src/game/server/npc_vehicledriver.h b/src/game/server/npc_vehicledriver.h
similarity index 100%
rename from mp/src/game/server/npc_vehicledriver.h
rename to src/game/server/npc_vehicledriver.h
diff --git a/mp/src/game/server/particle_fire.cpp b/src/game/server/particle_fire.cpp
similarity index 100%
rename from mp/src/game/server/particle_fire.cpp
rename to src/game/server/particle_fire.cpp
diff --git a/mp/src/game/server/particle_fire.h b/src/game/server/particle_fire.h
similarity index 100%
rename from mp/src/game/server/particle_fire.h
rename to src/game/server/particle_fire.h
diff --git a/mp/src/game/server/particle_light.cpp b/src/game/server/particle_light.cpp
similarity index 100%
rename from mp/src/game/server/particle_light.cpp
rename to src/game/server/particle_light.cpp
diff --git a/mp/src/game/server/particle_light.h b/src/game/server/particle_light.h
similarity index 100%
rename from mp/src/game/server/particle_light.h
rename to src/game/server/particle_light.h
diff --git a/mp/src/game/server/particle_smokegrenade.cpp b/src/game/server/particle_smokegrenade.cpp
similarity index 100%
rename from mp/src/game/server/particle_smokegrenade.cpp
rename to src/game/server/particle_smokegrenade.cpp
diff --git a/mp/src/game/server/particle_smokegrenade.h b/src/game/server/particle_smokegrenade.h
similarity index 100%
rename from mp/src/game/server/particle_smokegrenade.h
rename to src/game/server/particle_smokegrenade.h
diff --git a/mp/src/game/server/particle_system.cpp b/src/game/server/particle_system.cpp
similarity index 100%
rename from mp/src/game/server/particle_system.cpp
rename to src/game/server/particle_system.cpp
diff --git a/mp/src/game/server/particle_system.h b/src/game/server/particle_system.h
similarity index 100%
rename from mp/src/game/server/particle_system.h
rename to src/game/server/particle_system.h
diff --git a/mp/src/game/server/pathcorner.cpp b/src/game/server/pathcorner.cpp
similarity index 100%
rename from mp/src/game/server/pathcorner.cpp
rename to src/game/server/pathcorner.cpp
diff --git a/mp/src/game/server/pathtrack.cpp b/src/game/server/pathtrack.cpp
similarity index 100%
rename from mp/src/game/server/pathtrack.cpp
rename to src/game/server/pathtrack.cpp
diff --git a/mp/src/game/server/pathtrack.h b/src/game/server/pathtrack.h
similarity index 100%
rename from mp/src/game/server/pathtrack.h
rename to src/game/server/pathtrack.h
diff --git a/mp/src/game/server/phys_controller.cpp b/src/game/server/phys_controller.cpp
similarity index 100%
rename from mp/src/game/server/phys_controller.cpp
rename to src/game/server/phys_controller.cpp
diff --git a/mp/src/game/server/phys_controller.h b/src/game/server/phys_controller.h
similarity index 100%
rename from mp/src/game/server/phys_controller.h
rename to src/game/server/phys_controller.h
diff --git a/mp/src/game/server/physconstraint.cpp b/src/game/server/physconstraint.cpp
similarity index 100%
rename from mp/src/game/server/physconstraint.cpp
rename to src/game/server/physconstraint.cpp
diff --git a/mp/src/game/server/physconstraint.h b/src/game/server/physconstraint.h
similarity index 100%
rename from mp/src/game/server/physconstraint.h
rename to src/game/server/physconstraint.h
diff --git a/mp/src/game/server/physconstraint_sounds.h b/src/game/server/physconstraint_sounds.h
similarity index 100%
rename from mp/src/game/server/physconstraint_sounds.h
rename to src/game/server/physconstraint_sounds.h
diff --git a/mp/src/game/server/physgun.cpp b/src/game/server/physgun.cpp
similarity index 100%
rename from mp/src/game/server/physgun.cpp
rename to src/game/server/physgun.cpp
diff --git a/mp/src/game/server/physics.cpp b/src/game/server/physics.cpp
similarity index 100%
rename from mp/src/game/server/physics.cpp
rename to src/game/server/physics.cpp
diff --git a/mp/src/game/server/physics.h b/src/game/server/physics.h
similarity index 100%
rename from mp/src/game/server/physics.h
rename to src/game/server/physics.h
diff --git a/mp/src/game/server/physics_bone_follower.cpp b/src/game/server/physics_bone_follower.cpp
similarity index 100%
rename from mp/src/game/server/physics_bone_follower.cpp
rename to src/game/server/physics_bone_follower.cpp
diff --git a/mp/src/game/server/physics_bone_follower.h b/src/game/server/physics_bone_follower.h
similarity index 100%
rename from mp/src/game/server/physics_bone_follower.h
rename to src/game/server/physics_bone_follower.h
diff --git a/mp/src/game/server/physics_cannister.cpp b/src/game/server/physics_cannister.cpp
similarity index 100%
rename from mp/src/game/server/physics_cannister.cpp
rename to src/game/server/physics_cannister.cpp
diff --git a/mp/src/game/server/physics_cannister.h b/src/game/server/physics_cannister.h
similarity index 100%
rename from mp/src/game/server/physics_cannister.h
rename to src/game/server/physics_cannister.h
diff --git a/mp/src/game/server/physics_collisionevent.h b/src/game/server/physics_collisionevent.h
similarity index 100%
rename from mp/src/game/server/physics_collisionevent.h
rename to src/game/server/physics_collisionevent.h
diff --git a/mp/src/game/server/physics_fx.cpp b/src/game/server/physics_fx.cpp
similarity index 100%
rename from mp/src/game/server/physics_fx.cpp
rename to src/game/server/physics_fx.cpp
diff --git a/mp/src/game/server/physics_fx.h b/src/game/server/physics_fx.h
similarity index 100%
rename from mp/src/game/server/physics_fx.h
rename to src/game/server/physics_fx.h
diff --git a/mp/src/game/server/physics_impact_damage.cpp b/src/game/server/physics_impact_damage.cpp
similarity index 100%
rename from mp/src/game/server/physics_impact_damage.cpp
rename to src/game/server/physics_impact_damage.cpp
diff --git a/mp/src/game/server/physics_impact_damage.h b/src/game/server/physics_impact_damage.h
similarity index 100%
rename from mp/src/game/server/physics_impact_damage.h
rename to src/game/server/physics_impact_damage.h
diff --git a/mp/src/game/server/physics_main.cpp b/src/game/server/physics_main.cpp
similarity index 100%
rename from mp/src/game/server/physics_main.cpp
rename to src/game/server/physics_main.cpp
diff --git a/mp/src/game/server/physics_npc_solver.cpp b/src/game/server/physics_npc_solver.cpp
similarity index 100%
rename from mp/src/game/server/physics_npc_solver.cpp
rename to src/game/server/physics_npc_solver.cpp
diff --git a/mp/src/game/server/physics_npc_solver.h b/src/game/server/physics_npc_solver.h
similarity index 100%
rename from mp/src/game/server/physics_npc_solver.h
rename to src/game/server/physics_npc_solver.h
diff --git a/mp/src/game/server/physics_prop_ragdoll.cpp b/src/game/server/physics_prop_ragdoll.cpp
similarity index 100%
rename from mp/src/game/server/physics_prop_ragdoll.cpp
rename to src/game/server/physics_prop_ragdoll.cpp
diff --git a/mp/src/game/server/physics_prop_ragdoll.h b/src/game/server/physics_prop_ragdoll.h
similarity index 100%
rename from mp/src/game/server/physics_prop_ragdoll.h
rename to src/game/server/physics_prop_ragdoll.h
diff --git a/mp/src/game/server/physobj.cpp b/src/game/server/physobj.cpp
similarity index 100%
rename from mp/src/game/server/physobj.cpp
rename to src/game/server/physobj.cpp
diff --git a/mp/src/game/server/physobj.h b/src/game/server/physobj.h
similarity index 100%
rename from mp/src/game/server/physobj.h
rename to src/game/server/physobj.h
diff --git a/mp/src/game/server/plasma.cpp b/src/game/server/plasma.cpp
similarity index 100%
rename from mp/src/game/server/plasma.cpp
rename to src/game/server/plasma.cpp
diff --git a/mp/src/game/server/plasma.h b/src/game/server/plasma.h
similarity index 100%
rename from mp/src/game/server/plasma.h
rename to src/game/server/plasma.h
diff --git a/mp/src/game/server/player.cpp b/src/game/server/player.cpp
similarity index 100%
rename from mp/src/game/server/player.cpp
rename to src/game/server/player.cpp
diff --git a/mp/src/game/server/player.h b/src/game/server/player.h
similarity index 100%
rename from mp/src/game/server/player.h
rename to src/game/server/player.h
diff --git a/mp/src/game/server/player_command.cpp b/src/game/server/player_command.cpp
similarity index 100%
rename from mp/src/game/server/player_command.cpp
rename to src/game/server/player_command.cpp
diff --git a/mp/src/game/server/player_command.h b/src/game/server/player_command.h
similarity index 100%
rename from mp/src/game/server/player_command.h
rename to src/game/server/player_command.h
diff --git a/mp/src/game/server/player_lagcompensation.cpp b/src/game/server/player_lagcompensation.cpp
similarity index 100%
rename from mp/src/game/server/player_lagcompensation.cpp
rename to src/game/server/player_lagcompensation.cpp
diff --git a/mp/src/game/server/player_pickup.cpp b/src/game/server/player_pickup.cpp
similarity index 100%
rename from mp/src/game/server/player_pickup.cpp
rename to src/game/server/player_pickup.cpp
diff --git a/mp/src/game/server/player_pickup.h b/src/game/server/player_pickup.h
similarity index 100%
rename from mp/src/game/server/player_pickup.h
rename to src/game/server/player_pickup.h
diff --git a/mp/src/game/server/player_resource.cpp b/src/game/server/player_resource.cpp
similarity index 100%
rename from mp/src/game/server/player_resource.cpp
rename to src/game/server/player_resource.cpp
diff --git a/mp/src/game/server/player_resource.h b/src/game/server/player_resource.h
similarity index 100%
rename from mp/src/game/server/player_resource.h
rename to src/game/server/player_resource.h
diff --git a/mp/src/game/server/playerinfomanager.cpp b/src/game/server/playerinfomanager.cpp
similarity index 100%
rename from mp/src/game/server/playerinfomanager.cpp
rename to src/game/server/playerinfomanager.cpp
diff --git a/mp/src/game/server/playerinfomanager.h b/src/game/server/playerinfomanager.h
similarity index 100%
rename from mp/src/game/server/playerinfomanager.h
rename to src/game/server/playerinfomanager.h
diff --git a/mp/src/game/server/playerlocaldata.cpp b/src/game/server/playerlocaldata.cpp
similarity index 100%
rename from mp/src/game/server/playerlocaldata.cpp
rename to src/game/server/playerlocaldata.cpp
diff --git a/mp/src/game/server/playerlocaldata.h b/src/game/server/playerlocaldata.h
similarity index 100%
rename from mp/src/game/server/playerlocaldata.h
rename to src/game/server/playerlocaldata.h
diff --git a/mp/src/game/server/plugin_check.cpp b/src/game/server/plugin_check.cpp
similarity index 100%
rename from mp/src/game/server/plugin_check.cpp
rename to src/game/server/plugin_check.cpp
diff --git a/mp/src/game/server/point_camera.cpp b/src/game/server/point_camera.cpp
similarity index 100%
rename from mp/src/game/server/point_camera.cpp
rename to src/game/server/point_camera.cpp
diff --git a/mp/src/game/server/point_camera.h b/src/game/server/point_camera.h
similarity index 100%
rename from mp/src/game/server/point_camera.h
rename to src/game/server/point_camera.h
diff --git a/mp/src/game/server/point_devshot_camera.cpp b/src/game/server/point_devshot_camera.cpp
similarity index 100%
rename from mp/src/game/server/point_devshot_camera.cpp
rename to src/game/server/point_devshot_camera.cpp
diff --git a/mp/src/game/server/point_playermoveconstraint.cpp b/src/game/server/point_playermoveconstraint.cpp
similarity index 100%
rename from mp/src/game/server/point_playermoveconstraint.cpp
rename to src/game/server/point_playermoveconstraint.cpp
diff --git a/mp/src/game/server/point_spotlight.cpp b/src/game/server/point_spotlight.cpp
similarity index 100%
rename from mp/src/game/server/point_spotlight.cpp
rename to src/game/server/point_spotlight.cpp
diff --git a/mp/src/game/server/point_template.cpp b/src/game/server/point_template.cpp
similarity index 100%
rename from mp/src/game/server/point_template.cpp
rename to src/game/server/point_template.cpp
diff --git a/mp/src/game/server/point_template.h b/src/game/server/point_template.h
similarity index 100%
rename from mp/src/game/server/point_template.h
rename to src/game/server/point_template.h
diff --git a/mp/src/game/server/pointanglesensor.cpp b/src/game/server/pointanglesensor.cpp
similarity index 100%
rename from mp/src/game/server/pointanglesensor.cpp
rename to src/game/server/pointanglesensor.cpp
diff --git a/mp/src/game/server/pointhurt.cpp b/src/game/server/pointhurt.cpp
similarity index 100%
rename from mp/src/game/server/pointhurt.cpp
rename to src/game/server/pointhurt.cpp
diff --git a/mp/src/game/server/pointteleport.cpp b/src/game/server/pointteleport.cpp
similarity index 100%
rename from mp/src/game/server/pointteleport.cpp
rename to src/game/server/pointteleport.cpp
diff --git a/mp/src/game/server/props.cpp b/src/game/server/props.cpp
similarity index 100%
rename from mp/src/game/server/props.cpp
rename to src/game/server/props.cpp
diff --git a/mp/src/game/server/props.h b/src/game/server/props.h
similarity index 100%
rename from mp/src/game/server/props.h
rename to src/game/server/props.h
diff --git a/mp/src/game/server/pushentity.h b/src/game/server/pushentity.h
similarity index 100%
rename from mp/src/game/server/pushentity.h
rename to src/game/server/pushentity.h
diff --git a/mp/src/game/server/ragdoll_manager.cpp b/src/game/server/ragdoll_manager.cpp
similarity index 100%
rename from mp/src/game/server/ragdoll_manager.cpp
rename to src/game/server/ragdoll_manager.cpp
diff --git a/mp/src/game/server/recipientfilter.cpp b/src/game/server/recipientfilter.cpp
similarity index 100%
rename from mp/src/game/server/recipientfilter.cpp
rename to src/game/server/recipientfilter.cpp
diff --git a/mp/src/game/server/recipientfilter.h b/src/game/server/recipientfilter.h
similarity index 100%
rename from mp/src/game/server/recipientfilter.h
rename to src/game/server/recipientfilter.h
diff --git a/mp/src/game/server/rope.cpp b/src/game/server/rope.cpp
similarity index 100%
rename from mp/src/game/server/rope.cpp
rename to src/game/server/rope.cpp
diff --git a/mp/src/game/server/rope.h b/src/game/server/rope.h
similarity index 100%
rename from mp/src/game/server/rope.h
rename to src/game/server/rope.h
diff --git a/mp/src/game/server/saverestore_gamedll.cpp b/src/game/server/saverestore_gamedll.cpp
similarity index 100%
rename from mp/src/game/server/saverestore_gamedll.cpp
rename to src/game/server/saverestore_gamedll.cpp
diff --git a/mp/src/game/server/sceneentity.cpp b/src/game/server/sceneentity.cpp
similarity index 100%
rename from mp/src/game/server/sceneentity.cpp
rename to src/game/server/sceneentity.cpp
diff --git a/mp/src/game/server/sceneentity.h b/src/game/server/sceneentity.h
similarity index 100%
rename from mp/src/game/server/sceneentity.h
rename to src/game/server/sceneentity.h
diff --git a/mp/src/game/server/scratchpad_gamedll_helpers.cpp b/src/game/server/scratchpad_gamedll_helpers.cpp
similarity index 100%
rename from mp/src/game/server/scratchpad_gamedll_helpers.cpp
rename to src/game/server/scratchpad_gamedll_helpers.cpp
diff --git a/mp/src/game/server/scratchpad_gamedll_helpers.h b/src/game/server/scratchpad_gamedll_helpers.h
similarity index 100%
rename from mp/src/game/server/scratchpad_gamedll_helpers.h
rename to src/game/server/scratchpad_gamedll_helpers.h
diff --git a/mp/src/game/server/scripted.cpp b/src/game/server/scripted.cpp
similarity index 100%
rename from mp/src/game/server/scripted.cpp
rename to src/game/server/scripted.cpp
diff --git a/mp/src/game/server/scripted.h b/src/game/server/scripted.h
similarity index 100%
rename from mp/src/game/server/scripted.h
rename to src/game/server/scripted.h
diff --git a/mp/src/game/server/scriptedtarget.cpp b/src/game/server/scriptedtarget.cpp
similarity index 100%
rename from mp/src/game/server/scriptedtarget.cpp
rename to src/game/server/scriptedtarget.cpp
diff --git a/mp/src/game/server/scriptedtarget.h b/src/game/server/scriptedtarget.h
similarity index 100%
rename from mp/src/game/server/scriptedtarget.h
rename to src/game/server/scriptedtarget.h
diff --git a/mp/src/game/server/sdk/sdk_bot_temp.cpp b/src/game/server/sdk/sdk_bot_temp.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_bot_temp.cpp
rename to src/game/server/sdk/sdk_bot_temp.cpp
diff --git a/mp/src/game/server/sdk/sdk_bot_temp.h b/src/game/server/sdk/sdk_bot_temp.h
similarity index 100%
rename from mp/src/game/server/sdk/sdk_bot_temp.h
rename to src/game/server/sdk/sdk_bot_temp.h
diff --git a/mp/src/game/server/sdk/sdk_brushentity.cpp b/src/game/server/sdk/sdk_brushentity.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_brushentity.cpp
rename to src/game/server/sdk/sdk_brushentity.cpp
diff --git a/mp/src/game/server/sdk/sdk_client.cpp b/src/game/server/sdk/sdk_client.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_client.cpp
rename to src/game/server/sdk/sdk_client.cpp
diff --git a/mp/src/game/server/sdk/sdk_env_message.cpp b/src/game/server/sdk/sdk_env_message.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_env_message.cpp
rename to src/game/server/sdk/sdk_env_message.cpp
diff --git a/mp/src/game/server/sdk/sdk_env_sparkler.cpp b/src/game/server/sdk/sdk_env_sparkler.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_env_sparkler.cpp
rename to src/game/server/sdk/sdk_env_sparkler.cpp
diff --git a/mp/src/game/server/sdk/sdk_eventlog.cpp b/src/game/server/sdk/sdk_eventlog.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_eventlog.cpp
rename to src/game/server/sdk/sdk_eventlog.cpp
diff --git a/mp/src/game/server/sdk/sdk_gameinterface.cpp b/src/game/server/sdk/sdk_gameinterface.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_gameinterface.cpp
rename to src/game/server/sdk/sdk_gameinterface.cpp
diff --git a/mp/src/game/server/sdk/sdk_logicalentity.cpp b/src/game/server/sdk/sdk_logicalentity.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_logicalentity.cpp
rename to src/game/server/sdk/sdk_logicalentity.cpp
diff --git a/mp/src/game/server/sdk/sdk_modelentity.cpp b/src/game/server/sdk/sdk_modelentity.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_modelentity.cpp
rename to src/game/server/sdk/sdk_modelentity.cpp
diff --git a/mp/src/game/server/sdk/sdk_player.cpp b/src/game/server/sdk/sdk_player.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_player.cpp
rename to src/game/server/sdk/sdk_player.cpp
diff --git a/mp/src/game/server/sdk/sdk_player.h b/src/game/server/sdk/sdk_player.h
similarity index 100%
rename from mp/src/game/server/sdk/sdk_player.h
rename to src/game/server/sdk/sdk_player.h
diff --git a/mp/src/game/server/sdk/sdk_playermove.cpp b/src/game/server/sdk/sdk_playermove.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_playermove.cpp
rename to src/game/server/sdk/sdk_playermove.cpp
diff --git a/mp/src/game/server/sdk/sdk_team.cpp b/src/game/server/sdk/sdk_team.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_team.cpp
rename to src/game/server/sdk/sdk_team.cpp
diff --git a/mp/src/game/server/sdk/sdk_team.h b/src/game/server/sdk/sdk_team.h
similarity index 100%
rename from mp/src/game/server/sdk/sdk_team.h
rename to src/game/server/sdk/sdk_team.h
diff --git a/mp/src/game/server/sdk/sdk_vehicle_jeep.cpp b/src/game/server/sdk/sdk_vehicle_jeep.cpp
similarity index 100%
rename from mp/src/game/server/sdk/sdk_vehicle_jeep.cpp
rename to src/game/server/sdk/sdk_vehicle_jeep.cpp
diff --git a/mp/src/game/server/sdk/te_firebullets.cpp b/src/game/server/sdk/te_firebullets.cpp
similarity index 100%
rename from mp/src/game/server/sdk/te_firebullets.cpp
rename to src/game/server/sdk/te_firebullets.cpp
diff --git a/mp/src/game/server/sdk/te_firebullets.h b/src/game/server/sdk/te_firebullets.h
similarity index 100%
rename from mp/src/game/server/sdk/te_firebullets.h
rename to src/game/server/sdk/te_firebullets.h
diff --git a/mp/src/game/server/sendproxy.cpp b/src/game/server/sendproxy.cpp
similarity index 100%
rename from mp/src/game/server/sendproxy.cpp
rename to src/game/server/sendproxy.cpp
diff --git a/mp/src/game/server/sendproxy.h b/src/game/server/sendproxy.h
similarity index 100%
rename from mp/src/game/server/sendproxy.h
rename to src/game/server/sendproxy.h
diff --git a/mp/src/game/server/server_base.vpc b/src/game/server/server_base.vpc
similarity index 100%
rename from mp/src/game/server/server_base.vpc
rename to src/game/server/server_base.vpc
diff --git a/mp/src/game/server/server_hl2mp.vpc b/src/game/server/server_hl2mp.vpc
similarity index 100%
rename from mp/src/game/server/server_hl2mp.vpc
rename to src/game/server/server_hl2mp.vpc
diff --git a/mp/src/game/server/serverbenchmark_base.cpp b/src/game/server/serverbenchmark_base.cpp
similarity index 100%
rename from mp/src/game/server/serverbenchmark_base.cpp
rename to src/game/server/serverbenchmark_base.cpp
diff --git a/mp/src/game/server/serverbenchmark_base.h b/src/game/server/serverbenchmark_base.h
similarity index 100%
rename from mp/src/game/server/serverbenchmark_base.h
rename to src/game/server/serverbenchmark_base.h
diff --git a/mp/src/game/server/shadowcontrol.cpp b/src/game/server/shadowcontrol.cpp
similarity index 100%
rename from mp/src/game/server/shadowcontrol.cpp
rename to src/game/server/shadowcontrol.cpp
diff --git a/mp/src/game/server/slideshow_display.cpp b/src/game/server/slideshow_display.cpp
similarity index 100%
rename from mp/src/game/server/slideshow_display.cpp
rename to src/game/server/slideshow_display.cpp
diff --git a/mp/src/game/server/smoke_trail.cpp b/src/game/server/smoke_trail.cpp
similarity index 100%
rename from mp/src/game/server/smoke_trail.cpp
rename to src/game/server/smoke_trail.cpp
diff --git a/mp/src/game/server/smoke_trail.h b/src/game/server/smoke_trail.h
similarity index 100%
rename from mp/src/game/server/smoke_trail.h
rename to src/game/server/smoke_trail.h
diff --git a/mp/src/game/server/smokestack.cpp b/src/game/server/smokestack.cpp
similarity index 100%
rename from mp/src/game/server/smokestack.cpp
rename to src/game/server/smokestack.cpp
diff --git a/mp/src/game/server/smokestack.h b/src/game/server/smokestack.h
similarity index 100%
rename from mp/src/game/server/smokestack.h
rename to src/game/server/smokestack.h
diff --git a/mp/src/game/server/sound.cpp b/src/game/server/sound.cpp
similarity index 100%
rename from mp/src/game/server/sound.cpp
rename to src/game/server/sound.cpp
diff --git a/mp/src/game/server/soundent.cpp b/src/game/server/soundent.cpp
similarity index 100%
rename from mp/src/game/server/soundent.cpp
rename to src/game/server/soundent.cpp
diff --git a/mp/src/game/server/soundent.h b/src/game/server/soundent.h
similarity index 100%
rename from mp/src/game/server/soundent.h
rename to src/game/server/soundent.h
diff --git a/mp/src/game/server/soundscape.cpp b/src/game/server/soundscape.cpp
similarity index 100%
rename from mp/src/game/server/soundscape.cpp
rename to src/game/server/soundscape.cpp
diff --git a/mp/src/game/server/soundscape.h b/src/game/server/soundscape.h
similarity index 100%
rename from mp/src/game/server/soundscape.h
rename to src/game/server/soundscape.h
diff --git a/mp/src/game/server/soundscape_system.cpp b/src/game/server/soundscape_system.cpp
similarity index 100%
rename from mp/src/game/server/soundscape_system.cpp
rename to src/game/server/soundscape_system.cpp
diff --git a/mp/src/game/server/soundscape_system.h b/src/game/server/soundscape_system.h
similarity index 100%
rename from mp/src/game/server/soundscape_system.h
rename to src/game/server/soundscape_system.h
diff --git a/mp/src/game/server/spark.h b/src/game/server/spark.h
similarity index 100%
rename from mp/src/game/server/spark.h
rename to src/game/server/spark.h
diff --git a/mp/src/game/server/spotlightend.cpp b/src/game/server/spotlightend.cpp
similarity index 100%
rename from mp/src/game/server/spotlightend.cpp
rename to src/game/server/spotlightend.cpp
diff --git a/mp/src/game/server/spotlightend.h b/src/game/server/spotlightend.h
similarity index 100%
rename from mp/src/game/server/spotlightend.h
rename to src/game/server/spotlightend.h
diff --git a/mp/src/game/server/sprite_perfmonitor.cpp b/src/game/server/sprite_perfmonitor.cpp
similarity index 100%
rename from mp/src/game/server/sprite_perfmonitor.cpp
rename to src/game/server/sprite_perfmonitor.cpp
diff --git a/mp/src/game/server/stdafx.cpp b/src/game/server/stdafx.cpp
similarity index 100%
rename from mp/src/game/server/stdafx.cpp
rename to src/game/server/stdafx.cpp
diff --git a/mp/src/game/server/steamjet.cpp b/src/game/server/steamjet.cpp
similarity index 100%
rename from mp/src/game/server/steamjet.cpp
rename to src/game/server/steamjet.cpp
diff --git a/mp/src/game/server/steamjet.h b/src/game/server/steamjet.h
similarity index 100%
rename from mp/src/game/server/steamjet.h
rename to src/game/server/steamjet.h
diff --git a/mp/src/game/server/subs.cpp b/src/game/server/subs.cpp
similarity index 100%
rename from mp/src/game/server/subs.cpp
rename to src/game/server/subs.cpp
diff --git a/mp/src/game/server/sun.cpp b/src/game/server/sun.cpp
similarity index 100%
rename from mp/src/game/server/sun.cpp
rename to src/game/server/sun.cpp
diff --git a/mp/src/game/server/tactical_mission.cpp b/src/game/server/tactical_mission.cpp
similarity index 100%
rename from mp/src/game/server/tactical_mission.cpp
rename to src/game/server/tactical_mission.cpp
diff --git a/mp/src/game/server/tactical_mission.h b/src/game/server/tactical_mission.h
similarity index 100%
rename from mp/src/game/server/tactical_mission.h
rename to src/game/server/tactical_mission.h
diff --git a/mp/src/game/server/tanktrain.cpp b/src/game/server/tanktrain.cpp
similarity index 100%
rename from mp/src/game/server/tanktrain.cpp
rename to src/game/server/tanktrain.cpp
diff --git a/mp/src/game/server/te.cpp b/src/game/server/te.cpp
similarity index 100%
rename from mp/src/game/server/te.cpp
rename to src/game/server/te.cpp
diff --git a/mp/src/game/server/te.h b/src/game/server/te.h
similarity index 100%
rename from mp/src/game/server/te.h
rename to src/game/server/te.h
diff --git a/mp/src/game/server/te_armorricochet.cpp b/src/game/server/te_armorricochet.cpp
similarity index 100%
rename from mp/src/game/server/te_armorricochet.cpp
rename to src/game/server/te_armorricochet.cpp
diff --git a/mp/src/game/server/te_basebeam.cpp b/src/game/server/te_basebeam.cpp
similarity index 100%
rename from mp/src/game/server/te_basebeam.cpp
rename to src/game/server/te_basebeam.cpp
diff --git a/mp/src/game/server/te_basebeam.h b/src/game/server/te_basebeam.h
similarity index 100%
rename from mp/src/game/server/te_basebeam.h
rename to src/game/server/te_basebeam.h
diff --git a/mp/src/game/server/te_beamentpoint.cpp b/src/game/server/te_beamentpoint.cpp
similarity index 100%
rename from mp/src/game/server/te_beamentpoint.cpp
rename to src/game/server/te_beamentpoint.cpp
diff --git a/mp/src/game/server/te_beaments.cpp b/src/game/server/te_beaments.cpp
similarity index 100%
rename from mp/src/game/server/te_beaments.cpp
rename to src/game/server/te_beaments.cpp
diff --git a/mp/src/game/server/te_beamfollow.cpp b/src/game/server/te_beamfollow.cpp
similarity index 100%
rename from mp/src/game/server/te_beamfollow.cpp
rename to src/game/server/te_beamfollow.cpp
diff --git a/mp/src/game/server/te_beamlaser.cpp b/src/game/server/te_beamlaser.cpp
similarity index 100%
rename from mp/src/game/server/te_beamlaser.cpp
rename to src/game/server/te_beamlaser.cpp
diff --git a/mp/src/game/server/te_beampoints.cpp b/src/game/server/te_beampoints.cpp
similarity index 100%
rename from mp/src/game/server/te_beampoints.cpp
rename to src/game/server/te_beampoints.cpp
diff --git a/mp/src/game/server/te_beamring.cpp b/src/game/server/te_beamring.cpp
similarity index 100%
rename from mp/src/game/server/te_beamring.cpp
rename to src/game/server/te_beamring.cpp
diff --git a/mp/src/game/server/te_beamringpoint.cpp b/src/game/server/te_beamringpoint.cpp
similarity index 100%
rename from mp/src/game/server/te_beamringpoint.cpp
rename to src/game/server/te_beamringpoint.cpp
diff --git a/mp/src/game/server/te_beamspline.cpp b/src/game/server/te_beamspline.cpp
similarity index 100%
rename from mp/src/game/server/te_beamspline.cpp
rename to src/game/server/te_beamspline.cpp
diff --git a/mp/src/game/server/te_bloodsprite.cpp b/src/game/server/te_bloodsprite.cpp
similarity index 100%
rename from mp/src/game/server/te_bloodsprite.cpp
rename to src/game/server/te_bloodsprite.cpp
diff --git a/mp/src/game/server/te_bloodstream.cpp b/src/game/server/te_bloodstream.cpp
similarity index 100%
rename from mp/src/game/server/te_bloodstream.cpp
rename to src/game/server/te_bloodstream.cpp
diff --git a/mp/src/game/server/te_breakmodel.cpp b/src/game/server/te_breakmodel.cpp
similarity index 100%
rename from mp/src/game/server/te_breakmodel.cpp
rename to src/game/server/te_breakmodel.cpp
diff --git a/mp/src/game/server/te_bspdecal.cpp b/src/game/server/te_bspdecal.cpp
similarity index 100%
rename from mp/src/game/server/te_bspdecal.cpp
rename to src/game/server/te_bspdecal.cpp
diff --git a/mp/src/game/server/te_bubbles.cpp b/src/game/server/te_bubbles.cpp
similarity index 100%
rename from mp/src/game/server/te_bubbles.cpp
rename to src/game/server/te_bubbles.cpp
diff --git a/mp/src/game/server/te_bubbletrail.cpp b/src/game/server/te_bubbletrail.cpp
similarity index 100%
rename from mp/src/game/server/te_bubbletrail.cpp
rename to src/game/server/te_bubbletrail.cpp
diff --git a/mp/src/game/server/te_clientprojectile.cpp b/src/game/server/te_clientprojectile.cpp
similarity index 100%
rename from mp/src/game/server/te_clientprojectile.cpp
rename to src/game/server/te_clientprojectile.cpp
diff --git a/mp/src/game/server/te_decal.cpp b/src/game/server/te_decal.cpp
similarity index 100%
rename from mp/src/game/server/te_decal.cpp
rename to src/game/server/te_decal.cpp
diff --git a/mp/src/game/server/te_dynamiclight.cpp b/src/game/server/te_dynamiclight.cpp
similarity index 100%
rename from mp/src/game/server/te_dynamiclight.cpp
rename to src/game/server/te_dynamiclight.cpp
diff --git a/mp/src/game/server/te_effect_dispatch.cpp b/src/game/server/te_effect_dispatch.cpp
similarity index 100%
rename from mp/src/game/server/te_effect_dispatch.cpp
rename to src/game/server/te_effect_dispatch.cpp
diff --git a/mp/src/game/server/te_effect_dispatch.h b/src/game/server/te_effect_dispatch.h
similarity index 100%
rename from mp/src/game/server/te_effect_dispatch.h
rename to src/game/server/te_effect_dispatch.h
diff --git a/mp/src/game/server/te_energysplash.cpp b/src/game/server/te_energysplash.cpp
similarity index 100%
rename from mp/src/game/server/te_energysplash.cpp
rename to src/game/server/te_energysplash.cpp
diff --git a/mp/src/game/server/te_explosion.cpp b/src/game/server/te_explosion.cpp
similarity index 100%
rename from mp/src/game/server/te_explosion.cpp
rename to src/game/server/te_explosion.cpp
diff --git a/mp/src/game/server/te_fizz.cpp b/src/game/server/te_fizz.cpp
similarity index 100%
rename from mp/src/game/server/te_fizz.cpp
rename to src/game/server/te_fizz.cpp
diff --git a/mp/src/game/server/te_footprintdecal.cpp b/src/game/server/te_footprintdecal.cpp
similarity index 100%
rename from mp/src/game/server/te_footprintdecal.cpp
rename to src/game/server/te_footprintdecal.cpp
diff --git a/mp/src/game/server/te_glassshatter.cpp b/src/game/server/te_glassshatter.cpp
similarity index 100%
rename from mp/src/game/server/te_glassshatter.cpp
rename to src/game/server/te_glassshatter.cpp
diff --git a/mp/src/game/server/te_glowsprite.cpp b/src/game/server/te_glowsprite.cpp
similarity index 100%
rename from mp/src/game/server/te_glowsprite.cpp
rename to src/game/server/te_glowsprite.cpp
diff --git a/mp/src/game/server/te_impact.cpp b/src/game/server/te_impact.cpp
similarity index 100%
rename from mp/src/game/server/te_impact.cpp
rename to src/game/server/te_impact.cpp
diff --git a/mp/src/game/server/te_killplayerattachments.cpp b/src/game/server/te_killplayerattachments.cpp
similarity index 100%
rename from mp/src/game/server/te_killplayerattachments.cpp
rename to src/game/server/te_killplayerattachments.cpp
diff --git a/mp/src/game/server/te_largefunnel.cpp b/src/game/server/te_largefunnel.cpp
similarity index 100%
rename from mp/src/game/server/te_largefunnel.cpp
rename to src/game/server/te_largefunnel.cpp
diff --git a/mp/src/game/server/te_muzzleflash.cpp b/src/game/server/te_muzzleflash.cpp
similarity index 100%
rename from mp/src/game/server/te_muzzleflash.cpp
rename to src/game/server/te_muzzleflash.cpp
diff --git a/mp/src/game/server/te_particlesystem.cpp b/src/game/server/te_particlesystem.cpp
similarity index 100%
rename from mp/src/game/server/te_particlesystem.cpp
rename to src/game/server/te_particlesystem.cpp
diff --git a/mp/src/game/server/te_particlesystem.h b/src/game/server/te_particlesystem.h
similarity index 100%
rename from mp/src/game/server/te_particlesystem.h
rename to src/game/server/te_particlesystem.h
diff --git a/mp/src/game/server/te_physicsprop.cpp b/src/game/server/te_physicsprop.cpp
similarity index 100%
rename from mp/src/game/server/te_physicsprop.cpp
rename to src/game/server/te_physicsprop.cpp
diff --git a/mp/src/game/server/te_playerdecal.cpp b/src/game/server/te_playerdecal.cpp
similarity index 100%
rename from mp/src/game/server/te_playerdecal.cpp
rename to src/game/server/te_playerdecal.cpp
diff --git a/mp/src/game/server/te_projecteddecal.cpp b/src/game/server/te_projecteddecal.cpp
similarity index 100%
rename from mp/src/game/server/te_projecteddecal.cpp
rename to src/game/server/te_projecteddecal.cpp
diff --git a/mp/src/game/server/te_showline.cpp b/src/game/server/te_showline.cpp
similarity index 100%
rename from mp/src/game/server/te_showline.cpp
rename to src/game/server/te_showline.cpp
diff --git a/mp/src/game/server/te_smoke.cpp b/src/game/server/te_smoke.cpp
similarity index 100%
rename from mp/src/game/server/te_smoke.cpp
rename to src/game/server/te_smoke.cpp
diff --git a/mp/src/game/server/te_sparks.cpp b/src/game/server/te_sparks.cpp
similarity index 100%
rename from mp/src/game/server/te_sparks.cpp
rename to src/game/server/te_sparks.cpp
diff --git a/mp/src/game/server/te_sprite.cpp b/src/game/server/te_sprite.cpp
similarity index 100%
rename from mp/src/game/server/te_sprite.cpp
rename to src/game/server/te_sprite.cpp
diff --git a/mp/src/game/server/te_spritespray.cpp b/src/game/server/te_spritespray.cpp
similarity index 100%
rename from mp/src/game/server/te_spritespray.cpp
rename to src/game/server/te_spritespray.cpp
diff --git a/mp/src/game/server/te_worlddecal.cpp b/src/game/server/te_worlddecal.cpp
similarity index 100%
rename from mp/src/game/server/te_worlddecal.cpp
rename to src/game/server/te_worlddecal.cpp
diff --git a/mp/src/game/server/team.cpp b/src/game/server/team.cpp
similarity index 100%
rename from mp/src/game/server/team.cpp
rename to src/game/server/team.cpp
diff --git a/mp/src/game/server/team.h b/src/game/server/team.h
similarity index 100%
rename from mp/src/game/server/team.h
rename to src/game/server/team.h
diff --git a/mp/src/game/server/team_control_point.cpp b/src/game/server/team_control_point.cpp
similarity index 100%
rename from mp/src/game/server/team_control_point.cpp
rename to src/game/server/team_control_point.cpp
diff --git a/mp/src/game/server/team_control_point.h b/src/game/server/team_control_point.h
similarity index 100%
rename from mp/src/game/server/team_control_point.h
rename to src/game/server/team_control_point.h
diff --git a/mp/src/game/server/team_control_point_master.cpp b/src/game/server/team_control_point_master.cpp
similarity index 100%
rename from mp/src/game/server/team_control_point_master.cpp
rename to src/game/server/team_control_point_master.cpp
diff --git a/mp/src/game/server/team_control_point_master.h b/src/game/server/team_control_point_master.h
similarity index 100%
rename from mp/src/game/server/team_control_point_master.h
rename to src/game/server/team_control_point_master.h
diff --git a/mp/src/game/server/team_control_point_round.cpp b/src/game/server/team_control_point_round.cpp
similarity index 100%
rename from mp/src/game/server/team_control_point_round.cpp
rename to src/game/server/team_control_point_round.cpp
diff --git a/mp/src/game/server/team_control_point_round.h b/src/game/server/team_control_point_round.h
similarity index 100%
rename from mp/src/game/server/team_control_point_round.h
rename to src/game/server/team_control_point_round.h
diff --git a/mp/src/game/server/team_objectiveresource.cpp b/src/game/server/team_objectiveresource.cpp
similarity index 100%
rename from mp/src/game/server/team_objectiveresource.cpp
rename to src/game/server/team_objectiveresource.cpp
diff --git a/mp/src/game/server/team_objectiveresource.h b/src/game/server/team_objectiveresource.h
similarity index 100%
rename from mp/src/game/server/team_objectiveresource.h
rename to src/game/server/team_objectiveresource.h
diff --git a/mp/src/game/server/team_spawnpoint.cpp b/src/game/server/team_spawnpoint.cpp
similarity index 100%
rename from mp/src/game/server/team_spawnpoint.cpp
rename to src/game/server/team_spawnpoint.cpp
diff --git a/mp/src/game/server/team_spawnpoint.h b/src/game/server/team_spawnpoint.h
similarity index 100%
rename from mp/src/game/server/team_spawnpoint.h
rename to src/game/server/team_spawnpoint.h
diff --git a/mp/src/game/server/team_train_watcher.cpp b/src/game/server/team_train_watcher.cpp
similarity index 100%
rename from mp/src/game/server/team_train_watcher.cpp
rename to src/game/server/team_train_watcher.cpp
diff --git a/mp/src/game/server/team_train_watcher.h b/src/game/server/team_train_watcher.h
similarity index 100%
rename from mp/src/game/server/team_train_watcher.h
rename to src/game/server/team_train_watcher.h
diff --git a/mp/src/game/server/tempmonster.cpp b/src/game/server/tempmonster.cpp
similarity index 100%
rename from mp/src/game/server/tempmonster.cpp
rename to src/game/server/tempmonster.cpp
diff --git a/mp/src/game/server/tesla.cpp b/src/game/server/tesla.cpp
similarity index 100%
rename from mp/src/game/server/tesla.cpp
rename to src/game/server/tesla.cpp
diff --git a/mp/src/game/server/tesla.h b/src/game/server/tesla.h
similarity index 100%
rename from mp/src/game/server/tesla.h
rename to src/game/server/tesla.h
diff --git a/mp/src/game/server/test_proxytoggle.cpp b/src/game/server/test_proxytoggle.cpp
similarity index 100%
rename from mp/src/game/server/test_proxytoggle.cpp
rename to src/game/server/test_proxytoggle.cpp
diff --git a/mp/src/game/server/test_stressentities.cpp b/src/game/server/test_stressentities.cpp
similarity index 100%
rename from mp/src/game/server/test_stressentities.cpp
rename to src/game/server/test_stressentities.cpp
diff --git a/mp/src/game/server/test_stressentities.h b/src/game/server/test_stressentities.h
similarity index 100%
rename from mp/src/game/server/test_stressentities.h
rename to src/game/server/test_stressentities.h
diff --git a/mp/src/game/server/testfunctions.cpp b/src/game/server/testfunctions.cpp
similarity index 100%
rename from mp/src/game/server/testfunctions.cpp
rename to src/game/server/testfunctions.cpp
diff --git a/mp/src/game/server/testtraceline.cpp b/src/game/server/testtraceline.cpp
similarity index 100%
rename from mp/src/game/server/testtraceline.cpp
rename to src/game/server/testtraceline.cpp
diff --git a/mp/src/game/server/textstatsmgr.cpp b/src/game/server/textstatsmgr.cpp
similarity index 100%
rename from mp/src/game/server/textstatsmgr.cpp
rename to src/game/server/textstatsmgr.cpp
diff --git a/mp/src/game/server/textstatsmgr.h b/src/game/server/textstatsmgr.h
similarity index 100%
rename from mp/src/game/server/textstatsmgr.h
rename to src/game/server/textstatsmgr.h
diff --git a/mp/src/game/server/timedeventmgr.cpp b/src/game/server/timedeventmgr.cpp
similarity index 100%
rename from mp/src/game/server/timedeventmgr.cpp
rename to src/game/server/timedeventmgr.cpp
diff --git a/mp/src/game/server/timedeventmgr.h b/src/game/server/timedeventmgr.h
similarity index 100%
rename from mp/src/game/server/timedeventmgr.h
rename to src/game/server/timedeventmgr.h
diff --git a/mp/src/game/server/toolframework_server.cpp b/src/game/server/toolframework_server.cpp
similarity index 100%
rename from mp/src/game/server/toolframework_server.cpp
rename to src/game/server/toolframework_server.cpp
diff --git a/mp/src/game/server/toolframework_server.h b/src/game/server/toolframework_server.h
similarity index 100%
rename from mp/src/game/server/toolframework_server.h
rename to src/game/server/toolframework_server.h
diff --git a/mp/src/game/server/trains.cpp b/src/game/server/trains.cpp
similarity index 100%
rename from mp/src/game/server/trains.cpp
rename to src/game/server/trains.cpp
diff --git a/mp/src/game/server/trains.h b/src/game/server/trains.h
similarity index 100%
rename from mp/src/game/server/trains.h
rename to src/game/server/trains.h
diff --git a/mp/src/game/server/trigger_area_capture.cpp b/src/game/server/trigger_area_capture.cpp
similarity index 100%
rename from mp/src/game/server/trigger_area_capture.cpp
rename to src/game/server/trigger_area_capture.cpp
diff --git a/mp/src/game/server/trigger_area_capture.h b/src/game/server/trigger_area_capture.h
similarity index 100%
rename from mp/src/game/server/trigger_area_capture.h
rename to src/game/server/trigger_area_capture.h
diff --git a/mp/src/game/server/trigger_portal.cpp b/src/game/server/trigger_portal.cpp
similarity index 100%
rename from mp/src/game/server/trigger_portal.cpp
rename to src/game/server/trigger_portal.cpp
diff --git a/mp/src/game/server/triggers.cpp b/src/game/server/triggers.cpp
similarity index 100%
rename from mp/src/game/server/triggers.cpp
rename to src/game/server/triggers.cpp
diff --git a/mp/src/game/server/triggers.h b/src/game/server/triggers.h
similarity index 100%
rename from mp/src/game/server/triggers.h
rename to src/game/server/triggers.h
diff --git a/mp/src/game/server/util.cpp b/src/game/server/util.cpp
similarity index 100%
rename from mp/src/game/server/util.cpp
rename to src/game/server/util.cpp
diff --git a/mp/src/game/server/util.h b/src/game/server/util.h
similarity index 100%
rename from mp/src/game/server/util.h
rename to src/game/server/util.h
diff --git a/mp/src/game/server/variant_t.cpp b/src/game/server/variant_t.cpp
similarity index 100%
rename from mp/src/game/server/variant_t.cpp
rename to src/game/server/variant_t.cpp
diff --git a/mp/src/game/server/variant_t.h b/src/game/server/variant_t.h
similarity index 100%
rename from mp/src/game/server/variant_t.h
rename to src/game/server/variant_t.h
diff --git a/mp/src/game/server/vehicle_base.cpp b/src/game/server/vehicle_base.cpp
similarity index 100%
rename from mp/src/game/server/vehicle_base.cpp
rename to src/game/server/vehicle_base.cpp
diff --git a/mp/src/game/server/vehicle_base.h b/src/game/server/vehicle_base.h
similarity index 100%
rename from mp/src/game/server/vehicle_base.h
rename to src/game/server/vehicle_base.h
diff --git a/mp/src/game/server/vehicle_baseserver.cpp b/src/game/server/vehicle_baseserver.cpp
similarity index 100%
rename from mp/src/game/server/vehicle_baseserver.cpp
rename to src/game/server/vehicle_baseserver.cpp
diff --git a/mp/src/game/server/vehicle_baseserver.h b/src/game/server/vehicle_baseserver.h
similarity index 100%
rename from mp/src/game/server/vehicle_baseserver.h
rename to src/game/server/vehicle_baseserver.h
diff --git a/mp/src/game/server/vehicle_choreo_generic.cpp b/src/game/server/vehicle_choreo_generic.cpp
similarity index 100%
rename from mp/src/game/server/vehicle_choreo_generic.cpp
rename to src/game/server/vehicle_choreo_generic.cpp
diff --git a/mp/src/game/server/vehicle_sounds.h b/src/game/server/vehicle_sounds.h
similarity index 100%
rename from mp/src/game/server/vehicle_sounds.h
rename to src/game/server/vehicle_sounds.h
diff --git a/mp/src/game/server/vguiscreen.cpp b/src/game/server/vguiscreen.cpp
similarity index 100%
rename from mp/src/game/server/vguiscreen.cpp
rename to src/game/server/vguiscreen.cpp
diff --git a/mp/src/game/server/vguiscreen.h b/src/game/server/vguiscreen.h
similarity index 100%
rename from mp/src/game/server/vguiscreen.h
rename to src/game/server/vguiscreen.h
diff --git a/mp/src/game/server/vote_controller.cpp b/src/game/server/vote_controller.cpp
similarity index 100%
rename from mp/src/game/server/vote_controller.cpp
rename to src/game/server/vote_controller.cpp
diff --git a/mp/src/game/server/vote_controller.h b/src/game/server/vote_controller.h
similarity index 100%
rename from mp/src/game/server/vote_controller.h
rename to src/game/server/vote_controller.h
diff --git a/mp/src/game/server/waterbullet.cpp b/src/game/server/waterbullet.cpp
similarity index 100%
rename from mp/src/game/server/waterbullet.cpp
rename to src/game/server/waterbullet.cpp
diff --git a/mp/src/game/server/waterbullet.h b/src/game/server/waterbullet.h
similarity index 100%
rename from mp/src/game/server/waterbullet.h
rename to src/game/server/waterbullet.h
diff --git a/mp/src/game/server/wcedit.cpp b/src/game/server/wcedit.cpp
similarity index 100%
rename from mp/src/game/server/wcedit.cpp
rename to src/game/server/wcedit.cpp
diff --git a/mp/src/game/server/wcedit.h b/src/game/server/wcedit.h
similarity index 100%
rename from mp/src/game/server/wcedit.h
rename to src/game/server/wcedit.h
diff --git a/mp/src/game/server/weapon_cubemap.cpp b/src/game/server/weapon_cubemap.cpp
similarity index 100%
rename from mp/src/game/server/weapon_cubemap.cpp
rename to src/game/server/weapon_cubemap.cpp
diff --git a/mp/src/game/server/weight_button.cpp b/src/game/server/weight_button.cpp
similarity index 100%
rename from mp/src/game/server/weight_button.cpp
rename to src/game/server/weight_button.cpp
diff --git a/mp/src/game/server/worker_scientist.h b/src/game/server/worker_scientist.h
similarity index 100%
rename from mp/src/game/server/worker_scientist.h
rename to src/game/server/worker_scientist.h
diff --git a/mp/src/game/server/world.cpp b/src/game/server/world.cpp
similarity index 100%
rename from mp/src/game/server/world.cpp
rename to src/game/server/world.cpp
diff --git a/mp/src/game/server/world.h b/src/game/server/world.h
similarity index 100%
rename from mp/src/game/server/world.h
rename to src/game/server/world.h
diff --git a/mp/src/game/shared/EntityParticleTrail_Shared.cpp b/src/game/shared/EntityParticleTrail_Shared.cpp
similarity index 100%
rename from mp/src/game/shared/EntityParticleTrail_Shared.cpp
rename to src/game/shared/EntityParticleTrail_Shared.cpp
diff --git a/mp/src/game/shared/GameEventListener.h b/src/game/shared/GameEventListener.h
similarity index 100%
rename from mp/src/game/shared/GameEventListener.h
rename to src/game/shared/GameEventListener.h
diff --git a/mp/src/game/shared/GameStats.cpp b/src/game/shared/GameStats.cpp
similarity index 100%
rename from mp/src/game/shared/GameStats.cpp
rename to src/game/shared/GameStats.cpp
diff --git a/mp/src/game/shared/IEffects.h b/src/game/shared/IEffects.h
similarity index 100%
rename from mp/src/game/shared/IEffects.h
rename to src/game/shared/IEffects.h
diff --git a/mp/src/game/shared/IVehicle.h b/src/game/shared/IVehicle.h
similarity index 100%
rename from mp/src/game/shared/IVehicle.h
rename to src/game/shared/IVehicle.h
diff --git a/mp/src/game/shared/ModelSoundsCache.cpp b/src/game/shared/ModelSoundsCache.cpp
similarity index 100%
rename from mp/src/game/shared/ModelSoundsCache.cpp
rename to src/game/shared/ModelSoundsCache.cpp
diff --git a/mp/src/game/shared/ModelSoundsCache.h b/src/game/shared/ModelSoundsCache.h
similarity index 100%
rename from mp/src/game/shared/ModelSoundsCache.h
rename to src/game/shared/ModelSoundsCache.h
diff --git a/mp/src/game/shared/Multiplayer/multiplayer_animstate.cpp b/src/game/shared/Multiplayer/multiplayer_animstate.cpp
similarity index 100%
rename from mp/src/game/shared/Multiplayer/multiplayer_animstate.cpp
rename to src/game/shared/Multiplayer/multiplayer_animstate.cpp
diff --git a/mp/src/game/shared/Multiplayer/multiplayer_animstate.h b/src/game/shared/Multiplayer/multiplayer_animstate.h
similarity index 100%
rename from mp/src/game/shared/Multiplayer/multiplayer_animstate.h
rename to src/game/shared/Multiplayer/multiplayer_animstate.h
diff --git a/mp/src/game/shared/SceneCache.cpp b/src/game/shared/SceneCache.cpp
similarity index 100%
rename from mp/src/game/shared/SceneCache.cpp
rename to src/game/shared/SceneCache.cpp
diff --git a/mp/src/game/shared/SceneCache.h b/src/game/shared/SceneCache.h
similarity index 100%
rename from mp/src/game/shared/SceneCache.h
rename to src/game/shared/SceneCache.h
diff --git a/mp/src/game/shared/SharedFunctorUtils.cpp b/src/game/shared/SharedFunctorUtils.cpp
similarity index 100%
rename from mp/src/game/shared/SharedFunctorUtils.cpp
rename to src/game/shared/SharedFunctorUtils.cpp
diff --git a/mp/src/game/shared/SharedFunctorUtils.h b/src/game/shared/SharedFunctorUtils.h
similarity index 100%
rename from mp/src/game/shared/SharedFunctorUtils.h
rename to src/game/shared/SharedFunctorUtils.h
diff --git a/mp/src/game/shared/SoundEmitterSystem.cpp b/src/game/shared/SoundEmitterSystem.cpp
similarity index 100%
rename from mp/src/game/shared/SoundEmitterSystem.cpp
rename to src/game/shared/SoundEmitterSystem.cpp
diff --git a/mp/src/game/shared/Sprite.cpp b/src/game/shared/Sprite.cpp
similarity index 100%
rename from mp/src/game/shared/Sprite.cpp
rename to src/game/shared/Sprite.cpp
diff --git a/mp/src/game/shared/Sprite.h b/src/game/shared/Sprite.h
similarity index 100%
rename from mp/src/game/shared/Sprite.h
rename to src/game/shared/Sprite.h
diff --git a/mp/src/game/shared/SpriteTrail.cpp b/src/game/shared/SpriteTrail.cpp
similarity index 100%
rename from mp/src/game/shared/SpriteTrail.cpp
rename to src/game/shared/SpriteTrail.cpp
diff --git a/mp/src/game/shared/SpriteTrail.h b/src/game/shared/SpriteTrail.h
similarity index 100%
rename from mp/src/game/shared/SpriteTrail.h
rename to src/game/shared/SpriteTrail.h
diff --git a/mp/src/game/shared/achievement_saverestore.cpp b/src/game/shared/achievement_saverestore.cpp
similarity index 100%
rename from mp/src/game/shared/achievement_saverestore.cpp
rename to src/game/shared/achievement_saverestore.cpp
diff --git a/mp/src/game/shared/achievement_saverestore.h b/src/game/shared/achievement_saverestore.h
similarity index 100%
rename from mp/src/game/shared/achievement_saverestore.h
rename to src/game/shared/achievement_saverestore.h
diff --git a/mp/src/game/shared/achievementmgr.cpp b/src/game/shared/achievementmgr.cpp
similarity index 100%
rename from mp/src/game/shared/achievementmgr.cpp
rename to src/game/shared/achievementmgr.cpp
diff --git a/mp/src/game/shared/achievementmgr.h b/src/game/shared/achievementmgr.h
similarity index 100%
rename from mp/src/game/shared/achievementmgr.h
rename to src/game/shared/achievementmgr.h
diff --git a/mp/src/game/shared/achievements_and_stats_interface.h b/src/game/shared/achievements_and_stats_interface.h
similarity index 100%
rename from mp/src/game/shared/achievements_and_stats_interface.h
rename to src/game/shared/achievements_and_stats_interface.h
diff --git a/mp/src/game/shared/achievements_hlx.cpp b/src/game/shared/achievements_hlx.cpp
similarity index 100%
rename from mp/src/game/shared/achievements_hlx.cpp
rename to src/game/shared/achievements_hlx.cpp
diff --git a/mp/src/game/shared/activitylist.cpp b/src/game/shared/activitylist.cpp
similarity index 100%
rename from mp/src/game/shared/activitylist.cpp
rename to src/game/shared/activitylist.cpp
diff --git a/mp/src/game/shared/activitylist.h b/src/game/shared/activitylist.h
similarity index 100%
rename from mp/src/game/shared/activitylist.h
rename to src/game/shared/activitylist.h
diff --git a/mp/src/game/shared/ai_activity.h b/src/game/shared/ai_activity.h
similarity index 100%
rename from mp/src/game/shared/ai_activity.h
rename to src/game/shared/ai_activity.h
diff --git a/mp/src/game/shared/ai_debug_shared.h b/src/game/shared/ai_debug_shared.h
similarity index 100%
rename from mp/src/game/shared/ai_debug_shared.h
rename to src/game/shared/ai_debug_shared.h
diff --git a/mp/src/game/shared/ammodef.cpp b/src/game/shared/ammodef.cpp
similarity index 100%
rename from mp/src/game/shared/ammodef.cpp
rename to src/game/shared/ammodef.cpp
diff --git a/mp/src/game/shared/ammodef.h b/src/game/shared/ammodef.h
similarity index 100%
rename from mp/src/game/shared/ammodef.h
rename to src/game/shared/ammodef.h
diff --git a/mp/src/game/shared/animation.cpp b/src/game/shared/animation.cpp
similarity index 100%
rename from mp/src/game/shared/animation.cpp
rename to src/game/shared/animation.cpp
diff --git a/mp/src/game/shared/animation.h b/src/game/shared/animation.h
similarity index 100%
rename from mp/src/game/shared/animation.h
rename to src/game/shared/animation.h
diff --git a/mp/src/game/shared/apparent_velocity_helper.h b/src/game/shared/apparent_velocity_helper.h
similarity index 100%
rename from mp/src/game/shared/apparent_velocity_helper.h
rename to src/game/shared/apparent_velocity_helper.h
diff --git a/mp/src/game/shared/base_playeranimstate.cpp b/src/game/shared/base_playeranimstate.cpp
similarity index 100%
rename from mp/src/game/shared/base_playeranimstate.cpp
rename to src/game/shared/base_playeranimstate.cpp
diff --git a/mp/src/game/shared/base_playeranimstate.h b/src/game/shared/base_playeranimstate.h
similarity index 100%
rename from mp/src/game/shared/base_playeranimstate.h
rename to src/game/shared/base_playeranimstate.h
diff --git a/mp/src/game/shared/baseachievement.cpp b/src/game/shared/baseachievement.cpp
similarity index 100%
rename from mp/src/game/shared/baseachievement.cpp
rename to src/game/shared/baseachievement.cpp
diff --git a/mp/src/game/shared/baseachievement.h b/src/game/shared/baseachievement.h
similarity index 100%
rename from mp/src/game/shared/baseachievement.h
rename to src/game/shared/baseachievement.h
diff --git a/mp/src/game/shared/basecombatcharacter_shared.cpp b/src/game/shared/basecombatcharacter_shared.cpp
similarity index 100%
rename from mp/src/game/shared/basecombatcharacter_shared.cpp
rename to src/game/shared/basecombatcharacter_shared.cpp
diff --git a/mp/src/game/shared/basecombatweapon_shared.cpp b/src/game/shared/basecombatweapon_shared.cpp
similarity index 100%
rename from mp/src/game/shared/basecombatweapon_shared.cpp
rename to src/game/shared/basecombatweapon_shared.cpp
diff --git a/mp/src/game/shared/basecombatweapon_shared.h b/src/game/shared/basecombatweapon_shared.h
similarity index 100%
rename from mp/src/game/shared/basecombatweapon_shared.h
rename to src/game/shared/basecombatweapon_shared.h
diff --git a/mp/src/game/shared/baseentity_shared.cpp b/src/game/shared/baseentity_shared.cpp
similarity index 100%
rename from mp/src/game/shared/baseentity_shared.cpp
rename to src/game/shared/baseentity_shared.cpp
diff --git a/mp/src/game/shared/baseentity_shared.h b/src/game/shared/baseentity_shared.h
similarity index 100%
rename from mp/src/game/shared/baseentity_shared.h
rename to src/game/shared/baseentity_shared.h
diff --git a/mp/src/game/shared/basegrenade_shared.cpp b/src/game/shared/basegrenade_shared.cpp
similarity index 100%
rename from mp/src/game/shared/basegrenade_shared.cpp
rename to src/game/shared/basegrenade_shared.cpp
diff --git a/mp/src/game/shared/basegrenade_shared.h b/src/game/shared/basegrenade_shared.h
similarity index 100%
rename from mp/src/game/shared/basegrenade_shared.h
rename to src/game/shared/basegrenade_shared.h
diff --git a/mp/src/game/shared/baseparticleentity.cpp b/src/game/shared/baseparticleentity.cpp
similarity index 100%
rename from mp/src/game/shared/baseparticleentity.cpp
rename to src/game/shared/baseparticleentity.cpp
diff --git a/mp/src/game/shared/baseparticleentity.h b/src/game/shared/baseparticleentity.h
similarity index 100%
rename from mp/src/game/shared/baseparticleentity.h
rename to src/game/shared/baseparticleentity.h
diff --git a/mp/src/game/shared/baseplayer_shared.cpp b/src/game/shared/baseplayer_shared.cpp
similarity index 100%
rename from mp/src/game/shared/baseplayer_shared.cpp
rename to src/game/shared/baseplayer_shared.cpp
diff --git a/mp/src/game/shared/baseplayer_shared.h b/src/game/shared/baseplayer_shared.h
similarity index 100%
rename from mp/src/game/shared/baseplayer_shared.h
rename to src/game/shared/baseplayer_shared.h
diff --git a/mp/src/game/shared/baseprojectile.cpp b/src/game/shared/baseprojectile.cpp
similarity index 100%
rename from mp/src/game/shared/baseprojectile.cpp
rename to src/game/shared/baseprojectile.cpp
diff --git a/mp/src/game/shared/baseprojectile.h b/src/game/shared/baseprojectile.h
similarity index 100%
rename from mp/src/game/shared/baseprojectile.h
rename to src/game/shared/baseprojectile.h
diff --git a/mp/src/game/shared/baseviewmodel_shared.cpp b/src/game/shared/baseviewmodel_shared.cpp
similarity index 100%
rename from mp/src/game/shared/baseviewmodel_shared.cpp
rename to src/game/shared/baseviewmodel_shared.cpp
diff --git a/mp/src/game/shared/baseviewmodel_shared.h b/src/game/shared/baseviewmodel_shared.h
similarity index 100%
rename from mp/src/game/shared/baseviewmodel_shared.h
rename to src/game/shared/baseviewmodel_shared.h
diff --git a/mp/src/game/shared/beam_flags.h b/src/game/shared/beam_flags.h
similarity index 100%
rename from mp/src/game/shared/beam_flags.h
rename to src/game/shared/beam_flags.h
diff --git a/mp/src/game/shared/beam_shared.cpp b/src/game/shared/beam_shared.cpp
similarity index 100%
rename from mp/src/game/shared/beam_shared.cpp
rename to src/game/shared/beam_shared.cpp
diff --git a/mp/src/game/shared/beam_shared.h b/src/game/shared/beam_shared.h
similarity index 100%
rename from mp/src/game/shared/beam_shared.h
rename to src/game/shared/beam_shared.h
diff --git a/mp/src/game/shared/cam_thirdperson.cpp b/src/game/shared/cam_thirdperson.cpp
similarity index 100%
rename from mp/src/game/shared/cam_thirdperson.cpp
rename to src/game/shared/cam_thirdperson.cpp
diff --git a/mp/src/game/shared/cam_thirdperson.h b/src/game/shared/cam_thirdperson.h
similarity index 100%
rename from mp/src/game/shared/cam_thirdperson.h
rename to src/game/shared/cam_thirdperson.h
diff --git a/mp/src/game/shared/choreoactor.cpp b/src/game/shared/choreoactor.cpp
similarity index 100%
rename from mp/src/game/shared/choreoactor.cpp
rename to src/game/shared/choreoactor.cpp
diff --git a/mp/src/game/shared/choreoactor.h b/src/game/shared/choreoactor.h
similarity index 100%
rename from mp/src/game/shared/choreoactor.h
rename to src/game/shared/choreoactor.h
diff --git a/mp/src/game/shared/choreochannel.cpp b/src/game/shared/choreochannel.cpp
similarity index 100%
rename from mp/src/game/shared/choreochannel.cpp
rename to src/game/shared/choreochannel.cpp
diff --git a/mp/src/game/shared/choreochannel.h b/src/game/shared/choreochannel.h
similarity index 100%
rename from mp/src/game/shared/choreochannel.h
rename to src/game/shared/choreochannel.h
diff --git a/mp/src/game/shared/choreoevent.cpp b/src/game/shared/choreoevent.cpp
similarity index 100%
rename from mp/src/game/shared/choreoevent.cpp
rename to src/game/shared/choreoevent.cpp
diff --git a/mp/src/game/shared/choreoevent.h b/src/game/shared/choreoevent.h
similarity index 100%
rename from mp/src/game/shared/choreoevent.h
rename to src/game/shared/choreoevent.h
diff --git a/mp/src/game/shared/choreoscene.cpp b/src/game/shared/choreoscene.cpp
similarity index 100%
rename from mp/src/game/shared/choreoscene.cpp
rename to src/game/shared/choreoscene.cpp
diff --git a/mp/src/game/shared/choreoscene.h b/src/game/shared/choreoscene.h
similarity index 100%
rename from mp/src/game/shared/choreoscene.h
rename to src/game/shared/choreoscene.h
diff --git a/mp/src/game/shared/collisionproperty.cpp b/src/game/shared/collisionproperty.cpp
similarity index 100%
rename from mp/src/game/shared/collisionproperty.cpp
rename to src/game/shared/collisionproperty.cpp
diff --git a/mp/src/game/shared/collisionproperty.h b/src/game/shared/collisionproperty.h
similarity index 100%
rename from mp/src/game/shared/collisionproperty.h
rename to src/game/shared/collisionproperty.h
diff --git a/mp/src/game/shared/cs_achievements_and_stats_interface.cpp b/src/game/shared/cs_achievements_and_stats_interface.cpp
similarity index 100%
rename from mp/src/game/shared/cs_achievements_and_stats_interface.cpp
rename to src/game/shared/cs_achievements_and_stats_interface.cpp
diff --git a/mp/src/game/shared/cs_achievements_and_stats_interface.h b/src/game/shared/cs_achievements_and_stats_interface.h
similarity index 100%
rename from mp/src/game/shared/cs_achievements_and_stats_interface.h
rename to src/game/shared/cs_achievements_and_stats_interface.h
diff --git a/mp/src/game/shared/death_pose.cpp b/src/game/shared/death_pose.cpp
similarity index 100%
rename from mp/src/game/shared/death_pose.cpp
rename to src/game/shared/death_pose.cpp
diff --git a/mp/src/game/shared/death_pose.h b/src/game/shared/death_pose.h
similarity index 100%
rename from mp/src/game/shared/death_pose.h
rename to src/game/shared/death_pose.h
diff --git a/mp/src/game/shared/debugoverlay_null.cpp b/src/game/shared/debugoverlay_null.cpp
similarity index 100%
rename from mp/src/game/shared/debugoverlay_null.cpp
rename to src/game/shared/debugoverlay_null.cpp
diff --git a/mp/src/game/shared/debugoverlay_shared.cpp b/src/game/shared/debugoverlay_shared.cpp
similarity index 100%
rename from mp/src/game/shared/debugoverlay_shared.cpp
rename to src/game/shared/debugoverlay_shared.cpp
diff --git a/mp/src/game/shared/debugoverlay_shared.h b/src/game/shared/debugoverlay_shared.h
similarity index 100%
rename from mp/src/game/shared/debugoverlay_shared.h
rename to src/game/shared/debugoverlay_shared.h
diff --git a/mp/src/game/shared/decals.cpp b/src/game/shared/decals.cpp
similarity index 100%
rename from mp/src/game/shared/decals.cpp
rename to src/game/shared/decals.cpp
diff --git a/mp/src/game/shared/decals.h b/src/game/shared/decals.h
similarity index 100%
rename from mp/src/game/shared/decals.h
rename to src/game/shared/decals.h
diff --git a/mp/src/game/shared/econ/ihasowner.h b/src/game/shared/econ/ihasowner.h
similarity index 100%
rename from mp/src/game/shared/econ/ihasowner.h
rename to src/game/shared/econ/ihasowner.h
diff --git a/mp/src/game/shared/effect_color_tables.h b/src/game/shared/effect_color_tables.h
similarity index 100%
rename from mp/src/game/shared/effect_color_tables.h
rename to src/game/shared/effect_color_tables.h
diff --git a/mp/src/game/shared/effect_dispatch_data.cpp b/src/game/shared/effect_dispatch_data.cpp
similarity index 100%
rename from mp/src/game/shared/effect_dispatch_data.cpp
rename to src/game/shared/effect_dispatch_data.cpp
diff --git a/mp/src/game/shared/effect_dispatch_data.h b/src/game/shared/effect_dispatch_data.h
similarity index 100%
rename from mp/src/game/shared/effect_dispatch_data.h
rename to src/game/shared/effect_dispatch_data.h
diff --git a/mp/src/game/shared/ehandle.cpp b/src/game/shared/ehandle.cpp
similarity index 100%
rename from mp/src/game/shared/ehandle.cpp
rename to src/game/shared/ehandle.cpp
diff --git a/mp/src/game/shared/ehandle.h b/src/game/shared/ehandle.h
similarity index 100%
rename from mp/src/game/shared/ehandle.h
rename to src/game/shared/ehandle.h
diff --git a/mp/src/game/shared/entitydatainstantiator.h b/src/game/shared/entitydatainstantiator.h
similarity index 100%
rename from mp/src/game/shared/entitydatainstantiator.h
rename to src/game/shared/entitydatainstantiator.h
diff --git a/mp/src/game/shared/entitylist_base.cpp b/src/game/shared/entitylist_base.cpp
similarity index 100%
rename from mp/src/game/shared/entitylist_base.cpp
rename to src/game/shared/entitylist_base.cpp
diff --git a/mp/src/game/shared/entitylist_base.h b/src/game/shared/entitylist_base.h
similarity index 100%
rename from mp/src/game/shared/entitylist_base.h
rename to src/game/shared/entitylist_base.h
diff --git a/mp/src/game/shared/entityparticletrail_shared.h b/src/game/shared/entityparticletrail_shared.h
similarity index 100%
rename from mp/src/game/shared/entityparticletrail_shared.h
rename to src/game/shared/entityparticletrail_shared.h
diff --git a/mp/src/game/shared/env_detail_controller.cpp b/src/game/shared/env_detail_controller.cpp
similarity index 100%
rename from mp/src/game/shared/env_detail_controller.cpp
rename to src/game/shared/env_detail_controller.cpp
diff --git a/mp/src/game/shared/env_detail_controller.h b/src/game/shared/env_detail_controller.h
similarity index 100%
rename from mp/src/game/shared/env_detail_controller.h
rename to src/game/shared/env_detail_controller.h
diff --git a/mp/src/game/shared/env_meteor_shared.cpp b/src/game/shared/env_meteor_shared.cpp
similarity index 100%
rename from mp/src/game/shared/env_meteor_shared.cpp
rename to src/game/shared/env_meteor_shared.cpp
diff --git a/mp/src/game/shared/env_meteor_shared.h b/src/game/shared/env_meteor_shared.h
similarity index 100%
rename from mp/src/game/shared/env_meteor_shared.h
rename to src/game/shared/env_meteor_shared.h
diff --git a/mp/src/game/shared/env_wind_shared.cpp b/src/game/shared/env_wind_shared.cpp
similarity index 100%
rename from mp/src/game/shared/env_wind_shared.cpp
rename to src/game/shared/env_wind_shared.cpp
diff --git a/mp/src/game/shared/env_wind_shared.h b/src/game/shared/env_wind_shared.h
similarity index 100%
rename from mp/src/game/shared/env_wind_shared.h
rename to src/game/shared/env_wind_shared.h
diff --git a/mp/src/game/shared/episodic/achievements_ep1.cpp b/src/game/shared/episodic/achievements_ep1.cpp
similarity index 100%
rename from mp/src/game/shared/episodic/achievements_ep1.cpp
rename to src/game/shared/episodic/achievements_ep1.cpp
diff --git a/mp/src/game/shared/episodic/achievements_ep2.cpp b/src/game/shared/episodic/achievements_ep2.cpp
similarity index 100%
rename from mp/src/game/shared/episodic/achievements_ep2.cpp
rename to src/game/shared/episodic/achievements_ep2.cpp
diff --git a/mp/src/game/shared/episodic/achievements_epx.cpp b/src/game/shared/episodic/achievements_epx.cpp
similarity index 100%
rename from mp/src/game/shared/episodic/achievements_epx.cpp
rename to src/game/shared/episodic/achievements_epx.cpp
diff --git a/mp/src/game/shared/episodic/npc_advisor_shared.h b/src/game/shared/episodic/npc_advisor_shared.h
similarity index 100%
rename from mp/src/game/shared/episodic/npc_advisor_shared.h
rename to src/game/shared/episodic/npc_advisor_shared.h
diff --git a/mp/src/game/shared/eventlist.cpp b/src/game/shared/eventlist.cpp
similarity index 100%
rename from mp/src/game/shared/eventlist.cpp
rename to src/game/shared/eventlist.cpp
diff --git a/mp/src/game/shared/eventlist.h b/src/game/shared/eventlist.h
similarity index 100%
rename from mp/src/game/shared/eventlist.h
rename to src/game/shared/eventlist.h
diff --git a/mp/src/game/shared/expressionsample.h b/src/game/shared/expressionsample.h
similarity index 100%
rename from mp/src/game/shared/expressionsample.h
rename to src/game/shared/expressionsample.h
diff --git a/mp/src/game/shared/forcefeedback.h b/src/game/shared/forcefeedback.h
similarity index 100%
rename from mp/src/game/shared/forcefeedback.h
rename to src/game/shared/forcefeedback.h
diff --git a/mp/src/game/shared/func_dust_shared.h b/src/game/shared/func_dust_shared.h
similarity index 100%
rename from mp/src/game/shared/func_dust_shared.h
rename to src/game/shared/func_dust_shared.h
diff --git a/mp/src/game/shared/func_ladder.cpp b/src/game/shared/func_ladder.cpp
similarity index 100%
rename from mp/src/game/shared/func_ladder.cpp
rename to src/game/shared/func_ladder.cpp
diff --git a/mp/src/game/shared/func_ladder.h b/src/game/shared/func_ladder.h
similarity index 100%
rename from mp/src/game/shared/func_ladder.h
rename to src/game/shared/func_ladder.h
diff --git a/mp/src/game/shared/gameeventdefs.h b/src/game/shared/gameeventdefs.h
similarity index 100%
rename from mp/src/game/shared/gameeventdefs.h
rename to src/game/shared/gameeventdefs.h
diff --git a/mp/src/game/shared/gamemovement.cpp b/src/game/shared/gamemovement.cpp
similarity index 100%
rename from mp/src/game/shared/gamemovement.cpp
rename to src/game/shared/gamemovement.cpp
diff --git a/mp/src/game/shared/gamemovement.h b/src/game/shared/gamemovement.h
similarity index 100%
rename from mp/src/game/shared/gamemovement.h
rename to src/game/shared/gamemovement.h
diff --git a/mp/src/game/shared/gamerules.cpp b/src/game/shared/gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/gamerules.cpp
rename to src/game/shared/gamerules.cpp
diff --git a/mp/src/game/shared/gamerules.h b/src/game/shared/gamerules.h
similarity index 100%
rename from mp/src/game/shared/gamerules.h
rename to src/game/shared/gamerules.h
diff --git a/mp/src/game/shared/gamerules_register.cpp b/src/game/shared/gamerules_register.cpp
similarity index 100%
rename from mp/src/game/shared/gamerules_register.cpp
rename to src/game/shared/gamerules_register.cpp
diff --git a/mp/src/game/shared/gamerules_register.h b/src/game/shared/gamerules_register.h
similarity index 100%
rename from mp/src/game/shared/gamerules_register.h
rename to src/game/shared/gamerules_register.h
diff --git a/mp/src/game/shared/gamestats.h b/src/game/shared/gamestats.h
similarity index 100%
rename from mp/src/game/shared/gamestats.h
rename to src/game/shared/gamestats.h
diff --git a/mp/src/game/shared/gamestringpool.cpp b/src/game/shared/gamestringpool.cpp
similarity index 100%
rename from mp/src/game/shared/gamestringpool.cpp
rename to src/game/shared/gamestringpool.cpp
diff --git a/mp/src/game/shared/gamestringpool.h b/src/game/shared/gamestringpool.h
similarity index 100%
rename from mp/src/game/shared/gamestringpool.h
rename to src/game/shared/gamestringpool.h
diff --git a/mp/src/game/shared/gamevars_shared.cpp b/src/game/shared/gamevars_shared.cpp
similarity index 100%
rename from mp/src/game/shared/gamevars_shared.cpp
rename to src/game/shared/gamevars_shared.cpp
diff --git a/mp/src/game/shared/gamevars_shared.h b/src/game/shared/gamevars_shared.h
similarity index 100%
rename from mp/src/game/shared/gamevars_shared.h
rename to src/game/shared/gamevars_shared.h
diff --git a/mp/src/game/shared/groundlink.h b/src/game/shared/groundlink.h
similarity index 100%
rename from mp/src/game/shared/groundlink.h
rename to src/game/shared/groundlink.h
diff --git a/mp/src/game/shared/hintmessage.cpp b/src/game/shared/hintmessage.cpp
similarity index 100%
rename from mp/src/game/shared/hintmessage.cpp
rename to src/game/shared/hintmessage.cpp
diff --git a/mp/src/game/shared/hintmessage.h b/src/game/shared/hintmessage.h
similarity index 100%
rename from mp/src/game/shared/hintmessage.h
rename to src/game/shared/hintmessage.h
diff --git a/mp/src/game/shared/hintsystem.cpp b/src/game/shared/hintsystem.cpp
similarity index 100%
rename from mp/src/game/shared/hintsystem.cpp
rename to src/game/shared/hintsystem.cpp
diff --git a/mp/src/game/shared/hintsystem.h b/src/game/shared/hintsystem.h
similarity index 100%
rename from mp/src/game/shared/hintsystem.h
rename to src/game/shared/hintsystem.h
diff --git a/mp/src/game/shared/hl2/achievements_hl2.cpp b/src/game/shared/hl2/achievements_hl2.cpp
similarity index 100%
rename from mp/src/game/shared/hl2/achievements_hl2.cpp
rename to src/game/shared/hl2/achievements_hl2.cpp
diff --git a/mp/src/game/shared/hl2/basehlcombatweapon_shared.cpp b/src/game/shared/hl2/basehlcombatweapon_shared.cpp
similarity index 100%
rename from mp/src/game/shared/hl2/basehlcombatweapon_shared.cpp
rename to src/game/shared/hl2/basehlcombatweapon_shared.cpp
diff --git a/mp/src/game/shared/hl2/basehlcombatweapon_shared.h b/src/game/shared/hl2/basehlcombatweapon_shared.h
similarity index 100%
rename from mp/src/game/shared/hl2/basehlcombatweapon_shared.h
rename to src/game/shared/hl2/basehlcombatweapon_shared.h
diff --git a/mp/src/game/shared/hl2/citadel_effects_shared.h b/src/game/shared/hl2/citadel_effects_shared.h
similarity index 100%
rename from mp/src/game/shared/hl2/citadel_effects_shared.h
rename to src/game/shared/hl2/citadel_effects_shared.h
diff --git a/mp/src/game/shared/hl2/env_alyxemp_shared.h b/src/game/shared/hl2/env_alyxemp_shared.h
similarity index 100%
rename from mp/src/game/shared/hl2/env_alyxemp_shared.h
rename to src/game/shared/hl2/env_alyxemp_shared.h
diff --git a/mp/src/game/shared/hl2/env_headcrabcanister_shared.cpp b/src/game/shared/hl2/env_headcrabcanister_shared.cpp
similarity index 100%
rename from mp/src/game/shared/hl2/env_headcrabcanister_shared.cpp
rename to src/game/shared/hl2/env_headcrabcanister_shared.cpp
diff --git a/mp/src/game/shared/hl2/env_headcrabcanister_shared.h b/src/game/shared/hl2/env_headcrabcanister_shared.h
similarity index 100%
rename from mp/src/game/shared/hl2/env_headcrabcanister_shared.h
rename to src/game/shared/hl2/env_headcrabcanister_shared.h
diff --git a/mp/src/game/shared/hl2/hl2_gamerules.cpp b/src/game/shared/hl2/hl2_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/hl2/hl2_gamerules.cpp
rename to src/game/shared/hl2/hl2_gamerules.cpp
diff --git a/mp/src/game/shared/hl2/hl2_gamerules.h b/src/game/shared/hl2/hl2_gamerules.h
similarity index 100%
rename from mp/src/game/shared/hl2/hl2_gamerules.h
rename to src/game/shared/hl2/hl2_gamerules.h
diff --git a/mp/src/game/shared/hl2/hl2_player_shared.h b/src/game/shared/hl2/hl2_player_shared.h
similarity index 100%
rename from mp/src/game/shared/hl2/hl2_player_shared.h
rename to src/game/shared/hl2/hl2_player_shared.h
diff --git a/mp/src/game/shared/hl2/hl2_shareddefs.h b/src/game/shared/hl2/hl2_shareddefs.h
similarity index 100%
rename from mp/src/game/shared/hl2/hl2_shareddefs.h
rename to src/game/shared/hl2/hl2_shareddefs.h
diff --git a/mp/src/game/shared/hl2/hl2_usermessages.cpp b/src/game/shared/hl2/hl2_usermessages.cpp
similarity index 100%
rename from mp/src/game/shared/hl2/hl2_usermessages.cpp
rename to src/game/shared/hl2/hl2_usermessages.cpp
diff --git a/mp/src/game/shared/hl2/hl2_vehicle_radar.h b/src/game/shared/hl2/hl2_vehicle_radar.h
similarity index 100%
rename from mp/src/game/shared/hl2/hl2_vehicle_radar.h
rename to src/game/shared/hl2/hl2_vehicle_radar.h
diff --git a/mp/src/game/shared/hl2/hl_gamemovement.cpp b/src/game/shared/hl2/hl_gamemovement.cpp
similarity index 100%
rename from mp/src/game/shared/hl2/hl_gamemovement.cpp
rename to src/game/shared/hl2/hl_gamemovement.cpp
diff --git a/mp/src/game/shared/hl2/hl_gamemovement.h b/src/game/shared/hl2/hl_gamemovement.h
similarity index 100%
rename from mp/src/game/shared/hl2/hl_gamemovement.h
rename to src/game/shared/hl2/hl_gamemovement.h
diff --git a/mp/src/game/shared/hl2/hl_movedata.h b/src/game/shared/hl2/hl_movedata.h
similarity index 100%
rename from mp/src/game/shared/hl2/hl_movedata.h
rename to src/game/shared/hl2/hl_movedata.h
diff --git a/mp/src/game/shared/hl2/survival_gamerules.cpp b/src/game/shared/hl2/survival_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/hl2/survival_gamerules.cpp
rename to src/game/shared/hl2/survival_gamerules.cpp
diff --git a/mp/src/game/shared/hl2mp/hl2mp_gamerules.cpp b/src/game/shared/hl2mp/hl2mp_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/hl2mp_gamerules.cpp
rename to src/game/shared/hl2mp/hl2mp_gamerules.cpp
diff --git a/mp/src/game/shared/hl2mp/hl2mp_gamerules.h b/src/game/shared/hl2mp/hl2mp_gamerules.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/hl2mp_gamerules.h
rename to src/game/shared/hl2mp/hl2mp_gamerules.h
diff --git a/mp/src/game/shared/hl2mp/hl2mp_player_shared.cpp b/src/game/shared/hl2mp/hl2mp_player_shared.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/hl2mp_player_shared.cpp
rename to src/game/shared/hl2mp/hl2mp_player_shared.cpp
diff --git a/mp/src/game/shared/hl2mp/hl2mp_player_shared.h b/src/game/shared/hl2mp/hl2mp_player_shared.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/hl2mp_player_shared.h
rename to src/game/shared/hl2mp/hl2mp_player_shared.h
diff --git a/mp/src/game/shared/hl2mp/hl2mp_weapon_parse.cpp b/src/game/shared/hl2mp/hl2mp_weapon_parse.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/hl2mp_weapon_parse.cpp
rename to src/game/shared/hl2mp/hl2mp_weapon_parse.cpp
diff --git a/mp/src/game/shared/hl2mp/hl2mp_weapon_parse.h b/src/game/shared/hl2mp/hl2mp_weapon_parse.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/hl2mp_weapon_parse.h
rename to src/game/shared/hl2mp/hl2mp_weapon_parse.h
diff --git a/mp/src/game/shared/hl2mp/weapon_357.cpp b/src/game/shared/hl2mp/weapon_357.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_357.cpp
rename to src/game/shared/hl2mp/weapon_357.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_ar2.cpp b/src/game/shared/hl2mp/weapon_ar2.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_ar2.cpp
rename to src/game/shared/hl2mp/weapon_ar2.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_ar2.h b/src/game/shared/hl2mp/weapon_ar2.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_ar2.h
rename to src/game/shared/hl2mp/weapon_ar2.h
diff --git a/mp/src/game/shared/hl2mp/weapon_crossbow.cpp b/src/game/shared/hl2mp/weapon_crossbow.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_crossbow.cpp
rename to src/game/shared/hl2mp/weapon_crossbow.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_crowbar.cpp b/src/game/shared/hl2mp/weapon_crowbar.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_crowbar.cpp
rename to src/game/shared/hl2mp/weapon_crowbar.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_crowbar.h b/src/game/shared/hl2mp/weapon_crowbar.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_crowbar.h
rename to src/game/shared/hl2mp/weapon_crowbar.h
diff --git a/mp/src/game/shared/hl2mp/weapon_frag.cpp b/src/game/shared/hl2mp/weapon_frag.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_frag.cpp
rename to src/game/shared/hl2mp/weapon_frag.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbase.cpp b/src/game/shared/hl2mp/weapon_hl2mpbase.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbase.cpp
rename to src/game/shared/hl2mp/weapon_hl2mpbase.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbase.h b/src/game/shared/hl2mp/weapon_hl2mpbase.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbase.h
rename to src/game/shared/hl2mp/weapon_hl2mpbase.h
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.cpp b/src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.cpp
rename to src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.h b/src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.h
rename to src/game/shared/hl2mp/weapon_hl2mpbase_machinegun.h
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.cpp b/src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.cpp
rename to src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.h b/src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.h
rename to src/game/shared/hl2mp/weapon_hl2mpbasebasebludgeon.h
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.cpp b/src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.cpp
rename to src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.h b/src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.h
rename to src/game/shared/hl2mp/weapon_hl2mpbasehlmpcombatweapon.h
diff --git a/mp/src/game/shared/hl2mp/weapon_physcannon.cpp b/src/game/shared/hl2mp/weapon_physcannon.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_physcannon.cpp
rename to src/game/shared/hl2mp/weapon_physcannon.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_physcannon.h b/src/game/shared/hl2mp/weapon_physcannon.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_physcannon.h
rename to src/game/shared/hl2mp/weapon_physcannon.h
diff --git a/mp/src/game/shared/hl2mp/weapon_pistol.cpp b/src/game/shared/hl2mp/weapon_pistol.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_pistol.cpp
rename to src/game/shared/hl2mp/weapon_pistol.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_rpg.cpp b/src/game/shared/hl2mp/weapon_rpg.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_rpg.cpp
rename to src/game/shared/hl2mp/weapon_rpg.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_rpg.h b/src/game/shared/hl2mp/weapon_rpg.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_rpg.h
rename to src/game/shared/hl2mp/weapon_rpg.h
diff --git a/mp/src/game/shared/hl2mp/weapon_shotgun.cpp b/src/game/shared/hl2mp/weapon_shotgun.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_shotgun.cpp
rename to src/game/shared/hl2mp/weapon_shotgun.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_slam.cpp b/src/game/shared/hl2mp/weapon_slam.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_slam.cpp
rename to src/game/shared/hl2mp/weapon_slam.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_slam.h b/src/game/shared/hl2mp/weapon_slam.h
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_slam.h
rename to src/game/shared/hl2mp/weapon_slam.h
diff --git a/mp/src/game/shared/hl2mp/weapon_smg1.cpp b/src/game/shared/hl2mp/weapon_smg1.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_smg1.cpp
rename to src/game/shared/hl2mp/weapon_smg1.cpp
diff --git a/mp/src/game/shared/hl2mp/weapon_stunstick.cpp b/src/game/shared/hl2mp/weapon_stunstick.cpp
similarity index 100%
rename from mp/src/game/shared/hl2mp/weapon_stunstick.cpp
rename to src/game/shared/hl2mp/weapon_stunstick.cpp
diff --git a/mp/src/game/shared/ichoreoeventcallback.h b/src/game/shared/ichoreoeventcallback.h
similarity index 100%
rename from mp/src/game/shared/ichoreoeventcallback.h
rename to src/game/shared/ichoreoeventcallback.h
diff --git a/mp/src/game/shared/igamemovement.h b/src/game/shared/igamemovement.h
similarity index 100%
rename from mp/src/game/shared/igamemovement.h
rename to src/game/shared/igamemovement.h
diff --git a/mp/src/game/shared/igamesystem.cpp b/src/game/shared/igamesystem.cpp
similarity index 100%
rename from mp/src/game/shared/igamesystem.cpp
rename to src/game/shared/igamesystem.cpp
diff --git a/mp/src/game/shared/igamesystem.h b/src/game/shared/igamesystem.h
similarity index 100%
rename from mp/src/game/shared/igamesystem.h
rename to src/game/shared/igamesystem.h
diff --git a/mp/src/game/shared/imovehelper.h b/src/game/shared/imovehelper.h
similarity index 100%
rename from mp/src/game/shared/imovehelper.h
rename to src/game/shared/imovehelper.h
diff --git a/mp/src/game/shared/in_buttons.h b/src/game/shared/in_buttons.h
similarity index 100%
rename from mp/src/game/shared/in_buttons.h
rename to src/game/shared/in_buttons.h
diff --git a/mp/src/game/shared/interval.cpp b/src/game/shared/interval.cpp
similarity index 100%
rename from mp/src/game/shared/interval.cpp
rename to src/game/shared/interval.cpp
diff --git a/mp/src/game/shared/interval.h b/src/game/shared/interval.h
similarity index 100%
rename from mp/src/game/shared/interval.h
rename to src/game/shared/interval.h
diff --git a/mp/src/game/shared/iplayeranimstate.h b/src/game/shared/iplayeranimstate.h
similarity index 100%
rename from mp/src/game/shared/iplayeranimstate.h
rename to src/game/shared/iplayeranimstate.h
diff --git a/mp/src/game/shared/ipredictionsystem.h b/src/game/shared/ipredictionsystem.h
similarity index 100%
rename from mp/src/game/shared/ipredictionsystem.h
rename to src/game/shared/ipredictionsystem.h
diff --git a/mp/src/game/shared/iscenetokenprocessor.h b/src/game/shared/iscenetokenprocessor.h
similarity index 100%
rename from mp/src/game/shared/iscenetokenprocessor.h
rename to src/game/shared/iscenetokenprocessor.h
diff --git a/mp/src/game/shared/itempents.h b/src/game/shared/itempents.h
similarity index 100%
rename from mp/src/game/shared/itempents.h
rename to src/game/shared/itempents.h
diff --git a/mp/src/game/shared/mapdata_shared.h b/src/game/shared/mapdata_shared.h
similarity index 100%
rename from mp/src/game/shared/mapdata_shared.h
rename to src/game/shared/mapdata_shared.h
diff --git a/mp/src/game/shared/mapentities_shared.cpp b/src/game/shared/mapentities_shared.cpp
similarity index 100%
rename from mp/src/game/shared/mapentities_shared.cpp
rename to src/game/shared/mapentities_shared.cpp
diff --git a/mp/src/game/shared/mapentities_shared.h b/src/game/shared/mapentities_shared.h
similarity index 100%
rename from mp/src/game/shared/mapentities_shared.h
rename to src/game/shared/mapentities_shared.h
diff --git a/mp/src/game/shared/movetype_push.h b/src/game/shared/movetype_push.h
similarity index 100%
rename from mp/src/game/shared/movetype_push.h
rename to src/game/shared/movetype_push.h
diff --git a/mp/src/game/shared/movevars_shared.cpp b/src/game/shared/movevars_shared.cpp
similarity index 100%
rename from mp/src/game/shared/movevars_shared.cpp
rename to src/game/shared/movevars_shared.cpp
diff --git a/mp/src/game/shared/movevars_shared.h b/src/game/shared/movevars_shared.h
similarity index 100%
rename from mp/src/game/shared/movevars_shared.h
rename to src/game/shared/movevars_shared.h
diff --git a/mp/src/game/shared/mp_shareddefs.cpp b/src/game/shared/mp_shareddefs.cpp
similarity index 100%
rename from mp/src/game/shared/mp_shareddefs.cpp
rename to src/game/shared/mp_shareddefs.cpp
diff --git a/mp/src/game/shared/mp_shareddefs.h b/src/game/shared/mp_shareddefs.h
similarity index 100%
rename from mp/src/game/shared/mp_shareddefs.h
rename to src/game/shared/mp_shareddefs.h
diff --git a/mp/src/game/shared/multiplay_gamerules.cpp b/src/game/shared/multiplay_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/multiplay_gamerules.cpp
rename to src/game/shared/multiplay_gamerules.cpp
diff --git a/mp/src/game/shared/multiplay_gamerules.h b/src/game/shared/multiplay_gamerules.h
similarity index 100%
rename from mp/src/game/shared/multiplay_gamerules.h
rename to src/game/shared/multiplay_gamerules.h
diff --git a/mp/src/game/shared/npcevent.h b/src/game/shared/npcevent.h
similarity index 100%
rename from mp/src/game/shared/npcevent.h
rename to src/game/shared/npcevent.h
diff --git a/mp/src/game/shared/obstacle_pushaway.cpp b/src/game/shared/obstacle_pushaway.cpp
similarity index 100%
rename from mp/src/game/shared/obstacle_pushaway.cpp
rename to src/game/shared/obstacle_pushaway.cpp
diff --git a/mp/src/game/shared/obstacle_pushaway.h b/src/game/shared/obstacle_pushaway.h
similarity index 100%
rename from mp/src/game/shared/obstacle_pushaway.h
rename to src/game/shared/obstacle_pushaway.h
diff --git a/mp/src/game/shared/particle_parse.cpp b/src/game/shared/particle_parse.cpp
similarity index 100%
rename from mp/src/game/shared/particle_parse.cpp
rename to src/game/shared/particle_parse.cpp
diff --git a/mp/src/game/shared/particle_parse.h b/src/game/shared/particle_parse.h
similarity index 100%
rename from mp/src/game/shared/particle_parse.h
rename to src/game/shared/particle_parse.h
diff --git a/mp/src/game/shared/particle_property.cpp b/src/game/shared/particle_property.cpp
similarity index 100%
rename from mp/src/game/shared/particle_property.cpp
rename to src/game/shared/particle_property.cpp
diff --git a/mp/src/game/shared/particle_property.h b/src/game/shared/particle_property.h
similarity index 100%
rename from mp/src/game/shared/particle_property.h
rename to src/game/shared/particle_property.h
diff --git a/mp/src/game/shared/particle_property_inlines.h b/src/game/shared/particle_property_inlines.h
similarity index 100%
rename from mp/src/game/shared/particle_property_inlines.h
rename to src/game/shared/particle_property_inlines.h
diff --git a/mp/src/game/shared/particlesystemquery.cpp b/src/game/shared/particlesystemquery.cpp
similarity index 100%
rename from mp/src/game/shared/particlesystemquery.cpp
rename to src/game/shared/particlesystemquery.cpp
diff --git a/mp/src/game/shared/physics_main_shared.cpp b/src/game/shared/physics_main_shared.cpp
similarity index 100%
rename from mp/src/game/shared/physics_main_shared.cpp
rename to src/game/shared/physics_main_shared.cpp
diff --git a/mp/src/game/shared/physics_saverestore.cpp b/src/game/shared/physics_saverestore.cpp
similarity index 100%
rename from mp/src/game/shared/physics_saverestore.cpp
rename to src/game/shared/physics_saverestore.cpp
diff --git a/mp/src/game/shared/physics_saverestore.h b/src/game/shared/physics_saverestore.h
similarity index 100%
rename from mp/src/game/shared/physics_saverestore.h
rename to src/game/shared/physics_saverestore.h
diff --git a/mp/src/game/shared/physics_shared.cpp b/src/game/shared/physics_shared.cpp
similarity index 100%
rename from mp/src/game/shared/physics_shared.cpp
rename to src/game/shared/physics_shared.cpp
diff --git a/mp/src/game/shared/physics_shared.h b/src/game/shared/physics_shared.h
similarity index 100%
rename from mp/src/game/shared/physics_shared.h
rename to src/game/shared/physics_shared.h
diff --git a/mp/src/game/shared/playerclass_info_parse.cpp b/src/game/shared/playerclass_info_parse.cpp
similarity index 100%
rename from mp/src/game/shared/playerclass_info_parse.cpp
rename to src/game/shared/playerclass_info_parse.cpp
diff --git a/mp/src/game/shared/playerclass_info_parse.h b/src/game/shared/playerclass_info_parse.h
similarity index 100%
rename from mp/src/game/shared/playerclass_info_parse.h
rename to src/game/shared/playerclass_info_parse.h
diff --git a/mp/src/game/shared/playernet_vars.h b/src/game/shared/playernet_vars.h
similarity index 100%
rename from mp/src/game/shared/playernet_vars.h
rename to src/game/shared/playernet_vars.h
diff --git a/mp/src/game/shared/point_bonusmaps_accessor.cpp b/src/game/shared/point_bonusmaps_accessor.cpp
similarity index 100%
rename from mp/src/game/shared/point_bonusmaps_accessor.cpp
rename to src/game/shared/point_bonusmaps_accessor.cpp
diff --git a/mp/src/game/shared/point_bonusmaps_accessor.h b/src/game/shared/point_bonusmaps_accessor.h
similarity index 100%
rename from mp/src/game/shared/point_bonusmaps_accessor.h
rename to src/game/shared/point_bonusmaps_accessor.h
diff --git a/mp/src/game/shared/point_posecontroller.cpp b/src/game/shared/point_posecontroller.cpp
similarity index 100%
rename from mp/src/game/shared/point_posecontroller.cpp
rename to src/game/shared/point_posecontroller.cpp
diff --git a/mp/src/game/shared/point_posecontroller.h b/src/game/shared/point_posecontroller.h
similarity index 100%
rename from mp/src/game/shared/point_posecontroller.h
rename to src/game/shared/point_posecontroller.h
diff --git a/mp/src/game/shared/positionwatcher.h b/src/game/shared/positionwatcher.h
similarity index 100%
rename from mp/src/game/shared/positionwatcher.h
rename to src/game/shared/positionwatcher.h
diff --git a/mp/src/game/shared/precache_register.cpp b/src/game/shared/precache_register.cpp
similarity index 100%
rename from mp/src/game/shared/precache_register.cpp
rename to src/game/shared/precache_register.cpp
diff --git a/mp/src/game/shared/precache_register.h b/src/game/shared/precache_register.h
similarity index 100%
rename from mp/src/game/shared/precache_register.h
rename to src/game/shared/precache_register.h
diff --git a/mp/src/game/shared/precipitation_shared.h b/src/game/shared/precipitation_shared.h
similarity index 100%
rename from mp/src/game/shared/precipitation_shared.h
rename to src/game/shared/precipitation_shared.h
diff --git a/mp/src/game/shared/predictable_entity.h b/src/game/shared/predictable_entity.h
similarity index 100%
rename from mp/src/game/shared/predictable_entity.h
rename to src/game/shared/predictable_entity.h
diff --git a/mp/src/game/shared/predictableid.cpp b/src/game/shared/predictableid.cpp
similarity index 100%
rename from mp/src/game/shared/predictableid.cpp
rename to src/game/shared/predictableid.cpp
diff --git a/mp/src/game/shared/predictableid.h b/src/game/shared/predictableid.h
similarity index 100%
rename from mp/src/game/shared/predictableid.h
rename to src/game/shared/predictableid.h
diff --git a/mp/src/game/shared/predicted_viewmodel.cpp b/src/game/shared/predicted_viewmodel.cpp
similarity index 100%
rename from mp/src/game/shared/predicted_viewmodel.cpp
rename to src/game/shared/predicted_viewmodel.cpp
diff --git a/mp/src/game/shared/predicted_viewmodel.h b/src/game/shared/predicted_viewmodel.h
similarity index 100%
rename from mp/src/game/shared/predicted_viewmodel.h
rename to src/game/shared/predicted_viewmodel.h
diff --git a/mp/src/game/shared/predictioncopy.cpp b/src/game/shared/predictioncopy.cpp
similarity index 100%
rename from mp/src/game/shared/predictioncopy.cpp
rename to src/game/shared/predictioncopy.cpp
diff --git a/mp/src/game/shared/predictioncopy.h b/src/game/shared/predictioncopy.h
similarity index 100%
rename from mp/src/game/shared/predictioncopy.h
rename to src/game/shared/predictioncopy.h
diff --git a/mp/src/game/shared/props_shared.cpp b/src/game/shared/props_shared.cpp
similarity index 100%
rename from mp/src/game/shared/props_shared.cpp
rename to src/game/shared/props_shared.cpp
diff --git a/mp/src/game/shared/props_shared.h b/src/game/shared/props_shared.h
similarity index 100%
rename from mp/src/game/shared/props_shared.h
rename to src/game/shared/props_shared.h
diff --git a/mp/src/game/shared/querycache.cpp b/src/game/shared/querycache.cpp
similarity index 100%
rename from mp/src/game/shared/querycache.cpp
rename to src/game/shared/querycache.cpp
diff --git a/mp/src/game/shared/querycache.h b/src/game/shared/querycache.h
similarity index 100%
rename from mp/src/game/shared/querycache.h
rename to src/game/shared/querycache.h
diff --git a/mp/src/game/shared/ragdoll_shared.cpp b/src/game/shared/ragdoll_shared.cpp
similarity index 100%
rename from mp/src/game/shared/ragdoll_shared.cpp
rename to src/game/shared/ragdoll_shared.cpp
diff --git a/mp/src/game/shared/ragdoll_shared.h b/src/game/shared/ragdoll_shared.h
similarity index 100%
rename from mp/src/game/shared/ragdoll_shared.h
rename to src/game/shared/ragdoll_shared.h
diff --git a/mp/src/game/shared/rope_helpers.cpp b/src/game/shared/rope_helpers.cpp
similarity index 100%
rename from mp/src/game/shared/rope_helpers.cpp
rename to src/game/shared/rope_helpers.cpp
diff --git a/mp/src/game/shared/rope_helpers.h b/src/game/shared/rope_helpers.h
similarity index 100%
rename from mp/src/game/shared/rope_helpers.h
rename to src/game/shared/rope_helpers.h
diff --git a/mp/src/game/shared/rumble_shared.h b/src/game/shared/rumble_shared.h
similarity index 100%
rename from mp/src/game/shared/rumble_shared.h
rename to src/game/shared/rumble_shared.h
diff --git a/mp/src/game/shared/saverestore.cpp b/src/game/shared/saverestore.cpp
similarity index 100%
rename from mp/src/game/shared/saverestore.cpp
rename to src/game/shared/saverestore.cpp
diff --git a/mp/src/game/shared/saverestore.h b/src/game/shared/saverestore.h
similarity index 100%
rename from mp/src/game/shared/saverestore.h
rename to src/game/shared/saverestore.h
diff --git a/mp/src/game/shared/saverestore_bitstring.h b/src/game/shared/saverestore_bitstring.h
similarity index 100%
rename from mp/src/game/shared/saverestore_bitstring.h
rename to src/game/shared/saverestore_bitstring.h
diff --git a/mp/src/game/shared/saverestore_stringtable.h b/src/game/shared/saverestore_stringtable.h
similarity index 100%
rename from mp/src/game/shared/saverestore_stringtable.h
rename to src/game/shared/saverestore_stringtable.h
diff --git a/mp/src/game/shared/saverestore_utlclass.h b/src/game/shared/saverestore_utlclass.h
similarity index 100%
rename from mp/src/game/shared/saverestore_utlclass.h
rename to src/game/shared/saverestore_utlclass.h
diff --git a/mp/src/game/shared/saverestore_utlmap.h b/src/game/shared/saverestore_utlmap.h
similarity index 100%
rename from mp/src/game/shared/saverestore_utlmap.h
rename to src/game/shared/saverestore_utlmap.h
diff --git a/mp/src/game/shared/saverestore_utlrbtree.h b/src/game/shared/saverestore_utlrbtree.h
similarity index 100%
rename from mp/src/game/shared/saverestore_utlrbtree.h
rename to src/game/shared/saverestore_utlrbtree.h
diff --git a/mp/src/game/shared/saverestore_utlsymbol.h b/src/game/shared/saverestore_utlsymbol.h
similarity index 100%
rename from mp/src/game/shared/saverestore_utlsymbol.h
rename to src/game/shared/saverestore_utlsymbol.h
diff --git a/mp/src/game/shared/saverestore_utlvector.h b/src/game/shared/saverestore_utlvector.h
similarity index 100%
rename from mp/src/game/shared/saverestore_utlvector.h
rename to src/game/shared/saverestore_utlvector.h
diff --git a/mp/src/game/shared/sceneentity_shared.cpp b/src/game/shared/sceneentity_shared.cpp
similarity index 100%
rename from mp/src/game/shared/sceneentity_shared.cpp
rename to src/game/shared/sceneentity_shared.cpp
diff --git a/mp/src/game/shared/sceneentity_shared.h b/src/game/shared/sceneentity_shared.h
similarity index 100%
rename from mp/src/game/shared/sceneentity_shared.h
rename to src/game/shared/sceneentity_shared.h
diff --git a/mp/src/game/shared/sceneimage.cpp b/src/game/shared/sceneimage.cpp
similarity index 100%
rename from mp/src/game/shared/sceneimage.cpp
rename to src/game/shared/sceneimage.cpp
diff --git a/mp/src/game/shared/sceneimage.h b/src/game/shared/sceneimage.h
similarity index 100%
rename from mp/src/game/shared/sceneimage.h
rename to src/game/shared/sceneimage.h
diff --git a/mp/src/game/shared/script_intro_shared.cpp b/src/game/shared/script_intro_shared.cpp
similarity index 100%
rename from mp/src/game/shared/script_intro_shared.cpp
rename to src/game/shared/script_intro_shared.cpp
diff --git a/mp/src/game/shared/scriptevent.h b/src/game/shared/scriptevent.h
similarity index 100%
rename from mp/src/game/shared/scriptevent.h
rename to src/game/shared/scriptevent.h
diff --git a/mp/src/game/shared/sdk/sdk_basegrenade_projectile.cpp b/src/game/shared/sdk/sdk_basegrenade_projectile.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_basegrenade_projectile.cpp
rename to src/game/shared/sdk/sdk_basegrenade_projectile.cpp
diff --git a/mp/src/game/shared/sdk/sdk_basegrenade_projectile.h b/src/game/shared/sdk/sdk_basegrenade_projectile.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_basegrenade_projectile.h
rename to src/game/shared/sdk/sdk_basegrenade_projectile.h
diff --git a/mp/src/game/shared/sdk/sdk_fx_shared.cpp b/src/game/shared/sdk/sdk_fx_shared.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_fx_shared.cpp
rename to src/game/shared/sdk/sdk_fx_shared.cpp
diff --git a/mp/src/game/shared/sdk/sdk_fx_shared.h b/src/game/shared/sdk/sdk_fx_shared.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_fx_shared.h
rename to src/game/shared/sdk/sdk_fx_shared.h
diff --git a/mp/src/game/shared/sdk/sdk_gamemovement.cpp b/src/game/shared/sdk/sdk_gamemovement.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_gamemovement.cpp
rename to src/game/shared/sdk/sdk_gamemovement.cpp
diff --git a/mp/src/game/shared/sdk/sdk_gamerules.cpp b/src/game/shared/sdk/sdk_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_gamerules.cpp
rename to src/game/shared/sdk/sdk_gamerules.cpp
diff --git a/mp/src/game/shared/sdk/sdk_gamerules.h b/src/game/shared/sdk/sdk_gamerules.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_gamerules.h
rename to src/game/shared/sdk/sdk_gamerules.h
diff --git a/mp/src/game/shared/sdk/sdk_player_shared.cpp b/src/game/shared/sdk/sdk_player_shared.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_player_shared.cpp
rename to src/game/shared/sdk/sdk_player_shared.cpp
diff --git a/mp/src/game/shared/sdk/sdk_player_shared.h b/src/game/shared/sdk/sdk_player_shared.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_player_shared.h
rename to src/game/shared/sdk/sdk_player_shared.h
diff --git a/mp/src/game/shared/sdk/sdk_playeranimstate.cpp b/src/game/shared/sdk/sdk_playeranimstate.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_playeranimstate.cpp
rename to src/game/shared/sdk/sdk_playeranimstate.cpp
diff --git a/mp/src/game/shared/sdk/sdk_playeranimstate.h b/src/game/shared/sdk/sdk_playeranimstate.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_playeranimstate.h
rename to src/game/shared/sdk/sdk_playeranimstate.h
diff --git a/mp/src/game/shared/sdk/sdk_playerclass_info_parse.cpp b/src/game/shared/sdk/sdk_playerclass_info_parse.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_playerclass_info_parse.cpp
rename to src/game/shared/sdk/sdk_playerclass_info_parse.cpp
diff --git a/mp/src/game/shared/sdk/sdk_playerclass_info_parse.h b/src/game/shared/sdk/sdk_playerclass_info_parse.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_playerclass_info_parse.h
rename to src/game/shared/sdk/sdk_playerclass_info_parse.h
diff --git a/mp/src/game/shared/sdk/sdk_shareddefs.cpp b/src/game/shared/sdk/sdk_shareddefs.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_shareddefs.cpp
rename to src/game/shared/sdk/sdk_shareddefs.cpp
diff --git a/mp/src/game/shared/sdk/sdk_shareddefs.h b/src/game/shared/sdk/sdk_shareddefs.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_shareddefs.h
rename to src/game/shared/sdk/sdk_shareddefs.h
diff --git a/mp/src/game/shared/sdk/sdk_usermessages.cpp b/src/game/shared/sdk/sdk_usermessages.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_usermessages.cpp
rename to src/game/shared/sdk/sdk_usermessages.cpp
diff --git a/mp/src/game/shared/sdk/sdk_weapon_melee.cpp b/src/game/shared/sdk/sdk_weapon_melee.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_weapon_melee.cpp
rename to src/game/shared/sdk/sdk_weapon_melee.cpp
diff --git a/mp/src/game/shared/sdk/sdk_weapon_melee.h b/src/game/shared/sdk/sdk_weapon_melee.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_weapon_melee.h
rename to src/game/shared/sdk/sdk_weapon_melee.h
diff --git a/mp/src/game/shared/sdk/sdk_weapon_parse.cpp b/src/game/shared/sdk/sdk_weapon_parse.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_weapon_parse.cpp
rename to src/game/shared/sdk/sdk_weapon_parse.cpp
diff --git a/mp/src/game/shared/sdk/sdk_weapon_parse.h b/src/game/shared/sdk/sdk_weapon_parse.h
similarity index 100%
rename from mp/src/game/shared/sdk/sdk_weapon_parse.h
rename to src/game/shared/sdk/sdk_weapon_parse.h
diff --git a/mp/src/game/shared/sdk/weapon_basesdkgrenade.cpp b/src/game/shared/sdk/weapon_basesdkgrenade.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_basesdkgrenade.cpp
rename to src/game/shared/sdk/weapon_basesdkgrenade.cpp
diff --git a/mp/src/game/shared/sdk/weapon_basesdkgrenade.h b/src/game/shared/sdk/weapon_basesdkgrenade.h
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_basesdkgrenade.h
rename to src/game/shared/sdk/weapon_basesdkgrenade.h
diff --git a/mp/src/game/shared/sdk/weapon_crowbar.cpp b/src/game/shared/sdk/weapon_crowbar.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_crowbar.cpp
rename to src/game/shared/sdk/weapon_crowbar.cpp
diff --git a/mp/src/game/shared/sdk/weapon_grenade.cpp b/src/game/shared/sdk/weapon_grenade.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_grenade.cpp
rename to src/game/shared/sdk/weapon_grenade.cpp
diff --git a/mp/src/game/shared/sdk/weapon_grenade.h b/src/game/shared/sdk/weapon_grenade.h
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_grenade.h
rename to src/game/shared/sdk/weapon_grenade.h
diff --git a/mp/src/game/shared/sdk/weapon_mp5.cpp b/src/game/shared/sdk/weapon_mp5.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_mp5.cpp
rename to src/game/shared/sdk/weapon_mp5.cpp
diff --git a/mp/src/game/shared/sdk/weapon_pistol.cpp b/src/game/shared/sdk/weapon_pistol.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_pistol.cpp
rename to src/game/shared/sdk/weapon_pistol.cpp
diff --git a/mp/src/game/shared/sdk/weapon_sdkbase.cpp b/src/game/shared/sdk/weapon_sdkbase.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_sdkbase.cpp
rename to src/game/shared/sdk/weapon_sdkbase.cpp
diff --git a/mp/src/game/shared/sdk/weapon_sdkbase.h b/src/game/shared/sdk/weapon_sdkbase.h
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_sdkbase.h
rename to src/game/shared/sdk/weapon_sdkbase.h
diff --git a/mp/src/game/shared/sdk/weapon_shotgun.cpp b/src/game/shared/sdk/weapon_shotgun.cpp
similarity index 100%
rename from mp/src/game/shared/sdk/weapon_shotgun.cpp
rename to src/game/shared/sdk/weapon_shotgun.cpp
diff --git a/mp/src/game/shared/sequence_Transitioner.cpp b/src/game/shared/sequence_Transitioner.cpp
similarity index 100%
rename from mp/src/game/shared/sequence_Transitioner.cpp
rename to src/game/shared/sequence_Transitioner.cpp
diff --git a/mp/src/game/shared/sequence_Transitioner.h b/src/game/shared/sequence_Transitioner.h
similarity index 100%
rename from mp/src/game/shared/sequence_Transitioner.h
rename to src/game/shared/sequence_Transitioner.h
diff --git a/mp/src/game/shared/sharedInterface.h b/src/game/shared/sharedInterface.h
similarity index 100%
rename from mp/src/game/shared/sharedInterface.h
rename to src/game/shared/sharedInterface.h
diff --git a/mp/src/game/shared/shared_classnames.h b/src/game/shared/shared_classnames.h
similarity index 100%
rename from mp/src/game/shared/shared_classnames.h
rename to src/game/shared/shared_classnames.h
diff --git a/mp/src/game/shared/shareddefs.h b/src/game/shared/shareddefs.h
similarity index 100%
rename from mp/src/game/shared/shareddefs.h
rename to src/game/shared/shareddefs.h
diff --git a/mp/src/game/shared/sheetsimulator.cpp b/src/game/shared/sheetsimulator.cpp
similarity index 100%
rename from mp/src/game/shared/sheetsimulator.cpp
rename to src/game/shared/sheetsimulator.cpp
diff --git a/mp/src/game/shared/sheetsimulator.h b/src/game/shared/sheetsimulator.h
similarity index 100%
rename from mp/src/game/shared/sheetsimulator.h
rename to src/game/shared/sheetsimulator.h
diff --git a/mp/src/game/shared/shot_manipulator.h b/src/game/shared/shot_manipulator.h
similarity index 100%
rename from mp/src/game/shared/shot_manipulator.h
rename to src/game/shared/shot_manipulator.h
diff --git a/mp/src/game/shared/simtimer.cpp b/src/game/shared/simtimer.cpp
similarity index 100%
rename from mp/src/game/shared/simtimer.cpp
rename to src/game/shared/simtimer.cpp
diff --git a/mp/src/game/shared/simtimer.h b/src/game/shared/simtimer.h
similarity index 100%
rename from mp/src/game/shared/simtimer.h
rename to src/game/shared/simtimer.h
diff --git a/mp/src/game/shared/singleplay_gamerules.cpp b/src/game/shared/singleplay_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/singleplay_gamerules.cpp
rename to src/game/shared/singleplay_gamerules.cpp
diff --git a/mp/src/game/shared/singleplay_gamerules.h b/src/game/shared/singleplay_gamerules.h
similarity index 100%
rename from mp/src/game/shared/singleplay_gamerules.h
rename to src/game/shared/singleplay_gamerules.h
diff --git a/mp/src/game/shared/sixense/sixense_convars.cpp b/src/game/shared/sixense/sixense_convars.cpp
similarity index 100%
rename from mp/src/game/shared/sixense/sixense_convars.cpp
rename to src/game/shared/sixense/sixense_convars.cpp
diff --git a/mp/src/game/shared/sixense/sixense_convars_extern.h b/src/game/shared/sixense/sixense_convars_extern.h
similarity index 100%
rename from mp/src/game/shared/sixense/sixense_convars_extern.h
rename to src/game/shared/sixense/sixense_convars_extern.h
diff --git a/mp/src/game/shared/smoke_fog_overlay_shared.h b/src/game/shared/smoke_fog_overlay_shared.h
similarity index 100%
rename from mp/src/game/shared/smoke_fog_overlay_shared.h
rename to src/game/shared/smoke_fog_overlay_shared.h
diff --git a/mp/src/game/shared/solidsetdefaults.h b/src/game/shared/solidsetdefaults.h
similarity index 100%
rename from mp/src/game/shared/solidsetdefaults.h
rename to src/game/shared/solidsetdefaults.h
diff --git a/mp/src/game/shared/soundenvelope.cpp b/src/game/shared/soundenvelope.cpp
similarity index 100%
rename from mp/src/game/shared/soundenvelope.cpp
rename to src/game/shared/soundenvelope.cpp
diff --git a/mp/src/game/shared/soundenvelope.h b/src/game/shared/soundenvelope.h
similarity index 100%
rename from mp/src/game/shared/soundenvelope.h
rename to src/game/shared/soundenvelope.h
diff --git a/mp/src/game/shared/studio_shared.cpp b/src/game/shared/studio_shared.cpp
similarity index 100%
rename from mp/src/game/shared/studio_shared.cpp
rename to src/game/shared/studio_shared.cpp
diff --git a/mp/src/game/shared/sun_shared.h b/src/game/shared/sun_shared.h
similarity index 100%
rename from mp/src/game/shared/sun_shared.h
rename to src/game/shared/sun_shared.h
diff --git a/mp/src/game/shared/takedamageinfo.cpp b/src/game/shared/takedamageinfo.cpp
similarity index 100%
rename from mp/src/game/shared/takedamageinfo.cpp
rename to src/game/shared/takedamageinfo.cpp
diff --git a/mp/src/game/shared/takedamageinfo.h b/src/game/shared/takedamageinfo.h
similarity index 100%
rename from mp/src/game/shared/takedamageinfo.h
rename to src/game/shared/takedamageinfo.h
diff --git a/mp/src/game/shared/teamplay_gamerules.cpp b/src/game/shared/teamplay_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/teamplay_gamerules.cpp
rename to src/game/shared/teamplay_gamerules.cpp
diff --git a/mp/src/game/shared/teamplay_gamerules.h b/src/game/shared/teamplay_gamerules.h
similarity index 100%
rename from mp/src/game/shared/teamplay_gamerules.h
rename to src/game/shared/teamplay_gamerules.h
diff --git a/mp/src/game/shared/teamplay_round_timer.cpp b/src/game/shared/teamplay_round_timer.cpp
similarity index 100%
rename from mp/src/game/shared/teamplay_round_timer.cpp
rename to src/game/shared/teamplay_round_timer.cpp
diff --git a/mp/src/game/shared/teamplay_round_timer.h b/src/game/shared/teamplay_round_timer.h
similarity index 100%
rename from mp/src/game/shared/teamplay_round_timer.h
rename to src/game/shared/teamplay_round_timer.h
diff --git a/mp/src/game/shared/teamplayroundbased_gamerules.cpp b/src/game/shared/teamplayroundbased_gamerules.cpp
similarity index 100%
rename from mp/src/game/shared/teamplayroundbased_gamerules.cpp
rename to src/game/shared/teamplayroundbased_gamerules.cpp
diff --git a/mp/src/game/shared/teamplayroundbased_gamerules.h b/src/game/shared/teamplayroundbased_gamerules.h
similarity index 100%
rename from mp/src/game/shared/teamplayroundbased_gamerules.h
rename to src/game/shared/teamplayroundbased_gamerules.h
diff --git a/mp/src/game/shared/tempentity.h b/src/game/shared/tempentity.h
similarity index 100%
rename from mp/src/game/shared/tempentity.h
rename to src/game/shared/tempentity.h
diff --git a/mp/src/game/shared/test_ehandle.cpp b/src/game/shared/test_ehandle.cpp
similarity index 100%
rename from mp/src/game/shared/test_ehandle.cpp
rename to src/game/shared/test_ehandle.cpp
diff --git a/mp/src/game/shared/touchlink.h b/src/game/shared/touchlink.h
similarity index 100%
rename from mp/src/game/shared/touchlink.h
rename to src/game/shared/touchlink.h
diff --git a/mp/src/game/shared/triggers_shared.h b/src/game/shared/triggers_shared.h
similarity index 100%
rename from mp/src/game/shared/triggers_shared.h
rename to src/game/shared/triggers_shared.h
diff --git a/mp/src/game/shared/usercmd.cpp b/src/game/shared/usercmd.cpp
similarity index 100%
rename from mp/src/game/shared/usercmd.cpp
rename to src/game/shared/usercmd.cpp
diff --git a/mp/src/game/shared/usercmd.h b/src/game/shared/usercmd.h
similarity index 100%
rename from mp/src/game/shared/usercmd.h
rename to src/game/shared/usercmd.h
diff --git a/mp/src/game/shared/usermessages.cpp b/src/game/shared/usermessages.cpp
similarity index 100%
rename from mp/src/game/shared/usermessages.cpp
rename to src/game/shared/usermessages.cpp
diff --git a/mp/src/game/shared/usermessages.h b/src/game/shared/usermessages.h
similarity index 100%
rename from mp/src/game/shared/usermessages.h
rename to src/game/shared/usermessages.h
diff --git a/mp/src/game/shared/util_shared.cpp b/src/game/shared/util_shared.cpp
similarity index 100%
rename from mp/src/game/shared/util_shared.cpp
rename to src/game/shared/util_shared.cpp
diff --git a/mp/src/game/shared/util_shared.h b/src/game/shared/util_shared.h
similarity index 100%
rename from mp/src/game/shared/util_shared.h
rename to src/game/shared/util_shared.h
diff --git a/mp/src/game/shared/vehicle_choreo_generic_shared.h b/src/game/shared/vehicle_choreo_generic_shared.h
similarity index 100%
rename from mp/src/game/shared/vehicle_choreo_generic_shared.h
rename to src/game/shared/vehicle_choreo_generic_shared.h
diff --git a/mp/src/game/shared/vehicle_viewblend_shared.cpp b/src/game/shared/vehicle_viewblend_shared.cpp
similarity index 100%
rename from mp/src/game/shared/vehicle_viewblend_shared.cpp
rename to src/game/shared/vehicle_viewblend_shared.cpp
diff --git a/mp/src/game/shared/vehicle_viewblend_shared.h b/src/game/shared/vehicle_viewblend_shared.h
similarity index 100%
rename from mp/src/game/shared/vehicle_viewblend_shared.h
rename to src/game/shared/vehicle_viewblend_shared.h
diff --git a/mp/src/game/shared/vgui_defaultinputsignal.h b/src/game/shared/vgui_defaultinputsignal.h
similarity index 100%
rename from mp/src/game/shared/vgui_defaultinputsignal.h
rename to src/game/shared/vgui_defaultinputsignal.h
diff --git a/mp/src/game/shared/viewport_panel_names.h b/src/game/shared/viewport_panel_names.h
similarity index 100%
rename from mp/src/game/shared/viewport_panel_names.h
rename to src/game/shared/viewport_panel_names.h
diff --git a/mp/src/game/shared/voice_banmgr.cpp b/src/game/shared/voice_banmgr.cpp
similarity index 100%
rename from mp/src/game/shared/voice_banmgr.cpp
rename to src/game/shared/voice_banmgr.cpp
diff --git a/mp/src/game/shared/voice_banmgr.h b/src/game/shared/voice_banmgr.h
similarity index 100%
rename from mp/src/game/shared/voice_banmgr.h
rename to src/game/shared/voice_banmgr.h
diff --git a/mp/src/game/shared/voice_common.h b/src/game/shared/voice_common.h
similarity index 100%
rename from mp/src/game/shared/voice_common.h
rename to src/game/shared/voice_common.h
diff --git a/mp/src/game/shared/voice_gamemgr.cpp b/src/game/shared/voice_gamemgr.cpp
similarity index 100%
rename from mp/src/game/shared/voice_gamemgr.cpp
rename to src/game/shared/voice_gamemgr.cpp
diff --git a/mp/src/game/shared/voice_gamemgr.h b/src/game/shared/voice_gamemgr.h
similarity index 100%
rename from mp/src/game/shared/voice_gamemgr.h
rename to src/game/shared/voice_gamemgr.h
diff --git a/mp/src/game/shared/voice_status.cpp b/src/game/shared/voice_status.cpp
similarity index 100%
rename from mp/src/game/shared/voice_status.cpp
rename to src/game/shared/voice_status.cpp
diff --git a/mp/src/game/shared/voice_status.h b/src/game/shared/voice_status.h
similarity index 100%
rename from mp/src/game/shared/voice_status.h
rename to src/game/shared/voice_status.h
diff --git a/mp/src/game/shared/vphysics_sound.h b/src/game/shared/vphysics_sound.h
similarity index 100%
rename from mp/src/game/shared/vphysics_sound.h
rename to src/game/shared/vphysics_sound.h
diff --git a/mp/src/game/shared/vphysicsupdateai.h b/src/game/shared/vphysicsupdateai.h
similarity index 100%
rename from mp/src/game/shared/vphysicsupdateai.h
rename to src/game/shared/vphysicsupdateai.h
diff --git a/mp/src/game/shared/weapon_ifmbase.cpp b/src/game/shared/weapon_ifmbase.cpp
similarity index 100%
rename from mp/src/game/shared/weapon_ifmbase.cpp
rename to src/game/shared/weapon_ifmbase.cpp
diff --git a/mp/src/game/shared/weapon_ifmbase.h b/src/game/shared/weapon_ifmbase.h
similarity index 100%
rename from mp/src/game/shared/weapon_ifmbase.h
rename to src/game/shared/weapon_ifmbase.h
diff --git a/mp/src/game/shared/weapon_ifmbasecamera.cpp b/src/game/shared/weapon_ifmbasecamera.cpp
similarity index 100%
rename from mp/src/game/shared/weapon_ifmbasecamera.cpp
rename to src/game/shared/weapon_ifmbasecamera.cpp
diff --git a/mp/src/game/shared/weapon_ifmbasecamera.h b/src/game/shared/weapon_ifmbasecamera.h
similarity index 100%
rename from mp/src/game/shared/weapon_ifmbasecamera.h
rename to src/game/shared/weapon_ifmbasecamera.h
diff --git a/mp/src/game/shared/weapon_ifmsteadycam.cpp b/src/game/shared/weapon_ifmsteadycam.cpp
similarity index 100%
rename from mp/src/game/shared/weapon_ifmsteadycam.cpp
rename to src/game/shared/weapon_ifmsteadycam.cpp
diff --git a/mp/src/game/shared/weapon_ifmsteadycam.h b/src/game/shared/weapon_ifmsteadycam.h
similarity index 100%
rename from mp/src/game/shared/weapon_ifmsteadycam.h
rename to src/game/shared/weapon_ifmsteadycam.h
diff --git a/mp/src/game/shared/weapon_parse.cpp b/src/game/shared/weapon_parse.cpp
similarity index 100%
rename from mp/src/game/shared/weapon_parse.cpp
rename to src/game/shared/weapon_parse.cpp
diff --git a/mp/src/game/shared/weapon_parse.h b/src/game/shared/weapon_parse.h
similarity index 100%
rename from mp/src/game/shared/weapon_parse.h
rename to src/game/shared/weapon_parse.h
diff --git a/mp/src/game/shared/weapon_parse_default.cpp b/src/game/shared/weapon_parse_default.cpp
similarity index 100%
rename from mp/src/game/shared/weapon_parse_default.cpp
rename to src/game/shared/weapon_parse_default.cpp
diff --git a/mp/src/game/shared/weapon_proficiency.cpp b/src/game/shared/weapon_proficiency.cpp
similarity index 100%
rename from mp/src/game/shared/weapon_proficiency.cpp
rename to src/game/shared/weapon_proficiency.cpp
diff --git a/mp/src/game/shared/weapon_proficiency.h b/src/game/shared/weapon_proficiency.h
similarity index 100%
rename from mp/src/game/shared/weapon_proficiency.h
rename to src/game/shared/weapon_proficiency.h
diff --git a/mp/src/gcsdk/bin/linux/protoc b/src/gcsdk/bin/linux/protoc
similarity index 100%
rename from mp/src/gcsdk/bin/linux/protoc
rename to src/gcsdk/bin/linux/protoc
diff --git a/mp/src/gcsdk/bin/protoc.exe b/src/gcsdk/bin/protoc.exe
similarity index 100%
rename from mp/src/gcsdk/bin/protoc.exe
rename to src/gcsdk/bin/protoc.exe
diff --git a/mp/src/lib/common/libcurl.lib b/src/lib/common/libcurl.lib
similarity index 100%
rename from mp/src/lib/common/libcurl.lib
rename to src/lib/common/libcurl.lib
diff --git a/mp/src/lib/common/linux32/libcrypto.a b/src/lib/common/linux32/libcrypto.a
similarity index 100%
rename from mp/src/lib/common/linux32/libcrypto.a
rename to src/lib/common/linux32/libcrypto.a
diff --git a/mp/src/lib/common/linux32/libcurl.a b/src/lib/common/linux32/libcurl.a
similarity index 100%
rename from mp/src/lib/common/linux32/libcurl.a
rename to src/lib/common/linux32/libcurl.a
diff --git a/mp/src/lib/common/linux32/libcurlssl.a b/src/lib/common/linux32/libcurlssl.a
similarity index 100%
rename from mp/src/lib/common/linux32/libcurlssl.a
rename to src/lib/common/linux32/libcurlssl.a
diff --git a/mp/src/lib/common/linux32/libssl.a b/src/lib/common/linux32/libssl.a
similarity index 100%
rename from mp/src/lib/common/linux32/libssl.a
rename to src/lib/common/linux32/libssl.a
diff --git a/mp/src/lib/common/lzma.lib b/src/lib/common/lzma.lib
similarity index 100%
rename from mp/src/lib/common/lzma.lib
rename to src/lib/common/lzma.lib
diff --git a/mp/src/lib/common/ubuntu12_32/libcrypto.a b/src/lib/common/ubuntu12_32/libcrypto.a
similarity index 100%
rename from mp/src/lib/common/ubuntu12_32/libcrypto.a
rename to src/lib/common/ubuntu12_32/libcrypto.a
diff --git a/mp/src/lib/common/ubuntu12_32/libssl.a b/src/lib/common/ubuntu12_32/libssl.a
similarity index 100%
rename from mp/src/lib/common/ubuntu12_32/libssl.a
rename to src/lib/common/ubuntu12_32/libssl.a
diff --git a/mp/src/lib/public/2010/libprotobuf.lib b/src/lib/public/2010/libprotobuf.lib
similarity index 100%
rename from mp/src/lib/public/2010/libprotobuf.lib
rename to src/lib/public/2010/libprotobuf.lib
diff --git a/mp/src/lib/public/2012/libprotobuf.lib b/src/lib/public/2012/libprotobuf.lib
similarity index 100%
rename from mp/src/lib/public/2012/libprotobuf.lib
rename to src/lib/public/2012/libprotobuf.lib
diff --git a/mp/src/lib/public/appframework.lib b/src/lib/public/appframework.lib
similarity index 100%
rename from mp/src/lib/public/appframework.lib
rename to src/lib/public/appframework.lib
diff --git a/mp/src/lib/public/bitmap.lib b/src/lib/public/bitmap.lib
similarity index 100%
rename from mp/src/lib/public/bitmap.lib
rename to src/lib/public/bitmap.lib
diff --git a/mp/src/lib/public/choreoobjects.lib b/src/lib/public/choreoobjects.lib
similarity index 100%
rename from mp/src/lib/public/choreoobjects.lib
rename to src/lib/public/choreoobjects.lib
diff --git a/mp/src/lib/public/dmxloader.lib b/src/lib/public/dmxloader.lib
similarity index 100%
rename from mp/src/lib/public/dmxloader.lib
rename to src/lib/public/dmxloader.lib
diff --git a/mp/src/lib/public/fgdlib.lib b/src/lib/public/fgdlib.lib
similarity index 100%
rename from mp/src/lib/public/fgdlib.lib
rename to src/lib/public/fgdlib.lib
diff --git a/mp/src/lib/public/libprotobuf.lib b/src/lib/public/libprotobuf.lib
similarity index 100%
rename from mp/src/lib/public/libprotobuf.lib
rename to src/lib/public/libprotobuf.lib
diff --git a/mp/src/lib/public/libz.lib b/src/lib/public/libz.lib
similarity index 100%
rename from mp/src/lib/public/libz.lib
rename to src/lib/public/libz.lib
diff --git a/mp/src/lib/public/linux32/bitmap.a b/src/lib/public/linux32/bitmap.a
similarity index 100%
rename from mp/src/lib/public/linux32/bitmap.a
rename to src/lib/public/linux32/bitmap.a
diff --git a/mp/src/lib/public/linux32/choreoobjects.a b/src/lib/public/linux32/choreoobjects.a
similarity index 100%
rename from mp/src/lib/public/linux32/choreoobjects.a
rename to src/lib/public/linux32/choreoobjects.a
diff --git a/mp/src/lib/public/linux32/dmxloader.a b/src/lib/public/linux32/dmxloader.a
similarity index 100%
rename from mp/src/lib/public/linux32/dmxloader.a
rename to src/lib/public/linux32/dmxloader.a
diff --git a/mp/src/lib/public/linux32/libSDL2-2.0.so.0 b/src/lib/public/linux32/libSDL2-2.0.so.0
similarity index 100%
rename from mp/src/lib/public/linux32/libSDL2-2.0.so.0
rename to src/lib/public/linux32/libSDL2-2.0.so.0
diff --git a/mp/src/lib/public/linux32/libSDL2.so b/src/lib/public/linux32/libSDL2.so
similarity index 100%
rename from mp/src/lib/public/linux32/libSDL2.so
rename to src/lib/public/linux32/libSDL2.so
diff --git a/mp/src/lib/public/linux32/libprotobuf.a b/src/lib/public/linux32/libprotobuf.a
similarity index 100%
rename from mp/src/lib/public/linux32/libprotobuf.a
rename to src/lib/public/linux32/libprotobuf.a
diff --git a/mp/src/lib/public/linux32/libsteam_api.so b/src/lib/public/linux32/libsteam_api.so
similarity index 100%
rename from mp/src/lib/public/linux32/libsteam_api.so
rename to src/lib/public/linux32/libsteam_api.so
diff --git a/mp/src/lib/public/linux32/libtier0.so b/src/lib/public/linux32/libtier0.so
similarity index 100%
rename from mp/src/lib/public/linux32/libtier0.so
rename to src/lib/public/linux32/libtier0.so
diff --git a/mp/src/lib/public/linux32/libvstdlib.so b/src/lib/public/linux32/libvstdlib.so
similarity index 100%
rename from mp/src/lib/public/linux32/libvstdlib.so
rename to src/lib/public/linux32/libvstdlib.so
diff --git a/mp/src/lib/public/linux32/libz.a b/src/lib/public/linux32/libz.a
similarity index 100%
rename from mp/src/lib/public/linux32/libz.a
rename to src/lib/public/linux32/libz.a
diff --git a/mp/src/lib/public/linux32/mathlib.a b/src/lib/public/linux32/mathlib.a
similarity index 100%
rename from mp/src/lib/public/linux32/mathlib.a
rename to src/lib/public/linux32/mathlib.a
diff --git a/mp/src/lib/public/linux32/matsys_controls.a b/src/lib/public/linux32/matsys_controls.a
similarity index 100%
rename from mp/src/lib/public/linux32/matsys_controls.a
rename to src/lib/public/linux32/matsys_controls.a
diff --git a/mp/src/lib/public/linux32/particles.a b/src/lib/public/linux32/particles.a
similarity index 100%
rename from mp/src/lib/public/linux32/particles.a
rename to src/lib/public/linux32/particles.a
diff --git a/mp/src/lib/public/linux32/raytrace.a b/src/lib/public/linux32/raytrace.a
similarity index 100%
rename from mp/src/lib/public/linux32/raytrace.a
rename to src/lib/public/linux32/raytrace.a
diff --git a/mp/src/lib/public/linux32/shaderlib.a b/src/lib/public/linux32/shaderlib.a
similarity index 100%
rename from mp/src/lib/public/linux32/shaderlib.a
rename to src/lib/public/linux32/shaderlib.a
diff --git a/mp/src/lib/public/linux32/tier1.a b/src/lib/public/linux32/tier1.a
similarity index 100%
rename from mp/src/lib/public/linux32/tier1.a
rename to src/lib/public/linux32/tier1.a
diff --git a/mp/src/lib/public/linux32/tier2.a b/src/lib/public/linux32/tier2.a
similarity index 100%
rename from mp/src/lib/public/linux32/tier2.a
rename to src/lib/public/linux32/tier2.a
diff --git a/mp/src/lib/public/linux32/tier3.a b/src/lib/public/linux32/tier3.a
similarity index 100%
rename from mp/src/lib/public/linux32/tier3.a
rename to src/lib/public/linux32/tier3.a
diff --git a/mp/src/lib/public/linux32/vgui_controls.a b/src/lib/public/linux32/vgui_controls.a
similarity index 100%
rename from mp/src/lib/public/linux32/vgui_controls.a
rename to src/lib/public/linux32/vgui_controls.a
diff --git a/mp/src/lib/public/linux32/vtf.a b/src/lib/public/linux32/vtf.a
similarity index 100%
rename from mp/src/lib/public/linux32/vtf.a
rename to src/lib/public/linux32/vtf.a
diff --git a/mp/src/lib/public/mathlib.lib b/src/lib/public/mathlib.lib
similarity index 100%
rename from mp/src/lib/public/mathlib.lib
rename to src/lib/public/mathlib.lib
diff --git a/mp/src/lib/public/matsys_controls.lib b/src/lib/public/matsys_controls.lib
similarity index 100%
rename from mp/src/lib/public/matsys_controls.lib
rename to src/lib/public/matsys_controls.lib
diff --git a/mp/src/lib/public/nvtristrip.lib b/src/lib/public/nvtristrip.lib
similarity index 100%
rename from mp/src/lib/public/nvtristrip.lib
rename to src/lib/public/nvtristrip.lib
diff --git a/mp/src/lib/public/osx32/bitmap.a b/src/lib/public/osx32/bitmap.a
similarity index 100%
rename from mp/src/lib/public/osx32/bitmap.a
rename to src/lib/public/osx32/bitmap.a
diff --git a/mp/src/lib/public/osx32/choreoobjects.a b/src/lib/public/osx32/choreoobjects.a
similarity index 100%
rename from mp/src/lib/public/osx32/choreoobjects.a
rename to src/lib/public/osx32/choreoobjects.a
diff --git a/mp/src/lib/public/osx32/dmxloader.a b/src/lib/public/osx32/dmxloader.a
similarity index 100%
rename from mp/src/lib/public/osx32/dmxloader.a
rename to src/lib/public/osx32/dmxloader.a
diff --git a/mp/src/lib/public/osx32/libSDL2-2.0.0.dylib b/src/lib/public/osx32/libSDL2-2.0.0.dylib
similarity index 100%
rename from mp/src/lib/public/osx32/libSDL2-2.0.0.dylib
rename to src/lib/public/osx32/libSDL2-2.0.0.dylib
diff --git a/mp/src/lib/public/osx32/libSDL2.dylib b/src/lib/public/osx32/libSDL2.dylib
similarity index 100%
rename from mp/src/lib/public/osx32/libSDL2.dylib
rename to src/lib/public/osx32/libSDL2.dylib
diff --git a/mp/src/lib/public/osx32/libprotobuf.a b/src/lib/public/osx32/libprotobuf.a
similarity index 100%
rename from mp/src/lib/public/osx32/libprotobuf.a
rename to src/lib/public/osx32/libprotobuf.a
diff --git a/mp/src/lib/public/osx32/libsteam_api.dylib b/src/lib/public/osx32/libsteam_api.dylib
similarity index 100%
rename from mp/src/lib/public/osx32/libsteam_api.dylib
rename to src/lib/public/osx32/libsteam_api.dylib
diff --git a/mp/src/lib/public/osx32/libtier0.dylib b/src/lib/public/osx32/libtier0.dylib
similarity index 100%
rename from mp/src/lib/public/osx32/libtier0.dylib
rename to src/lib/public/osx32/libtier0.dylib
diff --git a/mp/src/lib/public/osx32/libvstdlib.dylib b/src/lib/public/osx32/libvstdlib.dylib
similarity index 100%
rename from mp/src/lib/public/osx32/libvstdlib.dylib
rename to src/lib/public/osx32/libvstdlib.dylib
diff --git a/mp/src/lib/public/osx32/mathlib.a b/src/lib/public/osx32/mathlib.a
similarity index 100%
rename from mp/src/lib/public/osx32/mathlib.a
rename to src/lib/public/osx32/mathlib.a
diff --git a/mp/src/lib/public/osx32/matsys_controls.a b/src/lib/public/osx32/matsys_controls.a
similarity index 100%
rename from mp/src/lib/public/osx32/matsys_controls.a
rename to src/lib/public/osx32/matsys_controls.a
diff --git a/mp/src/lib/public/osx32/particles.a b/src/lib/public/osx32/particles.a
similarity index 100%
rename from mp/src/lib/public/osx32/particles.a
rename to src/lib/public/osx32/particles.a
diff --git a/mp/src/lib/public/osx32/raytrace.a b/src/lib/public/osx32/raytrace.a
similarity index 100%
rename from mp/src/lib/public/osx32/raytrace.a
rename to src/lib/public/osx32/raytrace.a
diff --git a/mp/src/lib/public/osx32/shaderlib.a b/src/lib/public/osx32/shaderlib.a
similarity index 100%
rename from mp/src/lib/public/osx32/shaderlib.a
rename to src/lib/public/osx32/shaderlib.a
diff --git a/mp/src/lib/public/osx32/tier1.a b/src/lib/public/osx32/tier1.a
similarity index 100%
rename from mp/src/lib/public/osx32/tier1.a
rename to src/lib/public/osx32/tier1.a
diff --git a/mp/src/lib/public/osx32/tier2.a b/src/lib/public/osx32/tier2.a
similarity index 100%
rename from mp/src/lib/public/osx32/tier2.a
rename to src/lib/public/osx32/tier2.a
diff --git a/mp/src/lib/public/osx32/tier3.a b/src/lib/public/osx32/tier3.a
similarity index 100%
rename from mp/src/lib/public/osx32/tier3.a
rename to src/lib/public/osx32/tier3.a
diff --git a/mp/src/lib/public/osx32/vgui_controls.a b/src/lib/public/osx32/vgui_controls.a
similarity index 100%
rename from mp/src/lib/public/osx32/vgui_controls.a
rename to src/lib/public/osx32/vgui_controls.a
diff --git a/mp/src/lib/public/osx32/vtf.a b/src/lib/public/osx32/vtf.a
similarity index 100%
rename from mp/src/lib/public/osx32/vtf.a
rename to src/lib/public/osx32/vtf.a
diff --git a/mp/src/lib/public/particles.lib b/src/lib/public/particles.lib
similarity index 100%
rename from mp/src/lib/public/particles.lib
rename to src/lib/public/particles.lib
diff --git a/mp/src/lib/public/raytrace.lib b/src/lib/public/raytrace.lib
similarity index 100%
rename from mp/src/lib/public/raytrace.lib
rename to src/lib/public/raytrace.lib
diff --git a/mp/src/lib/public/shaderlib.lib b/src/lib/public/shaderlib.lib
similarity index 100%
rename from mp/src/lib/public/shaderlib.lib
rename to src/lib/public/shaderlib.lib
diff --git a/mp/src/lib/public/steam_api.lib b/src/lib/public/steam_api.lib
similarity index 100%
rename from mp/src/lib/public/steam_api.lib
rename to src/lib/public/steam_api.lib
diff --git a/mp/src/lib/public/tier0.lib b/src/lib/public/tier0.lib
similarity index 100%
rename from mp/src/lib/public/tier0.lib
rename to src/lib/public/tier0.lib
diff --git a/mp/src/lib/public/tier1.lib b/src/lib/public/tier1.lib
similarity index 100%
rename from mp/src/lib/public/tier1.lib
rename to src/lib/public/tier1.lib
diff --git a/mp/src/lib/public/tier2.lib b/src/lib/public/tier2.lib
similarity index 100%
rename from mp/src/lib/public/tier2.lib
rename to src/lib/public/tier2.lib
diff --git a/mp/src/lib/public/tier3.lib b/src/lib/public/tier3.lib
similarity index 100%
rename from mp/src/lib/public/tier3.lib
rename to src/lib/public/tier3.lib
diff --git a/mp/src/lib/public/vgui_controls.lib b/src/lib/public/vgui_controls.lib
similarity index 100%
rename from mp/src/lib/public/vgui_controls.lib
rename to src/lib/public/vgui_controls.lib
diff --git a/mp/src/lib/public/vmpi.lib b/src/lib/public/vmpi.lib
similarity index 100%
rename from mp/src/lib/public/vmpi.lib
rename to src/lib/public/vmpi.lib
diff --git a/mp/src/lib/public/vstdlib.lib b/src/lib/public/vstdlib.lib
similarity index 100%
rename from mp/src/lib/public/vstdlib.lib
rename to src/lib/public/vstdlib.lib
diff --git a/mp/src/lib/public/vtf.lib b/src/lib/public/vtf.lib
similarity index 100%
rename from mp/src/lib/public/vtf.lib
rename to src/lib/public/vtf.lib
diff --git a/mp/src/materialsystem/shaderapidx9/locald3dtypes.h b/src/materialsystem/shaderapidx9/locald3dtypes.h
similarity index 100%
rename from mp/src/materialsystem/shaderapidx9/locald3dtypes.h
rename to src/materialsystem/shaderapidx9/locald3dtypes.h
diff --git a/mp/src/materialsystem/stdshaders/BaseVSShader.cpp b/src/materialsystem/stdshaders/BaseVSShader.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BaseVSShader.cpp
rename to src/materialsystem/stdshaders/BaseVSShader.cpp
diff --git a/mp/src/materialsystem/stdshaders/BaseVSShader.h b/src/materialsystem/stdshaders/BaseVSShader.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BaseVSShader.h
rename to src/materialsystem/stdshaders/BaseVSShader.h
diff --git a/mp/src/materialsystem/stdshaders/Bloom.cpp b/src/materialsystem/stdshaders/Bloom.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Bloom.cpp
rename to src/materialsystem/stdshaders/Bloom.cpp
diff --git a/mp/src/materialsystem/stdshaders/BlurFilterX.cpp b/src/materialsystem/stdshaders/BlurFilterX.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilterX.cpp
rename to src/materialsystem/stdshaders/BlurFilterX.cpp
diff --git a/mp/src/materialsystem/stdshaders/BlurFilterX_dx80.cpp b/src/materialsystem/stdshaders/BlurFilterX_dx80.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilterX_dx80.cpp
rename to src/materialsystem/stdshaders/BlurFilterX_dx80.cpp
diff --git a/mp/src/materialsystem/stdshaders/BlurFilterY.cpp b/src/materialsystem/stdshaders/BlurFilterY.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilterY.cpp
rename to src/materialsystem/stdshaders/BlurFilterY.cpp
diff --git a/mp/src/materialsystem/stdshaders/BlurFilterY_dx80.cpp b/src/materialsystem/stdshaders/BlurFilterY_dx80.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilterY_dx80.cpp
rename to src/materialsystem/stdshaders/BlurFilterY_dx80.cpp
diff --git a/mp/src/materialsystem/stdshaders/BlurFilter_ps11.psh b/src/materialsystem/stdshaders/BlurFilter_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilter_ps11.psh
rename to src/materialsystem/stdshaders/BlurFilter_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/BlurFilter_ps2x.fxc b/src/materialsystem/stdshaders/BlurFilter_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilter_ps2x.fxc
rename to src/materialsystem/stdshaders/BlurFilter_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/BlurFilter_vs11.fxc b/src/materialsystem/stdshaders/BlurFilter_vs11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilter_vs11.fxc
rename to src/materialsystem/stdshaders/BlurFilter_vs11.fxc
diff --git a/mp/src/materialsystem/stdshaders/BlurFilter_vs20.fxc b/src/materialsystem/stdshaders/BlurFilter_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/BlurFilter_vs20.fxc
rename to src/materialsystem/stdshaders/BlurFilter_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/Cable.psh b/src/materialsystem/stdshaders/Cable.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Cable.psh
rename to src/materialsystem/stdshaders/Cable.psh
diff --git a/mp/src/materialsystem/stdshaders/Cable.vsh b/src/materialsystem/stdshaders/Cable.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Cable.vsh
rename to src/materialsystem/stdshaders/Cable.vsh
diff --git a/mp/src/materialsystem/stdshaders/DebugDrawDepth_ps2x.fxc b/src/materialsystem/stdshaders/DebugDrawDepth_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugDrawDepth_ps2x.fxc
rename to src/materialsystem/stdshaders/DebugDrawDepth_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/DebugDrawDepth_vs20.fxc b/src/materialsystem/stdshaders/DebugDrawDepth_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugDrawDepth_vs20.fxc
rename to src/materialsystem/stdshaders/DebugDrawDepth_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/DebugDrawEnvmapMask.cpp b/src/materialsystem/stdshaders/DebugDrawEnvmapMask.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugDrawEnvmapMask.cpp
rename to src/materialsystem/stdshaders/DebugDrawEnvmapMask.cpp
diff --git a/mp/src/materialsystem/stdshaders/DebugDrawEnvmapMask_ps2x.fxc b/src/materialsystem/stdshaders/DebugDrawEnvmapMask_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugDrawEnvmapMask_ps2x.fxc
rename to src/materialsystem/stdshaders/DebugDrawEnvmapMask_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/DebugDrawEnvmapMask_vs20.fxc b/src/materialsystem/stdshaders/DebugDrawEnvmapMask_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugDrawEnvmapMask_vs20.fxc
rename to src/materialsystem/stdshaders/DebugDrawEnvmapMask_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/DebugTextureView.cpp b/src/materialsystem/stdshaders/DebugTextureView.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugTextureView.cpp
rename to src/materialsystem/stdshaders/DebugTextureView.cpp
diff --git a/mp/src/materialsystem/stdshaders/DebugTextureView_ps2x.fxc b/src/materialsystem/stdshaders/DebugTextureView_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugTextureView_ps2x.fxc
rename to src/materialsystem/stdshaders/DebugTextureView_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/DebugTextureView_vs20.fxc b/src/materialsystem/stdshaders/DebugTextureView_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/DebugTextureView_vs20.fxc
rename to src/materialsystem/stdshaders/DebugTextureView_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/Eyes.psh b/src/materialsystem/stdshaders/Eyes.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Eyes.psh
rename to src/materialsystem/stdshaders/Eyes.psh
diff --git a/mp/src/materialsystem/stdshaders/Eyes_Overbright2.psh b/src/materialsystem/stdshaders/Eyes_Overbright2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Eyes_Overbright2.psh
rename to src/materialsystem/stdshaders/Eyes_Overbright2.psh
diff --git a/mp/src/materialsystem/stdshaders/Eyes_vs20.fxc b/src/materialsystem/stdshaders/Eyes_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Eyes_vs20.fxc
rename to src/materialsystem/stdshaders/Eyes_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric.psh b/src/materialsystem/stdshaders/LightmappedGeneric.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_AddBaseAlphaMaskedEnvMap.psh b/src/materialsystem/stdshaders/LightmappedGeneric_AddBaseAlphaMaskedEnvMap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_AddBaseAlphaMaskedEnvMap.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_AddBaseAlphaMaskedEnvMap.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapMaskNoTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapMaskNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapMaskNoTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapMaskNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapNoTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapNoTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_AddEnvMapNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseAlphaMaskedEnvMapV2.psh b/src/materialsystem/stdshaders/LightmappedGeneric_BaseAlphaMaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseAlphaMaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BaseAlphaMaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BaseTexture.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseTextureBlend.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_BaseTextureBlend.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BaseTextureBlend.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BaseTextureBlend.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.psh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.psh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedEnvmap_ps14.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.psh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.psh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_base_ps14.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.psh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_BumpmappedLightmap_blend_ps14.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_Decal.psh b/src/materialsystem/stdshaders/LightmappedGeneric_Decal.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_Decal.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_Decal.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_Decal.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_Decal.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_Decal.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_Decal.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_Detail.psh b/src/materialsystem/stdshaders/LightmappedGeneric_Detail.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_Detail.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_Detail.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_DetailNoTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_DetailNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_DetailNoTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_DetailNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_DetailSelfIlluminated.psh b/src/materialsystem/stdshaders/LightmappedGeneric_DetailSelfIlluminated.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_DetailSelfIlluminated.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_DetailSelfIlluminated.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_EnvMapNoTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_EnvMapNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_EnvMapNoTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_EnvMapNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_EnvMapV2.psh b/src/materialsystem/stdshaders/LightmappedGeneric_EnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_EnvMapV2.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_EnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly.vsh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly_Overbright2.psh b/src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly_Overbright2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly_Overbright2.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_LightingOnly_Overbright2.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapNoTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapNoTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapV2.psh b/src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_MaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLighting.psh b/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLighting.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLighting.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLighting.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingNoTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingNoTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingSelfIllum.psh b/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingSelfIllum.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingSelfIllum.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_MultiplyByLightingSelfIllum.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_NoTexture.psh b/src/materialsystem/stdshaders/LightmappedGeneric_NoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_NoTexture.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_NoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_SSBumpmappedLightmap.psh b/src/materialsystem/stdshaders/LightmappedGeneric_SSBumpmappedLightmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_SSBumpmappedLightmap.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_SSBumpmappedLightmap.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminated.psh b/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminated.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminated.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminated.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedEnvMapV2.psh b/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedEnvMapV2.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedMaskedEnvMapV2.psh b/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedMaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedMaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/LightmappedGeneric_SelfIlluminatedMaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/LightmappedGeneric_VertexColor.vsh b/src/materialsystem/stdshaders/LightmappedGeneric_VertexColor.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/LightmappedGeneric_VertexColor.vsh
rename to src/materialsystem/stdshaders/LightmappedGeneric_VertexColor.vsh
diff --git a/mp/src/materialsystem/stdshaders/Refract_model_vs11.vsh b/src/materialsystem/stdshaders/Refract_model_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Refract_model_vs11.vsh
rename to src/materialsystem/stdshaders/Refract_model_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/Refract_ps11.psh b/src/materialsystem/stdshaders/Refract_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Refract_ps11.psh
rename to src/materialsystem/stdshaders/Refract_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/Refract_vs20.fxc b/src/materialsystem/stdshaders/Refract_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Refract_vs20.fxc
rename to src/materialsystem/stdshaders/Refract_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/Refract_world_vs11.vsh b/src/materialsystem/stdshaders/Refract_world_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Refract_world_vs11.vsh
rename to src/materialsystem/stdshaders/Refract_world_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/SDK_Bloom_ps2x.fxc b/src/materialsystem/stdshaders/SDK_Bloom_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/SDK_Bloom_ps2x.fxc
rename to src/materialsystem/stdshaders/SDK_Bloom_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/SDK_bloomadd_ps11.fxc b/src/materialsystem/stdshaders/SDK_bloomadd_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/SDK_bloomadd_ps11.fxc
rename to src/materialsystem/stdshaders/SDK_bloomadd_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc b/src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc
rename to src/materialsystem/stdshaders/SDK_bloomadd_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/SDK_screenspaceeffect_vs20.fxc b/src/materialsystem/stdshaders/SDK_screenspaceeffect_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/SDK_screenspaceeffect_vs20.fxc
rename to src/materialsystem/stdshaders/SDK_screenspaceeffect_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/ShadowModel.psh b/src/materialsystem/stdshaders/ShadowModel.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/ShadowModel.psh
rename to src/materialsystem/stdshaders/ShadowModel.psh
diff --git a/mp/src/materialsystem/stdshaders/ShadowModel.vsh b/src/materialsystem/stdshaders/ShadowModel.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/ShadowModel.vsh
rename to src/materialsystem/stdshaders/ShadowModel.vsh
diff --git a/mp/src/materialsystem/stdshaders/Teeth.vsh b/src/materialsystem/stdshaders/Teeth.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Teeth.vsh
rename to src/materialsystem/stdshaders/Teeth.vsh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric.psh b/src/materialsystem/stdshaders/UnlitGeneric.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric.psh
rename to src/materialsystem/stdshaders/UnlitGeneric.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_BaseAlphaMaskedEnvMap.psh b/src/materialsystem/stdshaders/UnlitGeneric_BaseAlphaMaskedEnvMap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_BaseAlphaMaskedEnvMap.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_BaseAlphaMaskedEnvMap.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_Detail.psh b/src/materialsystem/stdshaders/UnlitGeneric_Detail.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_Detail.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_Detail.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_DetailBaseAlphaMaskedEnvMap.psh b/src/materialsystem/stdshaders/UnlitGeneric_DetailBaseAlphaMaskedEnvMap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_DetailBaseAlphaMaskedEnvMap.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_DetailBaseAlphaMaskedEnvMap.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMap.psh b/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMap.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMap.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMask.psh b/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMask.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMask.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMask.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMaskNoTexture.psh b/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMaskNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMaskNoTexture.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapMaskNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapNoTexture.psh b/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapNoTexture.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_DetailEnvMapNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_DetailNoTexture.psh b/src/materialsystem/stdshaders/UnlitGeneric_DetailNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_DetailNoTexture.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_DetailNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMap.psh b/src/materialsystem/stdshaders/UnlitGeneric_EnvMap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMap.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_EnvMap.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMapMask.psh b/src/materialsystem/stdshaders/UnlitGeneric_EnvMapMask.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMapMask.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_EnvMapMask.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMapMaskNoTexture.psh b/src/materialsystem/stdshaders/UnlitGeneric_EnvMapMaskNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMapMaskNoTexture.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_EnvMapMaskNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMapNoTexture.psh b/src/materialsystem/stdshaders/UnlitGeneric_EnvMapNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_EnvMapNoTexture.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_EnvMapNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_LightingOnly.vsh b/src/materialsystem/stdshaders/UnlitGeneric_LightingOnly.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_LightingOnly.vsh
rename to src/materialsystem/stdshaders/UnlitGeneric_LightingOnly.vsh
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_MaskBaseByDetailAlpha_ps11.fxc b/src/materialsystem/stdshaders/UnlitGeneric_MaskBaseByDetailAlpha_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_MaskBaseByDetailAlpha_ps11.fxc
rename to src/materialsystem/stdshaders/UnlitGeneric_MaskBaseByDetailAlpha_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/UnlitGeneric_NoTexture.psh b/src/materialsystem/stdshaders/UnlitGeneric_NoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/UnlitGeneric_NoTexture.psh
rename to src/materialsystem/stdshaders/UnlitGeneric_NoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric.psh b/src/materialsystem/stdshaders/VertexLitGeneric.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_BaseAlphaMaskedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_BaseAlphaMaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_BaseAlphaMaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_BaseAlphaMaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_BlendTint.psh b/src/materialsystem/stdshaders/VertexLitGeneric_BlendTint.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_BlendTint.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_BlendTint.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail.psh b/src/materialsystem/stdshaders/VertexLitGeneric_Detail.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_Detail.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailBaseAlphaMaskedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_DetailBaseAlphaMaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailBaseAlphaMaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_DetailBaseAlphaMaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_DetailEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_DetailEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailMaskedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_DetailMaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailMaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_DetailMaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailNoTexture.psh b/src/materialsystem/stdshaders/VertexLitGeneric_DetailNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailNoTexture.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_DetailNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminated.psh b/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminated.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminated.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminated.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedMaskedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedMaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedMaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_DetailSelfIlluminatedMaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail_LerpBase.psh b/src/materialsystem/stdshaders/VertexLitGeneric_Detail_LerpBase.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail_LerpBase.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_Detail_LerpBase.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive.psh b/src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive_selfillum.psh b/src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive_selfillum.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive_selfillum.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_Detail_additive_selfillum.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvMapNoTexture.psh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvMapNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvMapNoTexture.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvMapNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha.psh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha_ps14.psh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha_ps14.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_MultByAlpha_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_ps14.psh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_ps14.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmapV2_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting.vsh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting.vsh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting.vsh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting_ps14.vsh b/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting_ps14.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting_ps14.vsh
rename to src/materialsystem/stdshaders/VertexLitGeneric_EnvmappedBumpmap_NoLighting_ps14.vsh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapNoTexture.psh b/src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapNoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapNoTexture.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapNoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_MaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_NoTexture.psh b/src/materialsystem/stdshaders/VertexLitGeneric_NoTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_NoTexture.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_NoTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.psh b/src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.vsh b/src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.vsh
rename to src/materialsystem/stdshaders/VertexLitGeneric_SelfIllumOnly.vsh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminated.psh b/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminated.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminated.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminated.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedMaskedEnvMapV2.psh b/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedMaskedEnvMapV2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedMaskedEnvMapV2.psh
rename to src/materialsystem/stdshaders/VertexLitGeneric_SelfIlluminatedMaskedEnvMapV2.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitTexture.psh b/src/materialsystem/stdshaders/VertexLitTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitTexture.psh
rename to src/materialsystem/stdshaders/VertexLitTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/VertexLitTexture_Overbright2.psh b/src/materialsystem/stdshaders/VertexLitTexture_Overbright2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/VertexLitTexture_Overbright2.psh
rename to src/materialsystem/stdshaders/VertexLitTexture_Overbright2.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheapFresnelOpaque_ps14.psh b/src/materialsystem/stdshaders/WaterCheapFresnelOpaque_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheapFresnelOpaque_ps14.psh
rename to src/materialsystem/stdshaders/WaterCheapFresnelOpaque_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheapFresnel_ps14.psh b/src/materialsystem/stdshaders/WaterCheapFresnel_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheapFresnel_ps14.psh
rename to src/materialsystem/stdshaders/WaterCheapFresnel_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheapNoFresnelOpaque_ps11.psh b/src/materialsystem/stdshaders/WaterCheapNoFresnelOpaque_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheapNoFresnelOpaque_ps11.psh
rename to src/materialsystem/stdshaders/WaterCheapNoFresnelOpaque_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheapNoFresnel_ps11.psh b/src/materialsystem/stdshaders/WaterCheapNoFresnel_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheapNoFresnel_ps11.psh
rename to src/materialsystem/stdshaders/WaterCheapNoFresnel_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheapOpaque_ps11.psh b/src/materialsystem/stdshaders/WaterCheapOpaque_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheapOpaque_ps11.psh
rename to src/materialsystem/stdshaders/WaterCheapOpaque_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheapOpaque_ps14.psh b/src/materialsystem/stdshaders/WaterCheapOpaque_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheapOpaque_ps14.psh
rename to src/materialsystem/stdshaders/WaterCheapOpaque_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheapPerVertexFresnel_vs11.vsh b/src/materialsystem/stdshaders/WaterCheapPerVertexFresnel_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheapPerVertexFresnel_vs11.vsh
rename to src/materialsystem/stdshaders/WaterCheapPerVertexFresnel_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheap_ps11.psh b/src/materialsystem/stdshaders/WaterCheap_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheap_ps11.psh
rename to src/materialsystem/stdshaders/WaterCheap_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheap_ps14.psh b/src/materialsystem/stdshaders/WaterCheap_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheap_ps14.psh
rename to src/materialsystem/stdshaders/WaterCheap_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheap_ps2x.fxc b/src/materialsystem/stdshaders/WaterCheap_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheap_ps2x.fxc
rename to src/materialsystem/stdshaders/WaterCheap_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/WaterCheap_vs11.vsh b/src/materialsystem/stdshaders/WaterCheap_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheap_vs11.vsh
rename to src/materialsystem/stdshaders/WaterCheap_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheap_vs14.vsh b/src/materialsystem/stdshaders/WaterCheap_vs14.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheap_vs14.vsh
rename to src/materialsystem/stdshaders/WaterCheap_vs14.vsh
diff --git a/mp/src/materialsystem/stdshaders/WaterCheap_vs20.fxc b/src/materialsystem/stdshaders/WaterCheap_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterCheap_vs20.fxc
rename to src/materialsystem/stdshaders/WaterCheap_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/WaterReflect_ps11.psh b/src/materialsystem/stdshaders/WaterReflect_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterReflect_ps11.psh
rename to src/materialsystem/stdshaders/WaterReflect_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterRefractFresnel_ps11.psh b/src/materialsystem/stdshaders/WaterRefractFresnel_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterRefractFresnel_ps11.psh
rename to src/materialsystem/stdshaders/WaterRefractFresnel_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/WaterRefract_ps11.psh b/src/materialsystem/stdshaders/WaterRefract_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WaterRefract_ps11.psh
rename to src/materialsystem/stdshaders/WaterRefract_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/Water_ps14.psh b/src/materialsystem/stdshaders/Water_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Water_ps14.psh
rename to src/materialsystem/stdshaders/Water_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/Water_ps14.vsh b/src/materialsystem/stdshaders/Water_ps14.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Water_ps14.vsh
rename to src/materialsystem/stdshaders/Water_ps14.vsh
diff --git a/mp/src/materialsystem/stdshaders/Water_vs11.vsh b/src/materialsystem/stdshaders/Water_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Water_vs11.vsh
rename to src/materialsystem/stdshaders/Water_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/Water_vs20.fxc b/src/materialsystem/stdshaders/Water_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/Water_vs20.fxc
rename to src/materialsystem/stdshaders/Water_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/WorldTexture.psh b/src/materialsystem/stdshaders/WorldTexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldTexture.psh
rename to src/materialsystem/stdshaders/WorldTexture.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldTwoTextureBlend.psh b/src/materialsystem/stdshaders/WorldTwoTextureBlend.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldTwoTextureBlend.psh
rename to src/materialsystem/stdshaders/WorldTwoTextureBlend.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldTwoTextureBlend_DetailAlpha.psh b/src/materialsystem/stdshaders/WorldTwoTextureBlend_DetailAlpha.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldTwoTextureBlend_DetailAlpha.psh
rename to src/materialsystem/stdshaders/WorldTwoTextureBlend_DetailAlpha.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldTwoTextureBlend_SelfIlluminated.psh b/src/materialsystem/stdshaders/WorldTwoTextureBlend_SelfIlluminated.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldTwoTextureBlend_SelfIlluminated.psh
rename to src/materialsystem/stdshaders/WorldTwoTextureBlend_SelfIlluminated.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexAlpha.psh b/src/materialsystem/stdshaders/WorldVertexAlpha.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexAlpha.psh
rename to src/materialsystem/stdshaders/WorldVertexAlpha.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexAlpha.vsh b/src/materialsystem/stdshaders/WorldVertexAlpha.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexAlpha.vsh
rename to src/materialsystem/stdshaders/WorldVertexAlpha.vsh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexAlpha_ps2x.fxc b/src/materialsystem/stdshaders/WorldVertexAlpha_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexAlpha_ps2x.fxc
rename to src/materialsystem/stdshaders/WorldVertexAlpha_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition.psh b/src/materialsystem/stdshaders/WorldVertexTransition.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition.psh
rename to src/materialsystem/stdshaders/WorldVertexTransition.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition.vsh b/src/materialsystem/stdshaders/WorldVertexTransition.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition.vsh
rename to src/materialsystem/stdshaders/WorldVertexTransition.vsh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_BlendBase2.psh b/src/materialsystem/stdshaders/WorldVertexTransition_BlendBase2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_BlendBase2.psh
rename to src/materialsystem/stdshaders/WorldVertexTransition_BlendBase2.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_Editor.psh b/src/materialsystem/stdshaders/WorldVertexTransition_Editor.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_Editor.psh
rename to src/materialsystem/stdshaders/WorldVertexTransition_Editor.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_Seamless.psh b/src/materialsystem/stdshaders/WorldVertexTransition_Seamless.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_Seamless.psh
rename to src/materialsystem/stdshaders/WorldVertexTransition_Seamless.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_Seamless.vsh b/src/materialsystem/stdshaders/WorldVertexTransition_Seamless.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_Seamless.vsh
rename to src/materialsystem/stdshaders/WorldVertexTransition_Seamless.vsh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp b/src/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp
rename to src/materialsystem/stdshaders/WorldVertexTransition_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_ps14.psh b/src/materialsystem/stdshaders/WorldVertexTransition_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_ps14.psh
rename to src/materialsystem/stdshaders/WorldVertexTransition_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_ps2x.fxc b/src/materialsystem/stdshaders/WorldVertexTransition_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_ps2x.fxc
rename to src/materialsystem/stdshaders/WorldVertexTransition_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_vs14.vsh b/src/materialsystem/stdshaders/WorldVertexTransition_vs14.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_vs14.vsh
rename to src/materialsystem/stdshaders/WorldVertexTransition_vs14.vsh
diff --git a/mp/src/materialsystem/stdshaders/WorldVertexTransition_vs20.fxc b/src/materialsystem/stdshaders/WorldVertexTransition_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/WorldVertexTransition_vs20.fxc
rename to src/materialsystem/stdshaders/WorldVertexTransition_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/buildhl2mpshaders.bat b/src/materialsystem/stdshaders/buildhl2mpshaders.bat
similarity index 100%
rename from mp/src/materialsystem/stdshaders/buildhl2mpshaders.bat
rename to src/materialsystem/stdshaders/buildhl2mpshaders.bat
diff --git a/mp/src/materialsystem/stdshaders/buildsdkshaders.bat b/src/materialsystem/stdshaders/buildsdkshaders.bat
similarity index 100%
rename from mp/src/materialsystem/stdshaders/buildsdkshaders.bat
rename to src/materialsystem/stdshaders/buildsdkshaders.bat
diff --git a/mp/src/materialsystem/stdshaders/buildshaders.bat b/src/materialsystem/stdshaders/buildshaders.bat
similarity index 100%
rename from mp/src/materialsystem/stdshaders/buildshaders.bat
rename to src/materialsystem/stdshaders/buildshaders.bat
diff --git a/mp/src/materialsystem/stdshaders/cable_dx6.cpp b/src/materialsystem/stdshaders/cable_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cable_dx6.cpp
rename to src/materialsystem/stdshaders/cable_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/cable_dx8.cpp b/src/materialsystem/stdshaders/cable_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cable_dx8.cpp
rename to src/materialsystem/stdshaders/cable_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/cable_dx9.cpp b/src/materialsystem/stdshaders/cable_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cable_dx9.cpp
rename to src/materialsystem/stdshaders/cable_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/cable_ps2x.fxc b/src/materialsystem/stdshaders/cable_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cable_ps2x.fxc
rename to src/materialsystem/stdshaders/cable_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/cable_vs20.fxc b/src/materialsystem/stdshaders/cable_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cable_vs20.fxc
rename to src/materialsystem/stdshaders/cable_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/clean.bat b/src/materialsystem/stdshaders/clean.bat
similarity index 100%
rename from mp/src/materialsystem/stdshaders/clean.bat
rename to src/materialsystem/stdshaders/clean.bat
diff --git a/mp/src/materialsystem/stdshaders/cleantemps.bat b/src/materialsystem/stdshaders/cleantemps.bat
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cleantemps.bat
rename to src/materialsystem/stdshaders/cleantemps.bat
diff --git a/mp/src/materialsystem/stdshaders/cloud.cpp b/src/materialsystem/stdshaders/cloud.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cloud.cpp
rename to src/materialsystem/stdshaders/cloud.cpp
diff --git a/mp/src/materialsystem/stdshaders/cloud_dx8.cpp b/src/materialsystem/stdshaders/cloud_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cloud_dx8.cpp
rename to src/materialsystem/stdshaders/cloud_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/cloud_dx9.cpp b/src/materialsystem/stdshaders/cloud_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cloud_dx9.cpp
rename to src/materialsystem/stdshaders/cloud_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/cloud_ps11.psh b/src/materialsystem/stdshaders/cloud_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cloud_ps11.psh
rename to src/materialsystem/stdshaders/cloud_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/cloud_ps20.fxc b/src/materialsystem/stdshaders/cloud_ps20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cloud_ps20.fxc
rename to src/materialsystem/stdshaders/cloud_ps20.fxc
diff --git a/mp/src/materialsystem/stdshaders/cloud_vs11.vsh b/src/materialsystem/stdshaders/cloud_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cloud_vs11.vsh
rename to src/materialsystem/stdshaders/cloud_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/cloud_vs20.fxc b/src/materialsystem/stdshaders/cloud_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cloud_vs20.fxc
rename to src/materialsystem/stdshaders/cloud_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/commandbuilder.h b/src/materialsystem/stdshaders/commandbuilder.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/commandbuilder.h
rename to src/materialsystem/stdshaders/commandbuilder.h
diff --git a/mp/src/materialsystem/stdshaders/common_flashlight_fxc.h b/src/materialsystem/stdshaders/common_flashlight_fxc.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_flashlight_fxc.h
rename to src/materialsystem/stdshaders/common_flashlight_fxc.h
diff --git a/mp/src/materialsystem/stdshaders/common_fxc.h b/src/materialsystem/stdshaders/common_fxc.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_fxc.h
rename to src/materialsystem/stdshaders/common_fxc.h
diff --git a/mp/src/materialsystem/stdshaders/common_fxc2.h b/src/materialsystem/stdshaders/common_fxc2.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_fxc2.h
rename to src/materialsystem/stdshaders/common_fxc2.h
diff --git a/mp/src/materialsystem/stdshaders/common_hlsl_cpp_consts.h b/src/materialsystem/stdshaders/common_hlsl_cpp_consts.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_hlsl_cpp_consts.h
rename to src/materialsystem/stdshaders/common_hlsl_cpp_consts.h
diff --git a/mp/src/materialsystem/stdshaders/common_lightmappedgeneric_fxc.h b/src/materialsystem/stdshaders/common_lightmappedgeneric_fxc.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_lightmappedgeneric_fxc.h
rename to src/materialsystem/stdshaders/common_lightmappedgeneric_fxc.h
diff --git a/mp/src/materialsystem/stdshaders/common_pragmas.h b/src/materialsystem/stdshaders/common_pragmas.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_pragmas.h
rename to src/materialsystem/stdshaders/common_pragmas.h
diff --git a/mp/src/materialsystem/stdshaders/common_ps_fxc.h b/src/materialsystem/stdshaders/common_ps_fxc.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_ps_fxc.h
rename to src/materialsystem/stdshaders/common_ps_fxc.h
diff --git a/mp/src/materialsystem/stdshaders/common_vertexlitgeneric_dx9.h b/src/materialsystem/stdshaders/common_vertexlitgeneric_dx9.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_vertexlitgeneric_dx9.h
rename to src/materialsystem/stdshaders/common_vertexlitgeneric_dx9.h
diff --git a/mp/src/materialsystem/stdshaders/common_vs_fxc.h b/src/materialsystem/stdshaders/common_vs_fxc.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/common_vs_fxc.h
rename to src/materialsystem/stdshaders/common_vs_fxc.h
diff --git a/mp/src/materialsystem/stdshaders/cpp_shader_constant_register_map.h b/src/materialsystem/stdshaders/cpp_shader_constant_register_map.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/cpp_shader_constant_register_map.h
rename to src/materialsystem/stdshaders/cpp_shader_constant_register_map.h
diff --git a/mp/src/materialsystem/stdshaders/debugdepth.cpp b/src/materialsystem/stdshaders/debugdepth.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugdepth.cpp
rename to src/materialsystem/stdshaders/debugdepth.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugluxel.cpp b/src/materialsystem/stdshaders/debugluxel.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugluxel.cpp
rename to src/materialsystem/stdshaders/debugluxel.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugluxel_ps2x.fxc b/src/materialsystem/stdshaders/debugluxel_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugluxel_ps2x.fxc
rename to src/materialsystem/stdshaders/debugluxel_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/debugluxel_vs20.fxc b/src/materialsystem/stdshaders/debugluxel_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugluxel_vs20.fxc
rename to src/materialsystem/stdshaders/debugluxel_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/debugmodifyvertex.cpp b/src/materialsystem/stdshaders/debugmodifyvertex.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugmodifyvertex.cpp
rename to src/materialsystem/stdshaders/debugmodifyvertex.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugmorphaccumulator_dx9.cpp b/src/materialsystem/stdshaders/debugmorphaccumulator_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugmorphaccumulator_dx9.cpp
rename to src/materialsystem/stdshaders/debugmorphaccumulator_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugmorphaccumulator_ps30.fxc b/src/materialsystem/stdshaders/debugmorphaccumulator_ps30.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugmorphaccumulator_ps30.fxc
rename to src/materialsystem/stdshaders/debugmorphaccumulator_ps30.fxc
diff --git a/mp/src/materialsystem/stdshaders/debugmorphaccumulator_vs30.fxc b/src/materialsystem/stdshaders/debugmorphaccumulator_vs30.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugmorphaccumulator_vs30.fxc
rename to src/materialsystem/stdshaders/debugmorphaccumulator_vs30.fxc
diff --git a/mp/src/materialsystem/stdshaders/debugmrttexture.cpp b/src/materialsystem/stdshaders/debugmrttexture.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugmrttexture.cpp
rename to src/materialsystem/stdshaders/debugmrttexture.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugmrttexture_ps2x.fxc b/src/materialsystem/stdshaders/debugmrttexture_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugmrttexture_ps2x.fxc
rename to src/materialsystem/stdshaders/debugmrttexture_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/debugmrttexture_vs20.fxc b/src/materialsystem/stdshaders/debugmrttexture_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugmrttexture_vs20.fxc
rename to src/materialsystem/stdshaders/debugmrttexture_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/debugnormalmap.cpp b/src/materialsystem/stdshaders/debugnormalmap.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugnormalmap.cpp
rename to src/materialsystem/stdshaders/debugnormalmap.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugsoftwarevertexshader.cpp b/src/materialsystem/stdshaders/debugsoftwarevertexshader.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugsoftwarevertexshader.cpp
rename to src/materialsystem/stdshaders/debugsoftwarevertexshader.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugtangentspace.cpp b/src/materialsystem/stdshaders/debugtangentspace.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugtangentspace.cpp
rename to src/materialsystem/stdshaders/debugtangentspace.cpp
diff --git a/mp/src/materialsystem/stdshaders/debugtangentspace.vsh b/src/materialsystem/stdshaders/debugtangentspace.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugtangentspace.vsh
rename to src/materialsystem/stdshaders/debugtangentspace.vsh
diff --git a/mp/src/materialsystem/stdshaders/debugtangentspace_vs11.fxc b/src/materialsystem/stdshaders/debugtangentspace_vs11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugtangentspace_vs11.fxc
rename to src/materialsystem/stdshaders/debugtangentspace_vs11.fxc
diff --git a/mp/src/materialsystem/stdshaders/debugtangentspace_vs20.fxc b/src/materialsystem/stdshaders/debugtangentspace_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/debugtangentspace_vs20.fxc
rename to src/materialsystem/stdshaders/debugtangentspace_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/depthtodestalpha_ps20b.fxc b/src/materialsystem/stdshaders/depthtodestalpha_ps20b.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/depthtodestalpha_ps20b.fxc
rename to src/materialsystem/stdshaders/depthtodestalpha_ps20b.fxc
diff --git a/mp/src/materialsystem/stdshaders/depthtodestalpha_vs20.fxc b/src/materialsystem/stdshaders/depthtodestalpha_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/depthtodestalpha_vs20.fxc
rename to src/materialsystem/stdshaders/depthtodestalpha_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/depthwrite.cpp b/src/materialsystem/stdshaders/depthwrite.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/depthwrite.cpp
rename to src/materialsystem/stdshaders/depthwrite.cpp
diff --git a/mp/src/materialsystem/stdshaders/depthwrite_ps2x.fxc b/src/materialsystem/stdshaders/depthwrite_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/depthwrite_ps2x.fxc
rename to src/materialsystem/stdshaders/depthwrite_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/depthwrite_vs20.fxc b/src/materialsystem/stdshaders/depthwrite_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/depthwrite_vs20.fxc
rename to src/materialsystem/stdshaders/depthwrite_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/detail.cpp b/src/materialsystem/stdshaders/detail.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/detail.cpp
rename to src/materialsystem/stdshaders/detail.cpp
diff --git a/mp/src/materialsystem/stdshaders/detail_ps11.psh b/src/materialsystem/stdshaders/detail_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/detail_ps11.psh
rename to src/materialsystem/stdshaders/detail_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/detail_vs11.vsh b/src/materialsystem/stdshaders/detail_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/detail_vs11.vsh
rename to src/materialsystem/stdshaders/detail_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/dx8fallbacks.cpp b/src/materialsystem/stdshaders/dx8fallbacks.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/dx8fallbacks.cpp
rename to src/materialsystem/stdshaders/dx8fallbacks.cpp
diff --git a/mp/src/materialsystem/stdshaders/example_model_dx9.cpp b/src/materialsystem/stdshaders/example_model_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/example_model_dx9.cpp
rename to src/materialsystem/stdshaders/example_model_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/example_model_dx9_helper.cpp b/src/materialsystem/stdshaders/example_model_dx9_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/example_model_dx9_helper.cpp
rename to src/materialsystem/stdshaders/example_model_dx9_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/example_model_dx9_helper.h b/src/materialsystem/stdshaders/example_model_dx9_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/example_model_dx9_helper.h
rename to src/materialsystem/stdshaders/example_model_dx9_helper.h
diff --git a/mp/src/materialsystem/stdshaders/example_model_ps20b.fxc b/src/materialsystem/stdshaders/example_model_ps20b.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/example_model_ps20b.fxc
rename to src/materialsystem/stdshaders/example_model_ps20b.fxc
diff --git a/mp/src/materialsystem/stdshaders/example_model_vs20.fxc b/src/materialsystem/stdshaders/example_model_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/example_model_vs20.fxc
rename to src/materialsystem/stdshaders/example_model_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/eye_refract.cpp b/src/materialsystem/stdshaders/eye_refract.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eye_refract.cpp
rename to src/materialsystem/stdshaders/eye_refract.cpp
diff --git a/mp/src/materialsystem/stdshaders/eye_refract_helper.cpp b/src/materialsystem/stdshaders/eye_refract_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eye_refract_helper.cpp
rename to src/materialsystem/stdshaders/eye_refract_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/eye_refract_helper.h b/src/materialsystem/stdshaders/eye_refract_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eye_refract_helper.h
rename to src/materialsystem/stdshaders/eye_refract_helper.h
diff --git a/mp/src/materialsystem/stdshaders/eye_refract_ps2x.fxc b/src/materialsystem/stdshaders/eye_refract_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eye_refract_ps2x.fxc
rename to src/materialsystem/stdshaders/eye_refract_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/eye_refract_vs20.fxc b/src/materialsystem/stdshaders/eye_refract_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eye_refract_vs20.fxc
rename to src/materialsystem/stdshaders/eye_refract_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/eyeball.cpp b/src/materialsystem/stdshaders/eyeball.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyeball.cpp
rename to src/materialsystem/stdshaders/eyeball.cpp
diff --git a/mp/src/materialsystem/stdshaders/eyeglint_dx9.cpp b/src/materialsystem/stdshaders/eyeglint_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyeglint_dx9.cpp
rename to src/materialsystem/stdshaders/eyeglint_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/eyeglint_ps2x.fxc b/src/materialsystem/stdshaders/eyeglint_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyeglint_ps2x.fxc
rename to src/materialsystem/stdshaders/eyeglint_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/eyeglint_vs20.fxc b/src/materialsystem/stdshaders/eyeglint_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyeglint_vs20.fxc
rename to src/materialsystem/stdshaders/eyeglint_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/eyes.cpp b/src/materialsystem/stdshaders/eyes.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes.cpp
rename to src/materialsystem/stdshaders/eyes.cpp
diff --git a/mp/src/materialsystem/stdshaders/eyes.vsh b/src/materialsystem/stdshaders/eyes.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes.vsh
rename to src/materialsystem/stdshaders/eyes.vsh
diff --git a/mp/src/materialsystem/stdshaders/eyes_dx6.cpp b/src/materialsystem/stdshaders/eyes_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_dx6.cpp
rename to src/materialsystem/stdshaders/eyes_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/eyes_dx8_dx9_helper.cpp b/src/materialsystem/stdshaders/eyes_dx8_dx9_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_dx8_dx9_helper.cpp
rename to src/materialsystem/stdshaders/eyes_dx8_dx9_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/eyes_dx8_dx9_helper.h b/src/materialsystem/stdshaders/eyes_dx8_dx9_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_dx8_dx9_helper.h
rename to src/materialsystem/stdshaders/eyes_dx8_dx9_helper.h
diff --git a/mp/src/materialsystem/stdshaders/eyes_dx9.cpp b/src/materialsystem/stdshaders/eyes_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_dx9.cpp
rename to src/materialsystem/stdshaders/eyes_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/eyes_flashlight2_ps11.psh b/src/materialsystem/stdshaders/eyes_flashlight2_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_flashlight2_ps11.psh
rename to src/materialsystem/stdshaders/eyes_flashlight2_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/eyes_flashlight_inc.fxc b/src/materialsystem/stdshaders/eyes_flashlight_inc.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_flashlight_inc.fxc
rename to src/materialsystem/stdshaders/eyes_flashlight_inc.fxc
diff --git a/mp/src/materialsystem/stdshaders/eyes_flashlight_ps11.fxc b/src/materialsystem/stdshaders/eyes_flashlight_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_flashlight_ps11.fxc
rename to src/materialsystem/stdshaders/eyes_flashlight_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/eyes_flashlight_ps2x.fxc b/src/materialsystem/stdshaders/eyes_flashlight_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_flashlight_ps2x.fxc
rename to src/materialsystem/stdshaders/eyes_flashlight_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/eyes_flashlight_vs11.vsh b/src/materialsystem/stdshaders/eyes_flashlight_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_flashlight_vs11.vsh
rename to src/materialsystem/stdshaders/eyes_flashlight_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/eyes_flashlight_vs20.fxc b/src/materialsystem/stdshaders/eyes_flashlight_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_flashlight_vs20.fxc
rename to src/materialsystem/stdshaders/eyes_flashlight_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/eyes_ps2x.fxc b/src/materialsystem/stdshaders/eyes_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/eyes_ps2x.fxc
rename to src/materialsystem/stdshaders/eyes_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_helper.cpp b/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_helper.cpp
rename to src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_ps11.psh b/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_ps11.psh
rename to src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_vs11.vsh b/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_vs11.vsh
rename to src/materialsystem/stdshaders/flesh_interior_blended_pass_dx8_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.cpp b/src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.cpp
rename to src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.h b/src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.h
rename to src/materialsystem/stdshaders/flesh_interior_blended_pass_helper.h
diff --git a/mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_ps2x.fxc b/src/materialsystem/stdshaders/flesh_interior_blended_pass_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_ps2x.fxc
rename to src/materialsystem/stdshaders/flesh_interior_blended_pass_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_vs20.fxc b/src/materialsystem/stdshaders/flesh_interior_blended_pass_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/flesh_interior_blended_pass_vs20.fxc
rename to src/materialsystem/stdshaders/flesh_interior_blended_pass_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20.inc b/src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20.inc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20.inc
rename to src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20.inc
diff --git a/mp/src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20b.inc b/src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20b.inc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20b.inc
rename to src/materialsystem/stdshaders/fxctmp9/SDK_Bloom_ps20b.inc
diff --git a/mp/src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20.inc b/src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20.inc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20.inc
rename to src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20.inc
diff --git a/mp/src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20b.inc b/src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20b.inc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20b.inc
rename to src/materialsystem/stdshaders/fxctmp9/SDK_bloomadd_ps20b.inc
diff --git a/mp/src/materialsystem/stdshaders/fxctmp9/SDK_screenspaceeffect_vs20.inc b/src/materialsystem/stdshaders/fxctmp9/SDK_screenspaceeffect_vs20.inc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/fxctmp9/SDK_screenspaceeffect_vs20.inc
rename to src/materialsystem/stdshaders/fxctmp9/SDK_screenspaceeffect_vs20.inc
diff --git a/mp/src/materialsystem/stdshaders/fxctmp9/example_model_ps20b.inc b/src/materialsystem/stdshaders/fxctmp9/example_model_ps20b.inc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/fxctmp9/example_model_ps20b.inc
rename to src/materialsystem/stdshaders/fxctmp9/example_model_ps20b.inc
diff --git a/mp/src/materialsystem/stdshaders/fxctmp9/example_model_vs20.inc b/src/materialsystem/stdshaders/fxctmp9/example_model_vs20.inc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/fxctmp9/example_model_vs20.inc
rename to src/materialsystem/stdshaders/fxctmp9/example_model_vs20.inc
diff --git a/mp/src/materialsystem/stdshaders/game_shader_dx9_base.vpc b/src/materialsystem/stdshaders/game_shader_dx9_base.vpc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/game_shader_dx9_base.vpc
rename to src/materialsystem/stdshaders/game_shader_dx9_base.vpc
diff --git a/mp/src/materialsystem/stdshaders/game_shader_dx9_hl2mp.vpc b/src/materialsystem/stdshaders/game_shader_dx9_hl2mp.vpc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/game_shader_dx9_hl2mp.vpc
rename to src/materialsystem/stdshaders/game_shader_dx9_hl2mp.vpc
diff --git a/mp/src/materialsystem/stdshaders/genwaterloop.pl b/src/materialsystem/stdshaders/genwaterloop.pl
similarity index 100%
rename from mp/src/materialsystem/stdshaders/genwaterloop.pl
rename to src/materialsystem/stdshaders/genwaterloop.pl
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_basealphamaskedenvmap.psh b/src/materialsystem/stdshaders/lightmappedgeneric_basealphamaskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_basealphamaskedenvmap.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_basealphamaskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_basetextureblend.psh b/src/materialsystem/stdshaders/lightmappedgeneric_basetextureblend.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_basetextureblend.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_basetextureblend.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_decal.cpp b/src/materialsystem/stdshaders/lightmappedgeneric_decal.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_decal.cpp
rename to src/materialsystem/stdshaders/lightmappedgeneric_decal.cpp
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_decal_ps2x.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_decal_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_decal_ps2x.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_decal_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_decal_vs20.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_decal_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_decal_vs20.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_decal_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_dx6.cpp b/src/materialsystem/stdshaders/lightmappedgeneric_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_dx6.cpp
rename to src/materialsystem/stdshaders/lightmappedgeneric_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_dx8.cpp b/src/materialsystem/stdshaders/lightmappedgeneric_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_dx8.cpp
rename to src/materialsystem/stdshaders/lightmappedgeneric_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_dx9.cpp b/src/materialsystem/stdshaders/lightmappedgeneric_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_dx9.cpp
rename to src/materialsystem/stdshaders/lightmappedgeneric_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.cpp b/src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.cpp
rename to src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.h b/src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.h
rename to src/materialsystem/stdshaders/lightmappedgeneric_dx9_helper.h
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_envmap.psh b/src/materialsystem/stdshaders/lightmappedgeneric_envmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_envmap.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_envmap.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs11.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs11.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs11.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs20.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs20.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_flashlight_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_inc.vsh b/src/materialsystem/stdshaders/lightmappedgeneric_inc.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_inc.vsh
rename to src/materialsystem/stdshaders/lightmappedgeneric_inc.vsh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_overbright2_ps11.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_overbright2_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_overbright2_ps11.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_overbright2_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_vs11.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_vs11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_vs11.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_lightingonly_vs11.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_maskedenvmap.psh b/src/materialsystem/stdshaders/lightmappedgeneric_maskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_maskedenvmap.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_maskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasealphamaskedselfillum.psh b/src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasealphamaskedselfillum.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasealphamaskedselfillum.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasealphamaskedselfillum.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasenotexture.psh b/src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasenotexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasenotexture.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_multiplybylightingbasenotexture.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_ps11.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_ps11.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_ps2_3_x.h b/src/materialsystem/stdshaders/lightmappedgeneric_ps2_3_x.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_ps2_3_x.h
rename to src/materialsystem/stdshaders/lightmappedgeneric_ps2_3_x.h
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_ps2x.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_ps2x.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedenvmap.psh b/src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedenvmap.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedmaskedenvmap.psh b/src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedmaskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedmaskedenvmap.psh
rename to src/materialsystem/stdshaders/lightmappedgeneric_selfilluminatedmaskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_vs11.vsh b/src/materialsystem/stdshaders/lightmappedgeneric_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_vs11.vsh
rename to src/materialsystem/stdshaders/lightmappedgeneric_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/lightmappedgeneric_vs20.fxc b/src/materialsystem/stdshaders/lightmappedgeneric_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/lightmappedgeneric_vs20.fxc
rename to src/materialsystem/stdshaders/lightmappedgeneric_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/macros.vsh b/src/materialsystem/stdshaders/macros.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/macros.vsh
rename to src/materialsystem/stdshaders/macros.vsh
diff --git a/mp/src/materialsystem/stdshaders/refract.cpp b/src/materialsystem/stdshaders/refract.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/refract.cpp
rename to src/materialsystem/stdshaders/refract.cpp
diff --git a/mp/src/materialsystem/stdshaders/refract_dx60.cpp b/src/materialsystem/stdshaders/refract_dx60.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/refract_dx60.cpp
rename to src/materialsystem/stdshaders/refract_dx60.cpp
diff --git a/mp/src/materialsystem/stdshaders/refract_dx80.cpp b/src/materialsystem/stdshaders/refract_dx80.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/refract_dx80.cpp
rename to src/materialsystem/stdshaders/refract_dx80.cpp
diff --git a/mp/src/materialsystem/stdshaders/refract_dx9_helper.cpp b/src/materialsystem/stdshaders/refract_dx9_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/refract_dx9_helper.cpp
rename to src/materialsystem/stdshaders/refract_dx9_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/refract_dx9_helper.h b/src/materialsystem/stdshaders/refract_dx9_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/refract_dx9_helper.h
rename to src/materialsystem/stdshaders/refract_dx9_helper.h
diff --git a/mp/src/materialsystem/stdshaders/refract_ps2x.fxc b/src/materialsystem/stdshaders/refract_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/refract_ps2x.fxc
rename to src/materialsystem/stdshaders/refract_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/screenspace_general.cpp b/src/materialsystem/stdshaders/screenspace_general.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/screenspace_general.cpp
rename to src/materialsystem/stdshaders/screenspace_general.cpp
diff --git a/mp/src/materialsystem/stdshaders/shader_constant_register_map.h b/src/materialsystem/stdshaders/shader_constant_register_map.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/shader_constant_register_map.h
rename to src/materialsystem/stdshaders/shader_constant_register_map.h
diff --git a/mp/src/materialsystem/stdshaders/shadowmodel_dx8.cpp b/src/materialsystem/stdshaders/shadowmodel_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/shadowmodel_dx8.cpp
rename to src/materialsystem/stdshaders/shadowmodel_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/shadowmodel_dx9.cpp b/src/materialsystem/stdshaders/shadowmodel_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/shadowmodel_dx9.cpp
rename to src/materialsystem/stdshaders/shadowmodel_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/shadowmodel_ps20.fxc b/src/materialsystem/stdshaders/shadowmodel_ps20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/shadowmodel_ps20.fxc
rename to src/materialsystem/stdshaders/shadowmodel_ps20.fxc
diff --git a/mp/src/materialsystem/stdshaders/shadowmodel_vs20.fxc b/src/materialsystem/stdshaders/shadowmodel_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/shadowmodel_vs20.fxc
rename to src/materialsystem/stdshaders/shadowmodel_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/skin_dx9_helper.cpp b/src/materialsystem/stdshaders/skin_dx9_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/skin_dx9_helper.cpp
rename to src/materialsystem/stdshaders/skin_dx9_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/skin_dx9_helper.h b/src/materialsystem/stdshaders/skin_dx9_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/skin_dx9_helper.h
rename to src/materialsystem/stdshaders/skin_dx9_helper.h
diff --git a/mp/src/materialsystem/stdshaders/skin_ps20b.fxc b/src/materialsystem/stdshaders/skin_ps20b.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/skin_ps20b.fxc
rename to src/materialsystem/stdshaders/skin_ps20b.fxc
diff --git a/mp/src/materialsystem/stdshaders/skin_vs20.fxc b/src/materialsystem/stdshaders/skin_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/skin_vs20.fxc
rename to src/materialsystem/stdshaders/skin_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/sky_dx6.cpp b/src/materialsystem/stdshaders/sky_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sky_dx6.cpp
rename to src/materialsystem/stdshaders/sky_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/sky_dx9.cpp b/src/materialsystem/stdshaders/sky_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sky_dx9.cpp
rename to src/materialsystem/stdshaders/sky_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/sky_hdr_compressed_ps2x.fxc b/src/materialsystem/stdshaders/sky_hdr_compressed_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sky_hdr_compressed_ps2x.fxc
rename to src/materialsystem/stdshaders/sky_hdr_compressed_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/sky_hdr_compressed_rgbs_ps2x.fxc b/src/materialsystem/stdshaders/sky_hdr_compressed_rgbs_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sky_hdr_compressed_rgbs_ps2x.fxc
rename to src/materialsystem/stdshaders/sky_hdr_compressed_rgbs_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/sky_hdr_dx9.cpp b/src/materialsystem/stdshaders/sky_hdr_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sky_hdr_dx9.cpp
rename to src/materialsystem/stdshaders/sky_hdr_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/sky_ps2x.fxc b/src/materialsystem/stdshaders/sky_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sky_ps2x.fxc
rename to src/materialsystem/stdshaders/sky_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/sky_vs20.fxc b/src/materialsystem/stdshaders/sky_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sky_vs20.fxc
rename to src/materialsystem/stdshaders/sky_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/sprite.cpp b/src/materialsystem/stdshaders/sprite.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sprite.cpp
rename to src/materialsystem/stdshaders/sprite.cpp
diff --git a/mp/src/materialsystem/stdshaders/sprite_dx6.cpp b/src/materialsystem/stdshaders/sprite_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sprite_dx6.cpp
rename to src/materialsystem/stdshaders/sprite_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/sprite_dx9.cpp b/src/materialsystem/stdshaders/sprite_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sprite_dx9.cpp
rename to src/materialsystem/stdshaders/sprite_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/sprite_ps11.psh b/src/materialsystem/stdshaders/sprite_ps11.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sprite_ps11.psh
rename to src/materialsystem/stdshaders/sprite_ps11.psh
diff --git a/mp/src/materialsystem/stdshaders/sprite_ps2x.fxc b/src/materialsystem/stdshaders/sprite_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sprite_ps2x.fxc
rename to src/materialsystem/stdshaders/sprite_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/sprite_vs11.vsh b/src/materialsystem/stdshaders/sprite_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sprite_vs11.vsh
rename to src/materialsystem/stdshaders/sprite_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/sprite_vs20.fxc b/src/materialsystem/stdshaders/sprite_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/sprite_vs20.fxc
rename to src/materialsystem/stdshaders/sprite_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/spritecard.cpp b/src/materialsystem/stdshaders/spritecard.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/spritecard.cpp
rename to src/materialsystem/stdshaders/spritecard.cpp
diff --git a/mp/src/materialsystem/stdshaders/spritecard_ps11.fxc b/src/materialsystem/stdshaders/spritecard_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/spritecard_ps11.fxc
rename to src/materialsystem/stdshaders/spritecard_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/spritecard_ps2x.fxc b/src/materialsystem/stdshaders/spritecard_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/spritecard_ps2x.fxc
rename to src/materialsystem/stdshaders/spritecard_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/spritecard_vsxx.fxc b/src/materialsystem/stdshaders/spritecard_vsxx.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/spritecard_vsxx.fxc
rename to src/materialsystem/stdshaders/spritecard_vsxx.fxc
diff --git a/mp/src/materialsystem/stdshaders/stdshader_dx9_20b.txt b/src/materialsystem/stdshaders/stdshader_dx9_20b.txt
similarity index 100%
rename from mp/src/materialsystem/stdshaders/stdshader_dx9_20b.txt
rename to src/materialsystem/stdshaders/stdshader_dx9_20b.txt
diff --git a/mp/src/materialsystem/stdshaders/stdshader_dx9_30.txt b/src/materialsystem/stdshaders/stdshader_dx9_30.txt
similarity index 100%
rename from mp/src/materialsystem/stdshaders/stdshader_dx9_30.txt
rename to src/materialsystem/stdshaders/stdshader_dx9_30.txt
diff --git a/mp/src/materialsystem/stdshaders/teeth.cpp b/src/materialsystem/stdshaders/teeth.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth.cpp
rename to src/materialsystem/stdshaders/teeth.cpp
diff --git a/mp/src/materialsystem/stdshaders/teeth_bump_ps2x.fxc b/src/materialsystem/stdshaders/teeth_bump_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_bump_ps2x.fxc
rename to src/materialsystem/stdshaders/teeth_bump_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/teeth_bump_vs20.fxc b/src/materialsystem/stdshaders/teeth_bump_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_bump_vs20.fxc
rename to src/materialsystem/stdshaders/teeth_bump_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/teeth_dx6.cpp b/src/materialsystem/stdshaders/teeth_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_dx6.cpp
rename to src/materialsystem/stdshaders/teeth_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/teeth_dx8.cpp b/src/materialsystem/stdshaders/teeth_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_dx8.cpp
rename to src/materialsystem/stdshaders/teeth_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/teeth_flashlight_ps2x.fxc b/src/materialsystem/stdshaders/teeth_flashlight_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_flashlight_ps2x.fxc
rename to src/materialsystem/stdshaders/teeth_flashlight_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/teeth_flashlight_vs20.fxc b/src/materialsystem/stdshaders/teeth_flashlight_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_flashlight_vs20.fxc
rename to src/materialsystem/stdshaders/teeth_flashlight_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/teeth_ps2x.fxc b/src/materialsystem/stdshaders/teeth_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_ps2x.fxc
rename to src/materialsystem/stdshaders/teeth_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/teeth_vs20.fxc b/src/materialsystem/stdshaders/teeth_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/teeth_vs20.fxc
rename to src/materialsystem/stdshaders/teeth_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_basetimesdetail.psh b/src/materialsystem/stdshaders/unlitgeneric_basetimesdetail.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_basetimesdetail.psh
rename to src/materialsystem/stdshaders/unlitgeneric_basetimesdetail.psh
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_dx6.cpp b/src/materialsystem/stdshaders/unlitgeneric_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_dx6.cpp
rename to src/materialsystem/stdshaders/unlitgeneric_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_dx8.cpp b/src/materialsystem/stdshaders/unlitgeneric_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_dx8.cpp
rename to src/materialsystem/stdshaders/unlitgeneric_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_dx9.cpp b/src/materialsystem/stdshaders/unlitgeneric_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_dx9.cpp
rename to src/materialsystem/stdshaders/unlitgeneric_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_inc.vsh b/src/materialsystem/stdshaders/unlitgeneric_inc.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_inc.vsh
rename to src/materialsystem/stdshaders/unlitgeneric_inc.vsh
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_lightingonly_vs11.fxc b/src/materialsystem/stdshaders/unlitgeneric_lightingonly_vs11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_lightingonly_vs11.fxc
rename to src/materialsystem/stdshaders/unlitgeneric_lightingonly_vs11.fxc
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_notexture_ps11.fxc b/src/materialsystem/stdshaders/unlitgeneric_notexture_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_notexture_ps11.fxc
rename to src/materialsystem/stdshaders/unlitgeneric_notexture_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_notexture_ps2x.fxc b/src/materialsystem/stdshaders/unlitgeneric_notexture_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_notexture_ps2x.fxc
rename to src/materialsystem/stdshaders/unlitgeneric_notexture_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_ps11.fxc b/src/materialsystem/stdshaders/unlitgeneric_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_ps11.fxc
rename to src/materialsystem/stdshaders/unlitgeneric_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_ps2x.fxc b/src/materialsystem/stdshaders/unlitgeneric_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_ps2x.fxc
rename to src/materialsystem/stdshaders/unlitgeneric_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_vs11.vsh b/src/materialsystem/stdshaders/unlitgeneric_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_vs11.vsh
rename to src/materialsystem/stdshaders/unlitgeneric_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/unlitgeneric_vs20.fxc b/src/materialsystem/stdshaders/unlitgeneric_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/unlitgeneric_vs20.fxc
rename to src/materialsystem/stdshaders/unlitgeneric_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_ps2x.fxc b/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_ps2x.fxc
rename to src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_vs20.fxc b/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_vs20.fxc
rename to src/materialsystem/stdshaders/vertexlit_and_unlit_generic_bump_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_ps2x.fxc b/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_ps2x.fxc
rename to src/materialsystem/stdshaders/vertexlit_and_unlit_generic_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_vs20.fxc b/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlit_and_unlit_generic_vs20.fxc
rename to src/materialsystem/stdshaders/vertexlit_and_unlit_generic_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/vertexlit_lighting_only_ps2x.fxc b/src/materialsystem/stdshaders/vertexlit_lighting_only_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlit_lighting_only_ps2x.fxc
rename to src/materialsystem/stdshaders/vertexlit_lighting_only_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/vertexlit_notexture.psh b/src/materialsystem/stdshaders/vertexlit_notexture.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlit_notexture.psh
rename to src/materialsystem/stdshaders/vertexlit_notexture.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_basealphamaskedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_basealphamaskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_basealphamaskedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_basealphamaskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_detailbasealphamaskedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_detailbasealphamaskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_detailbasealphamaskedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_detailbasealphamaskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_detailenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_detailenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_detailenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_detailenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_detailmaskedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_detailmaskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_detailmaskedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_detailmaskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedmaskedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedmaskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedmaskedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_detailselfilluminatedmaskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_dx6.cpp b/src/materialsystem/stdshaders/vertexlitgeneric_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_dx6.cpp
rename to src/materialsystem/stdshaders/vertexlitgeneric_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_dx7.cpp b/src/materialsystem/stdshaders/vertexlitgeneric_dx7.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_dx7.cpp
rename to src/materialsystem/stdshaders/vertexlitgeneric_dx7.cpp
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp b/src/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp
rename to src/materialsystem/stdshaders/vertexlitgeneric_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_dx9.cpp b/src/materialsystem/stdshaders/vertexlitgeneric_dx9.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_dx9.cpp
rename to src/materialsystem/stdshaders/vertexlitgeneric_dx9.cpp
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_dx95_helper.h b/src/materialsystem/stdshaders/vertexlitgeneric_dx95_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_dx95_helper.h
rename to src/materialsystem/stdshaders/vertexlitgeneric_dx95_helper.h
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.cpp b/src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.cpp
rename to src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.h b/src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.h
rename to src/materialsystem/stdshaders/vertexlitgeneric_dx9_helper.h
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_envmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_envmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_envmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_envmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_flashlight_vs11.vsh b/src/materialsystem/stdshaders/vertexlitgeneric_flashlight_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_flashlight_vs11.vsh
rename to src/materialsystem/stdshaders/vertexlitgeneric_flashlight_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_inc.vsh b/src/materialsystem/stdshaders/vertexlitgeneric_inc.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_inc.vsh
rename to src/materialsystem/stdshaders/vertexlitgeneric_inc.vsh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2.psh b/src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2_ps11.fxc b/src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2_ps11.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2_ps11.fxc
rename to src/materialsystem/stdshaders/vertexlitgeneric_lightingonly_overbright2_ps11.fxc
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_maskedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_maskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_maskedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_maskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedmaskedenvmap.psh b/src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedmaskedenvmap.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedmaskedenvmap.psh
rename to src/materialsystem/stdshaders/vertexlitgeneric_selfilluminatedmaskedenvmap.psh
diff --git a/mp/src/materialsystem/stdshaders/vertexlitgeneric_vs11.vsh b/src/materialsystem/stdshaders/vertexlitgeneric_vs11.vsh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vertexlitgeneric_vs11.vsh
rename to src/materialsystem/stdshaders/vertexlitgeneric_vs11.vsh
diff --git a/mp/src/materialsystem/stdshaders/volume_clouds.cpp b/src/materialsystem/stdshaders/volume_clouds.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/volume_clouds.cpp
rename to src/materialsystem/stdshaders/volume_clouds.cpp
diff --git a/mp/src/materialsystem/stdshaders/volume_clouds_helper.cpp b/src/materialsystem/stdshaders/volume_clouds_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/volume_clouds_helper.cpp
rename to src/materialsystem/stdshaders/volume_clouds_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/volume_clouds_helper.h b/src/materialsystem/stdshaders/volume_clouds_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/volume_clouds_helper.h
rename to src/materialsystem/stdshaders/volume_clouds_helper.h
diff --git a/mp/src/materialsystem/stdshaders/volume_clouds_ps2x.fxc b/src/materialsystem/stdshaders/volume_clouds_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/volume_clouds_ps2x.fxc
rename to src/materialsystem/stdshaders/volume_clouds_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/volume_clouds_vs20.fxc b/src/materialsystem/stdshaders/volume_clouds_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/volume_clouds_vs20.fxc
rename to src/materialsystem/stdshaders/volume_clouds_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/vr_distort_hud.cpp b/src/materialsystem/stdshaders/vr_distort_hud.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vr_distort_hud.cpp
rename to src/materialsystem/stdshaders/vr_distort_hud.cpp
diff --git a/mp/src/materialsystem/stdshaders/vr_distort_hud_ps2x.fxc b/src/materialsystem/stdshaders/vr_distort_hud_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vr_distort_hud_ps2x.fxc
rename to src/materialsystem/stdshaders/vr_distort_hud_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/vr_distort_hud_vs20.fxc b/src/materialsystem/stdshaders/vr_distort_hud_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vr_distort_hud_vs20.fxc
rename to src/materialsystem/stdshaders/vr_distort_hud_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/vr_distort_texture.cpp b/src/materialsystem/stdshaders/vr_distort_texture.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vr_distort_texture.cpp
rename to src/materialsystem/stdshaders/vr_distort_texture.cpp
diff --git a/mp/src/materialsystem/stdshaders/vr_distort_texture_ps2x.fxc b/src/materialsystem/stdshaders/vr_distort_texture_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vr_distort_texture_ps2x.fxc
rename to src/materialsystem/stdshaders/vr_distort_texture_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/vr_distort_texture_vs20.fxc b/src/materialsystem/stdshaders/vr_distort_texture_vs20.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/vr_distort_texture_vs20.fxc
rename to src/materialsystem/stdshaders/vr_distort_texture_vs20.fxc
diff --git a/mp/src/materialsystem/stdshaders/water.cpp b/src/materialsystem/stdshaders/water.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/water.cpp
rename to src/materialsystem/stdshaders/water.cpp
diff --git a/mp/src/materialsystem/stdshaders/water_dudv.cpp b/src/materialsystem/stdshaders/water_dudv.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/water_dudv.cpp
rename to src/materialsystem/stdshaders/water_dudv.cpp
diff --git a/mp/src/materialsystem/stdshaders/water_dx60.cpp b/src/materialsystem/stdshaders/water_dx60.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/water_dx60.cpp
rename to src/materialsystem/stdshaders/water_dx60.cpp
diff --git a/mp/src/materialsystem/stdshaders/water_dx80.cpp b/src/materialsystem/stdshaders/water_dx80.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/water_dx80.cpp
rename to src/materialsystem/stdshaders/water_dx80.cpp
diff --git a/mp/src/materialsystem/stdshaders/water_dx81.cpp b/src/materialsystem/stdshaders/water_dx81.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/water_dx81.cpp
rename to src/materialsystem/stdshaders/water_dx81.cpp
diff --git a/mp/src/materialsystem/stdshaders/water_ps2x.fxc b/src/materialsystem/stdshaders/water_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/water_ps2x.fxc
rename to src/materialsystem/stdshaders/water_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/water_ps2x_helper.h b/src/materialsystem/stdshaders/water_ps2x_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/water_ps2x_helper.h
rename to src/materialsystem/stdshaders/water_ps2x_helper.h
diff --git a/mp/src/materialsystem/stdshaders/waterreflect_ps14.psh b/src/materialsystem/stdshaders/waterreflect_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/waterreflect_ps14.psh
rename to src/materialsystem/stdshaders/waterreflect_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/waterrefract_ps14.psh b/src/materialsystem/stdshaders/waterrefract_ps14.psh
similarity index 100%
rename from mp/src/materialsystem/stdshaders/waterrefract_ps14.psh
rename to src/materialsystem/stdshaders/waterrefract_ps14.psh
diff --git a/mp/src/materialsystem/stdshaders/worldtwotextureblend.cpp b/src/materialsystem/stdshaders/worldtwotextureblend.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldtwotextureblend.cpp
rename to src/materialsystem/stdshaders/worldtwotextureblend.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldtwotextureblend_dx6.cpp b/src/materialsystem/stdshaders/worldtwotextureblend_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldtwotextureblend_dx6.cpp
rename to src/materialsystem/stdshaders/worldtwotextureblend_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldtwotextureblend_dx8.cpp b/src/materialsystem/stdshaders/worldtwotextureblend_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldtwotextureblend_dx8.cpp
rename to src/materialsystem/stdshaders/worldtwotextureblend_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldtwotextureblend_ps2x.fxc b/src/materialsystem/stdshaders/worldtwotextureblend_ps2x.fxc
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldtwotextureblend_ps2x.fxc
rename to src/materialsystem/stdshaders/worldtwotextureblend_ps2x.fxc
diff --git a/mp/src/materialsystem/stdshaders/worldvertexalpha.cpp b/src/materialsystem/stdshaders/worldvertexalpha.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertexalpha.cpp
rename to src/materialsystem/stdshaders/worldvertexalpha.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldvertexalpha_dx8.cpp b/src/materialsystem/stdshaders/worldvertexalpha_dx8.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertexalpha_dx8.cpp
rename to src/materialsystem/stdshaders/worldvertexalpha_dx8.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldvertextransition.cpp b/src/materialsystem/stdshaders/worldvertextransition.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertextransition.cpp
rename to src/materialsystem/stdshaders/worldvertextransition.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldvertextransition_dx6.cpp b/src/materialsystem/stdshaders/worldvertextransition_dx6.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertextransition_dx6.cpp
rename to src/materialsystem/stdshaders/worldvertextransition_dx6.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldvertextransition_dx6_helper.cpp b/src/materialsystem/stdshaders/worldvertextransition_dx6_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertextransition_dx6_helper.cpp
rename to src/materialsystem/stdshaders/worldvertextransition_dx6_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldvertextransition_dx6_helper.h b/src/materialsystem/stdshaders/worldvertextransition_dx6_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertextransition_dx6_helper.h
rename to src/materialsystem/stdshaders/worldvertextransition_dx6_helper.h
diff --git a/mp/src/materialsystem/stdshaders/worldvertextransition_dx8_helper.cpp b/src/materialsystem/stdshaders/worldvertextransition_dx8_helper.cpp
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertextransition_dx8_helper.cpp
rename to src/materialsystem/stdshaders/worldvertextransition_dx8_helper.cpp
diff --git a/mp/src/materialsystem/stdshaders/worldvertextransition_dx8_helper.h b/src/materialsystem/stdshaders/worldvertextransition_dx8_helper.h
similarity index 100%
rename from mp/src/materialsystem/stdshaders/worldvertextransition_dx8_helper.h
rename to src/materialsystem/stdshaders/worldvertextransition_dx8_helper.h
diff --git a/mp/src/mathlib/3dnow.cpp b/src/mathlib/3dnow.cpp
similarity index 100%
rename from mp/src/mathlib/3dnow.cpp
rename to src/mathlib/3dnow.cpp
diff --git a/mp/src/mathlib/3dnow.h b/src/mathlib/3dnow.h
similarity index 100%
rename from mp/src/mathlib/3dnow.h
rename to src/mathlib/3dnow.h
diff --git a/mp/src/mathlib/IceKey.cpp b/src/mathlib/IceKey.cpp
similarity index 100%
rename from mp/src/mathlib/IceKey.cpp
rename to src/mathlib/IceKey.cpp
diff --git a/mp/src/mathlib/almostequal.cpp b/src/mathlib/almostequal.cpp
similarity index 100%
rename from mp/src/mathlib/almostequal.cpp
rename to src/mathlib/almostequal.cpp
diff --git a/mp/src/mathlib/anorms.cpp b/src/mathlib/anorms.cpp
similarity index 100%
rename from mp/src/mathlib/anorms.cpp
rename to src/mathlib/anorms.cpp
diff --git a/mp/src/mathlib/bumpvects.cpp b/src/mathlib/bumpvects.cpp
similarity index 100%
rename from mp/src/mathlib/bumpvects.cpp
rename to src/mathlib/bumpvects.cpp
diff --git a/mp/src/mathlib/color_conversion.cpp b/src/mathlib/color_conversion.cpp
similarity index 100%
rename from mp/src/mathlib/color_conversion.cpp
rename to src/mathlib/color_conversion.cpp
diff --git a/mp/src/mathlib/datagen.pl b/src/mathlib/datagen.pl
similarity index 100%
rename from mp/src/mathlib/datagen.pl
rename to src/mathlib/datagen.pl
diff --git a/mp/src/mathlib/halton.cpp b/src/mathlib/halton.cpp
similarity index 100%
rename from mp/src/mathlib/halton.cpp
rename to src/mathlib/halton.cpp
diff --git a/mp/src/mathlib/imagequant.cpp b/src/mathlib/imagequant.cpp
similarity index 100%
rename from mp/src/mathlib/imagequant.cpp
rename to src/mathlib/imagequant.cpp
diff --git a/mp/src/mathlib/lightdesc.cpp b/src/mathlib/lightdesc.cpp
similarity index 100%
rename from mp/src/mathlib/lightdesc.cpp
rename to src/mathlib/lightdesc.cpp
diff --git a/mp/src/mathlib/mathlib.vpc b/src/mathlib/mathlib.vpc
similarity index 100%
rename from mp/src/mathlib/mathlib.vpc
rename to src/mathlib/mathlib.vpc
diff --git a/mp/src/mathlib/mathlib_base.cpp b/src/mathlib/mathlib_base.cpp
similarity index 100%
rename from mp/src/mathlib/mathlib_base.cpp
rename to src/mathlib/mathlib_base.cpp
diff --git a/mp/src/mathlib/noisedata.h b/src/mathlib/noisedata.h
similarity index 100%
rename from mp/src/mathlib/noisedata.h
rename to src/mathlib/noisedata.h
diff --git a/mp/src/mathlib/polyhedron.cpp b/src/mathlib/polyhedron.cpp
similarity index 100%
rename from mp/src/mathlib/polyhedron.cpp
rename to src/mathlib/polyhedron.cpp
diff --git a/mp/src/mathlib/powsse.cpp b/src/mathlib/powsse.cpp
similarity index 100%
rename from mp/src/mathlib/powsse.cpp
rename to src/mathlib/powsse.cpp
diff --git a/mp/src/mathlib/quantize.cpp b/src/mathlib/quantize.cpp
similarity index 100%
rename from mp/src/mathlib/quantize.cpp
rename to src/mathlib/quantize.cpp
diff --git a/mp/src/mathlib/randsse.cpp b/src/mathlib/randsse.cpp
similarity index 100%
rename from mp/src/mathlib/randsse.cpp
rename to src/mathlib/randsse.cpp
diff --git a/mp/src/mathlib/simdvectormatrix.cpp b/src/mathlib/simdvectormatrix.cpp
similarity index 100%
rename from mp/src/mathlib/simdvectormatrix.cpp
rename to src/mathlib/simdvectormatrix.cpp
diff --git a/mp/src/mathlib/sparse_convolution_noise.cpp b/src/mathlib/sparse_convolution_noise.cpp
similarity index 100%
rename from mp/src/mathlib/sparse_convolution_noise.cpp
rename to src/mathlib/sparse_convolution_noise.cpp
diff --git a/mp/src/mathlib/spherical.cpp b/src/mathlib/spherical.cpp
similarity index 100%
rename from mp/src/mathlib/spherical.cpp
rename to src/mathlib/spherical.cpp
diff --git a/mp/src/mathlib/sse.cpp b/src/mathlib/sse.cpp
similarity index 100%
rename from mp/src/mathlib/sse.cpp
rename to src/mathlib/sse.cpp
diff --git a/mp/src/mathlib/sse.h b/src/mathlib/sse.h
similarity index 100%
rename from mp/src/mathlib/sse.h
rename to src/mathlib/sse.h
diff --git a/mp/src/mathlib/sseconst.cpp b/src/mathlib/sseconst.cpp
similarity index 100%
rename from mp/src/mathlib/sseconst.cpp
rename to src/mathlib/sseconst.cpp
diff --git a/mp/src/mathlib/ssenoise.cpp b/src/mathlib/ssenoise.cpp
similarity index 100%
rename from mp/src/mathlib/ssenoise.cpp
rename to src/mathlib/ssenoise.cpp
diff --git a/mp/src/mathlib/vector.cpp b/src/mathlib/vector.cpp
similarity index 100%
rename from mp/src/mathlib/vector.cpp
rename to src/mathlib/vector.cpp
diff --git a/mp/src/mathlib/vmatrix.cpp b/src/mathlib/vmatrix.cpp
similarity index 100%
rename from mp/src/mathlib/vmatrix.cpp
rename to src/mathlib/vmatrix.cpp
diff --git a/mp/src/public/BitmapFontFile.h b/src/public/BitmapFontFile.h
similarity index 100%
rename from mp/src/public/BitmapFontFile.h
rename to src/public/BitmapFontFile.h
diff --git a/mp/src/public/Color.h b/src/public/Color.h
similarity index 100%
rename from mp/src/public/Color.h
rename to src/public/Color.h
diff --git a/mp/src/public/Friends/AddOns/AddOnMessages.h b/src/public/Friends/AddOns/AddOnMessages.h
similarity index 100%
rename from mp/src/public/Friends/AddOns/AddOnMessages.h
rename to src/public/Friends/AddOns/AddOnMessages.h
diff --git a/mp/src/public/Friends/AddOns/AddOnTypes.h b/src/public/Friends/AddOns/AddOnTypes.h
similarity index 100%
rename from mp/src/public/Friends/AddOns/AddOnTypes.h
rename to src/public/Friends/AddOns/AddOnTypes.h
diff --git a/mp/src/public/Friends/AddOns/ISteamAddOn.h b/src/public/Friends/AddOns/ISteamAddOn.h
similarity index 100%
rename from mp/src/public/Friends/AddOns/ISteamAddOn.h
rename to src/public/Friends/AddOns/ISteamAddOn.h
diff --git a/mp/src/public/Friends/IFriendsNET.h b/src/public/Friends/IFriendsNET.h
similarity index 100%
rename from mp/src/public/Friends/IFriendsNET.h
rename to src/public/Friends/IFriendsNET.h
diff --git a/mp/src/public/Friends/IFriendsUser.h b/src/public/Friends/IFriendsUser.h
similarity index 100%
rename from mp/src/public/Friends/IFriendsUser.h
rename to src/public/Friends/IFriendsUser.h
diff --git a/mp/src/public/IGameUIFuncs.h b/src/public/IGameUIFuncs.h
similarity index 100%
rename from mp/src/public/IGameUIFuncs.h
rename to src/public/IGameUIFuncs.h
diff --git a/mp/src/public/IHammer.h b/src/public/IHammer.h
similarity index 100%
rename from mp/src/public/IHammer.h
rename to src/public/IHammer.h
diff --git a/mp/src/public/OfflineMode.h b/src/public/OfflineMode.h
similarity index 100%
rename from mp/src/public/OfflineMode.h
rename to src/public/OfflineMode.h
diff --git a/mp/src/public/PlayerState.h b/src/public/PlayerState.h
similarity index 100%
rename from mp/src/public/PlayerState.h
rename to src/public/PlayerState.h
diff --git a/mp/src/public/ScratchPadUtils.cpp b/src/public/ScratchPadUtils.cpp
similarity index 100%
rename from mp/src/public/ScratchPadUtils.cpp
rename to src/public/ScratchPadUtils.cpp
diff --git a/mp/src/public/ScratchPadUtils.h b/src/public/ScratchPadUtils.h
similarity index 100%
rename from mp/src/public/ScratchPadUtils.h
rename to src/public/ScratchPadUtils.h
diff --git a/mp/src/public/SoundEmitterSystem/isoundemittersystembase.h b/src/public/SoundEmitterSystem/isoundemittersystembase.h
similarity index 100%
rename from mp/src/public/SoundEmitterSystem/isoundemittersystembase.h
rename to src/public/SoundEmitterSystem/isoundemittersystembase.h
diff --git a/mp/src/public/SoundParametersInternal.cpp b/src/public/SoundParametersInternal.cpp
similarity index 100%
rename from mp/src/public/SoundParametersInternal.cpp
rename to src/public/SoundParametersInternal.cpp
diff --git a/mp/src/public/UnicodeFileHelpers.cpp b/src/public/UnicodeFileHelpers.cpp
similarity index 100%
rename from mp/src/public/UnicodeFileHelpers.cpp
rename to src/public/UnicodeFileHelpers.cpp
diff --git a/mp/src/public/UnicodeFileHelpers.h b/src/public/UnicodeFileHelpers.h
similarity index 100%
rename from mp/src/public/UnicodeFileHelpers.h
rename to src/public/UnicodeFileHelpers.h
diff --git a/mp/src/public/UtlCachedFileData.h b/src/public/UtlCachedFileData.h
similarity index 100%
rename from mp/src/public/UtlCachedFileData.h
rename to src/public/UtlCachedFileData.h
diff --git a/mp/src/public/VGuiMatSurface/IMatSystemSurface.h b/src/public/VGuiMatSurface/IMatSystemSurface.h
similarity index 100%
rename from mp/src/public/VGuiMatSurface/IMatSystemSurface.h
rename to src/public/VGuiMatSurface/IMatSystemSurface.h
diff --git a/mp/src/public/VGuiMatSurface/IMatSystemSurfaceV5.h b/src/public/VGuiMatSurface/IMatSystemSurfaceV5.h
similarity index 100%
rename from mp/src/public/VGuiMatSurface/IMatSystemSurfaceV5.h
rename to src/public/VGuiMatSurface/IMatSystemSurfaceV5.h
diff --git a/mp/src/public/XUnzip.cpp b/src/public/XUnzip.cpp
similarity index 100%
rename from mp/src/public/XUnzip.cpp
rename to src/public/XUnzip.cpp
diff --git a/mp/src/public/XZip.cpp b/src/public/XZip.cpp
similarity index 100%
rename from mp/src/public/XZip.cpp
rename to src/public/XZip.cpp
diff --git a/mp/src/public/appframework/AppFramework.h b/src/public/appframework/AppFramework.h
similarity index 100%
rename from mp/src/public/appframework/AppFramework.h
rename to src/public/appframework/AppFramework.h
diff --git a/mp/src/public/appframework/IAppSystem.h b/src/public/appframework/IAppSystem.h
similarity index 100%
rename from mp/src/public/appframework/IAppSystem.h
rename to src/public/appframework/IAppSystem.h
diff --git a/mp/src/public/appframework/IAppSystemGroup.h b/src/public/appframework/IAppSystemGroup.h
similarity index 100%
rename from mp/src/public/appframework/IAppSystemGroup.h
rename to src/public/appframework/IAppSystemGroup.h
diff --git a/mp/src/public/appframework/VguiMatSysApp.h b/src/public/appframework/VguiMatSysApp.h
similarity index 100%
rename from mp/src/public/appframework/VguiMatSysApp.h
rename to src/public/appframework/VguiMatSysApp.h
diff --git a/mp/src/public/appframework/ilaunchermgr.h b/src/public/appframework/ilaunchermgr.h
similarity index 100%
rename from mp/src/public/appframework/ilaunchermgr.h
rename to src/public/appframework/ilaunchermgr.h
diff --git a/mp/src/public/appframework/tier2app.h b/src/public/appframework/tier2app.h
similarity index 100%
rename from mp/src/public/appframework/tier2app.h
rename to src/public/appframework/tier2app.h
diff --git a/mp/src/public/appframework/tier3app.h b/src/public/appframework/tier3app.h
similarity index 100%
rename from mp/src/public/appframework/tier3app.h
rename to src/public/appframework/tier3app.h
diff --git a/mp/src/public/arraystack.h b/src/public/arraystack.h
similarity index 100%
rename from mp/src/public/arraystack.h
rename to src/public/arraystack.h
diff --git a/mp/src/public/avi/iavi.h b/src/public/avi/iavi.h
similarity index 100%
rename from mp/src/public/avi/iavi.h
rename to src/public/avi/iavi.h
diff --git a/mp/src/public/avi/iquicktime.h b/src/public/avi/iquicktime.h
similarity index 100%
rename from mp/src/public/avi/iquicktime.h
rename to src/public/avi/iquicktime.h
diff --git a/mp/src/public/basehandle.h b/src/public/basehandle.h
similarity index 100%
rename from mp/src/public/basehandle.h
rename to src/public/basehandle.h
diff --git a/mp/src/public/bitmap/bitmap.h b/src/public/bitmap/bitmap.h
similarity index 100%
rename from mp/src/public/bitmap/bitmap.h
rename to src/public/bitmap/bitmap.h
diff --git a/mp/src/public/bitmap/cubemap.h b/src/public/bitmap/cubemap.h
similarity index 100%
rename from mp/src/public/bitmap/cubemap.h
rename to src/public/bitmap/cubemap.h
diff --git a/mp/src/public/bitmap/float_bm.h b/src/public/bitmap/float_bm.h
similarity index 100%
rename from mp/src/public/bitmap/float_bm.h
rename to src/public/bitmap/float_bm.h
diff --git a/mp/src/public/bitmap/imageformat.h b/src/public/bitmap/imageformat.h
similarity index 100%
rename from mp/src/public/bitmap/imageformat.h
rename to src/public/bitmap/imageformat.h
diff --git a/mp/src/public/bitmap/psd.h b/src/public/bitmap/psd.h
similarity index 100%
rename from mp/src/public/bitmap/psd.h
rename to src/public/bitmap/psd.h
diff --git a/mp/src/public/bitmap/tgaloader.h b/src/public/bitmap/tgaloader.h
similarity index 100%
rename from mp/src/public/bitmap/tgaloader.h
rename to src/public/bitmap/tgaloader.h
diff --git a/mp/src/public/bitmap/tgawriter.h b/src/public/bitmap/tgawriter.h
similarity index 100%
rename from mp/src/public/bitmap/tgawriter.h
rename to src/public/bitmap/tgawriter.h
diff --git a/mp/src/public/bitvec.h b/src/public/bitvec.h
similarity index 100%
rename from mp/src/public/bitvec.h
rename to src/public/bitvec.h
diff --git a/mp/src/public/blockingudpsocket.cpp b/src/public/blockingudpsocket.cpp
similarity index 100%
rename from mp/src/public/blockingudpsocket.cpp
rename to src/public/blockingudpsocket.cpp
diff --git a/mp/src/public/blockingudpsocket.h b/src/public/blockingudpsocket.h
similarity index 100%
rename from mp/src/public/blockingudpsocket.h
rename to src/public/blockingudpsocket.h
diff --git a/mp/src/public/bone_accessor.cpp b/src/public/bone_accessor.cpp
similarity index 100%
rename from mp/src/public/bone_accessor.cpp
rename to src/public/bone_accessor.cpp
diff --git a/mp/src/public/bone_accessor.h b/src/public/bone_accessor.h
similarity index 100%
rename from mp/src/public/bone_accessor.h
rename to src/public/bone_accessor.h
diff --git a/mp/src/public/bone_setup.cpp b/src/public/bone_setup.cpp
similarity index 100%
rename from mp/src/public/bone_setup.cpp
rename to src/public/bone_setup.cpp
diff --git a/mp/src/public/bone_setup.h b/src/public/bone_setup.h
similarity index 100%
rename from mp/src/public/bone_setup.h
rename to src/public/bone_setup.h
diff --git a/mp/src/public/bspfile.h b/src/public/bspfile.h
similarity index 100%
rename from mp/src/public/bspfile.h
rename to src/public/bspfile.h
diff --git a/mp/src/public/bspflags.h b/src/public/bspflags.h
similarity index 100%
rename from mp/src/public/bspflags.h
rename to src/public/bspflags.h
diff --git a/mp/src/public/bsptreedata.cpp b/src/public/bsptreedata.cpp
similarity index 100%
rename from mp/src/public/bsptreedata.cpp
rename to src/public/bsptreedata.cpp
diff --git a/mp/src/public/bsptreedata.h b/src/public/bsptreedata.h
similarity index 100%
rename from mp/src/public/bsptreedata.h
rename to src/public/bsptreedata.h
diff --git a/mp/src/public/builddisp.cpp b/src/public/builddisp.cpp
similarity index 100%
rename from mp/src/public/builddisp.cpp
rename to src/public/builddisp.cpp
diff --git a/mp/src/public/builddisp.h b/src/public/builddisp.h
similarity index 100%
rename from mp/src/public/builddisp.h
rename to src/public/builddisp.h
diff --git a/mp/src/public/captioncompiler.h b/src/public/captioncompiler.h
similarity index 100%
rename from mp/src/public/captioncompiler.h
rename to src/public/captioncompiler.h
diff --git a/mp/src/public/cdll_int.h b/src/public/cdll_int.h
similarity index 100%
rename from mp/src/public/cdll_int.h
rename to src/public/cdll_int.h
diff --git a/mp/src/public/chunkfile.cpp b/src/public/chunkfile.cpp
similarity index 100%
rename from mp/src/public/chunkfile.cpp
rename to src/public/chunkfile.cpp
diff --git a/mp/src/public/chunkfile.h b/src/public/chunkfile.h
similarity index 100%
rename from mp/src/public/chunkfile.h
rename to src/public/chunkfile.h
diff --git a/mp/src/public/client_class.cpp b/src/public/client_class.cpp
similarity index 100%
rename from mp/src/public/client_class.cpp
rename to src/public/client_class.cpp
diff --git a/mp/src/public/client_class.h b/src/public/client_class.h
similarity index 100%
rename from mp/src/public/client_class.h
rename to src/public/client_class.h
diff --git a/mp/src/public/client_render_handle.h b/src/public/client_render_handle.h
similarity index 100%
rename from mp/src/public/client_render_handle.h
rename to src/public/client_render_handle.h
diff --git a/mp/src/public/client_textmessage.h b/src/public/client_textmessage.h
similarity index 100%
rename from mp/src/public/client_textmessage.h
rename to src/public/client_textmessage.h
diff --git a/mp/src/public/clientstats.h b/src/public/clientstats.h
similarity index 100%
rename from mp/src/public/clientstats.h
rename to src/public/clientstats.h
diff --git a/mp/src/public/cmodel.h b/src/public/cmodel.h
similarity index 100%
rename from mp/src/public/cmodel.h
rename to src/public/cmodel.h
diff --git a/mp/src/public/collisionutils.cpp b/src/public/collisionutils.cpp
similarity index 100%
rename from mp/src/public/collisionutils.cpp
rename to src/public/collisionutils.cpp
diff --git a/mp/src/public/collisionutils.h b/src/public/collisionutils.h
similarity index 100%
rename from mp/src/public/collisionutils.h
rename to src/public/collisionutils.h
diff --git a/mp/src/public/con_nprint.h b/src/public/con_nprint.h
similarity index 100%
rename from mp/src/public/con_nprint.h
rename to src/public/con_nprint.h
diff --git a/mp/src/public/const.h b/src/public/const.h
similarity index 100%
rename from mp/src/public/const.h
rename to src/public/const.h
diff --git a/mp/src/public/coordsize.h b/src/public/coordsize.h
similarity index 100%
rename from mp/src/public/coordsize.h
rename to src/public/coordsize.h
diff --git a/mp/src/public/crtmemdebug.cpp b/src/public/crtmemdebug.cpp
similarity index 100%
rename from mp/src/public/crtmemdebug.cpp
rename to src/public/crtmemdebug.cpp
diff --git a/mp/src/public/crtmemdebug.h b/src/public/crtmemdebug.h
similarity index 100%
rename from mp/src/public/crtmemdebug.h
rename to src/public/crtmemdebug.h
diff --git a/mp/src/public/datacache/idatacache.h b/src/public/datacache/idatacache.h
similarity index 100%
rename from mp/src/public/datacache/idatacache.h
rename to src/public/datacache/idatacache.h
diff --git a/mp/src/public/datacache/imdlcache.h b/src/public/datacache/imdlcache.h
similarity index 100%
rename from mp/src/public/datacache/imdlcache.h
rename to src/public/datacache/imdlcache.h
diff --git a/mp/src/public/datamap.h b/src/public/datamap.h
similarity index 100%
rename from mp/src/public/datamap.h
rename to src/public/datamap.h
diff --git a/mp/src/public/datamodel/attributeflags.h b/src/public/datamodel/attributeflags.h
similarity index 100%
rename from mp/src/public/datamodel/attributeflags.h
rename to src/public/datamodel/attributeflags.h
diff --git a/mp/src/public/datamodel/dmattribute.h b/src/public/datamodel/dmattribute.h
similarity index 100%
rename from mp/src/public/datamodel/dmattribute.h
rename to src/public/datamodel/dmattribute.h
diff --git a/mp/src/public/datamodel/dmattributetypes.h b/src/public/datamodel/dmattributetypes.h
similarity index 100%
rename from mp/src/public/datamodel/dmattributetypes.h
rename to src/public/datamodel/dmattributetypes.h
diff --git a/mp/src/public/datamodel/dmattributevar.h b/src/public/datamodel/dmattributevar.h
similarity index 100%
rename from mp/src/public/datamodel/dmattributevar.h
rename to src/public/datamodel/dmattributevar.h
diff --git a/mp/src/public/datamodel/dmehandle.h b/src/public/datamodel/dmehandle.h
similarity index 100%
rename from mp/src/public/datamodel/dmehandle.h
rename to src/public/datamodel/dmehandle.h
diff --git a/mp/src/public/datamodel/dmelement.h b/src/public/datamodel/dmelement.h
similarity index 100%
rename from mp/src/public/datamodel/dmelement.h
rename to src/public/datamodel/dmelement.h
diff --git a/mp/src/public/datamodel/dmelementfactoryhelper.h b/src/public/datamodel/dmelementfactoryhelper.h
similarity index 100%
rename from mp/src/public/datamodel/dmelementfactoryhelper.h
rename to src/public/datamodel/dmelementfactoryhelper.h
diff --git a/mp/src/public/datamodel/dmelementhandle.h b/src/public/datamodel/dmelementhandle.h
similarity index 100%
rename from mp/src/public/datamodel/dmelementhandle.h
rename to src/public/datamodel/dmelementhandle.h
diff --git a/mp/src/public/datamodel/dmvar.h b/src/public/datamodel/dmvar.h
similarity index 100%
rename from mp/src/public/datamodel/dmvar.h
rename to src/public/datamodel/dmvar.h
diff --git a/mp/src/public/datamodel/idatamodel.h b/src/public/datamodel/idatamodel.h
similarity index 100%
rename from mp/src/public/datamodel/idatamodel.h
rename to src/public/datamodel/idatamodel.h
diff --git a/mp/src/public/demofile/demoformat.h b/src/public/demofile/demoformat.h
similarity index 100%
rename from mp/src/public/demofile/demoformat.h
rename to src/public/demofile/demoformat.h
diff --git a/mp/src/public/disp_common.cpp b/src/public/disp_common.cpp
similarity index 100%
rename from mp/src/public/disp_common.cpp
rename to src/public/disp_common.cpp
diff --git a/mp/src/public/disp_common.h b/src/public/disp_common.h
similarity index 100%
rename from mp/src/public/disp_common.h
rename to src/public/disp_common.h
diff --git a/mp/src/public/disp_powerinfo.cpp b/src/public/disp_powerinfo.cpp
similarity index 100%
rename from mp/src/public/disp_powerinfo.cpp
rename to src/public/disp_powerinfo.cpp
diff --git a/mp/src/public/disp_powerinfo.h b/src/public/disp_powerinfo.h
similarity index 100%
rename from mp/src/public/disp_powerinfo.h
rename to src/public/disp_powerinfo.h
diff --git a/mp/src/public/disp_tesselate.h b/src/public/disp_tesselate.h
similarity index 100%
rename from mp/src/public/disp_tesselate.h
rename to src/public/disp_tesselate.h
diff --git a/mp/src/public/disp_vertindex.h b/src/public/disp_vertindex.h
similarity index 100%
rename from mp/src/public/disp_vertindex.h
rename to src/public/disp_vertindex.h
diff --git a/mp/src/public/dispcoll.cpp b/src/public/dispcoll.cpp
similarity index 100%
rename from mp/src/public/dispcoll.cpp
rename to src/public/dispcoll.cpp
diff --git a/mp/src/public/dispcoll.h b/src/public/dispcoll.h
similarity index 100%
rename from mp/src/public/dispcoll.h
rename to src/public/dispcoll.h
diff --git a/mp/src/public/dispcoll_common.cpp b/src/public/dispcoll_common.cpp
similarity index 100%
rename from mp/src/public/dispcoll_common.cpp
rename to src/public/dispcoll_common.cpp
diff --git a/mp/src/public/dispcoll_common.h b/src/public/dispcoll_common.h
similarity index 100%
rename from mp/src/public/dispcoll_common.h
rename to src/public/dispcoll_common.h
diff --git a/mp/src/public/dlight.h b/src/public/dlight.h
similarity index 100%
rename from mp/src/public/dlight.h
rename to src/public/dlight.h
diff --git a/mp/src/public/dmserializers/idmserializers.h b/src/public/dmserializers/idmserializers.h
similarity index 100%
rename from mp/src/public/dmserializers/idmserializers.h
rename to src/public/dmserializers/idmserializers.h
diff --git a/mp/src/public/dmxloader/dmxattribute.h b/src/public/dmxloader/dmxattribute.h
similarity index 100%
rename from mp/src/public/dmxloader/dmxattribute.h
rename to src/public/dmxloader/dmxattribute.h
diff --git a/mp/src/public/dmxloader/dmxelement.h b/src/public/dmxloader/dmxelement.h
similarity index 100%
rename from mp/src/public/dmxloader/dmxelement.h
rename to src/public/dmxloader/dmxelement.h
diff --git a/mp/src/public/dmxloader/dmxloader.h b/src/public/dmxloader/dmxloader.h
similarity index 100%
rename from mp/src/public/dmxloader/dmxloader.h
rename to src/public/dmxloader/dmxloader.h
diff --git a/mp/src/public/dt_common.h b/src/public/dt_common.h
similarity index 100%
rename from mp/src/public/dt_common.h
rename to src/public/dt_common.h
diff --git a/mp/src/public/dt_recv.cpp b/src/public/dt_recv.cpp
similarity index 100%
rename from mp/src/public/dt_recv.cpp
rename to src/public/dt_recv.cpp
diff --git a/mp/src/public/dt_recv.h b/src/public/dt_recv.h
similarity index 100%
rename from mp/src/public/dt_recv.h
rename to src/public/dt_recv.h
diff --git a/mp/src/public/dt_send.cpp b/src/public/dt_send.cpp
similarity index 100%
rename from mp/src/public/dt_send.cpp
rename to src/public/dt_send.cpp
diff --git a/mp/src/public/dt_send.h b/src/public/dt_send.h
similarity index 100%
rename from mp/src/public/dt_send.h
rename to src/public/dt_send.h
diff --git a/mp/src/public/dt_shared.cpp b/src/public/dt_shared.cpp
similarity index 100%
rename from mp/src/public/dt_shared.cpp
rename to src/public/dt_shared.cpp
diff --git a/mp/src/public/dt_shared.h b/src/public/dt_shared.h
similarity index 100%
rename from mp/src/public/dt_shared.h
rename to src/public/dt_shared.h
diff --git a/mp/src/public/dt_utlvector_common.cpp b/src/public/dt_utlvector_common.cpp
similarity index 100%
rename from mp/src/public/dt_utlvector_common.cpp
rename to src/public/dt_utlvector_common.cpp
diff --git a/mp/src/public/dt_utlvector_common.h b/src/public/dt_utlvector_common.h
similarity index 100%
rename from mp/src/public/dt_utlvector_common.h
rename to src/public/dt_utlvector_common.h
diff --git a/mp/src/public/dt_utlvector_recv.cpp b/src/public/dt_utlvector_recv.cpp
similarity index 100%
rename from mp/src/public/dt_utlvector_recv.cpp
rename to src/public/dt_utlvector_recv.cpp
diff --git a/mp/src/public/dt_utlvector_recv.h b/src/public/dt_utlvector_recv.h
similarity index 100%
rename from mp/src/public/dt_utlvector_recv.h
rename to src/public/dt_utlvector_recv.h
diff --git a/mp/src/public/dt_utlvector_send.cpp b/src/public/dt_utlvector_send.cpp
similarity index 100%
rename from mp/src/public/dt_utlvector_send.cpp
rename to src/public/dt_utlvector_send.cpp
diff --git a/mp/src/public/dt_utlvector_send.h b/src/public/dt_utlvector_send.h
similarity index 100%
rename from mp/src/public/dt_utlvector_send.h
rename to src/public/dt_utlvector_send.h
diff --git a/mp/src/public/edict.h b/src/public/edict.h
similarity index 100%
rename from mp/src/public/edict.h
rename to src/public/edict.h
diff --git a/mp/src/public/editor_sendcommand.cpp b/src/public/editor_sendcommand.cpp
similarity index 100%
rename from mp/src/public/editor_sendcommand.cpp
rename to src/public/editor_sendcommand.cpp
diff --git a/mp/src/public/editor_sendcommand.h b/src/public/editor_sendcommand.h
similarity index 100%
rename from mp/src/public/editor_sendcommand.h
rename to src/public/editor_sendcommand.h
diff --git a/mp/src/public/eiface.h b/src/public/eiface.h
similarity index 100%
rename from mp/src/public/eiface.h
rename to src/public/eiface.h
diff --git a/mp/src/public/eifacev21.h b/src/public/eifacev21.h
similarity index 100%
rename from mp/src/public/eifacev21.h
rename to src/public/eifacev21.h
diff --git a/mp/src/public/engine/IClientLeafSystem.h b/src/public/engine/IClientLeafSystem.h
similarity index 100%
rename from mp/src/public/engine/IClientLeafSystem.h
rename to src/public/engine/IClientLeafSystem.h
diff --git a/mp/src/public/engine/ICollideable.h b/src/public/engine/ICollideable.h
similarity index 100%
rename from mp/src/public/engine/ICollideable.h
rename to src/public/engine/ICollideable.h
diff --git a/mp/src/public/engine/IEngineSound.h b/src/public/engine/IEngineSound.h
similarity index 100%
rename from mp/src/public/engine/IEngineSound.h
rename to src/public/engine/IEngineSound.h
diff --git a/mp/src/public/engine/IEngineTrace.h b/src/public/engine/IEngineTrace.h
similarity index 100%
rename from mp/src/public/engine/IEngineTrace.h
rename to src/public/engine/IEngineTrace.h
diff --git a/mp/src/public/engine/IStaticPropMgr.h b/src/public/engine/IStaticPropMgr.h
similarity index 100%
rename from mp/src/public/engine/IStaticPropMgr.h
rename to src/public/engine/IStaticPropMgr.h
diff --git a/mp/src/public/engine/SndInfo.h b/src/public/engine/SndInfo.h
similarity index 100%
rename from mp/src/public/engine/SndInfo.h
rename to src/public/engine/SndInfo.h
diff --git a/mp/src/public/engine/http.h b/src/public/engine/http.h
similarity index 100%
rename from mp/src/public/engine/http.h
rename to src/public/engine/http.h
diff --git a/mp/src/public/engine/ienginevoice.h b/src/public/engine/ienginevoice.h
similarity index 100%
rename from mp/src/public/engine/ienginevoice.h
rename to src/public/engine/ienginevoice.h
diff --git a/mp/src/public/engine/imatchmaking.h b/src/public/engine/imatchmaking.h
similarity index 100%
rename from mp/src/public/engine/imatchmaking.h
rename to src/public/engine/imatchmaking.h
diff --git a/mp/src/public/engine/iserverplugin.h b/src/public/engine/iserverplugin.h
similarity index 100%
rename from mp/src/public/engine/iserverplugin.h
rename to src/public/engine/iserverplugin.h
diff --git a/mp/src/public/engine/ishadowmgr.h b/src/public/engine/ishadowmgr.h
similarity index 100%
rename from mp/src/public/engine/ishadowmgr.h
rename to src/public/engine/ishadowmgr.h
diff --git a/mp/src/public/engine/ivdebugoverlay.h b/src/public/engine/ivdebugoverlay.h
similarity index 100%
rename from mp/src/public/engine/ivdebugoverlay.h
rename to src/public/engine/ivdebugoverlay.h
diff --git a/mp/src/public/engine/ivmodelinfo.h b/src/public/engine/ivmodelinfo.h
similarity index 100%
rename from mp/src/public/engine/ivmodelinfo.h
rename to src/public/engine/ivmodelinfo.h
diff --git a/mp/src/public/engine/ivmodelrender.h b/src/public/engine/ivmodelrender.h
similarity index 100%
rename from mp/src/public/engine/ivmodelrender.h
rename to src/public/engine/ivmodelrender.h
diff --git a/mp/src/public/engine/view_sharedv1.h b/src/public/engine/view_sharedv1.h
similarity index 100%
rename from mp/src/public/engine/view_sharedv1.h
rename to src/public/engine/view_sharedv1.h
diff --git a/mp/src/public/engine_hlds_api.h b/src/public/engine_hlds_api.h
similarity index 100%
rename from mp/src/public/engine_hlds_api.h
rename to src/public/engine_hlds_api.h
diff --git a/mp/src/public/event_flags.h b/src/public/event_flags.h
similarity index 100%
rename from mp/src/public/event_flags.h
rename to src/public/event_flags.h
diff --git a/mp/src/public/fgdlib/entitydefs.h b/src/public/fgdlib/entitydefs.h
similarity index 100%
rename from mp/src/public/fgdlib/entitydefs.h
rename to src/public/fgdlib/entitydefs.h
diff --git a/mp/src/public/fgdlib/fgdlib.h b/src/public/fgdlib/fgdlib.h
similarity index 100%
rename from mp/src/public/fgdlib/fgdlib.h
rename to src/public/fgdlib/fgdlib.h
diff --git a/mp/src/public/fgdlib/gamedata.h b/src/public/fgdlib/gamedata.h
similarity index 100%
rename from mp/src/public/fgdlib/gamedata.h
rename to src/public/fgdlib/gamedata.h
diff --git a/mp/src/public/fgdlib/gdclass.h b/src/public/fgdlib/gdclass.h
similarity index 100%
rename from mp/src/public/fgdlib/gdclass.h
rename to src/public/fgdlib/gdclass.h
diff --git a/mp/src/public/fgdlib/gdvar.h b/src/public/fgdlib/gdvar.h
similarity index 100%
rename from mp/src/public/fgdlib/gdvar.h
rename to src/public/fgdlib/gdvar.h
diff --git a/mp/src/public/fgdlib/helperinfo.h b/src/public/fgdlib/helperinfo.h
similarity index 100%
rename from mp/src/public/fgdlib/helperinfo.h
rename to src/public/fgdlib/helperinfo.h
diff --git a/mp/src/public/fgdlib/ieditortexture.h b/src/public/fgdlib/ieditortexture.h
similarity index 100%
rename from mp/src/public/fgdlib/ieditortexture.h
rename to src/public/fgdlib/ieditortexture.h
diff --git a/mp/src/public/fgdlib/inputoutput.h b/src/public/fgdlib/inputoutput.h
similarity index 100%
rename from mp/src/public/fgdlib/inputoutput.h
rename to src/public/fgdlib/inputoutput.h
diff --git a/mp/src/public/fgdlib/wckeyvalues.h b/src/public/fgdlib/wckeyvalues.h
similarity index 100%
rename from mp/src/public/fgdlib/wckeyvalues.h
rename to src/public/fgdlib/wckeyvalues.h
diff --git a/mp/src/public/filesystem.h b/src/public/filesystem.h
similarity index 100%
rename from mp/src/public/filesystem.h
rename to src/public/filesystem.h
diff --git a/mp/src/public/filesystem/IQueuedLoader.h b/src/public/filesystem/IQueuedLoader.h
similarity index 100%
rename from mp/src/public/filesystem/IQueuedLoader.h
rename to src/public/filesystem/IQueuedLoader.h
diff --git a/mp/src/public/filesystem_helpers.cpp b/src/public/filesystem_helpers.cpp
similarity index 100%
rename from mp/src/public/filesystem_helpers.cpp
rename to src/public/filesystem_helpers.cpp
diff --git a/mp/src/public/filesystem_helpers.h b/src/public/filesystem_helpers.h
similarity index 100%
rename from mp/src/public/filesystem_helpers.h
rename to src/public/filesystem_helpers.h
diff --git a/mp/src/public/filesystem_init.cpp b/src/public/filesystem_init.cpp
similarity index 100%
rename from mp/src/public/filesystem_init.cpp
rename to src/public/filesystem_init.cpp
diff --git a/mp/src/public/filesystem_init.h b/src/public/filesystem_init.h
similarity index 100%
rename from mp/src/public/filesystem_init.h
rename to src/public/filesystem_init.h
diff --git a/mp/src/public/filesystem_passthru.h b/src/public/filesystem_passthru.h
similarity index 100%
rename from mp/src/public/filesystem_passthru.h
rename to src/public/filesystem_passthru.h
diff --git a/mp/src/public/g15/ig15.h b/src/public/g15/ig15.h
similarity index 100%
rename from mp/src/public/g15/ig15.h
rename to src/public/g15/ig15.h
diff --git a/mp/src/public/game/client/IGameClientExports.h b/src/public/game/client/IGameClientExports.h
similarity index 100%
rename from mp/src/public/game/client/IGameClientExports.h
rename to src/public/game/client/IGameClientExports.h
diff --git a/mp/src/public/game/client/iclientrendertargets.h b/src/public/game/client/iclientrendertargets.h
similarity index 100%
rename from mp/src/public/game/client/iclientrendertargets.h
rename to src/public/game/client/iclientrendertargets.h
diff --git a/mp/src/public/game/client/iviewport.h b/src/public/game/client/iviewport.h
similarity index 100%
rename from mp/src/public/game/client/iviewport.h
rename to src/public/game/client/iviewport.h
diff --git a/mp/src/public/game/server/ientityinfo.h b/src/public/game/server/ientityinfo.h
similarity index 100%
rename from mp/src/public/game/server/ientityinfo.h
rename to src/public/game/server/ientityinfo.h
diff --git a/mp/src/public/game/server/igameinfo.h b/src/public/game/server/igameinfo.h
similarity index 100%
rename from mp/src/public/game/server/igameinfo.h
rename to src/public/game/server/igameinfo.h
diff --git a/mp/src/public/game/server/iplayerinfo.h b/src/public/game/server/iplayerinfo.h
similarity index 100%
rename from mp/src/public/game/server/iplayerinfo.h
rename to src/public/game/server/iplayerinfo.h
diff --git a/mp/src/public/game/server/pluginvariant.h b/src/public/game/server/pluginvariant.h
similarity index 100%
rename from mp/src/public/game/server/pluginvariant.h
rename to src/public/game/server/pluginvariant.h
diff --git a/mp/src/public/gamebspfile.h b/src/public/gamebspfile.h
similarity index 100%
rename from mp/src/public/gamebspfile.h
rename to src/public/gamebspfile.h
diff --git a/mp/src/public/gametrace.h b/src/public/gametrace.h
similarity index 100%
rename from mp/src/public/gametrace.h
rename to src/public/gametrace.h
diff --git a/mp/src/public/globalvars_base.h b/src/public/globalvars_base.h
similarity index 100%
rename from mp/src/public/globalvars_base.h
rename to src/public/globalvars_base.h
diff --git a/mp/src/public/haptics/haptic_msgs.cpp b/src/public/haptics/haptic_msgs.cpp
similarity index 100%
rename from mp/src/public/haptics/haptic_msgs.cpp
rename to src/public/haptics/haptic_msgs.cpp
diff --git a/mp/src/public/haptics/haptic_msgs.h b/src/public/haptics/haptic_msgs.h
similarity index 100%
rename from mp/src/public/haptics/haptic_msgs.h
rename to src/public/haptics/haptic_msgs.h
diff --git a/mp/src/public/haptics/haptic_utils.cpp b/src/public/haptics/haptic_utils.cpp
similarity index 100%
rename from mp/src/public/haptics/haptic_utils.cpp
rename to src/public/haptics/haptic_utils.cpp
diff --git a/mp/src/public/haptics/haptic_utils.h b/src/public/haptics/haptic_utils.h
similarity index 100%
rename from mp/src/public/haptics/haptic_utils.h
rename to src/public/haptics/haptic_utils.h
diff --git a/mp/src/public/haptics/ihaptics.h b/src/public/haptics/ihaptics.h
similarity index 100%
rename from mp/src/public/haptics/ihaptics.h
rename to src/public/haptics/ihaptics.h
diff --git a/mp/src/public/iachievementmgr.h b/src/public/iachievementmgr.h
similarity index 100%
rename from mp/src/public/iachievementmgr.h
rename to src/public/iachievementmgr.h
diff --git a/mp/src/public/ibsppack.h b/src/public/ibsppack.h
similarity index 100%
rename from mp/src/public/ibsppack.h
rename to src/public/ibsppack.h
diff --git a/mp/src/public/iclient.h b/src/public/iclient.h
similarity index 100%
rename from mp/src/public/iclient.h
rename to src/public/iclient.h
diff --git a/mp/src/public/icliententity.h b/src/public/icliententity.h
similarity index 100%
rename from mp/src/public/icliententity.h
rename to src/public/icliententity.h
diff --git a/mp/src/public/icliententitylist.h b/src/public/icliententitylist.h
similarity index 100%
rename from mp/src/public/icliententitylist.h
rename to src/public/icliententitylist.h
diff --git a/mp/src/public/iclientnetworkable.h b/src/public/iclientnetworkable.h
similarity index 100%
rename from mp/src/public/iclientnetworkable.h
rename to src/public/iclientnetworkable.h
diff --git a/mp/src/public/iclientrenderable.h b/src/public/iclientrenderable.h
similarity index 100%
rename from mp/src/public/iclientrenderable.h
rename to src/public/iclientrenderable.h
diff --git a/mp/src/public/iclientthinkable.h b/src/public/iclientthinkable.h
similarity index 100%
rename from mp/src/public/iclientthinkable.h
rename to src/public/iclientthinkable.h
diff --git a/mp/src/public/iclientunknown.h b/src/public/iclientunknown.h
similarity index 100%
rename from mp/src/public/iclientunknown.h
rename to src/public/iclientunknown.h
diff --git a/mp/src/public/iclientvirtualreality.h b/src/public/iclientvirtualreality.h
similarity index 100%
rename from mp/src/public/iclientvirtualreality.h
rename to src/public/iclientvirtualreality.h
diff --git a/mp/src/public/icvar.h b/src/public/icvar.h
similarity index 100%
rename from mp/src/public/icvar.h
rename to src/public/icvar.h
diff --git a/mp/src/public/idedicatedexports.h b/src/public/idedicatedexports.h
similarity index 100%
rename from mp/src/public/idedicatedexports.h
rename to src/public/idedicatedexports.h
diff --git a/mp/src/public/iefx.h b/src/public/iefx.h
similarity index 100%
rename from mp/src/public/iefx.h
rename to src/public/iefx.h
diff --git a/mp/src/public/ienginevgui.h b/src/public/ienginevgui.h
similarity index 100%
rename from mp/src/public/ienginevgui.h
rename to src/public/ienginevgui.h
diff --git a/mp/src/public/iexternaltest.h b/src/public/iexternaltest.h
similarity index 100%
rename from mp/src/public/iexternaltest.h
rename to src/public/iexternaltest.h
diff --git a/mp/src/public/ifilelist.h b/src/public/ifilelist.h
similarity index 100%
rename from mp/src/public/ifilelist.h
rename to src/public/ifilelist.h
diff --git a/mp/src/public/igameevents.h b/src/public/igameevents.h
similarity index 100%
rename from mp/src/public/igameevents.h
rename to src/public/igameevents.h
diff --git a/mp/src/public/igameresources.h b/src/public/igameresources.h
similarity index 100%
rename from mp/src/public/igameresources.h
rename to src/public/igameresources.h
diff --git a/mp/src/public/ihandleentity.h b/src/public/ihandleentity.h
similarity index 100%
rename from mp/src/public/ihandleentity.h
rename to src/public/ihandleentity.h
diff --git a/mp/src/public/ihltv.h b/src/public/ihltv.h
similarity index 100%
rename from mp/src/public/ihltv.h
rename to src/public/ihltv.h
diff --git a/mp/src/public/ihltvdirector.h b/src/public/ihltvdirector.h
similarity index 100%
rename from mp/src/public/ihltvdirector.h
rename to src/public/ihltvdirector.h
diff --git a/mp/src/public/ilaunchabledll.h b/src/public/ilaunchabledll.h
similarity index 100%
rename from mp/src/public/ilaunchabledll.h
rename to src/public/ilaunchabledll.h
diff --git a/mp/src/public/imapoverview.h b/src/public/imapoverview.h
similarity index 100%
rename from mp/src/public/imapoverview.h
rename to src/public/imapoverview.h
diff --git a/mp/src/public/inetchannel.h b/src/public/inetchannel.h
similarity index 100%
rename from mp/src/public/inetchannel.h
rename to src/public/inetchannel.h
diff --git a/mp/src/public/inetchannelinfo.h b/src/public/inetchannelinfo.h
similarity index 100%
rename from mp/src/public/inetchannelinfo.h
rename to src/public/inetchannelinfo.h
diff --git a/mp/src/public/inetmessage.h b/src/public/inetmessage.h
similarity index 100%
rename from mp/src/public/inetmessage.h
rename to src/public/inetmessage.h
diff --git a/mp/src/public/inetmsghandler.h b/src/public/inetmsghandler.h
similarity index 100%
rename from mp/src/public/inetmsghandler.h
rename to src/public/inetmsghandler.h
diff --git a/mp/src/public/inetwork.h b/src/public/inetwork.h
similarity index 100%
rename from mp/src/public/inetwork.h
rename to src/public/inetwork.h
diff --git a/mp/src/public/inputsystem/AnalogCode.h b/src/public/inputsystem/AnalogCode.h
similarity index 100%
rename from mp/src/public/inputsystem/AnalogCode.h
rename to src/public/inputsystem/AnalogCode.h
diff --git a/mp/src/public/inputsystem/ButtonCode.h b/src/public/inputsystem/ButtonCode.h
similarity index 100%
rename from mp/src/public/inputsystem/ButtonCode.h
rename to src/public/inputsystem/ButtonCode.h
diff --git a/mp/src/public/inputsystem/InputEnums.h b/src/public/inputsystem/InputEnums.h
similarity index 100%
rename from mp/src/public/inputsystem/InputEnums.h
rename to src/public/inputsystem/InputEnums.h
diff --git a/mp/src/public/inputsystem/iinputsystem.h b/src/public/inputsystem/iinputsystem.h
similarity index 100%
rename from mp/src/public/inputsystem/iinputsystem.h
rename to src/public/inputsystem/iinputsystem.h
diff --git a/mp/src/public/interpolatortypes.cpp b/src/public/interpolatortypes.cpp
similarity index 100%
rename from mp/src/public/interpolatortypes.cpp
rename to src/public/interpolatortypes.cpp
diff --git a/mp/src/public/interpolatortypes.h b/src/public/interpolatortypes.h
similarity index 100%
rename from mp/src/public/interpolatortypes.h
rename to src/public/interpolatortypes.h
diff --git a/mp/src/public/iprediction.h b/src/public/iprediction.h
similarity index 100%
rename from mp/src/public/iprediction.h
rename to src/public/iprediction.h
diff --git a/mp/src/public/irecipientfilter.h b/src/public/irecipientfilter.h
similarity index 100%
rename from mp/src/public/irecipientfilter.h
rename to src/public/irecipientfilter.h
diff --git a/mp/src/public/iregistry.h b/src/public/iregistry.h
similarity index 100%
rename from mp/src/public/iregistry.h
rename to src/public/iregistry.h
diff --git a/mp/src/public/isaverestore.h b/src/public/isaverestore.h
similarity index 100%
rename from mp/src/public/isaverestore.h
rename to src/public/isaverestore.h
diff --git a/mp/src/public/iscratchpad3d.h b/src/public/iscratchpad3d.h
similarity index 100%
rename from mp/src/public/iscratchpad3d.h
rename to src/public/iscratchpad3d.h
diff --git a/mp/src/public/iserver.h b/src/public/iserver.h
similarity index 100%
rename from mp/src/public/iserver.h
rename to src/public/iserver.h
diff --git a/mp/src/public/iserverentity.h b/src/public/iserverentity.h
similarity index 100%
rename from mp/src/public/iserverentity.h
rename to src/public/iserverentity.h
diff --git a/mp/src/public/iservernetworkable.h b/src/public/iservernetworkable.h
similarity index 100%
rename from mp/src/public/iservernetworkable.h
rename to src/public/iservernetworkable.h
diff --git a/mp/src/public/iserverunknown.h b/src/public/iserverunknown.h
similarity index 100%
rename from mp/src/public/iserverunknown.h
rename to src/public/iserverunknown.h
diff --git a/mp/src/public/ishadercompiledll.h b/src/public/ishadercompiledll.h
similarity index 100%
rename from mp/src/public/ishadercompiledll.h
rename to src/public/ishadercompiledll.h
diff --git a/mp/src/public/isoundcombiner.h b/src/public/isoundcombiner.h
similarity index 100%
rename from mp/src/public/isoundcombiner.h
rename to src/public/isoundcombiner.h
diff --git a/mp/src/public/ispatialpartition.h b/src/public/ispatialpartition.h
similarity index 100%
rename from mp/src/public/ispatialpartition.h
rename to src/public/ispatialpartition.h
diff --git a/mp/src/public/isqlwrapper.h b/src/public/isqlwrapper.h
similarity index 100%
rename from mp/src/public/isqlwrapper.h
rename to src/public/isqlwrapper.h
diff --git a/mp/src/public/istudiorender.h b/src/public/istudiorender.h
similarity index 100%
rename from mp/src/public/istudiorender.h
rename to src/public/istudiorender.h
diff --git a/mp/src/public/ivguicenterprint.h b/src/public/ivguicenterprint.h
similarity index 100%
rename from mp/src/public/ivguicenterprint.h
rename to src/public/ivguicenterprint.h
diff --git a/mp/src/public/ivoiceserver.h b/src/public/ivoiceserver.h
similarity index 100%
rename from mp/src/public/ivoiceserver.h
rename to src/public/ivoiceserver.h
diff --git a/mp/src/public/ivoicetweak.h b/src/public/ivoicetweak.h
similarity index 100%
rename from mp/src/public/ivoicetweak.h
rename to src/public/ivoicetweak.h
diff --git a/mp/src/public/ivraddll.h b/src/public/ivraddll.h
similarity index 100%
rename from mp/src/public/ivraddll.h
rename to src/public/ivraddll.h
diff --git a/mp/src/public/ivrenderview.h b/src/public/ivrenderview.h
similarity index 100%
rename from mp/src/public/ivrenderview.h
rename to src/public/ivrenderview.h
diff --git a/mp/src/public/ivtex.h b/src/public/ivtex.h
similarity index 100%
rename from mp/src/public/ivtex.h
rename to src/public/ivtex.h
diff --git a/mp/src/public/ixboxsystem.h b/src/public/ixboxsystem.h
similarity index 100%
rename from mp/src/public/ixboxsystem.h
rename to src/public/ixboxsystem.h
diff --git a/mp/src/public/jigglebones.cpp b/src/public/jigglebones.cpp
similarity index 100%
rename from mp/src/public/jigglebones.cpp
rename to src/public/jigglebones.cpp
diff --git a/mp/src/public/jigglebones.h b/src/public/jigglebones.h
similarity index 100%
rename from mp/src/public/jigglebones.h
rename to src/public/jigglebones.h
diff --git a/mp/src/public/jpeglib/jconfig.h b/src/public/jpeglib/jconfig.h
similarity index 100%
rename from mp/src/public/jpeglib/jconfig.h
rename to src/public/jpeglib/jconfig.h
diff --git a/mp/src/public/jpeglib/jmorecfg.h b/src/public/jpeglib/jmorecfg.h
similarity index 100%
rename from mp/src/public/jpeglib/jmorecfg.h
rename to src/public/jpeglib/jmorecfg.h
diff --git a/mp/src/public/jpeglib/jpeglib.h b/src/public/jpeglib/jpeglib.h
similarity index 100%
rename from mp/src/public/jpeglib/jpeglib.h
rename to src/public/jpeglib/jpeglib.h
diff --git a/mp/src/public/kevvaluescompiler.cpp b/src/public/kevvaluescompiler.cpp
similarity index 100%
rename from mp/src/public/kevvaluescompiler.cpp
rename to src/public/kevvaluescompiler.cpp
diff --git a/mp/src/public/keyframe/keyframe.cpp b/src/public/keyframe/keyframe.cpp
similarity index 100%
rename from mp/src/public/keyframe/keyframe.cpp
rename to src/public/keyframe/keyframe.cpp
diff --git a/mp/src/public/keyframe/keyframe.h b/src/public/keyframe/keyframe.h
similarity index 100%
rename from mp/src/public/keyframe/keyframe.h
rename to src/public/keyframe/keyframe.h
diff --git a/mp/src/public/keyvaluescompiler.h b/src/public/keyvaluescompiler.h
similarity index 100%
rename from mp/src/public/keyvaluescompiler.h
rename to src/public/keyvaluescompiler.h
diff --git a/mp/src/public/list.h b/src/public/list.h
similarity index 100%
rename from mp/src/public/list.h
rename to src/public/list.h
diff --git a/mp/src/public/loadcmdline.cpp b/src/public/loadcmdline.cpp
similarity index 100%
rename from mp/src/public/loadcmdline.cpp
rename to src/public/loadcmdline.cpp
diff --git a/mp/src/public/loadcmdline.h b/src/public/loadcmdline.h
similarity index 100%
rename from mp/src/public/loadcmdline.h
rename to src/public/loadcmdline.h
diff --git a/mp/src/public/localflexcontroller.h b/src/public/localflexcontroller.h
similarity index 100%
rename from mp/src/public/localflexcontroller.h
rename to src/public/localflexcontroller.h
diff --git a/mp/src/public/lumpfiles.cpp b/src/public/lumpfiles.cpp
similarity index 100%
rename from mp/src/public/lumpfiles.cpp
rename to src/public/lumpfiles.cpp
diff --git a/mp/src/public/lumpfiles.h b/src/public/lumpfiles.h
similarity index 100%
rename from mp/src/public/lumpfiles.h
rename to src/public/lumpfiles.h
diff --git a/mp/src/public/map_utils.cpp b/src/public/map_utils.cpp
similarity index 100%
rename from mp/src/public/map_utils.cpp
rename to src/public/map_utils.cpp
diff --git a/mp/src/public/map_utils.h b/src/public/map_utils.h
similarity index 100%
rename from mp/src/public/map_utils.h
rename to src/public/map_utils.h
diff --git a/mp/src/public/materialsystem/IColorCorrection.h b/src/public/materialsystem/IColorCorrection.h
similarity index 100%
rename from mp/src/public/materialsystem/IColorCorrection.h
rename to src/public/materialsystem/IColorCorrection.h
diff --git a/mp/src/public/materialsystem/IShader.h b/src/public/materialsystem/IShader.h
similarity index 100%
rename from mp/src/public/materialsystem/IShader.h
rename to src/public/materialsystem/IShader.h
diff --git a/mp/src/public/materialsystem/MaterialSystemUtil.cpp b/src/public/materialsystem/MaterialSystemUtil.cpp
similarity index 100%
rename from mp/src/public/materialsystem/MaterialSystemUtil.cpp
rename to src/public/materialsystem/MaterialSystemUtil.cpp
diff --git a/mp/src/public/materialsystem/MaterialSystemUtil.h b/src/public/materialsystem/MaterialSystemUtil.h
similarity index 100%
rename from mp/src/public/materialsystem/MaterialSystemUtil.h
rename to src/public/materialsystem/MaterialSystemUtil.h
diff --git a/mp/src/public/materialsystem/combineoperations.h b/src/public/materialsystem/combineoperations.h
similarity index 100%
rename from mp/src/public/materialsystem/combineoperations.h
rename to src/public/materialsystem/combineoperations.h
diff --git a/mp/src/public/materialsystem/deformations.h b/src/public/materialsystem/deformations.h
similarity index 100%
rename from mp/src/public/materialsystem/deformations.h
rename to src/public/materialsystem/deformations.h
diff --git a/mp/src/public/materialsystem/hardwaretexels.h b/src/public/materialsystem/hardwaretexels.h
similarity index 100%
rename from mp/src/public/materialsystem/hardwaretexels.h
rename to src/public/materialsystem/hardwaretexels.h
diff --git a/mp/src/public/materialsystem/hardwareverts.h b/src/public/materialsystem/hardwareverts.h
similarity index 100%
rename from mp/src/public/materialsystem/hardwareverts.h
rename to src/public/materialsystem/hardwareverts.h
diff --git a/mp/src/public/materialsystem/idebugtextureinfo.h b/src/public/materialsystem/idebugtextureinfo.h
similarity index 100%
rename from mp/src/public/materialsystem/idebugtextureinfo.h
rename to src/public/materialsystem/idebugtextureinfo.h
diff --git a/mp/src/public/materialsystem/imaterial.h b/src/public/materialsystem/imaterial.h
similarity index 100%
rename from mp/src/public/materialsystem/imaterial.h
rename to src/public/materialsystem/imaterial.h
diff --git a/mp/src/public/materialsystem/imaterialproxy.h b/src/public/materialsystem/imaterialproxy.h
similarity index 100%
rename from mp/src/public/materialsystem/imaterialproxy.h
rename to src/public/materialsystem/imaterialproxy.h
diff --git a/mp/src/public/materialsystem/imaterialproxyfactory.h b/src/public/materialsystem/imaterialproxyfactory.h
similarity index 100%
rename from mp/src/public/materialsystem/imaterialproxyfactory.h
rename to src/public/materialsystem/imaterialproxyfactory.h
diff --git a/mp/src/public/materialsystem/imaterialsystem.h b/src/public/materialsystem/imaterialsystem.h
similarity index 100%
rename from mp/src/public/materialsystem/imaterialsystem.h
rename to src/public/materialsystem/imaterialsystem.h
diff --git a/mp/src/public/materialsystem/imaterialsystemhardwareconfig.h b/src/public/materialsystem/imaterialsystemhardwareconfig.h
similarity index 100%
rename from mp/src/public/materialsystem/imaterialsystemhardwareconfig.h
rename to src/public/materialsystem/imaterialsystemhardwareconfig.h
diff --git a/mp/src/public/materialsystem/imaterialsystemstub.h b/src/public/materialsystem/imaterialsystemstub.h
similarity index 100%
rename from mp/src/public/materialsystem/imaterialsystemstub.h
rename to src/public/materialsystem/imaterialsystemstub.h
diff --git a/mp/src/public/materialsystem/imaterialvar.h b/src/public/materialsystem/imaterialvar.h
similarity index 100%
rename from mp/src/public/materialsystem/imaterialvar.h
rename to src/public/materialsystem/imaterialvar.h
diff --git a/mp/src/public/materialsystem/imesh.h b/src/public/materialsystem/imesh.h
similarity index 100%
rename from mp/src/public/materialsystem/imesh.h
rename to src/public/materialsystem/imesh.h
diff --git a/mp/src/public/materialsystem/imorph.h b/src/public/materialsystem/imorph.h
similarity index 100%
rename from mp/src/public/materialsystem/imorph.h
rename to src/public/materialsystem/imorph.h
diff --git a/mp/src/public/materialsystem/ishaderapi.h b/src/public/materialsystem/ishaderapi.h
similarity index 100%
rename from mp/src/public/materialsystem/ishaderapi.h
rename to src/public/materialsystem/ishaderapi.h
diff --git a/mp/src/public/materialsystem/ishadersystem_declarations.h b/src/public/materialsystem/ishadersystem_declarations.h
similarity index 100%
rename from mp/src/public/materialsystem/ishadersystem_declarations.h
rename to src/public/materialsystem/ishadersystem_declarations.h
diff --git a/mp/src/public/materialsystem/itexture.h b/src/public/materialsystem/itexture.h
similarity index 100%
rename from mp/src/public/materialsystem/itexture.h
rename to src/public/materialsystem/itexture.h
diff --git a/mp/src/public/materialsystem/itexturecompositor.h b/src/public/materialsystem/itexturecompositor.h
similarity index 100%
rename from mp/src/public/materialsystem/itexturecompositor.h
rename to src/public/materialsystem/itexturecompositor.h
diff --git a/mp/src/public/materialsystem/ivballoctracker.h b/src/public/materialsystem/ivballoctracker.h
similarity index 100%
rename from mp/src/public/materialsystem/ivballoctracker.h
rename to src/public/materialsystem/ivballoctracker.h
diff --git a/mp/src/public/materialsystem/materialsystem_config.h b/src/public/materialsystem/materialsystem_config.h
similarity index 100%
rename from mp/src/public/materialsystem/materialsystem_config.h
rename to src/public/materialsystem/materialsystem_config.h
diff --git a/mp/src/public/materialsystem/meshreader.h b/src/public/materialsystem/meshreader.h
similarity index 100%
rename from mp/src/public/materialsystem/meshreader.h
rename to src/public/materialsystem/meshreader.h
diff --git a/mp/src/public/materialsystem/shader_vcs_version.h b/src/public/materialsystem/shader_vcs_version.h
similarity index 100%
rename from mp/src/public/materialsystem/shader_vcs_version.h
rename to src/public/materialsystem/shader_vcs_version.h
diff --git a/mp/src/public/mathlib/IceKey.H b/src/public/mathlib/IceKey.H
similarity index 100%
rename from mp/src/public/mathlib/IceKey.H
rename to src/public/mathlib/IceKey.H
diff --git a/mp/src/public/mathlib/amd3dx.h b/src/public/mathlib/amd3dx.h
similarity index 100%
rename from mp/src/public/mathlib/amd3dx.h
rename to src/public/mathlib/amd3dx.h
diff --git a/mp/src/public/mathlib/anorms.h b/src/public/mathlib/anorms.h
similarity index 100%
rename from mp/src/public/mathlib/anorms.h
rename to src/public/mathlib/anorms.h
diff --git a/mp/src/public/mathlib/bumpvects.h b/src/public/mathlib/bumpvects.h
similarity index 100%
rename from mp/src/public/mathlib/bumpvects.h
rename to src/public/mathlib/bumpvects.h
diff --git a/mp/src/public/mathlib/compressed_3d_unitvec.h b/src/public/mathlib/compressed_3d_unitvec.h
similarity index 100%
rename from mp/src/public/mathlib/compressed_3d_unitvec.h
rename to src/public/mathlib/compressed_3d_unitvec.h
diff --git a/mp/src/public/mathlib/compressed_light_cube.h b/src/public/mathlib/compressed_light_cube.h
similarity index 100%
rename from mp/src/public/mathlib/compressed_light_cube.h
rename to src/public/mathlib/compressed_light_cube.h
diff --git a/mp/src/public/mathlib/compressed_vector.h b/src/public/mathlib/compressed_vector.h
similarity index 100%
rename from mp/src/public/mathlib/compressed_vector.h
rename to src/public/mathlib/compressed_vector.h
diff --git a/mp/src/public/mathlib/halton.h b/src/public/mathlib/halton.h
similarity index 100%
rename from mp/src/public/mathlib/halton.h
rename to src/public/mathlib/halton.h
diff --git a/mp/src/public/mathlib/lightdesc.h b/src/public/mathlib/lightdesc.h
similarity index 100%
rename from mp/src/public/mathlib/lightdesc.h
rename to src/public/mathlib/lightdesc.h
diff --git a/mp/src/public/mathlib/math_pfns.h b/src/public/mathlib/math_pfns.h
similarity index 100%
rename from mp/src/public/mathlib/math_pfns.h
rename to src/public/mathlib/math_pfns.h
diff --git a/mp/src/public/mathlib/mathlib.h b/src/public/mathlib/mathlib.h
similarity index 100%
rename from mp/src/public/mathlib/mathlib.h
rename to src/public/mathlib/mathlib.h
diff --git a/mp/src/public/mathlib/matrixmath.h b/src/public/mathlib/matrixmath.h
similarity index 100%
rename from mp/src/public/mathlib/matrixmath.h
rename to src/public/mathlib/matrixmath.h
diff --git a/mp/src/public/mathlib/noise.h b/src/public/mathlib/noise.h
similarity index 100%
rename from mp/src/public/mathlib/noise.h
rename to src/public/mathlib/noise.h
diff --git a/mp/src/public/mathlib/polyhedron.h b/src/public/mathlib/polyhedron.h
similarity index 100%
rename from mp/src/public/mathlib/polyhedron.h
rename to src/public/mathlib/polyhedron.h
diff --git a/mp/src/public/mathlib/quantize.h b/src/public/mathlib/quantize.h
similarity index 100%
rename from mp/src/public/mathlib/quantize.h
rename to src/public/mathlib/quantize.h
diff --git a/mp/src/public/mathlib/simdvectormatrix.h b/src/public/mathlib/simdvectormatrix.h
similarity index 100%
rename from mp/src/public/mathlib/simdvectormatrix.h
rename to src/public/mathlib/simdvectormatrix.h
diff --git a/mp/src/public/mathlib/spherical_geometry.h b/src/public/mathlib/spherical_geometry.h
similarity index 100%
rename from mp/src/public/mathlib/spherical_geometry.h
rename to src/public/mathlib/spherical_geometry.h
diff --git a/mp/src/public/mathlib/ssemath.h b/src/public/mathlib/ssemath.h
similarity index 100%
rename from mp/src/public/mathlib/ssemath.h
rename to src/public/mathlib/ssemath.h
diff --git a/mp/src/public/mathlib/ssequaternion.h b/src/public/mathlib/ssequaternion.h
similarity index 100%
rename from mp/src/public/mathlib/ssequaternion.h
rename to src/public/mathlib/ssequaternion.h
diff --git a/mp/src/public/mathlib/vector.h b/src/public/mathlib/vector.h
similarity index 100%
rename from mp/src/public/mathlib/vector.h
rename to src/public/mathlib/vector.h
diff --git a/mp/src/public/mathlib/vector2d.h b/src/public/mathlib/vector2d.h
similarity index 100%
rename from mp/src/public/mathlib/vector2d.h
rename to src/public/mathlib/vector2d.h
diff --git a/mp/src/public/mathlib/vector4d.h b/src/public/mathlib/vector4d.h
similarity index 100%
rename from mp/src/public/mathlib/vector4d.h
rename to src/public/mathlib/vector4d.h
diff --git a/mp/src/public/mathlib/vmatrix.h b/src/public/mathlib/vmatrix.h
similarity index 100%
rename from mp/src/public/mathlib/vmatrix.h
rename to src/public/mathlib/vmatrix.h
diff --git a/mp/src/public/mathlib/vplane.h b/src/public/mathlib/vplane.h
similarity index 100%
rename from mp/src/public/mathlib/vplane.h
rename to src/public/mathlib/vplane.h
diff --git a/mp/src/public/matsys_controls/QCGenerator.h b/src/public/matsys_controls/QCGenerator.h
similarity index 100%
rename from mp/src/public/matsys_controls/QCGenerator.h
rename to src/public/matsys_controls/QCGenerator.h
diff --git a/mp/src/public/matsys_controls/assetpicker.h b/src/public/matsys_controls/assetpicker.h
similarity index 100%
rename from mp/src/public/matsys_controls/assetpicker.h
rename to src/public/matsys_controls/assetpicker.h
diff --git a/mp/src/public/matsys_controls/baseassetpicker.h b/src/public/matsys_controls/baseassetpicker.h
similarity index 100%
rename from mp/src/public/matsys_controls/baseassetpicker.h
rename to src/public/matsys_controls/baseassetpicker.h
diff --git a/mp/src/public/matsys_controls/colorpickerpanel.h b/src/public/matsys_controls/colorpickerpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/colorpickerpanel.h
rename to src/public/matsys_controls/colorpickerpanel.h
diff --git a/mp/src/public/matsys_controls/curveeditorpanel.h b/src/public/matsys_controls/curveeditorpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/curveeditorpanel.h
rename to src/public/matsys_controls/curveeditorpanel.h
diff --git a/mp/src/public/matsys_controls/gamefiletreeview.h b/src/public/matsys_controls/gamefiletreeview.h
similarity index 100%
rename from mp/src/public/matsys_controls/gamefiletreeview.h
rename to src/public/matsys_controls/gamefiletreeview.h
diff --git a/mp/src/public/matsys_controls/manipulator.h b/src/public/matsys_controls/manipulator.h
similarity index 100%
rename from mp/src/public/matsys_controls/manipulator.h
rename to src/public/matsys_controls/manipulator.h
diff --git a/mp/src/public/matsys_controls/matsyscontrols.h b/src/public/matsys_controls/matsyscontrols.h
similarity index 100%
rename from mp/src/public/matsys_controls/matsyscontrols.h
rename to src/public/matsys_controls/matsyscontrols.h
diff --git a/mp/src/public/matsys_controls/mdlpanel.h b/src/public/matsys_controls/mdlpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/mdlpanel.h
rename to src/public/matsys_controls/mdlpanel.h
diff --git a/mp/src/public/matsys_controls/mdlpicker.h b/src/public/matsys_controls/mdlpicker.h
similarity index 100%
rename from mp/src/public/matsys_controls/mdlpicker.h
rename to src/public/matsys_controls/mdlpicker.h
diff --git a/mp/src/public/matsys_controls/mdlsequencepicker.h b/src/public/matsys_controls/mdlsequencepicker.h
similarity index 100%
rename from mp/src/public/matsys_controls/mdlsequencepicker.h
rename to src/public/matsys_controls/mdlsequencepicker.h
diff --git a/mp/src/public/matsys_controls/picker.h b/src/public/matsys_controls/picker.h
similarity index 100%
rename from mp/src/public/matsys_controls/picker.h
rename to src/public/matsys_controls/picker.h
diff --git a/mp/src/public/matsys_controls/potterywheelpanel.h b/src/public/matsys_controls/potterywheelpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/potterywheelpanel.h
rename to src/public/matsys_controls/potterywheelpanel.h
diff --git a/mp/src/public/matsys_controls/proceduraltexturepanel.h b/src/public/matsys_controls/proceduraltexturepanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/proceduraltexturepanel.h
rename to src/public/matsys_controls/proceduraltexturepanel.h
diff --git a/mp/src/public/matsys_controls/sequencepicker.h b/src/public/matsys_controls/sequencepicker.h
similarity index 100%
rename from mp/src/public/matsys_controls/sequencepicker.h
rename to src/public/matsys_controls/sequencepicker.h
diff --git a/mp/src/public/matsys_controls/tgapreviewpanel.h b/src/public/matsys_controls/tgapreviewpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/tgapreviewpanel.h
rename to src/public/matsys_controls/tgapreviewpanel.h
diff --git a/mp/src/public/matsys_controls/vmtpanel.h b/src/public/matsys_controls/vmtpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/vmtpanel.h
rename to src/public/matsys_controls/vmtpanel.h
diff --git a/mp/src/public/matsys_controls/vmtpicker.h b/src/public/matsys_controls/vmtpicker.h
similarity index 100%
rename from mp/src/public/matsys_controls/vmtpicker.h
rename to src/public/matsys_controls/vmtpicker.h
diff --git a/mp/src/public/matsys_controls/vmtpreviewpanel.h b/src/public/matsys_controls/vmtpreviewpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/vmtpreviewpanel.h
rename to src/public/matsys_controls/vmtpreviewpanel.h
diff --git a/mp/src/public/matsys_controls/vtfpicker.h b/src/public/matsys_controls/vtfpicker.h
similarity index 100%
rename from mp/src/public/matsys_controls/vtfpicker.h
rename to src/public/matsys_controls/vtfpicker.h
diff --git a/mp/src/public/matsys_controls/vtfpreviewpanel.h b/src/public/matsys_controls/vtfpreviewpanel.h
similarity index 100%
rename from mp/src/public/matsys_controls/vtfpreviewpanel.h
rename to src/public/matsys_controls/vtfpreviewpanel.h
diff --git a/mp/src/public/maya/IMayaVGui.h b/src/public/maya/IMayaVGui.h
similarity index 100%
rename from mp/src/public/maya/IMayaVGui.h
rename to src/public/maya/IMayaVGui.h
diff --git a/mp/src/public/maya/VsMayaDmx.h b/src/public/maya/VsMayaDmx.h
similarity index 100%
rename from mp/src/public/maya/VsMayaDmx.h
rename to src/public/maya/VsMayaDmx.h
diff --git a/mp/src/public/maya/VsMayaMPxFactory.h b/src/public/maya/VsMayaMPxFactory.h
similarity index 100%
rename from mp/src/public/maya/VsMayaMPxFactory.h
rename to src/public/maya/VsMayaMPxFactory.h
diff --git a/mp/src/public/maya/VsVGuiWindow.h b/src/public/maya/VsVGuiWindow.h
similarity index 100%
rename from mp/src/public/maya/VsVGuiWindow.h
rename to src/public/maya/VsVGuiWindow.h
diff --git a/mp/src/public/maya/valveMaya.h b/src/public/maya/valveMaya.h
similarity index 100%
rename from mp/src/public/maya/valveMaya.h
rename to src/public/maya/valveMaya.h
diff --git a/mp/src/public/mdllib/mdllib.h b/src/public/mdllib/mdllib.h
similarity index 100%
rename from mp/src/public/mdllib/mdllib.h
rename to src/public/mdllib/mdllib.h
diff --git a/mp/src/public/measure_section.cpp b/src/public/measure_section.cpp
similarity index 100%
rename from mp/src/public/measure_section.cpp
rename to src/public/measure_section.cpp
diff --git a/mp/src/public/measure_section.h b/src/public/measure_section.h
similarity index 100%
rename from mp/src/public/measure_section.h
rename to src/public/measure_section.h
diff --git a/mp/src/public/minmax.h b/src/public/minmax.h
similarity index 100%
rename from mp/src/public/minmax.h
rename to src/public/minmax.h
diff --git a/mp/src/public/model_types.h b/src/public/model_types.h
similarity index 100%
rename from mp/src/public/model_types.h
rename to src/public/model_types.h
diff --git a/mp/src/public/modes.h b/src/public/modes.h
similarity index 100%
rename from mp/src/public/modes.h
rename to src/public/modes.h
diff --git a/mp/src/public/mouthinfo.h b/src/public/mouthinfo.h
similarity index 100%
rename from mp/src/public/mouthinfo.h
rename to src/public/mouthinfo.h
diff --git a/mp/src/public/networkstringtabledefs.h b/src/public/networkstringtabledefs.h
similarity index 100%
rename from mp/src/public/networkstringtabledefs.h
rename to src/public/networkstringtabledefs.h
diff --git a/mp/src/public/networkvar.cpp b/src/public/networkvar.cpp
similarity index 100%
rename from mp/src/public/networkvar.cpp
rename to src/public/networkvar.cpp
diff --git a/mp/src/public/networkvar.h b/src/public/networkvar.h
similarity index 100%
rename from mp/src/public/networkvar.h
rename to src/public/networkvar.h
diff --git a/mp/src/public/nmatrix.h b/src/public/nmatrix.h
similarity index 100%
rename from mp/src/public/nmatrix.h
rename to src/public/nmatrix.h
diff --git a/mp/src/public/ntree.h b/src/public/ntree.h
similarity index 100%
rename from mp/src/public/ntree.h
rename to src/public/ntree.h
diff --git a/mp/src/public/nvector.h b/src/public/nvector.h
similarity index 100%
rename from mp/src/public/nvector.h
rename to src/public/nvector.h
diff --git a/mp/src/public/nvtc.h b/src/public/nvtc.h
similarity index 100%
rename from mp/src/public/nvtc.h
rename to src/public/nvtc.h
diff --git a/mp/src/public/optimize.h b/src/public/optimize.h
similarity index 100%
rename from mp/src/public/optimize.h
rename to src/public/optimize.h
diff --git a/mp/src/public/overlaytext.h b/src/public/overlaytext.h
similarity index 100%
rename from mp/src/public/overlaytext.h
rename to src/public/overlaytext.h
diff --git a/mp/src/public/p4lib/ip4.h b/src/public/p4lib/ip4.h
similarity index 100%
rename from mp/src/public/p4lib/ip4.h
rename to src/public/p4lib/ip4.h
diff --git a/mp/src/public/particles/particles.h b/src/public/particles/particles.h
similarity index 100%
rename from mp/src/public/particles/particles.h
rename to src/public/particles/particles.h
diff --git a/mp/src/public/phonemeconverter.cpp b/src/public/phonemeconverter.cpp
similarity index 100%
rename from mp/src/public/phonemeconverter.cpp
rename to src/public/phonemeconverter.cpp
diff --git a/mp/src/public/phonemeconverter.h b/src/public/phonemeconverter.h
similarity index 100%
rename from mp/src/public/phonemeconverter.h
rename to src/public/phonemeconverter.h
diff --git a/mp/src/public/phonemeextractor/phonemeextractor.h b/src/public/phonemeextractor/phonemeextractor.h
similarity index 100%
rename from mp/src/public/phonemeextractor/phonemeextractor.h
rename to src/public/phonemeextractor/phonemeextractor.h
diff --git a/mp/src/public/phyfile.h b/src/public/phyfile.h
similarity index 100%
rename from mp/src/public/phyfile.h
rename to src/public/phyfile.h
diff --git a/mp/src/public/pixelwriter.h b/src/public/pixelwriter.h
similarity index 100%
rename from mp/src/public/pixelwriter.h
rename to src/public/pixelwriter.h
diff --git a/mp/src/public/posedebugger.cpp b/src/public/posedebugger.cpp
similarity index 100%
rename from mp/src/public/posedebugger.cpp
rename to src/public/posedebugger.cpp
diff --git a/mp/src/public/posedebugger.h b/src/public/posedebugger.h
similarity index 100%
rename from mp/src/public/posedebugger.h
rename to src/public/posedebugger.h
diff --git a/mp/src/public/r_efx.h b/src/public/r_efx.h
similarity index 100%
rename from mp/src/public/r_efx.h
rename to src/public/r_efx.h
diff --git a/mp/src/public/raytrace.h b/src/public/raytrace.h
similarity index 100%
rename from mp/src/public/raytrace.h
rename to src/public/raytrace.h
diff --git a/mp/src/public/registry.cpp b/src/public/registry.cpp
similarity index 100%
rename from mp/src/public/registry.cpp
rename to src/public/registry.cpp
diff --git a/mp/src/public/renamed_recvtable_compat.cpp b/src/public/renamed_recvtable_compat.cpp
similarity index 100%
rename from mp/src/public/renamed_recvtable_compat.cpp
rename to src/public/renamed_recvtable_compat.cpp
diff --git a/mp/src/public/renamed_recvtable_compat.h b/src/public/renamed_recvtable_compat.h
similarity index 100%
rename from mp/src/public/renamed_recvtable_compat.h
rename to src/public/renamed_recvtable_compat.h
diff --git a/mp/src/public/renderparm.h b/src/public/renderparm.h
similarity index 100%
rename from mp/src/public/renderparm.h
rename to src/public/renderparm.h
diff --git a/mp/src/public/rope_physics.cpp b/src/public/rope_physics.cpp
similarity index 100%
rename from mp/src/public/rope_physics.cpp
rename to src/public/rope_physics.cpp
diff --git a/mp/src/public/rope_physics.h b/src/public/rope_physics.h
similarity index 100%
rename from mp/src/public/rope_physics.h
rename to src/public/rope_physics.h
diff --git a/mp/src/public/rope_shared.h b/src/public/rope_shared.h
similarity index 100%
rename from mp/src/public/rope_shared.h
rename to src/public/rope_shared.h
diff --git a/mp/src/public/savegame_version.h b/src/public/savegame_version.h
similarity index 100%
rename from mp/src/public/savegame_version.h
rename to src/public/savegame_version.h
diff --git a/mp/src/public/saverestoretypes.h b/src/public/saverestoretypes.h
similarity index 100%
rename from mp/src/public/saverestoretypes.h
rename to src/public/saverestoretypes.h
diff --git a/mp/src/public/scenefilecache/ISceneFileCache.h b/src/public/scenefilecache/ISceneFileCache.h
similarity index 100%
rename from mp/src/public/scenefilecache/ISceneFileCache.h
rename to src/public/scenefilecache/ISceneFileCache.h
diff --git a/mp/src/public/scenefilecache/SceneImageFile.h b/src/public/scenefilecache/SceneImageFile.h
similarity index 100%
rename from mp/src/public/scenefilecache/SceneImageFile.h
rename to src/public/scenefilecache/SceneImageFile.h
diff --git a/mp/src/public/scratchpad3d.cpp b/src/public/scratchpad3d.cpp
similarity index 100%
rename from mp/src/public/scratchpad3d.cpp
rename to src/public/scratchpad3d.cpp
diff --git a/mp/src/public/scratchpad3d.h b/src/public/scratchpad3d.h
similarity index 100%
rename from mp/src/public/scratchpad3d.h
rename to src/public/scratchpad3d.h
diff --git a/mp/src/public/sentence.cpp b/src/public/sentence.cpp
similarity index 100%
rename from mp/src/public/sentence.cpp
rename to src/public/sentence.cpp
diff --git a/mp/src/public/sentence.h b/src/public/sentence.h
similarity index 100%
rename from mp/src/public/sentence.h
rename to src/public/sentence.h
diff --git a/mp/src/public/server_class.cpp b/src/public/server_class.cpp
similarity index 100%
rename from mp/src/public/server_class.cpp
rename to src/public/server_class.cpp
diff --git a/mp/src/public/server_class.h b/src/public/server_class.h
similarity index 100%
rename from mp/src/public/server_class.h
rename to src/public/server_class.h
diff --git a/mp/src/public/shaderapi/IShaderDevice.h b/src/public/shaderapi/IShaderDevice.h
similarity index 100%
rename from mp/src/public/shaderapi/IShaderDevice.h
rename to src/public/shaderapi/IShaderDevice.h
diff --git a/mp/src/public/shaderapi/commandbuffer.h b/src/public/shaderapi/commandbuffer.h
similarity index 100%
rename from mp/src/public/shaderapi/commandbuffer.h
rename to src/public/shaderapi/commandbuffer.h
diff --git a/mp/src/public/shaderapi/ishaderapi.h b/src/public/shaderapi/ishaderapi.h
similarity index 100%
rename from mp/src/public/shaderapi/ishaderapi.h
rename to src/public/shaderapi/ishaderapi.h
diff --git a/mp/src/public/shaderapi/ishaderdynamic.h b/src/public/shaderapi/ishaderdynamic.h
similarity index 100%
rename from mp/src/public/shaderapi/ishaderdynamic.h
rename to src/public/shaderapi/ishaderdynamic.h
diff --git a/mp/src/public/shaderapi/ishadershadow.h b/src/public/shaderapi/ishadershadow.h
similarity index 100%
rename from mp/src/public/shaderapi/ishadershadow.h
rename to src/public/shaderapi/ishadershadow.h
diff --git a/mp/src/public/shaderapi/ishaderutil.h b/src/public/shaderapi/ishaderutil.h
similarity index 100%
rename from mp/src/public/shaderapi/ishaderutil.h
rename to src/public/shaderapi/ishaderutil.h
diff --git a/mp/src/public/shaderapi/shareddefs.h b/src/public/shaderapi/shareddefs.h
similarity index 100%
rename from mp/src/public/shaderapi/shareddefs.h
rename to src/public/shaderapi/shareddefs.h
diff --git a/mp/src/public/shaderlib/BaseShader.h b/src/public/shaderlib/BaseShader.h
similarity index 100%
rename from mp/src/public/shaderlib/BaseShader.h
rename to src/public/shaderlib/BaseShader.h
diff --git a/mp/src/public/shaderlib/ShaderDLL.h b/src/public/shaderlib/ShaderDLL.h
similarity index 100%
rename from mp/src/public/shaderlib/ShaderDLL.h
rename to src/public/shaderlib/ShaderDLL.h
diff --git a/mp/src/public/shaderlib/cshader.h b/src/public/shaderlib/cshader.h
similarity index 100%
rename from mp/src/public/shaderlib/cshader.h
rename to src/public/shaderlib/cshader.h
diff --git a/mp/src/public/shake.h b/src/public/shake.h
similarity index 100%
rename from mp/src/public/shake.h
rename to src/public/shake.h
diff --git a/mp/src/public/shattersurfacetypes.h b/src/public/shattersurfacetypes.h
similarity index 100%
rename from mp/src/public/shattersurfacetypes.h
rename to src/public/shattersurfacetypes.h
diff --git a/mp/src/public/simple_physics.cpp b/src/public/simple_physics.cpp
similarity index 100%
rename from mp/src/public/simple_physics.cpp
rename to src/public/simple_physics.cpp
diff --git a/mp/src/public/simple_physics.h b/src/public/simple_physics.h
similarity index 100%
rename from mp/src/public/simple_physics.h
rename to src/public/simple_physics.h
diff --git a/mp/src/public/smooth_average.h b/src/public/smooth_average.h
similarity index 100%
rename from mp/src/public/smooth_average.h
rename to src/public/smooth_average.h
diff --git a/mp/src/public/soundchars.h b/src/public/soundchars.h
similarity index 100%
rename from mp/src/public/soundchars.h
rename to src/public/soundchars.h
diff --git a/mp/src/public/soundcombiner.cpp b/src/public/soundcombiner.cpp
similarity index 100%
rename from mp/src/public/soundcombiner.cpp
rename to src/public/soundcombiner.cpp
diff --git a/mp/src/public/soundflags.h b/src/public/soundflags.h
similarity index 100%
rename from mp/src/public/soundflags.h
rename to src/public/soundflags.h
diff --git a/mp/src/public/soundinfo.h b/src/public/soundinfo.h
similarity index 100%
rename from mp/src/public/soundinfo.h
rename to src/public/soundinfo.h
diff --git a/mp/src/public/soundsystem/isoundsystem.h b/src/public/soundsystem/isoundsystem.h
similarity index 100%
rename from mp/src/public/soundsystem/isoundsystem.h
rename to src/public/soundsystem/isoundsystem.h
diff --git a/mp/src/public/soundsystem/snd_audio_source.h b/src/public/soundsystem/snd_audio_source.h
similarity index 100%
rename from mp/src/public/soundsystem/snd_audio_source.h
rename to src/public/soundsystem/snd_audio_source.h
diff --git a/mp/src/public/soundsystem/snd_device.h b/src/public/soundsystem/snd_device.h
similarity index 100%
rename from mp/src/public/soundsystem/snd_device.h
rename to src/public/soundsystem/snd_device.h
diff --git a/mp/src/public/sourcevr/isourcevirtualreality.h b/src/public/sourcevr/isourcevirtualreality.h
similarity index 100%
rename from mp/src/public/sourcevr/isourcevirtualreality.h
rename to src/public/sourcevr/isourcevirtualreality.h
diff --git a/mp/src/public/stdstring.h b/src/public/stdstring.h
similarity index 100%
rename from mp/src/public/stdstring.h
rename to src/public/stdstring.h
diff --git a/mp/src/public/steam/isteamapplist.h b/src/public/steam/isteamapplist.h
similarity index 100%
rename from mp/src/public/steam/isteamapplist.h
rename to src/public/steam/isteamapplist.h
diff --git a/mp/src/public/steam/isteamapps.h b/src/public/steam/isteamapps.h
similarity index 100%
rename from mp/src/public/steam/isteamapps.h
rename to src/public/steam/isteamapps.h
diff --git a/mp/src/public/steam/isteamclient.h b/src/public/steam/isteamclient.h
similarity index 100%
rename from mp/src/public/steam/isteamclient.h
rename to src/public/steam/isteamclient.h
diff --git a/mp/src/public/steam/isteamcontroller.h b/src/public/steam/isteamcontroller.h
similarity index 100%
rename from mp/src/public/steam/isteamcontroller.h
rename to src/public/steam/isteamcontroller.h
diff --git a/mp/src/public/steam/isteamfriends.h b/src/public/steam/isteamfriends.h
similarity index 100%
rename from mp/src/public/steam/isteamfriends.h
rename to src/public/steam/isteamfriends.h
diff --git a/mp/src/public/steam/isteamgameserver.h b/src/public/steam/isteamgameserver.h
similarity index 100%
rename from mp/src/public/steam/isteamgameserver.h
rename to src/public/steam/isteamgameserver.h
diff --git a/mp/src/public/steam/isteamgameserverstats.h b/src/public/steam/isteamgameserverstats.h
similarity index 100%
rename from mp/src/public/steam/isteamgameserverstats.h
rename to src/public/steam/isteamgameserverstats.h
diff --git a/mp/src/public/steam/isteamhtmlsurface.h b/src/public/steam/isteamhtmlsurface.h
similarity index 100%
rename from mp/src/public/steam/isteamhtmlsurface.h
rename to src/public/steam/isteamhtmlsurface.h
diff --git a/mp/src/public/steam/isteamhttp.h b/src/public/steam/isteamhttp.h
similarity index 100%
rename from mp/src/public/steam/isteamhttp.h
rename to src/public/steam/isteamhttp.h
diff --git a/mp/src/public/steam/isteammatchmaking.h b/src/public/steam/isteammatchmaking.h
similarity index 100%
rename from mp/src/public/steam/isteammatchmaking.h
rename to src/public/steam/isteammatchmaking.h
diff --git a/mp/src/public/steam/isteammusic.h b/src/public/steam/isteammusic.h
similarity index 100%
rename from mp/src/public/steam/isteammusic.h
rename to src/public/steam/isteammusic.h
diff --git a/mp/src/public/steam/isteammusicremote.h b/src/public/steam/isteammusicremote.h
similarity index 100%
rename from mp/src/public/steam/isteammusicremote.h
rename to src/public/steam/isteammusicremote.h
diff --git a/mp/src/public/steam/isteamnetworking.h b/src/public/steam/isteamnetworking.h
similarity index 100%
rename from mp/src/public/steam/isteamnetworking.h
rename to src/public/steam/isteamnetworking.h
diff --git a/mp/src/public/steam/isteamremotestorage.h b/src/public/steam/isteamremotestorage.h
similarity index 100%
rename from mp/src/public/steam/isteamremotestorage.h
rename to src/public/steam/isteamremotestorage.h
diff --git a/mp/src/public/steam/isteamscreenshots.h b/src/public/steam/isteamscreenshots.h
similarity index 100%
rename from mp/src/public/steam/isteamscreenshots.h
rename to src/public/steam/isteamscreenshots.h
diff --git a/mp/src/public/steam/isteamugc.h b/src/public/steam/isteamugc.h
similarity index 100%
rename from mp/src/public/steam/isteamugc.h
rename to src/public/steam/isteamugc.h
diff --git a/mp/src/public/steam/isteamunifiedmessages.h b/src/public/steam/isteamunifiedmessages.h
similarity index 100%
rename from mp/src/public/steam/isteamunifiedmessages.h
rename to src/public/steam/isteamunifiedmessages.h
diff --git a/mp/src/public/steam/isteamuser.h b/src/public/steam/isteamuser.h
similarity index 100%
rename from mp/src/public/steam/isteamuser.h
rename to src/public/steam/isteamuser.h
diff --git a/mp/src/public/steam/isteamuserstats.h b/src/public/steam/isteamuserstats.h
similarity index 100%
rename from mp/src/public/steam/isteamuserstats.h
rename to src/public/steam/isteamuserstats.h
diff --git a/mp/src/public/steam/isteamutils.h b/src/public/steam/isteamutils.h
similarity index 100%
rename from mp/src/public/steam/isteamutils.h
rename to src/public/steam/isteamutils.h
diff --git a/mp/src/public/steam/matchmakingtypes.h b/src/public/steam/matchmakingtypes.h
similarity index 100%
rename from mp/src/public/steam/matchmakingtypes.h
rename to src/public/steam/matchmakingtypes.h
diff --git a/mp/src/public/steam/steam_api.h b/src/public/steam/steam_api.h
similarity index 100%
rename from mp/src/public/steam/steam_api.h
rename to src/public/steam/steam_api.h
diff --git a/mp/src/public/steam/steam_gameserver.h b/src/public/steam/steam_gameserver.h
similarity index 100%
rename from mp/src/public/steam/steam_gameserver.h
rename to src/public/steam/steam_gameserver.h
diff --git a/mp/src/public/steam/steamclientpublic.h b/src/public/steam/steamclientpublic.h
similarity index 100%
rename from mp/src/public/steam/steamclientpublic.h
rename to src/public/steam/steamclientpublic.h
diff --git a/mp/src/public/steam/steamhttpenums.h b/src/public/steam/steamhttpenums.h
similarity index 100%
rename from mp/src/public/steam/steamhttpenums.h
rename to src/public/steam/steamhttpenums.h
diff --git a/mp/src/public/steam/steamtypes.h b/src/public/steam/steamtypes.h
similarity index 100%
rename from mp/src/public/steam/steamtypes.h
rename to src/public/steam/steamtypes.h
diff --git a/mp/src/public/steam/steamuniverse.h b/src/public/steam/steamuniverse.h
similarity index 100%
rename from mp/src/public/steam/steamuniverse.h
rename to src/public/steam/steamuniverse.h
diff --git a/mp/src/public/string_t.h b/src/public/string_t.h
similarity index 100%
rename from mp/src/public/string_t.h
rename to src/public/string_t.h
diff --git a/mp/src/public/stringregistry.cpp b/src/public/stringregistry.cpp
similarity index 100%
rename from mp/src/public/stringregistry.cpp
rename to src/public/stringregistry.cpp
diff --git a/mp/src/public/stringregistry.h b/src/public/stringregistry.h
similarity index 100%
rename from mp/src/public/stringregistry.h
rename to src/public/stringregistry.h
diff --git a/mp/src/public/studio.cpp b/src/public/studio.cpp
similarity index 100%
rename from mp/src/public/studio.cpp
rename to src/public/studio.cpp
diff --git a/mp/src/public/studio.h b/src/public/studio.h
similarity index 100%
rename from mp/src/public/studio.h
rename to src/public/studio.h
diff --git a/mp/src/public/studio_generic_io.cpp b/src/public/studio_generic_io.cpp
similarity index 100%
rename from mp/src/public/studio_generic_io.cpp
rename to src/public/studio_generic_io.cpp
diff --git a/mp/src/public/studio_virtualmodel.cpp b/src/public/studio_virtualmodel.cpp
similarity index 100%
rename from mp/src/public/studio_virtualmodel.cpp
rename to src/public/studio_virtualmodel.cpp
diff --git a/mp/src/public/surfinfo.h b/src/public/surfinfo.h
similarity index 100%
rename from mp/src/public/surfinfo.h
rename to src/public/surfinfo.h
diff --git a/mp/src/public/texture_group_names.h b/src/public/texture_group_names.h
similarity index 100%
rename from mp/src/public/texture_group_names.h
rename to src/public/texture_group_names.h
diff --git a/mp/src/public/tier0/EventMasks.h b/src/public/tier0/EventMasks.h
similarity index 100%
rename from mp/src/public/tier0/EventMasks.h
rename to src/public/tier0/EventMasks.h
diff --git a/mp/src/public/tier0/EventModes.h b/src/public/tier0/EventModes.h
similarity index 100%
rename from mp/src/public/tier0/EventModes.h
rename to src/public/tier0/EventModes.h
diff --git a/mp/src/public/tier0/IOCTLCodes.h b/src/public/tier0/IOCTLCodes.h
similarity index 100%
rename from mp/src/public/tier0/IOCTLCodes.h
rename to src/public/tier0/IOCTLCodes.h
diff --git a/mp/src/public/tier0/K8PerformanceCounters.h b/src/public/tier0/K8PerformanceCounters.h
similarity index 100%
rename from mp/src/public/tier0/K8PerformanceCounters.h
rename to src/public/tier0/K8PerformanceCounters.h
diff --git a/mp/src/public/tier0/P4PerformanceCounters.h b/src/public/tier0/P4PerformanceCounters.h
similarity index 100%
rename from mp/src/public/tier0/P4PerformanceCounters.h
rename to src/public/tier0/P4PerformanceCounters.h
diff --git a/mp/src/public/tier0/P5P6PerformanceCounters.h b/src/public/tier0/P5P6PerformanceCounters.h
similarity index 100%
rename from mp/src/public/tier0/P5P6PerformanceCounters.h
rename to src/public/tier0/P5P6PerformanceCounters.h
diff --git a/mp/src/public/tier0/PMELib.h b/src/public/tier0/PMELib.h
similarity index 100%
rename from mp/src/public/tier0/PMELib.h
rename to src/public/tier0/PMELib.h
diff --git a/mp/src/public/tier0/afxmem_override.cpp b/src/public/tier0/afxmem_override.cpp
similarity index 100%
rename from mp/src/public/tier0/afxmem_override.cpp
rename to src/public/tier0/afxmem_override.cpp
diff --git a/mp/src/public/tier0/annotations.h b/src/public/tier0/annotations.h
similarity index 100%
rename from mp/src/public/tier0/annotations.h
rename to src/public/tier0/annotations.h
diff --git a/mp/src/public/tier0/basetypes.h b/src/public/tier0/basetypes.h
similarity index 100%
rename from mp/src/public/tier0/basetypes.h
rename to src/public/tier0/basetypes.h
diff --git a/mp/src/public/tier0/commonmacros.h b/src/public/tier0/commonmacros.h
similarity index 100%
rename from mp/src/public/tier0/commonmacros.h
rename to src/public/tier0/commonmacros.h
diff --git a/mp/src/public/tier0/cpumonitoring.h b/src/public/tier0/cpumonitoring.h
similarity index 100%
rename from mp/src/public/tier0/cpumonitoring.h
rename to src/public/tier0/cpumonitoring.h
diff --git a/mp/src/public/tier0/dbg.h b/src/public/tier0/dbg.h
similarity index 100%
rename from mp/src/public/tier0/dbg.h
rename to src/public/tier0/dbg.h
diff --git a/mp/src/public/tier0/dbgflag.h b/src/public/tier0/dbgflag.h
similarity index 100%
rename from mp/src/public/tier0/dbgflag.h
rename to src/public/tier0/dbgflag.h
diff --git a/mp/src/public/tier0/dynfunction.h b/src/public/tier0/dynfunction.h
similarity index 100%
rename from mp/src/public/tier0/dynfunction.h
rename to src/public/tier0/dynfunction.h
diff --git a/mp/src/public/tier0/etwprof.h b/src/public/tier0/etwprof.h
similarity index 100%
rename from mp/src/public/tier0/etwprof.h
rename to src/public/tier0/etwprof.h
diff --git a/mp/src/public/tier0/fasttimer.h b/src/public/tier0/fasttimer.h
similarity index 100%
rename from mp/src/public/tier0/fasttimer.h
rename to src/public/tier0/fasttimer.h
diff --git a/mp/src/public/tier0/ia32detect.h b/src/public/tier0/ia32detect.h
similarity index 100%
rename from mp/src/public/tier0/ia32detect.h
rename to src/public/tier0/ia32detect.h
diff --git a/mp/src/public/tier0/icommandline.h b/src/public/tier0/icommandline.h
similarity index 100%
rename from mp/src/public/tier0/icommandline.h
rename to src/public/tier0/icommandline.h
diff --git a/mp/src/public/tier0/l2cache.h b/src/public/tier0/l2cache.h
similarity index 100%
rename from mp/src/public/tier0/l2cache.h
rename to src/public/tier0/l2cache.h
diff --git a/mp/src/public/tier0/mem.h b/src/public/tier0/mem.h
similarity index 100%
rename from mp/src/public/tier0/mem.h
rename to src/public/tier0/mem.h
diff --git a/mp/src/public/tier0/memalloc.h b/src/public/tier0/memalloc.h
similarity index 100%
rename from mp/src/public/tier0/memalloc.h
rename to src/public/tier0/memalloc.h
diff --git a/mp/src/public/tier0/memdbgoff.h b/src/public/tier0/memdbgoff.h
similarity index 100%
rename from mp/src/public/tier0/memdbgoff.h
rename to src/public/tier0/memdbgoff.h
diff --git a/mp/src/public/tier0/memdbgon.h b/src/public/tier0/memdbgon.h
similarity index 100%
rename from mp/src/public/tier0/memdbgon.h
rename to src/public/tier0/memdbgon.h
diff --git a/mp/src/public/tier0/memoverride.cpp b/src/public/tier0/memoverride.cpp
similarity index 100%
rename from mp/src/public/tier0/memoverride.cpp
rename to src/public/tier0/memoverride.cpp
diff --git a/mp/src/public/tier0/minidump.h b/src/public/tier0/minidump.h
similarity index 100%
rename from mp/src/public/tier0/minidump.h
rename to src/public/tier0/minidump.h
diff --git a/mp/src/public/tier0/platform.h b/src/public/tier0/platform.h
similarity index 100%
rename from mp/src/public/tier0/platform.h
rename to src/public/tier0/platform.h
diff --git a/mp/src/public/tier0/pmc360.h b/src/public/tier0/pmc360.h
similarity index 100%
rename from mp/src/public/tier0/pmc360.h
rename to src/public/tier0/pmc360.h
diff --git a/mp/src/public/tier0/pointeroverride.asm b/src/public/tier0/pointeroverride.asm
similarity index 100%
rename from mp/src/public/tier0/pointeroverride.asm
rename to src/public/tier0/pointeroverride.asm
diff --git a/mp/src/public/tier0/progressbar.h b/src/public/tier0/progressbar.h
similarity index 100%
rename from mp/src/public/tier0/progressbar.h
rename to src/public/tier0/progressbar.h
diff --git a/mp/src/public/tier0/protected_things.h b/src/public/tier0/protected_things.h
similarity index 100%
rename from mp/src/public/tier0/protected_things.h
rename to src/public/tier0/protected_things.h
diff --git a/mp/src/public/tier0/stacktools.h b/src/public/tier0/stacktools.h
similarity index 100%
rename from mp/src/public/tier0/stacktools.h
rename to src/public/tier0/stacktools.h
diff --git a/mp/src/public/tier0/systeminformation.h b/src/public/tier0/systeminformation.h
similarity index 100%
rename from mp/src/public/tier0/systeminformation.h
rename to src/public/tier0/systeminformation.h
diff --git a/mp/src/public/tier0/testthread.h b/src/public/tier0/testthread.h
similarity index 100%
rename from mp/src/public/tier0/testthread.h
rename to src/public/tier0/testthread.h
diff --git a/mp/src/public/tier0/threadtools.h b/src/public/tier0/threadtools.h
similarity index 100%
rename from mp/src/public/tier0/threadtools.h
rename to src/public/tier0/threadtools.h
diff --git a/mp/src/public/tier0/tmapi_dummy.h b/src/public/tier0/tmapi_dummy.h
similarity index 100%
rename from mp/src/public/tier0/tmapi_dummy.h
rename to src/public/tier0/tmapi_dummy.h
diff --git a/mp/src/public/tier0/tslist.h b/src/public/tier0/tslist.h
similarity index 100%
rename from mp/src/public/tier0/tslist.h
rename to src/public/tier0/tslist.h
diff --git a/mp/src/public/tier0/validator.h b/src/public/tier0/validator.h
similarity index 100%
rename from mp/src/public/tier0/validator.h
rename to src/public/tier0/validator.h
diff --git a/mp/src/public/tier0/valobject.h b/src/public/tier0/valobject.h
similarity index 100%
rename from mp/src/public/tier0/valobject.h
rename to src/public/tier0/valobject.h
diff --git a/mp/src/public/tier0/valve_minmax_off.h b/src/public/tier0/valve_minmax_off.h
similarity index 100%
rename from mp/src/public/tier0/valve_minmax_off.h
rename to src/public/tier0/valve_minmax_off.h
diff --git a/mp/src/public/tier0/valve_minmax_on.h b/src/public/tier0/valve_minmax_on.h
similarity index 100%
rename from mp/src/public/tier0/valve_minmax_on.h
rename to src/public/tier0/valve_minmax_on.h
diff --git a/mp/src/public/tier0/valve_off.h b/src/public/tier0/valve_off.h
similarity index 100%
rename from mp/src/public/tier0/valve_off.h
rename to src/public/tier0/valve_off.h
diff --git a/mp/src/public/tier0/valve_on.h b/src/public/tier0/valve_on.h
similarity index 100%
rename from mp/src/public/tier0/valve_on.h
rename to src/public/tier0/valve_on.h
diff --git a/mp/src/public/tier0/vcr_shared.h b/src/public/tier0/vcr_shared.h
similarity index 100%
rename from mp/src/public/tier0/vcr_shared.h
rename to src/public/tier0/vcr_shared.h
diff --git a/mp/src/public/tier0/vcrmode.h b/src/public/tier0/vcrmode.h
similarity index 100%
rename from mp/src/public/tier0/vcrmode.h
rename to src/public/tier0/vcrmode.h
diff --git a/mp/src/public/tier0/vprof.h b/src/public/tier0/vprof.h
similarity index 100%
rename from mp/src/public/tier0/vprof.h
rename to src/public/tier0/vprof.h
diff --git a/mp/src/public/tier0/vprof_telemetry.h b/src/public/tier0/vprof_telemetry.h
similarity index 100%
rename from mp/src/public/tier0/vprof_telemetry.h
rename to src/public/tier0/vprof_telemetry.h
diff --git a/mp/src/public/tier0/wchartypes.h b/src/public/tier0/wchartypes.h
similarity index 100%
rename from mp/src/public/tier0/wchartypes.h
rename to src/public/tier0/wchartypes.h
diff --git a/mp/src/public/tier0/xbox_codeline_defines.h b/src/public/tier0/xbox_codeline_defines.h
similarity index 100%
rename from mp/src/public/tier0/xbox_codeline_defines.h
rename to src/public/tier0/xbox_codeline_defines.h
diff --git a/mp/src/public/tier1/CommandBuffer.h b/src/public/tier1/CommandBuffer.h
similarity index 100%
rename from mp/src/public/tier1/CommandBuffer.h
rename to src/public/tier1/CommandBuffer.h
diff --git a/mp/src/public/tier1/KeyValues.h b/src/public/tier1/KeyValues.h
similarity index 100%
rename from mp/src/public/tier1/KeyValues.h
rename to src/public/tier1/KeyValues.h
diff --git a/mp/src/public/tier1/UtlSortVector.h b/src/public/tier1/UtlSortVector.h
similarity index 100%
rename from mp/src/public/tier1/UtlSortVector.h
rename to src/public/tier1/UtlSortVector.h
diff --git a/mp/src/public/tier1/UtlStringMap.h b/src/public/tier1/UtlStringMap.h
similarity index 100%
rename from mp/src/public/tier1/UtlStringMap.h
rename to src/public/tier1/UtlStringMap.h
diff --git a/mp/src/public/tier1/bitbuf.h b/src/public/tier1/bitbuf.h
similarity index 100%
rename from mp/src/public/tier1/bitbuf.h
rename to src/public/tier1/bitbuf.h
diff --git a/mp/src/public/tier1/byteswap.h b/src/public/tier1/byteswap.h
similarity index 100%
rename from mp/src/public/tier1/byteswap.h
rename to src/public/tier1/byteswap.h
diff --git a/mp/src/public/tier1/callqueue.h b/src/public/tier1/callqueue.h
similarity index 100%
rename from mp/src/public/tier1/callqueue.h
rename to src/public/tier1/callqueue.h
diff --git a/mp/src/public/tier1/characterset.h b/src/public/tier1/characterset.h
similarity index 100%
rename from mp/src/public/tier1/characterset.h
rename to src/public/tier1/characterset.h
diff --git a/mp/src/public/tier1/checksum_crc.h b/src/public/tier1/checksum_crc.h
similarity index 100%
rename from mp/src/public/tier1/checksum_crc.h
rename to src/public/tier1/checksum_crc.h
diff --git a/mp/src/public/tier1/checksum_md5.h b/src/public/tier1/checksum_md5.h
similarity index 100%
rename from mp/src/public/tier1/checksum_md5.h
rename to src/public/tier1/checksum_md5.h
diff --git a/mp/src/public/tier1/checksum_sha1.h b/src/public/tier1/checksum_sha1.h
similarity index 100%
rename from mp/src/public/tier1/checksum_sha1.h
rename to src/public/tier1/checksum_sha1.h
diff --git a/mp/src/public/tier1/convar.h b/src/public/tier1/convar.h
similarity index 100%
rename from mp/src/public/tier1/convar.h
rename to src/public/tier1/convar.h
diff --git a/mp/src/public/tier1/convar_serverbounded.h b/src/public/tier1/convar_serverbounded.h
similarity index 100%
rename from mp/src/public/tier1/convar_serverbounded.h
rename to src/public/tier1/convar_serverbounded.h
diff --git a/mp/src/public/tier1/datamanager.h b/src/public/tier1/datamanager.h
similarity index 100%
rename from mp/src/public/tier1/datamanager.h
rename to src/public/tier1/datamanager.h
diff --git a/mp/src/public/tier1/delegates.h b/src/public/tier1/delegates.h
similarity index 100%
rename from mp/src/public/tier1/delegates.h
rename to src/public/tier1/delegates.h
diff --git a/mp/src/public/tier1/diff.h b/src/public/tier1/diff.h
similarity index 100%
rename from mp/src/public/tier1/diff.h
rename to src/public/tier1/diff.h
diff --git a/mp/src/public/tier1/fileio.h b/src/public/tier1/fileio.h
similarity index 100%
rename from mp/src/public/tier1/fileio.h
rename to src/public/tier1/fileio.h
diff --git a/mp/src/public/tier1/fmtstr.h b/src/public/tier1/fmtstr.h
similarity index 100%
rename from mp/src/public/tier1/fmtstr.h
rename to src/public/tier1/fmtstr.h
diff --git a/mp/src/public/tier1/functors.h b/src/public/tier1/functors.h
similarity index 100%
rename from mp/src/public/tier1/functors.h
rename to src/public/tier1/functors.h
diff --git a/mp/src/public/tier1/generichash.h b/src/public/tier1/generichash.h
similarity index 100%
rename from mp/src/public/tier1/generichash.h
rename to src/public/tier1/generichash.h
diff --git a/mp/src/public/tier1/iconvar.h b/src/public/tier1/iconvar.h
similarity index 100%
rename from mp/src/public/tier1/iconvar.h
rename to src/public/tier1/iconvar.h
diff --git a/mp/src/public/tier1/ilocalize.h b/src/public/tier1/ilocalize.h
similarity index 100%
rename from mp/src/public/tier1/ilocalize.h
rename to src/public/tier1/ilocalize.h
diff --git a/mp/src/public/tier1/interface.h b/src/public/tier1/interface.h
similarity index 100%
rename from mp/src/public/tier1/interface.h
rename to src/public/tier1/interface.h
diff --git a/mp/src/public/tier1/kvpacker.h b/src/public/tier1/kvpacker.h
similarity index 100%
rename from mp/src/public/tier1/kvpacker.h
rename to src/public/tier1/kvpacker.h
diff --git a/mp/src/public/tier1/lzmaDecoder.h b/src/public/tier1/lzmaDecoder.h
similarity index 100%
rename from mp/src/public/tier1/lzmaDecoder.h
rename to src/public/tier1/lzmaDecoder.h
diff --git a/mp/src/public/tier1/lzss.h b/src/public/tier1/lzss.h
similarity index 100%
rename from mp/src/public/tier1/lzss.h
rename to src/public/tier1/lzss.h
diff --git a/mp/src/public/tier1/mempool.h b/src/public/tier1/mempool.h
similarity index 100%
rename from mp/src/public/tier1/mempool.h
rename to src/public/tier1/mempool.h
diff --git a/mp/src/public/tier1/memstack.h b/src/public/tier1/memstack.h
similarity index 100%
rename from mp/src/public/tier1/memstack.h
rename to src/public/tier1/memstack.h
diff --git a/mp/src/public/tier1/netadr.h b/src/public/tier1/netadr.h
similarity index 100%
rename from mp/src/public/tier1/netadr.h
rename to src/public/tier1/netadr.h
diff --git a/mp/src/public/tier1/passwordhash.h b/src/public/tier1/passwordhash.h
similarity index 100%
rename from mp/src/public/tier1/passwordhash.h
rename to src/public/tier1/passwordhash.h
diff --git a/mp/src/public/tier1/processor_detect.h b/src/public/tier1/processor_detect.h
similarity index 100%
rename from mp/src/public/tier1/processor_detect.h
rename to src/public/tier1/processor_detect.h
diff --git a/mp/src/public/tier1/rangecheckedvar.h b/src/public/tier1/rangecheckedvar.h
similarity index 100%
rename from mp/src/public/tier1/rangecheckedvar.h
rename to src/public/tier1/rangecheckedvar.h
diff --git a/mp/src/public/tier1/refcount.h b/src/public/tier1/refcount.h
similarity index 100%
rename from mp/src/public/tier1/refcount.h
rename to src/public/tier1/refcount.h
diff --git a/mp/src/public/tier1/reliabletimer.h b/src/public/tier1/reliabletimer.h
similarity index 100%
rename from mp/src/public/tier1/reliabletimer.h
rename to src/public/tier1/reliabletimer.h
diff --git a/mp/src/public/tier1/smartptr.h b/src/public/tier1/smartptr.h
similarity index 100%
rename from mp/src/public/tier1/smartptr.h
rename to src/public/tier1/smartptr.h
diff --git a/mp/src/public/tier1/snappy-sinksource.h b/src/public/tier1/snappy-sinksource.h
similarity index 100%
rename from mp/src/public/tier1/snappy-sinksource.h
rename to src/public/tier1/snappy-sinksource.h
diff --git a/mp/src/public/tier1/snappy-stubs-public.h b/src/public/tier1/snappy-stubs-public.h
similarity index 100%
rename from mp/src/public/tier1/snappy-stubs-public.h
rename to src/public/tier1/snappy-stubs-public.h
diff --git a/mp/src/public/tier1/snappy.h b/src/public/tier1/snappy.h
similarity index 100%
rename from mp/src/public/tier1/snappy.h
rename to src/public/tier1/snappy.h
diff --git a/mp/src/public/tier1/sparsematrix.h b/src/public/tier1/sparsematrix.h
similarity index 100%
rename from mp/src/public/tier1/sparsematrix.h
rename to src/public/tier1/sparsematrix.h
diff --git a/mp/src/public/tier1/stringpool.h b/src/public/tier1/stringpool.h
similarity index 100%
rename from mp/src/public/tier1/stringpool.h
rename to src/public/tier1/stringpool.h
diff --git a/mp/src/public/tier1/strtools.h b/src/public/tier1/strtools.h
similarity index 100%
rename from mp/src/public/tier1/strtools.h
rename to src/public/tier1/strtools.h
diff --git a/mp/src/public/tier1/thash.h b/src/public/tier1/thash.h
similarity index 100%
rename from mp/src/public/tier1/thash.h
rename to src/public/tier1/thash.h
diff --git a/mp/src/public/tier1/tier1.h b/src/public/tier1/tier1.h
similarity index 100%
rename from mp/src/public/tier1/tier1.h
rename to src/public/tier1/tier1.h
diff --git a/mp/src/public/tier1/tokenreader.h b/src/public/tier1/tokenreader.h
similarity index 100%
rename from mp/src/public/tier1/tokenreader.h
rename to src/public/tier1/tokenreader.h
diff --git a/mp/src/public/tier1/uniqueid.h b/src/public/tier1/uniqueid.h
similarity index 100%
rename from mp/src/public/tier1/uniqueid.h
rename to src/public/tier1/uniqueid.h
diff --git a/mp/src/public/tier1/utlallocation.h b/src/public/tier1/utlallocation.h
similarity index 100%
rename from mp/src/public/tier1/utlallocation.h
rename to src/public/tier1/utlallocation.h
diff --git a/mp/src/public/tier1/utlarray.h b/src/public/tier1/utlarray.h
similarity index 100%
rename from mp/src/public/tier1/utlarray.h
rename to src/public/tier1/utlarray.h
diff --git a/mp/src/public/tier1/utlbidirectionalset.h b/src/public/tier1/utlbidirectionalset.h
similarity index 100%
rename from mp/src/public/tier1/utlbidirectionalset.h
rename to src/public/tier1/utlbidirectionalset.h
diff --git a/mp/src/public/tier1/utlbinaryblock.h b/src/public/tier1/utlbinaryblock.h
similarity index 100%
rename from mp/src/public/tier1/utlbinaryblock.h
rename to src/public/tier1/utlbinaryblock.h
diff --git a/mp/src/public/tier1/utlblockmemory.h b/src/public/tier1/utlblockmemory.h
similarity index 100%
rename from mp/src/public/tier1/utlblockmemory.h
rename to src/public/tier1/utlblockmemory.h
diff --git a/mp/src/public/tier1/utlbuffer.h b/src/public/tier1/utlbuffer.h
similarity index 100%
rename from mp/src/public/tier1/utlbuffer.h
rename to src/public/tier1/utlbuffer.h
diff --git a/mp/src/public/tier1/utlbufferutil.h b/src/public/tier1/utlbufferutil.h
similarity index 100%
rename from mp/src/public/tier1/utlbufferutil.h
rename to src/public/tier1/utlbufferutil.h
diff --git a/mp/src/public/tier1/utlcommon.h b/src/public/tier1/utlcommon.h
similarity index 100%
rename from mp/src/public/tier1/utlcommon.h
rename to src/public/tier1/utlcommon.h
diff --git a/mp/src/public/tier1/utldelegate.h b/src/public/tier1/utldelegate.h
similarity index 100%
rename from mp/src/public/tier1/utldelegate.h
rename to src/public/tier1/utldelegate.h
diff --git a/mp/src/public/tier1/utldelegateimpl.h b/src/public/tier1/utldelegateimpl.h
similarity index 100%
rename from mp/src/public/tier1/utldelegateimpl.h
rename to src/public/tier1/utldelegateimpl.h
diff --git a/mp/src/public/tier1/utldict.h b/src/public/tier1/utldict.h
similarity index 100%
rename from mp/src/public/tier1/utldict.h
rename to src/public/tier1/utldict.h
diff --git a/mp/src/public/tier1/utlenvelope.h b/src/public/tier1/utlenvelope.h
similarity index 100%
rename from mp/src/public/tier1/utlenvelope.h
rename to src/public/tier1/utlenvelope.h
diff --git a/mp/src/public/tier1/utlfixedmemory.h b/src/public/tier1/utlfixedmemory.h
similarity index 100%
rename from mp/src/public/tier1/utlfixedmemory.h
rename to src/public/tier1/utlfixedmemory.h
diff --git a/mp/src/public/tier1/utlflags.h b/src/public/tier1/utlflags.h
similarity index 100%
rename from mp/src/public/tier1/utlflags.h
rename to src/public/tier1/utlflags.h
diff --git a/mp/src/public/tier1/utlhandletable.h b/src/public/tier1/utlhandletable.h
similarity index 100%
rename from mp/src/public/tier1/utlhandletable.h
rename to src/public/tier1/utlhandletable.h
diff --git a/mp/src/public/tier1/utlhash.h b/src/public/tier1/utlhash.h
similarity index 100%
rename from mp/src/public/tier1/utlhash.h
rename to src/public/tier1/utlhash.h
diff --git a/mp/src/public/tier1/utlhashdict.h b/src/public/tier1/utlhashdict.h
similarity index 100%
rename from mp/src/public/tier1/utlhashdict.h
rename to src/public/tier1/utlhashdict.h
diff --git a/mp/src/public/tier1/utlhashtable.h b/src/public/tier1/utlhashtable.h
similarity index 100%
rename from mp/src/public/tier1/utlhashtable.h
rename to src/public/tier1/utlhashtable.h
diff --git a/mp/src/public/tier1/utlintrusivelist.h b/src/public/tier1/utlintrusivelist.h
similarity index 100%
rename from mp/src/public/tier1/utlintrusivelist.h
rename to src/public/tier1/utlintrusivelist.h
diff --git a/mp/src/public/tier1/utllinkedlist.h b/src/public/tier1/utllinkedlist.h
similarity index 100%
rename from mp/src/public/tier1/utllinkedlist.h
rename to src/public/tier1/utllinkedlist.h
diff --git a/mp/src/public/tier1/utlmap.h b/src/public/tier1/utlmap.h
similarity index 100%
rename from mp/src/public/tier1/utlmap.h
rename to src/public/tier1/utlmap.h
diff --git a/mp/src/public/tier1/utlmemory.h b/src/public/tier1/utlmemory.h
similarity index 100%
rename from mp/src/public/tier1/utlmemory.h
rename to src/public/tier1/utlmemory.h
diff --git a/mp/src/public/tier1/utlmovingaverage.h b/src/public/tier1/utlmovingaverage.h
similarity index 100%
rename from mp/src/public/tier1/utlmovingaverage.h
rename to src/public/tier1/utlmovingaverage.h
diff --git a/mp/src/public/tier1/utlmultilist.h b/src/public/tier1/utlmultilist.h
similarity index 100%
rename from mp/src/public/tier1/utlmultilist.h
rename to src/public/tier1/utlmultilist.h
diff --git a/mp/src/public/tier1/utlntree.h b/src/public/tier1/utlntree.h
similarity index 100%
rename from mp/src/public/tier1/utlntree.h
rename to src/public/tier1/utlntree.h
diff --git a/mp/src/public/tier1/utlobjectreference.h b/src/public/tier1/utlobjectreference.h
similarity index 100%
rename from mp/src/public/tier1/utlobjectreference.h
rename to src/public/tier1/utlobjectreference.h
diff --git a/mp/src/public/tier1/utlpair.h b/src/public/tier1/utlpair.h
similarity index 100%
rename from mp/src/public/tier1/utlpair.h
rename to src/public/tier1/utlpair.h
diff --git a/mp/src/public/tier1/utlpriorityqueue.h b/src/public/tier1/utlpriorityqueue.h
similarity index 100%
rename from mp/src/public/tier1/utlpriorityqueue.h
rename to src/public/tier1/utlpriorityqueue.h
diff --git a/mp/src/public/tier1/utlqueue.h b/src/public/tier1/utlqueue.h
similarity index 100%
rename from mp/src/public/tier1/utlqueue.h
rename to src/public/tier1/utlqueue.h
diff --git a/mp/src/public/tier1/utlrbtree.h b/src/public/tier1/utlrbtree.h
similarity index 100%
rename from mp/src/public/tier1/utlrbtree.h
rename to src/public/tier1/utlrbtree.h
diff --git a/mp/src/public/tier1/utlsoacontainer.h b/src/public/tier1/utlsoacontainer.h
similarity index 100%
rename from mp/src/public/tier1/utlsoacontainer.h
rename to src/public/tier1/utlsoacontainer.h
diff --git a/mp/src/public/tier1/utlstack.h b/src/public/tier1/utlstack.h
similarity index 100%
rename from mp/src/public/tier1/utlstack.h
rename to src/public/tier1/utlstack.h
diff --git a/mp/src/public/tier1/utlstring.h b/src/public/tier1/utlstring.h
similarity index 100%
rename from mp/src/public/tier1/utlstring.h
rename to src/public/tier1/utlstring.h
diff --git a/mp/src/public/tier1/utlsymbol.h b/src/public/tier1/utlsymbol.h
similarity index 100%
rename from mp/src/public/tier1/utlsymbol.h
rename to src/public/tier1/utlsymbol.h
diff --git a/mp/src/public/tier1/utlsymbollarge.h b/src/public/tier1/utlsymbollarge.h
similarity index 100%
rename from mp/src/public/tier1/utlsymbollarge.h
rename to src/public/tier1/utlsymbollarge.h
diff --git a/mp/src/public/tier1/utltshash.h b/src/public/tier1/utltshash.h
similarity index 100%
rename from mp/src/public/tier1/utltshash.h
rename to src/public/tier1/utltshash.h
diff --git a/mp/src/public/tier1/utlvector.h b/src/public/tier1/utlvector.h
similarity index 100%
rename from mp/src/public/tier1/utlvector.h
rename to src/public/tier1/utlvector.h
diff --git a/mp/src/public/tier2/beamsegdraw.h b/src/public/tier2/beamsegdraw.h
similarity index 100%
rename from mp/src/public/tier2/beamsegdraw.h
rename to src/public/tier2/beamsegdraw.h
diff --git a/mp/src/public/tier2/camerautils.h b/src/public/tier2/camerautils.h
similarity index 100%
rename from mp/src/public/tier2/camerautils.h
rename to src/public/tier2/camerautils.h
diff --git a/mp/src/public/tier2/fileutils.h b/src/public/tier2/fileutils.h
similarity index 100%
rename from mp/src/public/tier2/fileutils.h
rename to src/public/tier2/fileutils.h
diff --git a/mp/src/public/tier2/keybindings.h b/src/public/tier2/keybindings.h
similarity index 100%
rename from mp/src/public/tier2/keybindings.h
rename to src/public/tier2/keybindings.h
diff --git a/mp/src/public/tier2/meshutils.h b/src/public/tier2/meshutils.h
similarity index 100%
rename from mp/src/public/tier2/meshutils.h
rename to src/public/tier2/meshutils.h
diff --git a/mp/src/public/tier2/p4helpers.h b/src/public/tier2/p4helpers.h
similarity index 100%
rename from mp/src/public/tier2/p4helpers.h
rename to src/public/tier2/p4helpers.h
diff --git a/mp/src/public/tier2/renderutils.h b/src/public/tier2/renderutils.h
similarity index 100%
rename from mp/src/public/tier2/renderutils.h
rename to src/public/tier2/renderutils.h
diff --git a/mp/src/public/tier2/riff.h b/src/public/tier2/riff.h
similarity index 100%
rename from mp/src/public/tier2/riff.h
rename to src/public/tier2/riff.h
diff --git a/mp/src/public/tier2/soundutils.h b/src/public/tier2/soundutils.h
similarity index 100%
rename from mp/src/public/tier2/soundutils.h
rename to src/public/tier2/soundutils.h
diff --git a/mp/src/public/tier2/tier2.h b/src/public/tier2/tier2.h
similarity index 100%
rename from mp/src/public/tier2/tier2.h
rename to src/public/tier2/tier2.h
diff --git a/mp/src/public/tier2/tier2dm.h b/src/public/tier2/tier2dm.h
similarity index 100%
rename from mp/src/public/tier2/tier2dm.h
rename to src/public/tier2/tier2dm.h
diff --git a/mp/src/public/tier2/utlstreambuffer.h b/src/public/tier2/utlstreambuffer.h
similarity index 100%
rename from mp/src/public/tier2/utlstreambuffer.h
rename to src/public/tier2/utlstreambuffer.h
diff --git a/mp/src/public/tier2/vconfig.h b/src/public/tier2/vconfig.h
similarity index 100%
rename from mp/src/public/tier2/vconfig.h
rename to src/public/tier2/vconfig.h
diff --git a/mp/src/public/tier3/choreoutils.h b/src/public/tier3/choreoutils.h
similarity index 100%
rename from mp/src/public/tier3/choreoutils.h
rename to src/public/tier3/choreoutils.h
diff --git a/mp/src/public/tier3/mdlutils.h b/src/public/tier3/mdlutils.h
similarity index 100%
rename from mp/src/public/tier3/mdlutils.h
rename to src/public/tier3/mdlutils.h
diff --git a/mp/src/public/tier3/scenetokenprocessor.h b/src/public/tier3/scenetokenprocessor.h
similarity index 100%
rename from mp/src/public/tier3/scenetokenprocessor.h
rename to src/public/tier3/scenetokenprocessor.h
diff --git a/mp/src/public/tier3/tier3.h b/src/public/tier3/tier3.h
similarity index 100%
rename from mp/src/public/tier3/tier3.h
rename to src/public/tier3/tier3.h
diff --git a/mp/src/public/tier3/tier3dm.h b/src/public/tier3/tier3dm.h
similarity index 100%
rename from mp/src/public/tier3/tier3dm.h
rename to src/public/tier3/tier3dm.h
diff --git a/mp/src/public/togl/glfuncs.inl b/src/public/togl/glfuncs.inl
similarity index 100%
rename from mp/src/public/togl/glfuncs.inl
rename to src/public/togl/glfuncs.inl
diff --git a/mp/src/public/togl/linuxwin/cglmbuffer.h b/src/public/togl/linuxwin/cglmbuffer.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/cglmbuffer.h
rename to src/public/togl/linuxwin/cglmbuffer.h
diff --git a/mp/src/public/togl/linuxwin/cglmfbo.h b/src/public/togl/linuxwin/cglmfbo.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/cglmfbo.h
rename to src/public/togl/linuxwin/cglmfbo.h
diff --git a/mp/src/public/togl/linuxwin/cglmprogram.h b/src/public/togl/linuxwin/cglmprogram.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/cglmprogram.h
rename to src/public/togl/linuxwin/cglmprogram.h
diff --git a/mp/src/public/togl/linuxwin/cglmquery.h b/src/public/togl/linuxwin/cglmquery.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/cglmquery.h
rename to src/public/togl/linuxwin/cglmquery.h
diff --git a/mp/src/public/togl/linuxwin/cglmtex.h b/src/public/togl/linuxwin/cglmtex.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/cglmtex.h
rename to src/public/togl/linuxwin/cglmtex.h
diff --git a/mp/src/public/togl/linuxwin/dxabstract.h b/src/public/togl/linuxwin/dxabstract.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/dxabstract.h
rename to src/public/togl/linuxwin/dxabstract.h
diff --git a/mp/src/public/togl/linuxwin/dxabstract_types.h b/src/public/togl/linuxwin/dxabstract_types.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/dxabstract_types.h
rename to src/public/togl/linuxwin/dxabstract_types.h
diff --git a/mp/src/public/togl/linuxwin/glbase.h b/src/public/togl/linuxwin/glbase.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glbase.h
rename to src/public/togl/linuxwin/glbase.h
diff --git a/mp/src/public/togl/linuxwin/glentrypoints.h b/src/public/togl/linuxwin/glentrypoints.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glentrypoints.h
rename to src/public/togl/linuxwin/glentrypoints.h
diff --git a/mp/src/public/togl/linuxwin/glfuncs.h b/src/public/togl/linuxwin/glfuncs.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glfuncs.h
rename to src/public/togl/linuxwin/glfuncs.h
diff --git a/mp/src/public/togl/linuxwin/glmdebug.h b/src/public/togl/linuxwin/glmdebug.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glmdebug.h
rename to src/public/togl/linuxwin/glmdebug.h
diff --git a/mp/src/public/togl/linuxwin/glmdisplay.h b/src/public/togl/linuxwin/glmdisplay.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glmdisplay.h
rename to src/public/togl/linuxwin/glmdisplay.h
diff --git a/mp/src/public/togl/linuxwin/glmdisplaydb.h b/src/public/togl/linuxwin/glmdisplaydb.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glmdisplaydb.h
rename to src/public/togl/linuxwin/glmdisplaydb.h
diff --git a/mp/src/public/togl/linuxwin/glmgr.h b/src/public/togl/linuxwin/glmgr.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glmgr.h
rename to src/public/togl/linuxwin/glmgr.h
diff --git a/mp/src/public/togl/linuxwin/glmgrbasics.h b/src/public/togl/linuxwin/glmgrbasics.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glmgrbasics.h
rename to src/public/togl/linuxwin/glmgrbasics.h
diff --git a/mp/src/public/togl/linuxwin/glmgrext.h b/src/public/togl/linuxwin/glmgrext.h
similarity index 100%
rename from mp/src/public/togl/linuxwin/glmgrext.h
rename to src/public/togl/linuxwin/glmgrext.h
diff --git a/mp/src/public/togl/rendermechanism.h b/src/public/togl/rendermechanism.h
similarity index 100%
rename from mp/src/public/togl/rendermechanism.h
rename to src/public/togl/rendermechanism.h
diff --git a/mp/src/public/toolframework/iclientenginetools.h b/src/public/toolframework/iclientenginetools.h
similarity index 100%
rename from mp/src/public/toolframework/iclientenginetools.h
rename to src/public/toolframework/iclientenginetools.h
diff --git a/mp/src/public/toolframework/ienginetool.h b/src/public/toolframework/ienginetool.h
similarity index 100%
rename from mp/src/public/toolframework/ienginetool.h
rename to src/public/toolframework/ienginetool.h
diff --git a/mp/src/public/toolframework/iserverenginetools.h b/src/public/toolframework/iserverenginetools.h
similarity index 100%
rename from mp/src/public/toolframework/iserverenginetools.h
rename to src/public/toolframework/iserverenginetools.h
diff --git a/mp/src/public/toolframework/itooldictionary.h b/src/public/toolframework/itooldictionary.h
similarity index 100%
rename from mp/src/public/toolframework/itooldictionary.h
rename to src/public/toolframework/itooldictionary.h
diff --git a/mp/src/public/toolframework/itoolentity.h b/src/public/toolframework/itoolentity.h
similarity index 100%
rename from mp/src/public/toolframework/itoolentity.h
rename to src/public/toolframework/itoolentity.h
diff --git a/mp/src/public/toolframework/itoolframework.h b/src/public/toolframework/itoolframework.h
similarity index 100%
rename from mp/src/public/toolframework/itoolframework.h
rename to src/public/toolframework/itoolframework.h
diff --git a/mp/src/public/toolframework/itoolsystem.h b/src/public/toolframework/itoolsystem.h
similarity index 100%
rename from mp/src/public/toolframework/itoolsystem.h
rename to src/public/toolframework/itoolsystem.h
diff --git a/mp/src/public/toolframework/toolframework.cpp b/src/public/toolframework/toolframework.cpp
similarity index 100%
rename from mp/src/public/toolframework/toolframework.cpp
rename to src/public/toolframework/toolframework.cpp
diff --git a/mp/src/public/tools/bonelist.cpp b/src/public/tools/bonelist.cpp
similarity index 100%
rename from mp/src/public/tools/bonelist.cpp
rename to src/public/tools/bonelist.cpp
diff --git a/mp/src/public/tools/bonelist.h b/src/public/tools/bonelist.h
similarity index 100%
rename from mp/src/public/tools/bonelist.h
rename to src/public/tools/bonelist.h
diff --git a/mp/src/public/trace.h b/src/public/trace.h
similarity index 100%
rename from mp/src/public/trace.h
rename to src/public/trace.h
diff --git a/mp/src/public/unicode/unicode.h b/src/public/unicode/unicode.h
similarity index 100%
rename from mp/src/public/unicode/unicode.h
rename to src/public/unicode/unicode.h
diff --git a/mp/src/public/unitlib/unitlib.h b/src/public/unitlib/unitlib.h
similarity index 100%
rename from mp/src/public/unitlib/unitlib.h
rename to src/public/unitlib/unitlib.h
diff --git a/mp/src/public/vallocator.cpp b/src/public/vallocator.cpp
similarity index 100%
rename from mp/src/public/vallocator.cpp
rename to src/public/vallocator.cpp
diff --git a/mp/src/public/vallocator.h b/src/public/vallocator.h
similarity index 100%
rename from mp/src/public/vallocator.h
rename to src/public/vallocator.h
diff --git a/mp/src/public/vaudio/ivaudio.h b/src/public/vaudio/ivaudio.h
similarity index 100%
rename from mp/src/public/vaudio/ivaudio.h
rename to src/public/vaudio/ivaudio.h
diff --git a/mp/src/public/vcollide.h b/src/public/vcollide.h
similarity index 100%
rename from mp/src/public/vcollide.h
rename to src/public/vcollide.h
diff --git a/mp/src/public/vcollide_parse.h b/src/public/vcollide_parse.h
similarity index 100%
rename from mp/src/public/vcollide_parse.h
rename to src/public/vcollide_parse.h
diff --git a/mp/src/public/vgui/Cursor.h b/src/public/vgui/Cursor.h
similarity index 100%
rename from mp/src/public/vgui/Cursor.h
rename to src/public/vgui/Cursor.h
diff --git a/mp/src/public/vgui/Dar.h b/src/public/vgui/Dar.h
similarity index 100%
rename from mp/src/public/vgui/Dar.h
rename to src/public/vgui/Dar.h
diff --git a/mp/src/public/vgui/IBorder.h b/src/public/vgui/IBorder.h
similarity index 100%
rename from mp/src/public/vgui/IBorder.h
rename to src/public/vgui/IBorder.h
diff --git a/mp/src/public/vgui/IClientPanel.h b/src/public/vgui/IClientPanel.h
similarity index 100%
rename from mp/src/public/vgui/IClientPanel.h
rename to src/public/vgui/IClientPanel.h
diff --git a/mp/src/public/vgui/IHTML.h b/src/public/vgui/IHTML.h
similarity index 100%
rename from mp/src/public/vgui/IHTML.h
rename to src/public/vgui/IHTML.h
diff --git a/mp/src/public/vgui/IImage.h b/src/public/vgui/IImage.h
similarity index 100%
rename from mp/src/public/vgui/IImage.h
rename to src/public/vgui/IImage.h
diff --git a/mp/src/public/vgui/IInput.h b/src/public/vgui/IInput.h
similarity index 100%
rename from mp/src/public/vgui/IInput.h
rename to src/public/vgui/IInput.h
diff --git a/mp/src/public/vgui/IInputInternal.h b/src/public/vgui/IInputInternal.h
similarity index 100%
rename from mp/src/public/vgui/IInputInternal.h
rename to src/public/vgui/IInputInternal.h
diff --git a/mp/src/public/vgui/ILocalize.h b/src/public/vgui/ILocalize.h
similarity index 100%
rename from mp/src/public/vgui/ILocalize.h
rename to src/public/vgui/ILocalize.h
diff --git a/mp/src/public/vgui/IPanel.h b/src/public/vgui/IPanel.h
similarity index 100%
rename from mp/src/public/vgui/IPanel.h
rename to src/public/vgui/IPanel.h
diff --git a/mp/src/public/vgui/IScheme.h b/src/public/vgui/IScheme.h
similarity index 100%
rename from mp/src/public/vgui/IScheme.h
rename to src/public/vgui/IScheme.h
diff --git a/mp/src/public/vgui/ISurface.h b/src/public/vgui/ISurface.h
similarity index 100%
rename from mp/src/public/vgui/ISurface.h
rename to src/public/vgui/ISurface.h
diff --git a/mp/src/public/vgui/ISurfaceV30.h b/src/public/vgui/ISurfaceV30.h
similarity index 100%
rename from mp/src/public/vgui/ISurfaceV30.h
rename to src/public/vgui/ISurfaceV30.h
diff --git a/mp/src/public/vgui/ISystem.h b/src/public/vgui/ISystem.h
similarity index 100%
rename from mp/src/public/vgui/ISystem.h
rename to src/public/vgui/ISystem.h
diff --git a/mp/src/public/vgui/IVGui.h b/src/public/vgui/IVGui.h
similarity index 100%
rename from mp/src/public/vgui/IVGui.h
rename to src/public/vgui/IVGui.h
diff --git a/mp/src/public/vgui/IVguiMatInfo.h b/src/public/vgui/IVguiMatInfo.h
similarity index 100%
rename from mp/src/public/vgui/IVguiMatInfo.h
rename to src/public/vgui/IVguiMatInfo.h
diff --git a/mp/src/public/vgui/IVguiMatInfoVar.h b/src/public/vgui/IVguiMatInfoVar.h
similarity index 100%
rename from mp/src/public/vgui/IVguiMatInfoVar.h
rename to src/public/vgui/IVguiMatInfoVar.h
diff --git a/mp/src/public/vgui/KeyCode.h b/src/public/vgui/KeyCode.h
similarity index 100%
rename from mp/src/public/vgui/KeyCode.h
rename to src/public/vgui/KeyCode.h
diff --git a/mp/src/public/vgui/MouseCode.h b/src/public/vgui/MouseCode.h
similarity index 100%
rename from mp/src/public/vgui/MouseCode.h
rename to src/public/vgui/MouseCode.h
diff --git a/mp/src/public/vgui/Point.h b/src/public/vgui/Point.h
similarity index 100%
rename from mp/src/public/vgui/Point.h
rename to src/public/vgui/Point.h
diff --git a/mp/src/public/vgui/VGUI.h b/src/public/vgui/VGUI.h
similarity index 100%
rename from mp/src/public/vgui/VGUI.h
rename to src/public/vgui/VGUI.h
diff --git a/mp/src/public/vgui/ipainthtml.h b/src/public/vgui/ipainthtml.h
similarity index 100%
rename from mp/src/public/vgui/ipainthtml.h
rename to src/public/vgui/ipainthtml.h
diff --git a/mp/src/public/vgui/keyrepeat.h b/src/public/vgui/keyrepeat.h
similarity index 100%
rename from mp/src/public/vgui/keyrepeat.h
rename to src/public/vgui/keyrepeat.h
diff --git a/mp/src/public/vgui_controls/AnalogBar.h b/src/public/vgui_controls/AnalogBar.h
similarity index 100%
rename from mp/src/public/vgui_controls/AnalogBar.h
rename to src/public/vgui_controls/AnalogBar.h
diff --git a/mp/src/public/vgui_controls/AnimatingImagePanel.h b/src/public/vgui_controls/AnimatingImagePanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/AnimatingImagePanel.h
rename to src/public/vgui_controls/AnimatingImagePanel.h
diff --git a/mp/src/public/vgui_controls/AnimationController.h b/src/public/vgui_controls/AnimationController.h
similarity index 100%
rename from mp/src/public/vgui_controls/AnimationController.h
rename to src/public/vgui_controls/AnimationController.h
diff --git a/mp/src/public/vgui_controls/BitmapImagePanel.h b/src/public/vgui_controls/BitmapImagePanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/BitmapImagePanel.h
rename to src/public/vgui_controls/BitmapImagePanel.h
diff --git a/mp/src/public/vgui_controls/BuildGroup.h b/src/public/vgui_controls/BuildGroup.h
similarity index 100%
rename from mp/src/public/vgui_controls/BuildGroup.h
rename to src/public/vgui_controls/BuildGroup.h
diff --git a/mp/src/public/vgui_controls/BuildModeDialog.h b/src/public/vgui_controls/BuildModeDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/BuildModeDialog.h
rename to src/public/vgui_controls/BuildModeDialog.h
diff --git a/mp/src/public/vgui_controls/Button.h b/src/public/vgui_controls/Button.h
similarity index 100%
rename from mp/src/public/vgui_controls/Button.h
rename to src/public/vgui_controls/Button.h
diff --git a/mp/src/public/vgui_controls/CheckButton.h b/src/public/vgui_controls/CheckButton.h
similarity index 100%
rename from mp/src/public/vgui_controls/CheckButton.h
rename to src/public/vgui_controls/CheckButton.h
diff --git a/mp/src/public/vgui_controls/CheckButtonList.h b/src/public/vgui_controls/CheckButtonList.h
similarity index 100%
rename from mp/src/public/vgui_controls/CheckButtonList.h
rename to src/public/vgui_controls/CheckButtonList.h
diff --git a/mp/src/public/vgui_controls/CircularProgressBar.h b/src/public/vgui_controls/CircularProgressBar.h
similarity index 100%
rename from mp/src/public/vgui_controls/CircularProgressBar.h
rename to src/public/vgui_controls/CircularProgressBar.h
diff --git a/mp/src/public/vgui_controls/ComboBox.h b/src/public/vgui_controls/ComboBox.h
similarity index 100%
rename from mp/src/public/vgui_controls/ComboBox.h
rename to src/public/vgui_controls/ComboBox.h
diff --git a/mp/src/public/vgui_controls/ControllerMap.h b/src/public/vgui_controls/ControllerMap.h
similarity index 100%
rename from mp/src/public/vgui_controls/ControllerMap.h
rename to src/public/vgui_controls/ControllerMap.h
diff --git a/mp/src/public/vgui_controls/Controls.h b/src/public/vgui_controls/Controls.h
similarity index 100%
rename from mp/src/public/vgui_controls/Controls.h
rename to src/public/vgui_controls/Controls.h
diff --git a/mp/src/public/vgui_controls/DialogManager.h b/src/public/vgui_controls/DialogManager.h
similarity index 100%
rename from mp/src/public/vgui_controls/DialogManager.h
rename to src/public/vgui_controls/DialogManager.h
diff --git a/mp/src/public/vgui_controls/DirectorySelectDialog.h b/src/public/vgui_controls/DirectorySelectDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/DirectorySelectDialog.h
rename to src/public/vgui_controls/DirectorySelectDialog.h
diff --git a/mp/src/public/vgui_controls/Divider.h b/src/public/vgui_controls/Divider.h
similarity index 100%
rename from mp/src/public/vgui_controls/Divider.h
rename to src/public/vgui_controls/Divider.h
diff --git a/mp/src/public/vgui_controls/EditablePanel.h b/src/public/vgui_controls/EditablePanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/EditablePanel.h
rename to src/public/vgui_controls/EditablePanel.h
diff --git a/mp/src/public/vgui_controls/ExpandButton.h b/src/public/vgui_controls/ExpandButton.h
similarity index 100%
rename from mp/src/public/vgui_controls/ExpandButton.h
rename to src/public/vgui_controls/ExpandButton.h
diff --git a/mp/src/public/vgui_controls/FileOpenDialog.h b/src/public/vgui_controls/FileOpenDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/FileOpenDialog.h
rename to src/public/vgui_controls/FileOpenDialog.h
diff --git a/mp/src/public/vgui_controls/FileOpenStateMachine.h b/src/public/vgui_controls/FileOpenStateMachine.h
similarity index 100%
rename from mp/src/public/vgui_controls/FileOpenStateMachine.h
rename to src/public/vgui_controls/FileOpenStateMachine.h
diff --git a/mp/src/public/vgui_controls/FocusNavGroup.h b/src/public/vgui_controls/FocusNavGroup.h
similarity index 100%
rename from mp/src/public/vgui_controls/FocusNavGroup.h
rename to src/public/vgui_controls/FocusNavGroup.h
diff --git a/mp/src/public/vgui_controls/Frame.h b/src/public/vgui_controls/Frame.h
similarity index 100%
rename from mp/src/public/vgui_controls/Frame.h
rename to src/public/vgui_controls/Frame.h
diff --git a/mp/src/public/vgui_controls/GraphPanel.h b/src/public/vgui_controls/GraphPanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/GraphPanel.h
rename to src/public/vgui_controls/GraphPanel.h
diff --git a/mp/src/public/vgui_controls/HTML.h b/src/public/vgui_controls/HTML.h
similarity index 100%
rename from mp/src/public/vgui_controls/HTML.h
rename to src/public/vgui_controls/HTML.h
diff --git a/mp/src/public/vgui_controls/Image.h b/src/public/vgui_controls/Image.h
similarity index 100%
rename from mp/src/public/vgui_controls/Image.h
rename to src/public/vgui_controls/Image.h
diff --git a/mp/src/public/vgui_controls/ImageList.h b/src/public/vgui_controls/ImageList.h
similarity index 100%
rename from mp/src/public/vgui_controls/ImageList.h
rename to src/public/vgui_controls/ImageList.h
diff --git a/mp/src/public/vgui_controls/ImagePanel.h b/src/public/vgui_controls/ImagePanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/ImagePanel.h
rename to src/public/vgui_controls/ImagePanel.h
diff --git a/mp/src/public/vgui_controls/InputDialog.h b/src/public/vgui_controls/InputDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/InputDialog.h
rename to src/public/vgui_controls/InputDialog.h
diff --git a/mp/src/public/vgui_controls/KeyBindingHelpDialog.h b/src/public/vgui_controls/KeyBindingHelpDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/KeyBindingHelpDialog.h
rename to src/public/vgui_controls/KeyBindingHelpDialog.h
diff --git a/mp/src/public/vgui_controls/KeyBindingMap.h b/src/public/vgui_controls/KeyBindingMap.h
similarity index 100%
rename from mp/src/public/vgui_controls/KeyBindingMap.h
rename to src/public/vgui_controls/KeyBindingMap.h
diff --git a/mp/src/public/vgui_controls/KeyBoardEditorDialog.h b/src/public/vgui_controls/KeyBoardEditorDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/KeyBoardEditorDialog.h
rename to src/public/vgui_controls/KeyBoardEditorDialog.h
diff --git a/mp/src/public/vgui_controls/KeyRepeat.h b/src/public/vgui_controls/KeyRepeat.h
similarity index 100%
rename from mp/src/public/vgui_controls/KeyRepeat.h
rename to src/public/vgui_controls/KeyRepeat.h
diff --git a/mp/src/public/vgui_controls/Label.h b/src/public/vgui_controls/Label.h
similarity index 100%
rename from mp/src/public/vgui_controls/Label.h
rename to src/public/vgui_controls/Label.h
diff --git a/mp/src/public/vgui_controls/ListPanel.h b/src/public/vgui_controls/ListPanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/ListPanel.h
rename to src/public/vgui_controls/ListPanel.h
diff --git a/mp/src/public/vgui_controls/ListViewPanel.h b/src/public/vgui_controls/ListViewPanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/ListViewPanel.h
rename to src/public/vgui_controls/ListViewPanel.h
diff --git a/mp/src/public/vgui_controls/Menu.h b/src/public/vgui_controls/Menu.h
similarity index 100%
rename from mp/src/public/vgui_controls/Menu.h
rename to src/public/vgui_controls/Menu.h
diff --git a/mp/src/public/vgui_controls/MenuBar.h b/src/public/vgui_controls/MenuBar.h
similarity index 100%
rename from mp/src/public/vgui_controls/MenuBar.h
rename to src/public/vgui_controls/MenuBar.h
diff --git a/mp/src/public/vgui_controls/MenuButton.h b/src/public/vgui_controls/MenuButton.h
similarity index 100%
rename from mp/src/public/vgui_controls/MenuButton.h
rename to src/public/vgui_controls/MenuButton.h
diff --git a/mp/src/public/vgui_controls/MenuItem.h b/src/public/vgui_controls/MenuItem.h
similarity index 100%
rename from mp/src/public/vgui_controls/MenuItem.h
rename to src/public/vgui_controls/MenuItem.h
diff --git a/mp/src/public/vgui_controls/MessageBox.h b/src/public/vgui_controls/MessageBox.h
similarity index 100%
rename from mp/src/public/vgui_controls/MessageBox.h
rename to src/public/vgui_controls/MessageBox.h
diff --git a/mp/src/public/vgui_controls/MessageDialog.h b/src/public/vgui_controls/MessageDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/MessageDialog.h
rename to src/public/vgui_controls/MessageDialog.h
diff --git a/mp/src/public/vgui_controls/MessageMap.h b/src/public/vgui_controls/MessageMap.h
similarity index 100%
rename from mp/src/public/vgui_controls/MessageMap.h
rename to src/public/vgui_controls/MessageMap.h
diff --git a/mp/src/public/vgui_controls/PHandle.h b/src/public/vgui_controls/PHandle.h
similarity index 100%
rename from mp/src/public/vgui_controls/PHandle.h
rename to src/public/vgui_controls/PHandle.h
diff --git a/mp/src/public/vgui_controls/Panel.h b/src/public/vgui_controls/Panel.h
similarity index 100%
rename from mp/src/public/vgui_controls/Panel.h
rename to src/public/vgui_controls/Panel.h
diff --git a/mp/src/public/vgui_controls/PanelAnimationVar.h b/src/public/vgui_controls/PanelAnimationVar.h
similarity index 100%
rename from mp/src/public/vgui_controls/PanelAnimationVar.h
rename to src/public/vgui_controls/PanelAnimationVar.h
diff --git a/mp/src/public/vgui_controls/PanelListPanel.h b/src/public/vgui_controls/PanelListPanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/PanelListPanel.h
rename to src/public/vgui_controls/PanelListPanel.h
diff --git a/mp/src/public/vgui_controls/PerforceFileExplorer.h b/src/public/vgui_controls/PerforceFileExplorer.h
similarity index 100%
rename from mp/src/public/vgui_controls/PerforceFileExplorer.h
rename to src/public/vgui_controls/PerforceFileExplorer.h
diff --git a/mp/src/public/vgui_controls/PerforceFileList.h b/src/public/vgui_controls/PerforceFileList.h
similarity index 100%
rename from mp/src/public/vgui_controls/PerforceFileList.h
rename to src/public/vgui_controls/PerforceFileList.h
diff --git a/mp/src/public/vgui_controls/ProgressBar.h b/src/public/vgui_controls/ProgressBar.h
similarity index 100%
rename from mp/src/public/vgui_controls/ProgressBar.h
rename to src/public/vgui_controls/ProgressBar.h
diff --git a/mp/src/public/vgui_controls/ProgressBox.h b/src/public/vgui_controls/ProgressBox.h
similarity index 100%
rename from mp/src/public/vgui_controls/ProgressBox.h
rename to src/public/vgui_controls/ProgressBox.h
diff --git a/mp/src/public/vgui_controls/PropertyDialog.h b/src/public/vgui_controls/PropertyDialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/PropertyDialog.h
rename to src/public/vgui_controls/PropertyDialog.h
diff --git a/mp/src/public/vgui_controls/PropertyPage.h b/src/public/vgui_controls/PropertyPage.h
similarity index 100%
rename from mp/src/public/vgui_controls/PropertyPage.h
rename to src/public/vgui_controls/PropertyPage.h
diff --git a/mp/src/public/vgui_controls/PropertySheet.h b/src/public/vgui_controls/PropertySheet.h
similarity index 100%
rename from mp/src/public/vgui_controls/PropertySheet.h
rename to src/public/vgui_controls/PropertySheet.h
diff --git a/mp/src/public/vgui_controls/QueryBox.h b/src/public/vgui_controls/QueryBox.h
similarity index 100%
rename from mp/src/public/vgui_controls/QueryBox.h
rename to src/public/vgui_controls/QueryBox.h
diff --git a/mp/src/public/vgui_controls/RadioButton.h b/src/public/vgui_controls/RadioButton.h
similarity index 100%
rename from mp/src/public/vgui_controls/RadioButton.h
rename to src/public/vgui_controls/RadioButton.h
diff --git a/mp/src/public/vgui_controls/RichText.h b/src/public/vgui_controls/RichText.h
similarity index 100%
rename from mp/src/public/vgui_controls/RichText.h
rename to src/public/vgui_controls/RichText.h
diff --git a/mp/src/public/vgui_controls/RotatingProgressBar.h b/src/public/vgui_controls/RotatingProgressBar.h
similarity index 100%
rename from mp/src/public/vgui_controls/RotatingProgressBar.h
rename to src/public/vgui_controls/RotatingProgressBar.h
diff --git a/mp/src/public/vgui_controls/ScalableImagePanel.h b/src/public/vgui_controls/ScalableImagePanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/ScalableImagePanel.h
rename to src/public/vgui_controls/ScalableImagePanel.h
diff --git a/mp/src/public/vgui_controls/ScrollBar.h b/src/public/vgui_controls/ScrollBar.h
similarity index 100%
rename from mp/src/public/vgui_controls/ScrollBar.h
rename to src/public/vgui_controls/ScrollBar.h
diff --git a/mp/src/public/vgui_controls/ScrollBarSlider.h b/src/public/vgui_controls/ScrollBarSlider.h
similarity index 100%
rename from mp/src/public/vgui_controls/ScrollBarSlider.h
rename to src/public/vgui_controls/ScrollBarSlider.h
diff --git a/mp/src/public/vgui_controls/ScrollableEditablePanel.h b/src/public/vgui_controls/ScrollableEditablePanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/ScrollableEditablePanel.h
rename to src/public/vgui_controls/ScrollableEditablePanel.h
diff --git a/mp/src/public/vgui_controls/SectionedListPanel.h b/src/public/vgui_controls/SectionedListPanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/SectionedListPanel.h
rename to src/public/vgui_controls/SectionedListPanel.h
diff --git a/mp/src/public/vgui_controls/Slider.h b/src/public/vgui_controls/Slider.h
similarity index 100%
rename from mp/src/public/vgui_controls/Slider.h
rename to src/public/vgui_controls/Slider.h
diff --git a/mp/src/public/vgui_controls/Splitter.h b/src/public/vgui_controls/Splitter.h
similarity index 100%
rename from mp/src/public/vgui_controls/Splitter.h
rename to src/public/vgui_controls/Splitter.h
diff --git a/mp/src/public/vgui_controls/TextEntry.h b/src/public/vgui_controls/TextEntry.h
similarity index 100%
rename from mp/src/public/vgui_controls/TextEntry.h
rename to src/public/vgui_controls/TextEntry.h
diff --git a/mp/src/public/vgui_controls/TextImage.h b/src/public/vgui_controls/TextImage.h
similarity index 100%
rename from mp/src/public/vgui_controls/TextImage.h
rename to src/public/vgui_controls/TextImage.h
diff --git a/mp/src/public/vgui_controls/ToggleButton.h b/src/public/vgui_controls/ToggleButton.h
similarity index 100%
rename from mp/src/public/vgui_controls/ToggleButton.h
rename to src/public/vgui_controls/ToggleButton.h
diff --git a/mp/src/public/vgui_controls/ToolWindow.h b/src/public/vgui_controls/ToolWindow.h
similarity index 100%
rename from mp/src/public/vgui_controls/ToolWindow.h
rename to src/public/vgui_controls/ToolWindow.h
diff --git a/mp/src/public/vgui_controls/Tooltip.h b/src/public/vgui_controls/Tooltip.h
similarity index 100%
rename from mp/src/public/vgui_controls/Tooltip.h
rename to src/public/vgui_controls/Tooltip.h
diff --git a/mp/src/public/vgui_controls/TreeView.h b/src/public/vgui_controls/TreeView.h
similarity index 100%
rename from mp/src/public/vgui_controls/TreeView.h
rename to src/public/vgui_controls/TreeView.h
diff --git a/mp/src/public/vgui_controls/TreeViewListControl.h b/src/public/vgui_controls/TreeViewListControl.h
similarity index 100%
rename from mp/src/public/vgui_controls/TreeViewListControl.h
rename to src/public/vgui_controls/TreeViewListControl.h
diff --git a/mp/src/public/vgui_controls/URLLabel.h b/src/public/vgui_controls/URLLabel.h
similarity index 100%
rename from mp/src/public/vgui_controls/URLLabel.h
rename to src/public/vgui_controls/URLLabel.h
diff --git a/mp/src/public/vgui_controls/WizardPanel.h b/src/public/vgui_controls/WizardPanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/WizardPanel.h
rename to src/public/vgui_controls/WizardPanel.h
diff --git a/mp/src/public/vgui_controls/WizardSubPanel.h b/src/public/vgui_controls/WizardSubPanel.h
similarity index 100%
rename from mp/src/public/vgui_controls/WizardSubPanel.h
rename to src/public/vgui_controls/WizardSubPanel.h
diff --git a/mp/src/public/vgui_controls/consoledialog.h b/src/public/vgui_controls/consoledialog.h
similarity index 100%
rename from mp/src/public/vgui_controls/consoledialog.h
rename to src/public/vgui_controls/consoledialog.h
diff --git a/mp/src/public/vgui_controls/cvartogglecheckbutton.h b/src/public/vgui_controls/cvartogglecheckbutton.h
similarity index 100%
rename from mp/src/public/vgui_controls/cvartogglecheckbutton.h
rename to src/public/vgui_controls/cvartogglecheckbutton.h
diff --git a/mp/src/public/vgui_controls/pch_vgui_controls.h b/src/public/vgui_controls/pch_vgui_controls.h
similarity index 100%
rename from mp/src/public/vgui_controls/pch_vgui_controls.h
rename to src/public/vgui_controls/pch_vgui_controls.h
diff --git a/mp/src/public/vgui_controls/perforcefilelistframe.h b/src/public/vgui_controls/perforcefilelistframe.h
similarity index 100%
rename from mp/src/public/vgui_controls/perforcefilelistframe.h
rename to src/public/vgui_controls/perforcefilelistframe.h
diff --git a/mp/src/public/vgui_controls/savedocumentquery.h b/src/public/vgui_controls/savedocumentquery.h
similarity index 100%
rename from mp/src/public/vgui_controls/savedocumentquery.h
rename to src/public/vgui_controls/savedocumentquery.h
diff --git a/mp/src/public/vgui_controls/subrectimage.h b/src/public/vgui_controls/subrectimage.h
similarity index 100%
rename from mp/src/public/vgui_controls/subrectimage.h
rename to src/public/vgui_controls/subrectimage.h
diff --git a/mp/src/public/vgui_controls/vgui_controls.cpp b/src/public/vgui_controls/vgui_controls.cpp
similarity index 100%
rename from mp/src/public/vgui_controls/vgui_controls.cpp
rename to src/public/vgui_controls/vgui_controls.cpp
diff --git a/mp/src/public/video/ivideoservices.h b/src/public/video/ivideoservices.h
similarity index 100%
rename from mp/src/public/video/ivideoservices.h
rename to src/public/video/ivideoservices.h
diff --git a/mp/src/public/view_shared.h b/src/public/view_shared.h
similarity index 100%
rename from mp/src/public/view_shared.h
rename to src/public/view_shared.h
diff --git a/mp/src/public/vphysics/collision_set.h b/src/public/vphysics/collision_set.h
similarity index 100%
rename from mp/src/public/vphysics/collision_set.h
rename to src/public/vphysics/collision_set.h
diff --git a/mp/src/public/vphysics/constraints.h b/src/public/vphysics/constraints.h
similarity index 100%
rename from mp/src/public/vphysics/constraints.h
rename to src/public/vphysics/constraints.h
diff --git a/mp/src/public/vphysics/friction.h b/src/public/vphysics/friction.h
similarity index 100%
rename from mp/src/public/vphysics/friction.h
rename to src/public/vphysics/friction.h
diff --git a/mp/src/public/vphysics/object_hash.h b/src/public/vphysics/object_hash.h
similarity index 100%
rename from mp/src/public/vphysics/object_hash.h
rename to src/public/vphysics/object_hash.h
diff --git a/mp/src/public/vphysics/performance.h b/src/public/vphysics/performance.h
similarity index 100%
rename from mp/src/public/vphysics/performance.h
rename to src/public/vphysics/performance.h
diff --git a/mp/src/public/vphysics/player_controller.h b/src/public/vphysics/player_controller.h
similarity index 100%
rename from mp/src/public/vphysics/player_controller.h
rename to src/public/vphysics/player_controller.h
diff --git a/mp/src/public/vphysics/stats.h b/src/public/vphysics/stats.h
similarity index 100%
rename from mp/src/public/vphysics/stats.h
rename to src/public/vphysics/stats.h
diff --git a/mp/src/public/vphysics/vehicles.h b/src/public/vphysics/vehicles.h
similarity index 100%
rename from mp/src/public/vphysics/vehicles.h
rename to src/public/vphysics/vehicles.h
diff --git a/mp/src/public/vphysics/virtualmesh.h b/src/public/vphysics/virtualmesh.h
similarity index 100%
rename from mp/src/public/vphysics/virtualmesh.h
rename to src/public/vphysics/virtualmesh.h
diff --git a/mp/src/public/vphysics_interface.h b/src/public/vphysics_interface.h
similarity index 100%
rename from mp/src/public/vphysics_interface.h
rename to src/public/vphysics_interface.h
diff --git a/mp/src/public/vphysics_interfaceV30.h b/src/public/vphysics_interfaceV30.h
similarity index 100%
rename from mp/src/public/vphysics_interfaceV30.h
rename to src/public/vphysics_interfaceV30.h
diff --git a/mp/src/public/vstdlib/IKeyValuesSystem.h b/src/public/vstdlib/IKeyValuesSystem.h
similarity index 100%
rename from mp/src/public/vstdlib/IKeyValuesSystem.h
rename to src/public/vstdlib/IKeyValuesSystem.h
diff --git a/mp/src/public/vstdlib/coroutine.h b/src/public/vstdlib/coroutine.h
similarity index 100%
rename from mp/src/public/vstdlib/coroutine.h
rename to src/public/vstdlib/coroutine.h
diff --git a/mp/src/public/vstdlib/cvar.h b/src/public/vstdlib/cvar.h
similarity index 100%
rename from mp/src/public/vstdlib/cvar.h
rename to src/public/vstdlib/cvar.h
diff --git a/mp/src/public/vstdlib/iprocessutils.h b/src/public/vstdlib/iprocessutils.h
similarity index 100%
rename from mp/src/public/vstdlib/iprocessutils.h
rename to src/public/vstdlib/iprocessutils.h
diff --git a/mp/src/public/vstdlib/jobthread.h b/src/public/vstdlib/jobthread.h
similarity index 100%
rename from mp/src/public/vstdlib/jobthread.h
rename to src/public/vstdlib/jobthread.h
diff --git a/mp/src/public/vstdlib/osversion.h b/src/public/vstdlib/osversion.h
similarity index 100%
rename from mp/src/public/vstdlib/osversion.h
rename to src/public/vstdlib/osversion.h
diff --git a/mp/src/public/vstdlib/pch_vstdlib.h b/src/public/vstdlib/pch_vstdlib.h
similarity index 100%
rename from mp/src/public/vstdlib/pch_vstdlib.h
rename to src/public/vstdlib/pch_vstdlib.h
diff --git a/mp/src/public/vstdlib/random.h b/src/public/vstdlib/random.h
similarity index 100%
rename from mp/src/public/vstdlib/random.h
rename to src/public/vstdlib/random.h
diff --git a/mp/src/public/vstdlib/vcover.h b/src/public/vstdlib/vcover.h
similarity index 100%
rename from mp/src/public/vstdlib/vcover.h
rename to src/public/vstdlib/vcover.h
diff --git a/mp/src/public/vstdlib/vstdlib.h b/src/public/vstdlib/vstdlib.h
similarity index 100%
rename from mp/src/public/vstdlib/vstdlib.h
rename to src/public/vstdlib/vstdlib.h
diff --git a/mp/src/public/vtf/vtf.h b/src/public/vtf/vtf.h
similarity index 100%
rename from mp/src/public/vtf/vtf.h
rename to src/public/vtf/vtf.h
diff --git a/mp/src/public/wadtypes.h b/src/public/wadtypes.h
similarity index 100%
rename from mp/src/public/wadtypes.h
rename to src/public/wadtypes.h
diff --git a/mp/src/public/windows_default.manifest b/src/public/windows_default.manifest
similarity index 100%
rename from mp/src/public/windows_default.manifest
rename to src/public/windows_default.manifest
diff --git a/mp/src/public/winlite.h b/src/public/winlite.h
similarity index 100%
rename from mp/src/public/winlite.h
rename to src/public/winlite.h
diff --git a/mp/src/public/worldsize.h b/src/public/worldsize.h
similarity index 100%
rename from mp/src/public/worldsize.h
rename to src/public/worldsize.h
diff --git a/mp/src/public/xwvfile.h b/src/public/xwvfile.h
similarity index 100%
rename from mp/src/public/xwvfile.h
rename to src/public/xwvfile.h
diff --git a/mp/src/public/xzp.cpp b/src/public/xzp.cpp
similarity index 100%
rename from mp/src/public/xzp.cpp
rename to src/public/xzp.cpp
diff --git a/mp/src/public/zip/XUnzip.h b/src/public/zip/XUnzip.h
similarity index 100%
rename from mp/src/public/zip/XUnzip.h
rename to src/public/zip/XUnzip.h
diff --git a/mp/src/public/zip/XZip.h b/src/public/zip/XZip.h
similarity index 100%
rename from mp/src/public/zip/XZip.h
rename to src/public/zip/XZip.h
diff --git a/mp/src/public/zip_uncompressed.h b/src/public/zip_uncompressed.h
similarity index 100%
rename from mp/src/public/zip_uncompressed.h
rename to src/public/zip_uncompressed.h
diff --git a/mp/src/public/zip_utils.cpp b/src/public/zip_utils.cpp
similarity index 100%
rename from mp/src/public/zip_utils.cpp
rename to src/public/zip_utils.cpp
diff --git a/mp/src/public/zip_utils.h b/src/public/zip_utils.h
similarity index 100%
rename from mp/src/public/zip_utils.h
rename to src/public/zip_utils.h
diff --git a/mp/src/raytrace/raytrace.cpp b/src/raytrace/raytrace.cpp
similarity index 100%
rename from mp/src/raytrace/raytrace.cpp
rename to src/raytrace/raytrace.cpp
diff --git a/mp/src/raytrace/raytrace.vpc b/src/raytrace/raytrace.vpc
similarity index 100%
rename from mp/src/raytrace/raytrace.vpc
rename to src/raytrace/raytrace.vpc
diff --git a/mp/src/raytrace/trace2.cpp b/src/raytrace/trace2.cpp
similarity index 100%
rename from mp/src/raytrace/trace2.cpp
rename to src/raytrace/trace2.cpp
diff --git a/mp/src/raytrace/trace3.cpp b/src/raytrace/trace3.cpp
similarity index 100%
rename from mp/src/raytrace/trace3.cpp
rename to src/raytrace/trace3.cpp
diff --git a/mp/src/thirdparty/protobuf-2.3.0/CHANGES.txt b/src/thirdparty/protobuf-2.3.0/CHANGES.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/CHANGES.txt
rename to src/thirdparty/protobuf-2.3.0/CHANGES.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/CONTRIBUTORS.txt b/src/thirdparty/protobuf-2.3.0/CONTRIBUTORS.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/CONTRIBUTORS.txt
rename to src/thirdparty/protobuf-2.3.0/CONTRIBUTORS.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/COPYING.txt b/src/thirdparty/protobuf-2.3.0/COPYING.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/COPYING.txt
rename to src/thirdparty/protobuf-2.3.0/COPYING.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/INSTALL.txt b/src/thirdparty/protobuf-2.3.0/INSTALL.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/INSTALL.txt
rename to src/thirdparty/protobuf-2.3.0/INSTALL.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/Makefile.am b/src/thirdparty/protobuf-2.3.0/Makefile.am
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/Makefile.am
rename to src/thirdparty/protobuf-2.3.0/Makefile.am
diff --git a/mp/src/thirdparty/protobuf-2.3.0/Makefile.in b/src/thirdparty/protobuf-2.3.0/Makefile.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/Makefile.in
rename to src/thirdparty/protobuf-2.3.0/Makefile.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/README.txt b/src/thirdparty/protobuf-2.3.0/README.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/README.txt
rename to src/thirdparty/protobuf-2.3.0/README.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/README.valve b/src/thirdparty/protobuf-2.3.0/README.valve
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/README.valve
rename to src/thirdparty/protobuf-2.3.0/README.valve
diff --git a/mp/src/thirdparty/protobuf-2.3.0/aclocal.m4 b/src/thirdparty/protobuf-2.3.0/aclocal.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/aclocal.m4
rename to src/thirdparty/protobuf-2.3.0/aclocal.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/autogen.sh b/src/thirdparty/protobuf-2.3.0/autogen.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/autogen.sh
rename to src/thirdparty/protobuf-2.3.0/autogen.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/config.guess b/src/thirdparty/protobuf-2.3.0/config.guess
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/config.guess
rename to src/thirdparty/protobuf-2.3.0/config.guess
diff --git a/mp/src/thirdparty/protobuf-2.3.0/config.h.in b/src/thirdparty/protobuf-2.3.0/config.h.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/config.h.in
rename to src/thirdparty/protobuf-2.3.0/config.h.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/config.sub b/src/thirdparty/protobuf-2.3.0/config.sub
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/config.sub
rename to src/thirdparty/protobuf-2.3.0/config.sub
diff --git a/mp/src/thirdparty/protobuf-2.3.0/configure b/src/thirdparty/protobuf-2.3.0/configure
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/configure
rename to src/thirdparty/protobuf-2.3.0/configure
diff --git a/mp/src/thirdparty/protobuf-2.3.0/configure.ac b/src/thirdparty/protobuf-2.3.0/configure.ac
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/configure.ac
rename to src/thirdparty/protobuf-2.3.0/configure.ac
diff --git a/mp/src/thirdparty/protobuf-2.3.0/depcomp b/src/thirdparty/protobuf-2.3.0/depcomp
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/depcomp
rename to src/thirdparty/protobuf-2.3.0/depcomp
diff --git a/mp/src/thirdparty/protobuf-2.3.0/editors/README.txt b/src/thirdparty/protobuf-2.3.0/editors/README.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/editors/README.txt
rename to src/thirdparty/protobuf-2.3.0/editors/README.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/editors/proto.vim b/src/thirdparty/protobuf-2.3.0/editors/proto.vim
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/editors/proto.vim
rename to src/thirdparty/protobuf-2.3.0/editors/proto.vim
diff --git a/mp/src/thirdparty/protobuf-2.3.0/editors/protobuf-mode.el b/src/thirdparty/protobuf-2.3.0/editors/protobuf-mode.el
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/editors/protobuf-mode.el
rename to src/thirdparty/protobuf-2.3.0/editors/protobuf-mode.el
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/AddPerson.java b/src/thirdparty/protobuf-2.3.0/examples/AddPerson.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/AddPerson.java
rename to src/thirdparty/protobuf-2.3.0/examples/AddPerson.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/ListPeople.java b/src/thirdparty/protobuf-2.3.0/examples/ListPeople.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/ListPeople.java
rename to src/thirdparty/protobuf-2.3.0/examples/ListPeople.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/Makefile b/src/thirdparty/protobuf-2.3.0/examples/Makefile
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/Makefile
rename to src/thirdparty/protobuf-2.3.0/examples/Makefile
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/README.txt b/src/thirdparty/protobuf-2.3.0/examples/README.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/README.txt
rename to src/thirdparty/protobuf-2.3.0/examples/README.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/add_person.cc b/src/thirdparty/protobuf-2.3.0/examples/add_person.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/add_person.cc
rename to src/thirdparty/protobuf-2.3.0/examples/add_person.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/add_person.py b/src/thirdparty/protobuf-2.3.0/examples/add_person.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/add_person.py
rename to src/thirdparty/protobuf-2.3.0/examples/add_person.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/addressbook.proto b/src/thirdparty/protobuf-2.3.0/examples/addressbook.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/addressbook.proto
rename to src/thirdparty/protobuf-2.3.0/examples/addressbook.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/list_people.cc b/src/thirdparty/protobuf-2.3.0/examples/list_people.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/list_people.cc
rename to src/thirdparty/protobuf-2.3.0/examples/list_people.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/examples/list_people.py b/src/thirdparty/protobuf-2.3.0/examples/list_people.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/examples/list_people.py
rename to src/thirdparty/protobuf-2.3.0/examples/list_people.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/generate_descriptor_proto.sh b/src/thirdparty/protobuf-2.3.0/generate_descriptor_proto.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/generate_descriptor_proto.sh
rename to src/thirdparty/protobuf-2.3.0/generate_descriptor_proto.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/CHANGES b/src/thirdparty/protobuf-2.3.0/gtest/CHANGES
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/CHANGES
rename to src/thirdparty/protobuf-2.3.0/gtest/CHANGES
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/CONTRIBUTORS b/src/thirdparty/protobuf-2.3.0/gtest/CONTRIBUTORS
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/CONTRIBUTORS
rename to src/thirdparty/protobuf-2.3.0/gtest/CONTRIBUTORS
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/COPYING b/src/thirdparty/protobuf-2.3.0/gtest/COPYING
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/COPYING
rename to src/thirdparty/protobuf-2.3.0/gtest/COPYING
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/Makefile.am b/src/thirdparty/protobuf-2.3.0/gtest/Makefile.am
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/Makefile.am
rename to src/thirdparty/protobuf-2.3.0/gtest/Makefile.am
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/Makefile.in b/src/thirdparty/protobuf-2.3.0/gtest/Makefile.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/Makefile.in
rename to src/thirdparty/protobuf-2.3.0/gtest/Makefile.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/README b/src/thirdparty/protobuf-2.3.0/gtest/README
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/README
rename to src/thirdparty/protobuf-2.3.0/gtest/README
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/aclocal.m4 b/src/thirdparty/protobuf-2.3.0/gtest/aclocal.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/aclocal.m4
rename to src/thirdparty/protobuf-2.3.0/gtest/aclocal.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.guess b/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.guess
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.guess
rename to src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.guess
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.h.in b/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.h.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.h.in
rename to src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.h.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.sub b/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.sub
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.sub
rename to src/thirdparty/protobuf-2.3.0/gtest/build-aux/config.sub
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/depcomp b/src/thirdparty/protobuf-2.3.0/gtest/build-aux/depcomp
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/depcomp
rename to src/thirdparty/protobuf-2.3.0/gtest/build-aux/depcomp
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/install-sh b/src/thirdparty/protobuf-2.3.0/gtest/build-aux/install-sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/install-sh
rename to src/thirdparty/protobuf-2.3.0/gtest/build-aux/install-sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/ltmain.sh b/src/thirdparty/protobuf-2.3.0/gtest/build-aux/ltmain.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/ltmain.sh
rename to src/thirdparty/protobuf-2.3.0/gtest/build-aux/ltmain.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/missing b/src/thirdparty/protobuf-2.3.0/gtest/build-aux/missing
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/build-aux/missing
rename to src/thirdparty/protobuf-2.3.0/gtest/build-aux/missing
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.cbproj b/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.cbproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.cbproj
rename to src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.cbproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.groupproj b/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.groupproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.groupproj
rename to src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest.groupproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_all.cc b/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_all.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_all.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_all.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_link.cc b/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_link.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_link.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_link.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_main.cbproj b/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_main.cbproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_main.cbproj
rename to src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_main.cbproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_unittest.cbproj b/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_unittest.cbproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_unittest.cbproj
rename to src/thirdparty/protobuf-2.3.0/gtest/codegear/gtest_unittest.cbproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/configure b/src/thirdparty/protobuf-2.3.0/gtest/configure
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/configure
rename to src/thirdparty/protobuf-2.3.0/gtest/configure
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/configure.ac b/src/thirdparty/protobuf-2.3.0/gtest/configure.ac
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/configure.ac
rename to src/thirdparty/protobuf-2.3.0/gtest/configure.ac
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-death-test.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-death-test.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-death-test.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-death-test.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-message.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-message.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-message.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-message.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h.pump b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h.pump
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-param-test.h.pump
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-spi.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-spi.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-spi.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-spi.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-test-part.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-test-part.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-test-part.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-test-part.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-typed-test.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-typed-test.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest-typed-test.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_pred_impl.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_pred_impl.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_pred_impl.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_prod.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_prod.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_prod.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/gtest_prod.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-death-test-internal.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-death-test-internal.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-filepath.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-filepath.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-filepath.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-internal.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-internal.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-internal.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-linked_ptr.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-linked_ptr.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-param-util.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-port.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-port.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-port.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-string.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-string.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-string.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h.pump b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h.pump
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h.pump b/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h.pump
rename to src/thirdparty/protobuf-2.3.0/gtest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/m4/acx_pthread.m4 b/src/thirdparty/protobuf-2.3.0/gtest/m4/acx_pthread.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/m4/acx_pthread.m4
rename to src/thirdparty/protobuf-2.3.0/gtest/m4/acx_pthread.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/m4/gtest.m4 b/src/thirdparty/protobuf-2.3.0/gtest/m4/gtest.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/m4/gtest.m4
rename to src/thirdparty/protobuf-2.3.0/gtest/m4/gtest.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/make/Makefile b/src/thirdparty/protobuf-2.3.0/gtest/make/Makefile
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/make/Makefile
rename to src/thirdparty/protobuf-2.3.0/gtest/make/Makefile
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.sln b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.sln
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.sln
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.sln
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest-md.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.sln b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.sln
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.sln
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.sln
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj.7.10.old b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj.7.10.old
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj.7.10.old
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcproj.7.10.old
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcxproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcxproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main-md.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main-md.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main-md.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main-md.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj.7.10.old b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj.7.10.old
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj.7.10.old
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcproj.7.10.old
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcxproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcxproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_main.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test-md.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test-md.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test-md.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test-md.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_prod_test.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest-md.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest-md.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest-md.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest-md.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest.vcproj b/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest.vcproj
rename to src/thirdparty/protobuf-2.3.0/gtest/msvc/gtest_unittest.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/prime_tables.h b/src/thirdparty/protobuf-2.3.0/gtest/samples/prime_tables.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/prime_tables.h
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/prime_tables.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.h b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.h
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample1.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample10_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample10_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample10_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample10_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample1_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample1_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.h b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.h
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample2.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample2_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample2_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample3-inl.h b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample3-inl.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample3-inl.h
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample3-inl.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample3_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample3_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample3_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample3_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.h b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.h
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample4.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample4_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample4_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample5_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample5_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample5_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample5_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample6_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample6_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample6_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample6_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample7_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample7_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample7_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample7_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample8_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample8_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample8_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample8_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample9_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/samples/sample9_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/samples/sample9_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/samples/sample9_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConscript b/src/thirdparty/protobuf-2.3.0/gtest/scons/SConscript
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConscript
rename to src/thirdparty/protobuf-2.3.0/gtest/scons/SConscript
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct b/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct
rename to src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct.common b/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct.common
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct.common
rename to src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct.common
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/fuse_gtest_files.py b/src/thirdparty/protobuf-2.3.0/gtest/scripts/fuse_gtest_files.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/fuse_gtest_files.py
rename to src/thirdparty/protobuf-2.3.0/gtest/scripts/fuse_gtest_files.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/gen_gtest_pred_impl.py b/src/thirdparty/protobuf-2.3.0/gtest/scripts/gen_gtest_pred_impl.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/gen_gtest_pred_impl.py
rename to src/thirdparty/protobuf-2.3.0/gtest/scripts/gen_gtest_pred_impl.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/gtest-config.in b/src/thirdparty/protobuf-2.3.0/gtest/scripts/gtest-config.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/gtest-config.in
rename to src/thirdparty/protobuf-2.3.0/gtest/scripts/gtest-config.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/test/Makefile b/src/thirdparty/protobuf-2.3.0/gtest/scripts/test/Makefile
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/scripts/test/Makefile
rename to src/thirdparty/protobuf-2.3.0/gtest/scripts/test/Makefile
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-all.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-all.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-all.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest-all.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-death-test.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-death-test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-death-test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest-death-test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-filepath.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-filepath.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-filepath.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest-filepath.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-internal-inl.h b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-internal-inl.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-internal-inl.h
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest-internal-inl.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-port.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-port.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-port.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest-port.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-test-part.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-test-part.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-test-part.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest-test-part.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-typed-test.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-typed-test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest-typed-test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest-typed-test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest_main.cc b/src/thirdparty/protobuf-2.3.0/gtest/src/gtest_main.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/src/gtest_main.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/src/gtest_main.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-death-test_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-death-test_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-death-test_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-death-test_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-filepath_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-filepath_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-filepath_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-filepath_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-linked_ptr_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-linked_ptr_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-linked_ptr_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-linked_ptr_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-listener_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-listener_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-listener_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-listener_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-message_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-message_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-message_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-message_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-options_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-options_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-options_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-options_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test2_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test2_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test2_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test2_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-param-test_test.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-port_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-port_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-port_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-port_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-test-part_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-test-part_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-test-part_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-test-part_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-tuple_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-tuple_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-tuple_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-tuple_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test2_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test2_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test2_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test2_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-typed-test_test.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-unittest-api_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-unittest-api_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest-unittest-api_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest-unittest-api_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_all_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_all_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_all_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_all_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_break_on_failure_unittest_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_color_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_env_var_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_environment_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_environment_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_environment_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_environment_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_filter_unittest_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_help_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_list_tests_unittest_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_main_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_main_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_main_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_main_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_nc_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_no_test_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_no_test_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_no_test_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_no_test_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_lin.txt b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_lin.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_lin.txt
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_lin.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_win.txt b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_win.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_win.txt
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_output_test_golden_win.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_pred_impl_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_pred_impl_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_pred_impl_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_pred_impl_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_prod_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_prod_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_prod_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_prod_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_repeat_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_repeat_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_repeat_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_repeat_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_shuffle_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_sole_header_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_sole_header_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_sole_header_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_sole_header_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_stress_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_stress_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_stress_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_stress_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_test_utils.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_ex_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_ex_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_ex_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_ex_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_throw_on_failure_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_uninitialized_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_unittest.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile1_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile1_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile1_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile1_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile2_test_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile2_test_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile2_test_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfile2_test_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_outfiles_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest_.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest_.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest_.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_output_unittest_.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py b/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py
rename to src/thirdparty/protobuf-2.3.0/gtest/test/gtest_xml_test_utils.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.cc b/src/thirdparty/protobuf-2.3.0/gtest/test/production.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/test/production.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.h b/src/thirdparty/protobuf-2.3.0/gtest/test/production.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/test/production.h
rename to src/thirdparty/protobuf-2.3.0/gtest/test/production.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Resources/Info.plist b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Resources/Info.plist
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Resources/Info.plist
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Resources/Info.plist
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/Info.plist b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/Info.plist
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/Info.plist
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/Info.plist
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.cc b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.h b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.h
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget_test.cc b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget_test.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget_test.cc
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/runtests.sh b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/runtests.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/runtests.sh
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/runtests.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/versiongenerate.py b/src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/versiongenerate.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/versiongenerate.py
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/Scripts/versiongenerate.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/gtest.xcodeproj/project.pbxproj b/src/thirdparty/protobuf-2.3.0/gtest/xcode/gtest.xcodeproj/project.pbxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/gtest.xcodeproj/project.pbxproj
rename to src/thirdparty/protobuf-2.3.0/gtest/xcode/gtest.xcodeproj/project.pbxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/install-sh b/src/thirdparty/protobuf-2.3.0/install-sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/install-sh
rename to src/thirdparty/protobuf-2.3.0/install-sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/README.txt b/src/thirdparty/protobuf-2.3.0/java/README.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/README.txt
rename to src/thirdparty/protobuf-2.3.0/java/README.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/pom.xml b/src/thirdparty/protobuf-2.3.0/java/pom.xml
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/pom.xml
rename to src/thirdparty/protobuf-2.3.0/java/pom.xml
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessage.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessage.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessage.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessage.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessageLite.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessageLite.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessageLite.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/AbstractMessageLite.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingRpcChannel.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingRpcChannel.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingRpcChannel.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingRpcChannel.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingService.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingService.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingService.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/BlockingService.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ByteString.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ByteString.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ByteString.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ByteString.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedInputStream.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedInputStream.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedInputStream.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedInputStream.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedOutputStream.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedOutputStream.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedOutputStream.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/CodedOutputStream.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Descriptors.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Descriptors.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Descriptors.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Descriptors.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/DynamicMessage.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/DynamicMessage.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/DynamicMessage.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/DynamicMessage.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistry.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistry.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistry.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistry.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/FieldSet.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/FieldSet.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/FieldSet.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/FieldSet.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessage.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessage.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessage.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessage.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Internal.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Internal.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Internal.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Internal.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Message.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Message.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Message.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Message.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/MessageLite.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/MessageLite.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/MessageLite.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/MessageLite.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcCallback.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcCallback.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcCallback.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcCallback.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcChannel.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcChannel.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcChannel.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcChannel.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcController.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcController.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcController.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcController.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcUtil.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcUtil.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcUtil.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/RpcUtil.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Service.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Service.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Service.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/Service.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ServiceException.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ServiceException.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ServiceException.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/ServiceException.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/TextFormat.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/TextFormat.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/TextFormat.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/TextFormat.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UninitializedMessageException.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UninitializedMessageException.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UninitializedMessageException.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UninitializedMessageException.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UnknownFieldSet.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UnknownFieldSet.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UnknownFieldSet.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/UnknownFieldSet.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/WireFormat.java b/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/WireFormat.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/WireFormat.java
rename to src/thirdparty/protobuf-2.3.0/java/src/main/java/com/google/protobuf/WireFormat.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/AbstractMessageTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/AbstractMessageTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/AbstractMessageTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/AbstractMessageTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedInputStreamTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedInputStreamTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedInputStreamTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedInputStreamTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DescriptorsTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DescriptorsTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DescriptorsTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DescriptorsTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DynamicMessageTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DynamicMessageTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DynamicMessageTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/DynamicMessageTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/LiteTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/LiteTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/LiteTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/LiteTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/MessageTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/MessageTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/MessageTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/MessageTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/ServiceTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/ServiceTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/ServiceTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/ServiceTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TestUtil.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TestUtil.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TestUtil.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TestUtil.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TextFormatTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TextFormatTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TextFormatTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/TextFormatTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/WireFormatTest.java b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/WireFormatTest.java
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/WireFormatTest.java
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/WireFormatTest.java
diff --git a/mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/multiple_files_test.proto b/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/multiple_files_test.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/multiple_files_test.proto
rename to src/thirdparty/protobuf-2.3.0/java/src/test/java/com/google/protobuf/multiple_files_test.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/ltmain.sh b/src/thirdparty/protobuf-2.3.0/ltmain.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/ltmain.sh
rename to src/thirdparty/protobuf-2.3.0/ltmain.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/ac_system_extensions.m4 b/src/thirdparty/protobuf-2.3.0/m4/ac_system_extensions.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/ac_system_extensions.m4
rename to src/thirdparty/protobuf-2.3.0/m4/ac_system_extensions.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/acx_check_suncc.m4 b/src/thirdparty/protobuf-2.3.0/m4/acx_check_suncc.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/acx_check_suncc.m4
rename to src/thirdparty/protobuf-2.3.0/m4/acx_check_suncc.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/acx_pthread.m4 b/src/thirdparty/protobuf-2.3.0/m4/acx_pthread.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/acx_pthread.m4
rename to src/thirdparty/protobuf-2.3.0/m4/acx_pthread.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/libtool.m4 b/src/thirdparty/protobuf-2.3.0/m4/libtool.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/libtool.m4
rename to src/thirdparty/protobuf-2.3.0/m4/libtool.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/ltoptions.m4 b/src/thirdparty/protobuf-2.3.0/m4/ltoptions.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/ltoptions.m4
rename to src/thirdparty/protobuf-2.3.0/m4/ltoptions.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/ltsugar.m4 b/src/thirdparty/protobuf-2.3.0/m4/ltsugar.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/ltsugar.m4
rename to src/thirdparty/protobuf-2.3.0/m4/ltsugar.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/ltversion.m4 b/src/thirdparty/protobuf-2.3.0/m4/ltversion.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/ltversion.m4
rename to src/thirdparty/protobuf-2.3.0/m4/ltversion.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/lt~obsolete.m4 b/src/thirdparty/protobuf-2.3.0/m4/lt~obsolete.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/lt~obsolete.m4
rename to src/thirdparty/protobuf-2.3.0/m4/lt~obsolete.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/m4/stl_hash.m4 b/src/thirdparty/protobuf-2.3.0/m4/stl_hash.m4
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/m4/stl_hash.m4
rename to src/thirdparty/protobuf-2.3.0/m4/stl_hash.m4
diff --git a/mp/src/thirdparty/protobuf-2.3.0/missing b/src/thirdparty/protobuf-2.3.0/missing
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/missing
rename to src/thirdparty/protobuf-2.3.0/missing
diff --git a/mp/src/thirdparty/protobuf-2.3.0/protobuf-lite.pc.in b/src/thirdparty/protobuf-2.3.0/protobuf-lite.pc.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/protobuf-lite.pc.in
rename to src/thirdparty/protobuf-2.3.0/protobuf-lite.pc.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/protobuf.pc.in b/src/thirdparty/protobuf-2.3.0/protobuf.pc.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/protobuf.pc.in
rename to src/thirdparty/protobuf-2.3.0/protobuf.pc.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/ps3projects/config.h b/src/thirdparty/protobuf-2.3.0/ps3projects/config.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/ps3projects/config.h
rename to src/thirdparty/protobuf-2.3.0/ps3projects/config.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/ps3projects/libprotobuf.vcproj b/src/thirdparty/protobuf-2.3.0/ps3projects/libprotobuf.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/ps3projects/libprotobuf.vcproj
rename to src/thirdparty/protobuf-2.3.0/ps3projects/libprotobuf.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/ps3projects/protobuf.sln b/src/thirdparty/protobuf-2.3.0/ps3projects/protobuf.sln
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/ps3projects/protobuf.sln
rename to src/thirdparty/protobuf-2.3.0/ps3projects/protobuf.sln
diff --git a/mp/src/thirdparty/protobuf-2.3.0/ps3projects/vsi.nul b/src/thirdparty/protobuf-2.3.0/ps3projects/vsi.nul
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/ps3projects/vsi.nul
rename to src/thirdparty/protobuf-2.3.0/ps3projects/vsi.nul
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/README.txt b/src/thirdparty/protobuf-2.3.0/python/README.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/README.txt
rename to src/thirdparty/protobuf-2.3.0/python/README.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/ez_setup.py b/src/thirdparty/protobuf-2.3.0/python/ez_setup.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/ez_setup.py
rename to src/thirdparty/protobuf-2.3.0/python/ez_setup.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/__init__.py b/src/thirdparty/protobuf-2.3.0/python/google/__init__.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/__init__.py
rename to src/thirdparty/protobuf-2.3.0/python/google/__init__.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/__init__.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/__init__.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/__init__.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/__init__.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/descriptor.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/descriptor.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/descriptor.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/descriptor.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/__init__.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/__init__.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/__init__.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/__init__.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/containers.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/containers.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/containers.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/containers.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/decoder.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/decoder.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/decoder.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/decoder.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/descriptor_test.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/descriptor_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/descriptor_test.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/descriptor_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/encoder.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/encoder.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/encoder.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/encoder.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/generator_test.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/generator_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/generator_test.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/generator_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_listener.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_listener.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_listener.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_listener.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_test.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_test.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/message_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_extensions.proto b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_extensions.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_extensions.proto
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_extensions.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_messages.proto b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_messages.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_messages.proto
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/more_messages.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/reflection_test.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/reflection_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/reflection_test.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/reflection_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/service_reflection_test.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/service_reflection_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/service_reflection_test.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/service_reflection_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/test_util.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/test_util.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/test_util.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/test_util.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/text_format_test.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/text_format_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/text_format_test.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/text_format_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/type_checkers.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/type_checkers.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/type_checkers.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/type_checkers.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format_test.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format_test.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format_test.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/internal/wire_format_test.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/message.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/message.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/message.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/message.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/reflection.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/reflection.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/reflection.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/reflection.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/service.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/service.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/service.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/service.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/service_reflection.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/service_reflection.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/service_reflection.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/service_reflection.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/text_format.py b/src/thirdparty/protobuf-2.3.0/python/google/protobuf/text_format.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/google/protobuf/text_format.py
rename to src/thirdparty/protobuf-2.3.0/python/google/protobuf/text_format.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/mox.py b/src/thirdparty/protobuf-2.3.0/python/mox.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/mox.py
rename to src/thirdparty/protobuf-2.3.0/python/mox.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/setup.py b/src/thirdparty/protobuf-2.3.0/python/setup.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/setup.py
rename to src/thirdparty/protobuf-2.3.0/python/setup.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/python/stubout.py b/src/thirdparty/protobuf-2.3.0/python/stubout.py
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/python/stubout.py
rename to src/thirdparty/protobuf-2.3.0/python/stubout.py
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/Makefile.am b/src/thirdparty/protobuf-2.3.0/src/Makefile.am
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/Makefile.am
rename to src/thirdparty/protobuf-2.3.0/src/Makefile.am
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/Makefile.in b/src/thirdparty/protobuf-2.3.0/src/Makefile.in
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/Makefile.in
rename to src/thirdparty/protobuf-2.3.0/src/Makefile.in
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/code_generator.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/command_line_interface_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_enum_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_extension.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_file.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_generator.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_helpers.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_message_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_service.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_string_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/cpp/cpp_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/importer_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_enum_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_extension.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_file.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_generator.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_helpers.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_message_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_plugin_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_plugin_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_plugin_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_plugin_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_primitive_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/java/java_service.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/main.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/main.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/main.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/main.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/mock_code_generator.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/package_info.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/package_info.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/package_info.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/package_info.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/parser_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.pb.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/plugin.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_generator.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_plugin_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_plugin_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_plugin_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/python/python_plugin_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/subprocess.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/test_plugin.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/test_plugin.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/test_plugin.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/test_plugin.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_output_unittest.sh b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_output_unittest.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_output_unittest.sh
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_output_unittest.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/compiler/zip_writer.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.pb.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_database_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/descriptor_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/dynamic_message_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_heavy.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_heavy.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_heavy.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_heavy.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/extension_set_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_reflection_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/generated_message_util.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_inl.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_inl.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_inl.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_inl.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/coded_stream_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream_unittest.sh b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream_unittest.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream_unittest.sh
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/gzip_stream_unittest.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/package_info.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/package_info.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/package_info.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/package_info.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/printer_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/tokenizer_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_impl_lite.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/io/zero_copy_stream_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/lite_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/lite_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/lite_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/lite_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/message.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_lite.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/message_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/package_info.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/package_info.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/package_info.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/package_info.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/reflection_ops_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/repeated_field_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/service.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/common_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/hash.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/map-util.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/map-util.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/map-util.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/map-util.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/once_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/stl_util-inl.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/stl_util-inl.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/stl_util-inl.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/stl_util-inl.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/structurally_valid_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/strutil_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/stubs/substitute.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/test_util_lite.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_message b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_message
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_message
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_message
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_packed_fields_message b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_packed_fields_message
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_packed_fields_message
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/golden_packed_fields_message
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_data.txt b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_data.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_data.txt
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_data.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/file.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/googletest.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgunzip.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgunzip.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgunzip.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgunzip.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgzip.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgzip.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgzip.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/testing/zcgzip.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/text_format_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_custom_options.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_custom_options.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_custom_options.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_custom_options.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_embed_optimize_for.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_embed_optimize_for.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_embed_optimize_for.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_embed_optimize_for.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_empty.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_empty.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_empty.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_empty.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_enormous_descriptor.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_enormous_descriptor.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_enormous_descriptor.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_enormous_descriptor.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import_lite.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import_lite.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import_lite.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_import_lite.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite_imports_nonlite.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite_imports_nonlite.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite_imports_nonlite.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_lite_imports_nonlite.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_mset.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_mset.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_mset.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_mset.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_no_generic_services.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_no_generic_services.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_no_generic_services.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_no_generic_services.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_optimize_for.proto b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_optimize_for.proto
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_optimize_for.proto
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unittest_optimize_for.proto
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/unknown_field_set_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite_inl.h b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite_inl.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite_inl.h
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_lite_inl.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_unittest.cc b/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_unittest.cc
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_unittest.cc
rename to src/thirdparty/protobuf-2.3.0/src/google/protobuf/wire_format_unittest.cc
diff --git a/mp/src/thirdparty/protobuf-2.3.0/src/solaris/libstdc++.la b/src/thirdparty/protobuf-2.3.0/src/solaris/libstdc++.la
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/src/solaris/libstdc++.la
rename to src/thirdparty/protobuf-2.3.0/src/solaris/libstdc++.la
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/build.bat b/src/thirdparty/protobuf-2.3.0/vsprojects/build.bat
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/build.bat
rename to src/thirdparty/protobuf-2.3.0/vsprojects/build.bat
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/config.h b/src/thirdparty/protobuf-2.3.0/vsprojects/config.h
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/config.h
rename to src/thirdparty/protobuf-2.3.0/vsprojects/config.h
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/convert2008to2005.sh b/src/thirdparty/protobuf-2.3.0/vsprojects/convert2008to2005.sh
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/convert2008to2005.sh
rename to src/thirdparty/protobuf-2.3.0/vsprojects/convert2008to2005.sh
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/extract_includes.bat b/src/thirdparty/protobuf-2.3.0/vsprojects/extract_includes.bat
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/extract_includes.bat
rename to src/thirdparty/protobuf-2.3.0/vsprojects/extract_includes.bat
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcproj b/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcxproj b/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcxproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf-lite.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcproj b/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcxproj b/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcxproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/libprotobuf.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcproj b/src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcxproj b/src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcxproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/libprotoc.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcproj b/src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcxproj b/src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcxproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/lite-test.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/make2013.bat b/src/thirdparty/protobuf-2.3.0/vsprojects/make2013.bat
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/make2013.bat
rename to src/thirdparty/protobuf-2.3.0/vsprojects/make2013.bat
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/protobuf.sln b/src/thirdparty/protobuf-2.3.0/vsprojects/protobuf.sln
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/protobuf.sln
rename to src/thirdparty/protobuf-2.3.0/vsprojects/protobuf.sln
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/protobuf_2010.sln b/src/thirdparty/protobuf-2.3.0/vsprojects/protobuf_2010.sln
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/protobuf_2010.sln
rename to src/thirdparty/protobuf-2.3.0/vsprojects/protobuf_2010.sln
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcproj b/src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcxproj b/src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcxproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/protoc.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/readme.txt b/src/thirdparty/protobuf-2.3.0/vsprojects/readme.txt
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/readme.txt
rename to src/thirdparty/protobuf-2.3.0/vsprojects/readme.txt
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcproj b/src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcxproj b/src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcxproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/test_plugin.vcxproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcproj b/src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcproj
diff --git a/mp/src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcxproj b/src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcxproj
similarity index 100%
rename from mp/src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcxproj
rename to src/thirdparty/protobuf-2.3.0/vsprojects/tests.vcxproj
diff --git a/mp/src/tier0/tier0_exclude.vpc b/src/tier0/tier0_exclude.vpc
similarity index 100%
rename from mp/src/tier0/tier0_exclude.vpc
rename to src/tier0/tier0_exclude.vpc
diff --git a/mp/src/tier1/KeyValues.cpp b/src/tier1/KeyValues.cpp
similarity index 100%
rename from mp/src/tier1/KeyValues.cpp
rename to src/tier1/KeyValues.cpp
diff --git a/mp/src/tier1/NetAdr.cpp b/src/tier1/NetAdr.cpp
similarity index 100%
rename from mp/src/tier1/NetAdr.cpp
rename to src/tier1/NetAdr.cpp
diff --git a/mp/src/tier1/bitbuf.cpp b/src/tier1/bitbuf.cpp
similarity index 100%
rename from mp/src/tier1/bitbuf.cpp
rename to src/tier1/bitbuf.cpp
diff --git a/mp/src/tier1/byteswap.cpp b/src/tier1/byteswap.cpp
similarity index 100%
rename from mp/src/tier1/byteswap.cpp
rename to src/tier1/byteswap.cpp
diff --git a/mp/src/tier1/characterset.cpp b/src/tier1/characterset.cpp
similarity index 100%
rename from mp/src/tier1/characterset.cpp
rename to src/tier1/characterset.cpp
diff --git a/mp/src/tier1/checksum_crc.cpp b/src/tier1/checksum_crc.cpp
similarity index 100%
rename from mp/src/tier1/checksum_crc.cpp
rename to src/tier1/checksum_crc.cpp
diff --git a/mp/src/tier1/checksum_md5.cpp b/src/tier1/checksum_md5.cpp
similarity index 100%
rename from mp/src/tier1/checksum_md5.cpp
rename to src/tier1/checksum_md5.cpp
diff --git a/mp/src/tier1/checksum_sha1.cpp b/src/tier1/checksum_sha1.cpp
similarity index 100%
rename from mp/src/tier1/checksum_sha1.cpp
rename to src/tier1/checksum_sha1.cpp
diff --git a/mp/src/tier1/commandbuffer.cpp b/src/tier1/commandbuffer.cpp
similarity index 100%
rename from mp/src/tier1/commandbuffer.cpp
rename to src/tier1/commandbuffer.cpp
diff --git a/mp/src/tier1/convar.cpp b/src/tier1/convar.cpp
similarity index 100%
rename from mp/src/tier1/convar.cpp
rename to src/tier1/convar.cpp
diff --git a/mp/src/tier1/datamanager.cpp b/src/tier1/datamanager.cpp
similarity index 100%
rename from mp/src/tier1/datamanager.cpp
rename to src/tier1/datamanager.cpp
diff --git a/mp/src/tier1/diff.cpp b/src/tier1/diff.cpp
similarity index 100%
rename from mp/src/tier1/diff.cpp
rename to src/tier1/diff.cpp
diff --git a/mp/src/tier1/fileio.cpp b/src/tier1/fileio.cpp
similarity index 100%
rename from mp/src/tier1/fileio.cpp
rename to src/tier1/fileio.cpp
diff --git a/mp/src/tier1/generichash.cpp b/src/tier1/generichash.cpp
similarity index 100%
rename from mp/src/tier1/generichash.cpp
rename to src/tier1/generichash.cpp
diff --git a/mp/src/tier1/ilocalize.cpp b/src/tier1/ilocalize.cpp
similarity index 100%
rename from mp/src/tier1/ilocalize.cpp
rename to src/tier1/ilocalize.cpp
diff --git a/mp/src/tier1/interface.cpp b/src/tier1/interface.cpp
similarity index 100%
rename from mp/src/tier1/interface.cpp
rename to src/tier1/interface.cpp
diff --git a/mp/src/tier1/kvpacker.cpp b/src/tier1/kvpacker.cpp
similarity index 100%
rename from mp/src/tier1/kvpacker.cpp
rename to src/tier1/kvpacker.cpp
diff --git a/mp/src/tier1/lzmaDecoder.cpp b/src/tier1/lzmaDecoder.cpp
similarity index 100%
rename from mp/src/tier1/lzmaDecoder.cpp
rename to src/tier1/lzmaDecoder.cpp
diff --git a/mp/src/tier1/mempool.cpp b/src/tier1/mempool.cpp
similarity index 100%
rename from mp/src/tier1/mempool.cpp
rename to src/tier1/mempool.cpp
diff --git a/mp/src/tier1/memstack.cpp b/src/tier1/memstack.cpp
similarity index 100%
rename from mp/src/tier1/memstack.cpp
rename to src/tier1/memstack.cpp
diff --git a/mp/src/tier1/newbitbuf.cpp b/src/tier1/newbitbuf.cpp
similarity index 100%
rename from mp/src/tier1/newbitbuf.cpp
rename to src/tier1/newbitbuf.cpp
diff --git a/mp/src/tier1/pathmatch.cpp b/src/tier1/pathmatch.cpp
similarity index 100%
rename from mp/src/tier1/pathmatch.cpp
rename to src/tier1/pathmatch.cpp
diff --git a/mp/src/tier1/pathmatch_casefolding.h b/src/tier1/pathmatch_casefolding.h
similarity index 100%
rename from mp/src/tier1/pathmatch_casefolding.h
rename to src/tier1/pathmatch_casefolding.h
diff --git a/mp/src/tier1/processor_detect.cpp b/src/tier1/processor_detect.cpp
similarity index 100%
rename from mp/src/tier1/processor_detect.cpp
rename to src/tier1/processor_detect.cpp
diff --git a/mp/src/tier1/processor_detect_linux.cpp b/src/tier1/processor_detect_linux.cpp
similarity index 100%
rename from mp/src/tier1/processor_detect_linux.cpp
rename to src/tier1/processor_detect_linux.cpp
diff --git a/mp/src/tier1/qsort_s.cpp b/src/tier1/qsort_s.cpp
similarity index 100%
rename from mp/src/tier1/qsort_s.cpp
rename to src/tier1/qsort_s.cpp
diff --git a/mp/src/tier1/rangecheckedvar.cpp b/src/tier1/rangecheckedvar.cpp
similarity index 100%
rename from mp/src/tier1/rangecheckedvar.cpp
rename to src/tier1/rangecheckedvar.cpp
diff --git a/mp/src/tier1/reliabletimer.cpp b/src/tier1/reliabletimer.cpp
similarity index 100%
rename from mp/src/tier1/reliabletimer.cpp
rename to src/tier1/reliabletimer.cpp
diff --git a/mp/src/tier1/snappy-internal.h b/src/tier1/snappy-internal.h
similarity index 100%
rename from mp/src/tier1/snappy-internal.h
rename to src/tier1/snappy-internal.h
diff --git a/mp/src/tier1/snappy-sinksource.cpp b/src/tier1/snappy-sinksource.cpp
similarity index 100%
rename from mp/src/tier1/snappy-sinksource.cpp
rename to src/tier1/snappy-sinksource.cpp
diff --git a/mp/src/tier1/snappy-stubs-internal.cpp b/src/tier1/snappy-stubs-internal.cpp
similarity index 100%
rename from mp/src/tier1/snappy-stubs-internal.cpp
rename to src/tier1/snappy-stubs-internal.cpp
diff --git a/mp/src/tier1/snappy-stubs-internal.h b/src/tier1/snappy-stubs-internal.h
similarity index 100%
rename from mp/src/tier1/snappy-stubs-internal.h
rename to src/tier1/snappy-stubs-internal.h
diff --git a/mp/src/tier1/snappy.cpp b/src/tier1/snappy.cpp
similarity index 100%
rename from mp/src/tier1/snappy.cpp
rename to src/tier1/snappy.cpp
diff --git a/mp/src/tier1/sparsematrix.cpp b/src/tier1/sparsematrix.cpp
similarity index 100%
rename from mp/src/tier1/sparsematrix.cpp
rename to src/tier1/sparsematrix.cpp
diff --git a/mp/src/tier1/splitstring.cpp b/src/tier1/splitstring.cpp
similarity index 100%
rename from mp/src/tier1/splitstring.cpp
rename to src/tier1/splitstring.cpp
diff --git a/mp/src/tier1/stringpool.cpp b/src/tier1/stringpool.cpp
similarity index 100%
rename from mp/src/tier1/stringpool.cpp
rename to src/tier1/stringpool.cpp
diff --git a/mp/src/tier1/strtools.cpp b/src/tier1/strtools.cpp
similarity index 100%
rename from mp/src/tier1/strtools.cpp
rename to src/tier1/strtools.cpp
diff --git a/mp/src/tier1/strtools_unicode.cpp b/src/tier1/strtools_unicode.cpp
similarity index 100%
rename from mp/src/tier1/strtools_unicode.cpp
rename to src/tier1/strtools_unicode.cpp
diff --git a/mp/src/tier1/tier1.cpp b/src/tier1/tier1.cpp
similarity index 100%
rename from mp/src/tier1/tier1.cpp
rename to src/tier1/tier1.cpp
diff --git a/mp/src/tier1/tier1.vpc b/src/tier1/tier1.vpc
similarity index 100%
rename from mp/src/tier1/tier1.vpc
rename to src/tier1/tier1.vpc
diff --git a/mp/src/tier1/tier1_exclude.vpc b/src/tier1/tier1_exclude.vpc
similarity index 100%
rename from mp/src/tier1/tier1_exclude.vpc
rename to src/tier1/tier1_exclude.vpc
diff --git a/mp/src/tier1/tokenreader.cpp b/src/tier1/tokenreader.cpp
similarity index 100%
rename from mp/src/tier1/tokenreader.cpp
rename to src/tier1/tokenreader.cpp
diff --git a/mp/src/tier1/undiff.cpp b/src/tier1/undiff.cpp
similarity index 100%
rename from mp/src/tier1/undiff.cpp
rename to src/tier1/undiff.cpp
diff --git a/mp/src/tier1/uniqueid.cpp b/src/tier1/uniqueid.cpp
similarity index 100%
rename from mp/src/tier1/uniqueid.cpp
rename to src/tier1/uniqueid.cpp
diff --git a/mp/src/tier1/utlbinaryblock.cpp b/src/tier1/utlbinaryblock.cpp
similarity index 100%
rename from mp/src/tier1/utlbinaryblock.cpp
rename to src/tier1/utlbinaryblock.cpp
diff --git a/mp/src/tier1/utlbuffer.cpp b/src/tier1/utlbuffer.cpp
similarity index 100%
rename from mp/src/tier1/utlbuffer.cpp
rename to src/tier1/utlbuffer.cpp
diff --git a/mp/src/tier1/utlbufferutil.cpp b/src/tier1/utlbufferutil.cpp
similarity index 100%
rename from mp/src/tier1/utlbufferutil.cpp
rename to src/tier1/utlbufferutil.cpp
diff --git a/mp/src/tier1/utlstring.cpp b/src/tier1/utlstring.cpp
similarity index 100%
rename from mp/src/tier1/utlstring.cpp
rename to src/tier1/utlstring.cpp
diff --git a/mp/src/tier1/utlsymbol.cpp b/src/tier1/utlsymbol.cpp
similarity index 100%
rename from mp/src/tier1/utlsymbol.cpp
rename to src/tier1/utlsymbol.cpp
diff --git a/mp/src/utils/captioncompiler/captioncompiler.cpp b/src/utils/captioncompiler/captioncompiler.cpp
similarity index 100%
rename from mp/src/utils/captioncompiler/captioncompiler.cpp
rename to src/utils/captioncompiler/captioncompiler.cpp
diff --git a/mp/src/utils/captioncompiler/captioncompiler.vpc b/src/utils/captioncompiler/captioncompiler.vpc
similarity index 100%
rename from mp/src/utils/captioncompiler/captioncompiler.vpc
rename to src/utils/captioncompiler/captioncompiler.vpc
diff --git a/mp/src/utils/captioncompiler/cbase.h b/src/utils/captioncompiler/cbase.h
similarity index 100%
rename from mp/src/utils/captioncompiler/cbase.h
rename to src/utils/captioncompiler/cbase.h
diff --git a/mp/src/utils/common/ISQLDBReplyTarget.h b/src/utils/common/ISQLDBReplyTarget.h
similarity index 100%
rename from mp/src/utils/common/ISQLDBReplyTarget.h
rename to src/utils/common/ISQLDBReplyTarget.h
diff --git a/mp/src/utils/common/MySqlDatabase.cpp b/src/utils/common/MySqlDatabase.cpp
similarity index 100%
rename from mp/src/utils/common/MySqlDatabase.cpp
rename to src/utils/common/MySqlDatabase.cpp
diff --git a/mp/src/utils/common/MySqlDatabase.h b/src/utils/common/MySqlDatabase.h
similarity index 100%
rename from mp/src/utils/common/MySqlDatabase.h
rename to src/utils/common/MySqlDatabase.h
diff --git a/mp/src/utils/common/bsplib.cpp b/src/utils/common/bsplib.cpp
similarity index 100%
rename from mp/src/utils/common/bsplib.cpp
rename to src/utils/common/bsplib.cpp
diff --git a/mp/src/utils/common/bsplib.h b/src/utils/common/bsplib.h
similarity index 100%
rename from mp/src/utils/common/bsplib.h
rename to src/utils/common/bsplib.h
diff --git a/mp/src/utils/common/cmdlib.cpp b/src/utils/common/cmdlib.cpp
similarity index 100%
rename from mp/src/utils/common/cmdlib.cpp
rename to src/utils/common/cmdlib.cpp
diff --git a/mp/src/utils/common/cmdlib.h b/src/utils/common/cmdlib.h
similarity index 100%
rename from mp/src/utils/common/cmdlib.h
rename to src/utils/common/cmdlib.h
diff --git a/mp/src/utils/common/consolewnd.cpp b/src/utils/common/consolewnd.cpp
similarity index 100%
rename from mp/src/utils/common/consolewnd.cpp
rename to src/utils/common/consolewnd.cpp
diff --git a/mp/src/utils/common/consolewnd.h b/src/utils/common/consolewnd.h
similarity index 100%
rename from mp/src/utils/common/consolewnd.h
rename to src/utils/common/consolewnd.h
diff --git a/mp/src/utils/common/filesystem_tools.cpp b/src/utils/common/filesystem_tools.cpp
similarity index 100%
rename from mp/src/utils/common/filesystem_tools.cpp
rename to src/utils/common/filesystem_tools.cpp
diff --git a/mp/src/utils/common/filesystem_tools.h b/src/utils/common/filesystem_tools.h
similarity index 100%
rename from mp/src/utils/common/filesystem_tools.h
rename to src/utils/common/filesystem_tools.h
diff --git a/mp/src/utils/common/map_shared.cpp b/src/utils/common/map_shared.cpp
similarity index 100%
rename from mp/src/utils/common/map_shared.cpp
rename to src/utils/common/map_shared.cpp
diff --git a/mp/src/utils/common/map_shared.h b/src/utils/common/map_shared.h
similarity index 100%
rename from mp/src/utils/common/map_shared.h
rename to src/utils/common/map_shared.h
diff --git a/mp/src/utils/common/movie.h b/src/utils/common/movie.h
similarity index 100%
rename from mp/src/utils/common/movie.h
rename to src/utils/common/movie.h
diff --git a/mp/src/utils/common/mpi_stats.cpp b/src/utils/common/mpi_stats.cpp
similarity index 100%
rename from mp/src/utils/common/mpi_stats.cpp
rename to src/utils/common/mpi_stats.cpp
diff --git a/mp/src/utils/common/mpi_stats.h b/src/utils/common/mpi_stats.h
similarity index 100%
rename from mp/src/utils/common/mpi_stats.h
rename to src/utils/common/mpi_stats.h
diff --git a/mp/src/utils/common/mstristrip.cpp b/src/utils/common/mstristrip.cpp
similarity index 100%
rename from mp/src/utils/common/mstristrip.cpp
rename to src/utils/common/mstristrip.cpp
diff --git a/mp/src/utils/common/mstristrip.h b/src/utils/common/mstristrip.h
similarity index 100%
rename from mp/src/utils/common/mstristrip.h
rename to src/utils/common/mstristrip.h
diff --git a/mp/src/utils/common/pacifier.cpp b/src/utils/common/pacifier.cpp
similarity index 100%
rename from mp/src/utils/common/pacifier.cpp
rename to src/utils/common/pacifier.cpp
diff --git a/mp/src/utils/common/pacifier.h b/src/utils/common/pacifier.h
similarity index 100%
rename from mp/src/utils/common/pacifier.h
rename to src/utils/common/pacifier.h
diff --git a/mp/src/utils/common/physdll.cpp b/src/utils/common/physdll.cpp
similarity index 100%
rename from mp/src/utils/common/physdll.cpp
rename to src/utils/common/physdll.cpp
diff --git a/mp/src/utils/common/physdll.h b/src/utils/common/physdll.h
similarity index 100%
rename from mp/src/utils/common/physdll.h
rename to src/utils/common/physdll.h
diff --git a/mp/src/utils/common/polylib.cpp b/src/utils/common/polylib.cpp
similarity index 100%
rename from mp/src/utils/common/polylib.cpp
rename to src/utils/common/polylib.cpp
diff --git a/mp/src/utils/common/polylib.h b/src/utils/common/polylib.h
similarity index 100%
rename from mp/src/utils/common/polylib.h
rename to src/utils/common/polylib.h
diff --git a/mp/src/utils/common/qfiles.h b/src/utils/common/qfiles.h
similarity index 100%
rename from mp/src/utils/common/qfiles.h
rename to src/utils/common/qfiles.h
diff --git a/mp/src/utils/common/scratchpad_helpers.cpp b/src/utils/common/scratchpad_helpers.cpp
similarity index 100%
rename from mp/src/utils/common/scratchpad_helpers.cpp
rename to src/utils/common/scratchpad_helpers.cpp
diff --git a/mp/src/utils/common/scratchpad_helpers.h b/src/utils/common/scratchpad_helpers.h
similarity index 100%
rename from mp/src/utils/common/scratchpad_helpers.h
rename to src/utils/common/scratchpad_helpers.h
diff --git a/mp/src/utils/common/scriplib.cpp b/src/utils/common/scriplib.cpp
similarity index 100%
rename from mp/src/utils/common/scriplib.cpp
rename to src/utils/common/scriplib.cpp
diff --git a/mp/src/utils/common/scriplib.h b/src/utils/common/scriplib.h
similarity index 100%
rename from mp/src/utils/common/scriplib.h
rename to src/utils/common/scriplib.h
diff --git a/mp/src/utils/common/threads.cpp b/src/utils/common/threads.cpp
similarity index 100%
rename from mp/src/utils/common/threads.cpp
rename to src/utils/common/threads.cpp
diff --git a/mp/src/utils/common/threads.h b/src/utils/common/threads.h
similarity index 100%
rename from mp/src/utils/common/threads.h
rename to src/utils/common/threads.h
diff --git a/mp/src/utils/common/tools_minidump.cpp b/src/utils/common/tools_minidump.cpp
similarity index 100%
rename from mp/src/utils/common/tools_minidump.cpp
rename to src/utils/common/tools_minidump.cpp
diff --git a/mp/src/utils/common/tools_minidump.h b/src/utils/common/tools_minidump.h
similarity index 100%
rename from mp/src/utils/common/tools_minidump.h
rename to src/utils/common/tools_minidump.h
diff --git a/mp/src/utils/common/utilmatlib.cpp b/src/utils/common/utilmatlib.cpp
similarity index 100%
rename from mp/src/utils/common/utilmatlib.cpp
rename to src/utils/common/utilmatlib.cpp
diff --git a/mp/src/utils/common/utilmatlib.h b/src/utils/common/utilmatlib.h
similarity index 100%
rename from mp/src/utils/common/utilmatlib.h
rename to src/utils/common/utilmatlib.h
diff --git a/mp/src/utils/common/vmpi_tools_shared.cpp b/src/utils/common/vmpi_tools_shared.cpp
similarity index 100%
rename from mp/src/utils/common/vmpi_tools_shared.cpp
rename to src/utils/common/vmpi_tools_shared.cpp
diff --git a/mp/src/utils/common/vmpi_tools_shared.h b/src/utils/common/vmpi_tools_shared.h
similarity index 100%
rename from mp/src/utils/common/vmpi_tools_shared.h
rename to src/utils/common/vmpi_tools_shared.h
diff --git a/mp/src/utils/common/wadlib.c b/src/utils/common/wadlib.c
similarity index 100%
rename from mp/src/utils/common/wadlib.c
rename to src/utils/common/wadlib.c
diff --git a/mp/src/utils/common/wadlib.h b/src/utils/common/wadlib.h
similarity index 100%
rename from mp/src/utils/common/wadlib.h
rename to src/utils/common/wadlib.h
diff --git a/mp/src/utils/glview/glos.h b/src/utils/glview/glos.h
similarity index 100%
rename from mp/src/utils/glview/glos.h
rename to src/utils/glview/glos.h
diff --git a/mp/src/utils/glview/glview.cpp b/src/utils/glview/glview.cpp
similarity index 100%
rename from mp/src/utils/glview/glview.cpp
rename to src/utils/glview/glview.cpp
diff --git a/mp/src/utils/glview/glview.vpc b/src/utils/glview/glview.vpc
similarity index 100%
rename from mp/src/utils/glview/glview.vpc
rename to src/utils/glview/glview.vpc
diff --git a/mp/src/utils/height2normal/height2normal.cpp b/src/utils/height2normal/height2normal.cpp
similarity index 100%
rename from mp/src/utils/height2normal/height2normal.cpp
rename to src/utils/height2normal/height2normal.cpp
diff --git a/mp/src/utils/height2normal/height2normal.vpc b/src/utils/height2normal/height2normal.vpc
similarity index 100%
rename from mp/src/utils/height2normal/height2normal.vpc
rename to src/utils/height2normal/height2normal.vpc
diff --git a/mp/src/utils/lzma/C/7z.h b/src/utils/lzma/C/7z.h
similarity index 100%
rename from mp/src/utils/lzma/C/7z.h
rename to src/utils/lzma/C/7z.h
diff --git a/mp/src/utils/lzma/C/7zAlloc.c b/src/utils/lzma/C/7zAlloc.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zAlloc.c
rename to src/utils/lzma/C/7zAlloc.c
diff --git a/mp/src/utils/lzma/C/7zAlloc.h b/src/utils/lzma/C/7zAlloc.h
similarity index 100%
rename from mp/src/utils/lzma/C/7zAlloc.h
rename to src/utils/lzma/C/7zAlloc.h
diff --git a/mp/src/utils/lzma/C/7zArcIn.c b/src/utils/lzma/C/7zArcIn.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zArcIn.c
rename to src/utils/lzma/C/7zArcIn.c
diff --git a/mp/src/utils/lzma/C/7zBuf.c b/src/utils/lzma/C/7zBuf.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zBuf.c
rename to src/utils/lzma/C/7zBuf.c
diff --git a/mp/src/utils/lzma/C/7zBuf.h b/src/utils/lzma/C/7zBuf.h
similarity index 100%
rename from mp/src/utils/lzma/C/7zBuf.h
rename to src/utils/lzma/C/7zBuf.h
diff --git a/mp/src/utils/lzma/C/7zBuf2.c b/src/utils/lzma/C/7zBuf2.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zBuf2.c
rename to src/utils/lzma/C/7zBuf2.c
diff --git a/mp/src/utils/lzma/C/7zCrc.c b/src/utils/lzma/C/7zCrc.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zCrc.c
rename to src/utils/lzma/C/7zCrc.c
diff --git a/mp/src/utils/lzma/C/7zCrc.h b/src/utils/lzma/C/7zCrc.h
similarity index 100%
rename from mp/src/utils/lzma/C/7zCrc.h
rename to src/utils/lzma/C/7zCrc.h
diff --git a/mp/src/utils/lzma/C/7zCrcOpt.c b/src/utils/lzma/C/7zCrcOpt.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zCrcOpt.c
rename to src/utils/lzma/C/7zCrcOpt.c
diff --git a/mp/src/utils/lzma/C/7zDec.c b/src/utils/lzma/C/7zDec.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zDec.c
rename to src/utils/lzma/C/7zDec.c
diff --git a/mp/src/utils/lzma/C/7zFile.c b/src/utils/lzma/C/7zFile.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zFile.c
rename to src/utils/lzma/C/7zFile.c
diff --git a/mp/src/utils/lzma/C/7zFile.h b/src/utils/lzma/C/7zFile.h
similarity index 100%
rename from mp/src/utils/lzma/C/7zFile.h
rename to src/utils/lzma/C/7zFile.h
diff --git a/mp/src/utils/lzma/C/7zStream.c b/src/utils/lzma/C/7zStream.c
similarity index 100%
rename from mp/src/utils/lzma/C/7zStream.c
rename to src/utils/lzma/C/7zStream.c
diff --git a/mp/src/utils/lzma/C/7zTypes.h b/src/utils/lzma/C/7zTypes.h
similarity index 100%
rename from mp/src/utils/lzma/C/7zTypes.h
rename to src/utils/lzma/C/7zTypes.h
diff --git a/mp/src/utils/lzma/C/7zVersion.h b/src/utils/lzma/C/7zVersion.h
similarity index 100%
rename from mp/src/utils/lzma/C/7zVersion.h
rename to src/utils/lzma/C/7zVersion.h
diff --git a/mp/src/utils/lzma/C/7zVersion.rc b/src/utils/lzma/C/7zVersion.rc
similarity index 100%
rename from mp/src/utils/lzma/C/7zVersion.rc
rename to src/utils/lzma/C/7zVersion.rc
diff --git a/mp/src/utils/lzma/C/Aes.c b/src/utils/lzma/C/Aes.c
similarity index 100%
rename from mp/src/utils/lzma/C/Aes.c
rename to src/utils/lzma/C/Aes.c
diff --git a/mp/src/utils/lzma/C/Aes.h b/src/utils/lzma/C/Aes.h
similarity index 100%
rename from mp/src/utils/lzma/C/Aes.h
rename to src/utils/lzma/C/Aes.h
diff --git a/mp/src/utils/lzma/C/AesOpt.c b/src/utils/lzma/C/AesOpt.c
similarity index 100%
rename from mp/src/utils/lzma/C/AesOpt.c
rename to src/utils/lzma/C/AesOpt.c
diff --git a/mp/src/utils/lzma/C/Alloc.c b/src/utils/lzma/C/Alloc.c
similarity index 100%
rename from mp/src/utils/lzma/C/Alloc.c
rename to src/utils/lzma/C/Alloc.c
diff --git a/mp/src/utils/lzma/C/Alloc.h b/src/utils/lzma/C/Alloc.h
similarity index 100%
rename from mp/src/utils/lzma/C/Alloc.h
rename to src/utils/lzma/C/Alloc.h
diff --git a/mp/src/utils/lzma/C/Bcj2.c b/src/utils/lzma/C/Bcj2.c
similarity index 100%
rename from mp/src/utils/lzma/C/Bcj2.c
rename to src/utils/lzma/C/Bcj2.c
diff --git a/mp/src/utils/lzma/C/Bcj2.h b/src/utils/lzma/C/Bcj2.h
similarity index 100%
rename from mp/src/utils/lzma/C/Bcj2.h
rename to src/utils/lzma/C/Bcj2.h
diff --git a/mp/src/utils/lzma/C/Bra.c b/src/utils/lzma/C/Bra.c
similarity index 100%
rename from mp/src/utils/lzma/C/Bra.c
rename to src/utils/lzma/C/Bra.c
diff --git a/mp/src/utils/lzma/C/Bra.h b/src/utils/lzma/C/Bra.h
similarity index 100%
rename from mp/src/utils/lzma/C/Bra.h
rename to src/utils/lzma/C/Bra.h
diff --git a/mp/src/utils/lzma/C/Bra86.c b/src/utils/lzma/C/Bra86.c
similarity index 100%
rename from mp/src/utils/lzma/C/Bra86.c
rename to src/utils/lzma/C/Bra86.c
diff --git a/mp/src/utils/lzma/C/BraIA64.c b/src/utils/lzma/C/BraIA64.c
similarity index 100%
rename from mp/src/utils/lzma/C/BraIA64.c
rename to src/utils/lzma/C/BraIA64.c
diff --git a/mp/src/utils/lzma/C/Compiler.h b/src/utils/lzma/C/Compiler.h
similarity index 100%
rename from mp/src/utils/lzma/C/Compiler.h
rename to src/utils/lzma/C/Compiler.h
diff --git a/mp/src/utils/lzma/C/CpuArch.c b/src/utils/lzma/C/CpuArch.c
similarity index 100%
rename from mp/src/utils/lzma/C/CpuArch.c
rename to src/utils/lzma/C/CpuArch.c
diff --git a/mp/src/utils/lzma/C/CpuArch.h b/src/utils/lzma/C/CpuArch.h
similarity index 100%
rename from mp/src/utils/lzma/C/CpuArch.h
rename to src/utils/lzma/C/CpuArch.h
diff --git a/mp/src/utils/lzma/C/Delta.c b/src/utils/lzma/C/Delta.c
similarity index 100%
rename from mp/src/utils/lzma/C/Delta.c
rename to src/utils/lzma/C/Delta.c
diff --git a/mp/src/utils/lzma/C/Delta.h b/src/utils/lzma/C/Delta.h
similarity index 100%
rename from mp/src/utils/lzma/C/Delta.h
rename to src/utils/lzma/C/Delta.h
diff --git a/mp/src/utils/lzma/C/LzFind.c b/src/utils/lzma/C/LzFind.c
similarity index 100%
rename from mp/src/utils/lzma/C/LzFind.c
rename to src/utils/lzma/C/LzFind.c
diff --git a/mp/src/utils/lzma/C/LzFind.h b/src/utils/lzma/C/LzFind.h
similarity index 100%
rename from mp/src/utils/lzma/C/LzFind.h
rename to src/utils/lzma/C/LzFind.h
diff --git a/mp/src/utils/lzma/C/LzFindMt.c b/src/utils/lzma/C/LzFindMt.c
similarity index 100%
rename from mp/src/utils/lzma/C/LzFindMt.c
rename to src/utils/lzma/C/LzFindMt.c
diff --git a/mp/src/utils/lzma/C/LzFindMt.h b/src/utils/lzma/C/LzFindMt.h
similarity index 100%
rename from mp/src/utils/lzma/C/LzFindMt.h
rename to src/utils/lzma/C/LzFindMt.h
diff --git a/mp/src/utils/lzma/C/LzHash.h b/src/utils/lzma/C/LzHash.h
similarity index 100%
rename from mp/src/utils/lzma/C/LzHash.h
rename to src/utils/lzma/C/LzHash.h
diff --git a/mp/src/utils/lzma/C/Lzma2Dec.c b/src/utils/lzma/C/Lzma2Dec.c
similarity index 100%
rename from mp/src/utils/lzma/C/Lzma2Dec.c
rename to src/utils/lzma/C/Lzma2Dec.c
diff --git a/mp/src/utils/lzma/C/Lzma2Dec.h b/src/utils/lzma/C/Lzma2Dec.h
similarity index 100%
rename from mp/src/utils/lzma/C/Lzma2Dec.h
rename to src/utils/lzma/C/Lzma2Dec.h
diff --git a/mp/src/utils/lzma/C/Lzma2Enc.c b/src/utils/lzma/C/Lzma2Enc.c
similarity index 100%
rename from mp/src/utils/lzma/C/Lzma2Enc.c
rename to src/utils/lzma/C/Lzma2Enc.c
diff --git a/mp/src/utils/lzma/C/Lzma2Enc.h b/src/utils/lzma/C/Lzma2Enc.h
similarity index 100%
rename from mp/src/utils/lzma/C/Lzma2Enc.h
rename to src/utils/lzma/C/Lzma2Enc.h
diff --git a/mp/src/utils/lzma/C/Lzma86.h b/src/utils/lzma/C/Lzma86.h
similarity index 100%
rename from mp/src/utils/lzma/C/Lzma86.h
rename to src/utils/lzma/C/Lzma86.h
diff --git a/mp/src/utils/lzma/C/Lzma86Dec.c b/src/utils/lzma/C/Lzma86Dec.c
similarity index 100%
rename from mp/src/utils/lzma/C/Lzma86Dec.c
rename to src/utils/lzma/C/Lzma86Dec.c
diff --git a/mp/src/utils/lzma/C/Lzma86Enc.c b/src/utils/lzma/C/Lzma86Enc.c
similarity index 100%
rename from mp/src/utils/lzma/C/Lzma86Enc.c
rename to src/utils/lzma/C/Lzma86Enc.c
diff --git a/mp/src/utils/lzma/C/LzmaDec.c b/src/utils/lzma/C/LzmaDec.c
similarity index 100%
rename from mp/src/utils/lzma/C/LzmaDec.c
rename to src/utils/lzma/C/LzmaDec.c
diff --git a/mp/src/utils/lzma/C/LzmaDec.h b/src/utils/lzma/C/LzmaDec.h
similarity index 100%
rename from mp/src/utils/lzma/C/LzmaDec.h
rename to src/utils/lzma/C/LzmaDec.h
diff --git a/mp/src/utils/lzma/C/LzmaEnc.c b/src/utils/lzma/C/LzmaEnc.c
similarity index 100%
rename from mp/src/utils/lzma/C/LzmaEnc.c
rename to src/utils/lzma/C/LzmaEnc.c
diff --git a/mp/src/utils/lzma/C/LzmaEnc.h b/src/utils/lzma/C/LzmaEnc.h
similarity index 100%
rename from mp/src/utils/lzma/C/LzmaEnc.h
rename to src/utils/lzma/C/LzmaEnc.h
diff --git a/mp/src/utils/lzma/C/LzmaLib.c b/src/utils/lzma/C/LzmaLib.c
similarity index 100%
rename from mp/src/utils/lzma/C/LzmaLib.c
rename to src/utils/lzma/C/LzmaLib.c
diff --git a/mp/src/utils/lzma/C/LzmaLib.h b/src/utils/lzma/C/LzmaLib.h
similarity index 100%
rename from mp/src/utils/lzma/C/LzmaLib.h
rename to src/utils/lzma/C/LzmaLib.h
diff --git a/mp/src/utils/lzma/C/MtCoder.c b/src/utils/lzma/C/MtCoder.c
similarity index 100%
rename from mp/src/utils/lzma/C/MtCoder.c
rename to src/utils/lzma/C/MtCoder.c
diff --git a/mp/src/utils/lzma/C/MtCoder.h b/src/utils/lzma/C/MtCoder.h
similarity index 100%
rename from mp/src/utils/lzma/C/MtCoder.h
rename to src/utils/lzma/C/MtCoder.h
diff --git a/mp/src/utils/lzma/C/Ppmd.h b/src/utils/lzma/C/Ppmd.h
similarity index 100%
rename from mp/src/utils/lzma/C/Ppmd.h
rename to src/utils/lzma/C/Ppmd.h
diff --git a/mp/src/utils/lzma/C/Ppmd7.c b/src/utils/lzma/C/Ppmd7.c
similarity index 100%
rename from mp/src/utils/lzma/C/Ppmd7.c
rename to src/utils/lzma/C/Ppmd7.c
diff --git a/mp/src/utils/lzma/C/Ppmd7.h b/src/utils/lzma/C/Ppmd7.h
similarity index 100%
rename from mp/src/utils/lzma/C/Ppmd7.h
rename to src/utils/lzma/C/Ppmd7.h
diff --git a/mp/src/utils/lzma/C/Ppmd7Dec.c b/src/utils/lzma/C/Ppmd7Dec.c
similarity index 100%
rename from mp/src/utils/lzma/C/Ppmd7Dec.c
rename to src/utils/lzma/C/Ppmd7Dec.c
diff --git a/mp/src/utils/lzma/C/Ppmd7Enc.c b/src/utils/lzma/C/Ppmd7Enc.c
similarity index 100%
rename from mp/src/utils/lzma/C/Ppmd7Enc.c
rename to src/utils/lzma/C/Ppmd7Enc.c
diff --git a/mp/src/utils/lzma/C/Precomp.h b/src/utils/lzma/C/Precomp.h
similarity index 100%
rename from mp/src/utils/lzma/C/Precomp.h
rename to src/utils/lzma/C/Precomp.h
diff --git a/mp/src/utils/lzma/C/RotateDefs.h b/src/utils/lzma/C/RotateDefs.h
similarity index 100%
rename from mp/src/utils/lzma/C/RotateDefs.h
rename to src/utils/lzma/C/RotateDefs.h
diff --git a/mp/src/utils/lzma/C/Sha256.c b/src/utils/lzma/C/Sha256.c
similarity index 100%
rename from mp/src/utils/lzma/C/Sha256.c
rename to src/utils/lzma/C/Sha256.c
diff --git a/mp/src/utils/lzma/C/Sha256.h b/src/utils/lzma/C/Sha256.h
similarity index 100%
rename from mp/src/utils/lzma/C/Sha256.h
rename to src/utils/lzma/C/Sha256.h
diff --git a/mp/src/utils/lzma/C/Sort.c b/src/utils/lzma/C/Sort.c
similarity index 100%
rename from mp/src/utils/lzma/C/Sort.c
rename to src/utils/lzma/C/Sort.c
diff --git a/mp/src/utils/lzma/C/Sort.h b/src/utils/lzma/C/Sort.h
similarity index 100%
rename from mp/src/utils/lzma/C/Sort.h
rename to src/utils/lzma/C/Sort.h
diff --git a/mp/src/utils/lzma/C/Threads.c b/src/utils/lzma/C/Threads.c
similarity index 100%
rename from mp/src/utils/lzma/C/Threads.c
rename to src/utils/lzma/C/Threads.c
diff --git a/mp/src/utils/lzma/C/Threads.h b/src/utils/lzma/C/Threads.h
similarity index 100%
rename from mp/src/utils/lzma/C/Threads.h
rename to src/utils/lzma/C/Threads.h
diff --git a/mp/src/utils/lzma/C/Util/7z/7z.dsp b/src/utils/lzma/C/Util/7z/7z.dsp
similarity index 100%
rename from mp/src/utils/lzma/C/Util/7z/7z.dsp
rename to src/utils/lzma/C/Util/7z/7z.dsp
diff --git a/mp/src/utils/lzma/C/Util/7z/7z.dsw b/src/utils/lzma/C/Util/7z/7z.dsw
similarity index 100%
rename from mp/src/utils/lzma/C/Util/7z/7z.dsw
rename to src/utils/lzma/C/Util/7z/7z.dsw
diff --git a/mp/src/utils/lzma/C/Util/7z/7zMain.c b/src/utils/lzma/C/Util/7z/7zMain.c
similarity index 100%
rename from mp/src/utils/lzma/C/Util/7z/7zMain.c
rename to src/utils/lzma/C/Util/7z/7zMain.c
diff --git a/mp/src/utils/lzma/C/Util/7z/Precomp.c b/src/utils/lzma/C/Util/7z/Precomp.c
similarity index 100%
rename from mp/src/utils/lzma/C/Util/7z/Precomp.c
rename to src/utils/lzma/C/Util/7z/Precomp.c
diff --git a/mp/src/utils/lzma/C/Util/7z/Precomp.h b/src/utils/lzma/C/Util/7z/Precomp.h
similarity index 100%
rename from mp/src/utils/lzma/C/Util/7z/Precomp.h
rename to src/utils/lzma/C/Util/7z/Precomp.h
diff --git a/mp/src/utils/lzma/C/Util/7z/makefile b/src/utils/lzma/C/Util/7z/makefile
similarity index 100%
rename from mp/src/utils/lzma/C/Util/7z/makefile
rename to src/utils/lzma/C/Util/7z/makefile
diff --git a/mp/src/utils/lzma/C/Util/7z/makefile.gcc b/src/utils/lzma/C/Util/7z/makefile.gcc
similarity index 100%
rename from mp/src/utils/lzma/C/Util/7z/makefile.gcc
rename to src/utils/lzma/C/Util/7z/makefile.gcc
diff --git a/mp/src/utils/lzma/C/Util/Lzma/LzmaUtil.c b/src/utils/lzma/C/Util/Lzma/LzmaUtil.c
similarity index 100%
rename from mp/src/utils/lzma/C/Util/Lzma/LzmaUtil.c
rename to src/utils/lzma/C/Util/Lzma/LzmaUtil.c
diff --git a/mp/src/utils/lzma/C/Util/Lzma/LzmaUtil.dsp b/src/utils/lzma/C/Util/Lzma/LzmaUtil.dsp
similarity index 100%
rename from mp/src/utils/lzma/C/Util/Lzma/LzmaUtil.dsp
rename to src/utils/lzma/C/Util/Lzma/LzmaUtil.dsp
diff --git a/mp/src/utils/lzma/C/Util/Lzma/LzmaUtil.dsw b/src/utils/lzma/C/Util/Lzma/LzmaUtil.dsw
similarity index 100%
rename from mp/src/utils/lzma/C/Util/Lzma/LzmaUtil.dsw
rename to src/utils/lzma/C/Util/Lzma/LzmaUtil.dsw
diff --git a/mp/src/utils/lzma/C/Util/Lzma/makefile b/src/utils/lzma/C/Util/Lzma/makefile
similarity index 100%
rename from mp/src/utils/lzma/C/Util/Lzma/makefile
rename to src/utils/lzma/C/Util/Lzma/makefile
diff --git a/mp/src/utils/lzma/C/Util/Lzma/makefile.gcc b/src/utils/lzma/C/Util/Lzma/makefile.gcc
similarity index 100%
rename from mp/src/utils/lzma/C/Util/Lzma/makefile.gcc
rename to src/utils/lzma/C/Util/Lzma/makefile.gcc
diff --git a/mp/src/utils/lzma/C/Util/LzmaLib/LzmaLib.def b/src/utils/lzma/C/Util/LzmaLib/LzmaLib.def
similarity index 100%
rename from mp/src/utils/lzma/C/Util/LzmaLib/LzmaLib.def
rename to src/utils/lzma/C/Util/LzmaLib/LzmaLib.def
diff --git a/mp/src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsp b/src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsp
similarity index 100%
rename from mp/src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsp
rename to src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsp
diff --git a/mp/src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsw b/src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsw
similarity index 100%
rename from mp/src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsw
rename to src/utils/lzma/C/Util/LzmaLib/LzmaLib.dsw
diff --git a/mp/src/utils/lzma/C/Util/LzmaLib/LzmaLibExports.c b/src/utils/lzma/C/Util/LzmaLib/LzmaLibExports.c
similarity index 100%
rename from mp/src/utils/lzma/C/Util/LzmaLib/LzmaLibExports.c
rename to src/utils/lzma/C/Util/LzmaLib/LzmaLibExports.c
diff --git a/mp/src/utils/lzma/C/Util/LzmaLib/makefile b/src/utils/lzma/C/Util/LzmaLib/makefile
similarity index 100%
rename from mp/src/utils/lzma/C/Util/LzmaLib/makefile
rename to src/utils/lzma/C/Util/LzmaLib/makefile
diff --git a/mp/src/utils/lzma/C/Util/LzmaLib/resource.rc b/src/utils/lzma/C/Util/LzmaLib/resource.rc
similarity index 100%
rename from mp/src/utils/lzma/C/Util/LzmaLib/resource.rc
rename to src/utils/lzma/C/Util/LzmaLib/resource.rc
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/Precomp.c b/src/utils/lzma/C/Util/SfxSetup/Precomp.c
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/Precomp.c
rename to src/utils/lzma/C/Util/SfxSetup/Precomp.c
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/Precomp.h b/src/utils/lzma/C/Util/SfxSetup/Precomp.h
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/Precomp.h
rename to src/utils/lzma/C/Util/SfxSetup/Precomp.h
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/SfxSetup.c b/src/utils/lzma/C/Util/SfxSetup/SfxSetup.c
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/SfxSetup.c
rename to src/utils/lzma/C/Util/SfxSetup/SfxSetup.c
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsp b/src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsp
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsp
rename to src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsp
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsw b/src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsw
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsw
rename to src/utils/lzma/C/Util/SfxSetup/SfxSetup.dsw
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/makefile b/src/utils/lzma/C/Util/SfxSetup/makefile
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/makefile
rename to src/utils/lzma/C/Util/SfxSetup/makefile
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/makefile_con b/src/utils/lzma/C/Util/SfxSetup/makefile_con
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/makefile_con
rename to src/utils/lzma/C/Util/SfxSetup/makefile_con
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/resource.rc b/src/utils/lzma/C/Util/SfxSetup/resource.rc
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/resource.rc
rename to src/utils/lzma/C/Util/SfxSetup/resource.rc
diff --git a/mp/src/utils/lzma/C/Util/SfxSetup/setup.ico b/src/utils/lzma/C/Util/SfxSetup/setup.ico
similarity index 100%
rename from mp/src/utils/lzma/C/Util/SfxSetup/setup.ico
rename to src/utils/lzma/C/Util/SfxSetup/setup.ico
diff --git a/mp/src/utils/lzma/C/Xz.c b/src/utils/lzma/C/Xz.c
similarity index 100%
rename from mp/src/utils/lzma/C/Xz.c
rename to src/utils/lzma/C/Xz.c
diff --git a/mp/src/utils/lzma/C/Xz.h b/src/utils/lzma/C/Xz.h
similarity index 100%
rename from mp/src/utils/lzma/C/Xz.h
rename to src/utils/lzma/C/Xz.h
diff --git a/mp/src/utils/lzma/C/XzCrc64.c b/src/utils/lzma/C/XzCrc64.c
similarity index 100%
rename from mp/src/utils/lzma/C/XzCrc64.c
rename to src/utils/lzma/C/XzCrc64.c
diff --git a/mp/src/utils/lzma/C/XzCrc64.h b/src/utils/lzma/C/XzCrc64.h
similarity index 100%
rename from mp/src/utils/lzma/C/XzCrc64.h
rename to src/utils/lzma/C/XzCrc64.h
diff --git a/mp/src/utils/lzma/C/XzCrc64Opt.c b/src/utils/lzma/C/XzCrc64Opt.c
similarity index 100%
rename from mp/src/utils/lzma/C/XzCrc64Opt.c
rename to src/utils/lzma/C/XzCrc64Opt.c
diff --git a/mp/src/utils/lzma/C/XzDec.c b/src/utils/lzma/C/XzDec.c
similarity index 100%
rename from mp/src/utils/lzma/C/XzDec.c
rename to src/utils/lzma/C/XzDec.c
diff --git a/mp/src/utils/lzma/C/XzEnc.c b/src/utils/lzma/C/XzEnc.c
similarity index 100%
rename from mp/src/utils/lzma/C/XzEnc.c
rename to src/utils/lzma/C/XzEnc.c
diff --git a/mp/src/utils/lzma/C/XzEnc.h b/src/utils/lzma/C/XzEnc.h
similarity index 100%
rename from mp/src/utils/lzma/C/XzEnc.h
rename to src/utils/lzma/C/XzEnc.h
diff --git a/mp/src/utils/lzma/C/XzIn.c b/src/utils/lzma/C/XzIn.c
similarity index 100%
rename from mp/src/utils/lzma/C/XzIn.c
rename to src/utils/lzma/C/XzIn.c
diff --git a/mp/src/utils/motionmapper/motionmapper.cpp b/src/utils/motionmapper/motionmapper.cpp
similarity index 100%
rename from mp/src/utils/motionmapper/motionmapper.cpp
rename to src/utils/motionmapper/motionmapper.cpp
diff --git a/mp/src/utils/motionmapper/motionmapper.h b/src/utils/motionmapper/motionmapper.h
similarity index 100%
rename from mp/src/utils/motionmapper/motionmapper.h
rename to src/utils/motionmapper/motionmapper.h
diff --git a/mp/src/utils/motionmapper/motionmapper.vpc b/src/utils/motionmapper/motionmapper.vpc
similarity index 100%
rename from mp/src/utils/motionmapper/motionmapper.vpc
rename to src/utils/motionmapper/motionmapper.vpc
diff --git a/mp/src/utils/nvtristriplib/nvtristrip.h b/src/utils/nvtristriplib/nvtristrip.h
similarity index 100%
rename from mp/src/utils/nvtristriplib/nvtristrip.h
rename to src/utils/nvtristriplib/nvtristrip.h
diff --git a/mp/src/utils/phonemeextractor/extractor_utils.cpp b/src/utils/phonemeextractor/extractor_utils.cpp
similarity index 100%
rename from mp/src/utils/phonemeextractor/extractor_utils.cpp
rename to src/utils/phonemeextractor/extractor_utils.cpp
diff --git a/mp/src/utils/phonemeextractor/phonemeextractor.cpp b/src/utils/phonemeextractor/phonemeextractor.cpp
similarity index 100%
rename from mp/src/utils/phonemeextractor/phonemeextractor.cpp
rename to src/utils/phonemeextractor/phonemeextractor.cpp
diff --git a/mp/src/utils/phonemeextractor/phonemeextractor.vpc b/src/utils/phonemeextractor/phonemeextractor.vpc
similarity index 100%
rename from mp/src/utils/phonemeextractor/phonemeextractor.vpc
rename to src/utils/phonemeextractor/phonemeextractor.vpc
diff --git a/mp/src/utils/phonemeextractor/phonemeextractor_ims.cpp b/src/utils/phonemeextractor/phonemeextractor_ims.cpp
similarity index 100%
rename from mp/src/utils/phonemeextractor/phonemeextractor_ims.cpp
rename to src/utils/phonemeextractor/phonemeextractor_ims.cpp
diff --git a/mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc b/src/utils/phonemeextractor/phonemeextractor_ims.vpc
similarity index 100%
rename from mp/src/utils/phonemeextractor/phonemeextractor_ims.vpc
rename to src/utils/phonemeextractor/phonemeextractor_ims.vpc
diff --git a/mp/src/utils/phonemeextractor/talkback.doc b/src/utils/phonemeextractor/talkback.doc
similarity index 100%
rename from mp/src/utils/phonemeextractor/talkback.doc
rename to src/utils/phonemeextractor/talkback.doc
diff --git a/mp/src/utils/phonemeextractor/talkback.h b/src/utils/phonemeextractor/talkback.h
similarity index 100%
rename from mp/src/utils/phonemeextractor/talkback.h
rename to src/utils/phonemeextractor/talkback.h
diff --git a/mp/src/utils/qc_eyes/QC_Eyes.cpp b/src/utils/qc_eyes/QC_Eyes.cpp
similarity index 100%
rename from mp/src/utils/qc_eyes/QC_Eyes.cpp
rename to src/utils/qc_eyes/QC_Eyes.cpp
diff --git a/mp/src/utils/qc_eyes/QC_Eyes.h b/src/utils/qc_eyes/QC_Eyes.h
similarity index 100%
rename from mp/src/utils/qc_eyes/QC_Eyes.h
rename to src/utils/qc_eyes/QC_Eyes.h
diff --git a/mp/src/utils/qc_eyes/QC_Eyes.rc b/src/utils/qc_eyes/QC_Eyes.rc
similarity index 100%
rename from mp/src/utils/qc_eyes/QC_Eyes.rc
rename to src/utils/qc_eyes/QC_Eyes.rc
diff --git a/mp/src/utils/qc_eyes/QC_EyesDlg.cpp b/src/utils/qc_eyes/QC_EyesDlg.cpp
similarity index 100%
rename from mp/src/utils/qc_eyes/QC_EyesDlg.cpp
rename to src/utils/qc_eyes/QC_EyesDlg.cpp
diff --git a/mp/src/utils/qc_eyes/QC_EyesDlg.h b/src/utils/qc_eyes/QC_EyesDlg.h
similarity index 100%
rename from mp/src/utils/qc_eyes/QC_EyesDlg.h
rename to src/utils/qc_eyes/QC_EyesDlg.h
diff --git a/mp/src/utils/qc_eyes/StdAfx.cpp b/src/utils/qc_eyes/StdAfx.cpp
similarity index 100%
rename from mp/src/utils/qc_eyes/StdAfx.cpp
rename to src/utils/qc_eyes/StdAfx.cpp
diff --git a/mp/src/utils/qc_eyes/StdAfx.h b/src/utils/qc_eyes/StdAfx.h
similarity index 100%
rename from mp/src/utils/qc_eyes/StdAfx.h
rename to src/utils/qc_eyes/StdAfx.h
diff --git a/mp/src/utils/qc_eyes/qc_eyes.vpc b/src/utils/qc_eyes/qc_eyes.vpc
similarity index 100%
rename from mp/src/utils/qc_eyes/qc_eyes.vpc
rename to src/utils/qc_eyes/qc_eyes.vpc
diff --git a/mp/src/utils/qc_eyes/res/QC_Eyes.ico b/src/utils/qc_eyes/res/QC_Eyes.ico
similarity index 100%
rename from mp/src/utils/qc_eyes/res/QC_Eyes.ico
rename to src/utils/qc_eyes/res/QC_Eyes.ico
diff --git a/mp/src/utils/qc_eyes/res/QC_Eyes.rc2 b/src/utils/qc_eyes/res/QC_Eyes.rc2
similarity index 100%
rename from mp/src/utils/qc_eyes/res/QC_Eyes.rc2
rename to src/utils/qc_eyes/res/QC_Eyes.rc2
diff --git a/mp/src/utils/qc_eyes/res/eye_XY_L.bmp b/src/utils/qc_eyes/res/eye_XY_L.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_XY_L.bmp
rename to src/utils/qc_eyes/res/eye_XY_L.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_XY_R.bmp b/src/utils/qc_eyes/res/eye_XY_R.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_XY_R.bmp
rename to src/utils/qc_eyes/res/eye_XY_R.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_Z_L.bmp b/src/utils/qc_eyes/res/eye_Z_L.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_Z_L.bmp
rename to src/utils/qc_eyes/res/eye_Z_L.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_Z_R.bmp b/src/utils/qc_eyes/res/eye_Z_R.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_Z_R.bmp
rename to src/utils/qc_eyes/res/eye_Z_R.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_default.bmp b/src/utils/qc_eyes/res/eye_default.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_default.bmp
rename to src/utils/qc_eyes/res/eye_default.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_lower_hi.bmp b/src/utils/qc_eyes/res/eye_lower_hi.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_lower_hi.bmp
rename to src/utils/qc_eyes/res/eye_lower_hi.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_lower_lo.bmp b/src/utils/qc_eyes/res/eye_lower_lo.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_lower_lo.bmp
rename to src/utils/qc_eyes/res/eye_lower_lo.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_lower_mid.bmp b/src/utils/qc_eyes/res/eye_lower_mid.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_lower_mid.bmp
rename to src/utils/qc_eyes/res/eye_lower_mid.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_upper_hi.bmp b/src/utils/qc_eyes/res/eye_upper_hi.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_upper_hi.bmp
rename to src/utils/qc_eyes/res/eye_upper_hi.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_upper_lo.bmp b/src/utils/qc_eyes/res/eye_upper_lo.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_upper_lo.bmp
rename to src/utils/qc_eyes/res/eye_upper_lo.bmp
diff --git a/mp/src/utils/qc_eyes/res/eye_upper_mid.bmp b/src/utils/qc_eyes/res/eye_upper_mid.bmp
similarity index 100%
rename from mp/src/utils/qc_eyes/res/eye_upper_mid.bmp
rename to src/utils/qc_eyes/res/eye_upper_mid.bmp
diff --git a/mp/src/utils/qc_eyes/resource.h b/src/utils/qc_eyes/resource.h
similarity index 100%
rename from mp/src/utils/qc_eyes/resource.h
rename to src/utils/qc_eyes/resource.h
diff --git a/mp/src/utils/serverplugin_sample/serverplugin_bot.cpp b/src/utils/serverplugin_sample/serverplugin_bot.cpp
similarity index 100%
rename from mp/src/utils/serverplugin_sample/serverplugin_bot.cpp
rename to src/utils/serverplugin_sample/serverplugin_bot.cpp
diff --git a/mp/src/utils/serverplugin_sample/serverplugin_empty.cpp b/src/utils/serverplugin_sample/serverplugin_empty.cpp
similarity index 100%
rename from mp/src/utils/serverplugin_sample/serverplugin_empty.cpp
rename to src/utils/serverplugin_sample/serverplugin_empty.cpp
diff --git a/mp/src/utils/serverplugin_sample/serverplugin_empty.vpc b/src/utils/serverplugin_sample/serverplugin_empty.vpc
similarity index 100%
rename from mp/src/utils/serverplugin_sample/serverplugin_empty.vpc
rename to src/utils/serverplugin_sample/serverplugin_empty.vpc
diff --git a/mp/src/utils/smdlexp/smdlexp.cpp b/src/utils/smdlexp/smdlexp.cpp
similarity index 100%
rename from mp/src/utils/smdlexp/smdlexp.cpp
rename to src/utils/smdlexp/smdlexp.cpp
diff --git a/mp/src/utils/smdlexp/smdlexp.def b/src/utils/smdlexp/smdlexp.def
similarity index 100%
rename from mp/src/utils/smdlexp/smdlexp.def
rename to src/utils/smdlexp/smdlexp.def
diff --git a/mp/src/utils/smdlexp/smdlexp.mak b/src/utils/smdlexp/smdlexp.mak
similarity index 100%
rename from mp/src/utils/smdlexp/smdlexp.mak
rename to src/utils/smdlexp/smdlexp.mak
diff --git a/mp/src/utils/smdlexp/smdlexp.rc b/src/utils/smdlexp/smdlexp.rc
similarity index 100%
rename from mp/src/utils/smdlexp/smdlexp.rc
rename to src/utils/smdlexp/smdlexp.rc
diff --git a/mp/src/utils/smdlexp/smdlexp.vcproj b/src/utils/smdlexp/smdlexp.vcproj
similarity index 100%
rename from mp/src/utils/smdlexp/smdlexp.vcproj
rename to src/utils/smdlexp/smdlexp.vcproj
diff --git a/mp/src/utils/smdlexp/smedefs.h b/src/utils/smdlexp/smedefs.h
similarity index 100%
rename from mp/src/utils/smdlexp/smedefs.h
rename to src/utils/smdlexp/smedefs.h
diff --git a/mp/src/utils/smdlexp/smexprc.h b/src/utils/smdlexp/smexprc.h
similarity index 100%
rename from mp/src/utils/smdlexp/smexprc.h
rename to src/utils/smdlexp/smexprc.h
diff --git a/mp/src/utils/tgadiff/tgadiff.cpp b/src/utils/tgadiff/tgadiff.cpp
similarity index 100%
rename from mp/src/utils/tgadiff/tgadiff.cpp
rename to src/utils/tgadiff/tgadiff.cpp
diff --git a/mp/src/utils/tgadiff/tgadiff.vpc b/src/utils/tgadiff/tgadiff.vpc
similarity index 100%
rename from mp/src/utils/tgadiff/tgadiff.vpc
rename to src/utils/tgadiff/tgadiff.vpc
diff --git a/mp/src/utils/vbsp/boundbox.cpp b/src/utils/vbsp/boundbox.cpp
similarity index 100%
rename from mp/src/utils/vbsp/boundbox.cpp
rename to src/utils/vbsp/boundbox.cpp
diff --git a/mp/src/utils/vbsp/boundbox.h b/src/utils/vbsp/boundbox.h
similarity index 100%
rename from mp/src/utils/vbsp/boundbox.h
rename to src/utils/vbsp/boundbox.h
diff --git a/mp/src/utils/vbsp/brushbsp.cpp b/src/utils/vbsp/brushbsp.cpp
similarity index 100%
rename from mp/src/utils/vbsp/brushbsp.cpp
rename to src/utils/vbsp/brushbsp.cpp
diff --git a/mp/src/utils/vbsp/csg.cpp b/src/utils/vbsp/csg.cpp
similarity index 100%
rename from mp/src/utils/vbsp/csg.cpp
rename to src/utils/vbsp/csg.cpp
diff --git a/mp/src/utils/vbsp/csg.h b/src/utils/vbsp/csg.h
similarity index 100%
rename from mp/src/utils/vbsp/csg.h
rename to src/utils/vbsp/csg.h
diff --git a/mp/src/utils/vbsp/cubemap.cpp b/src/utils/vbsp/cubemap.cpp
similarity index 100%
rename from mp/src/utils/vbsp/cubemap.cpp
rename to src/utils/vbsp/cubemap.cpp
diff --git a/mp/src/utils/vbsp/detail.cpp b/src/utils/vbsp/detail.cpp
similarity index 100%
rename from mp/src/utils/vbsp/detail.cpp
rename to src/utils/vbsp/detail.cpp
diff --git a/mp/src/utils/vbsp/detail.h b/src/utils/vbsp/detail.h
similarity index 100%
rename from mp/src/utils/vbsp/detail.h
rename to src/utils/vbsp/detail.h
diff --git a/mp/src/utils/vbsp/detailobjects.cpp b/src/utils/vbsp/detailobjects.cpp
similarity index 100%
rename from mp/src/utils/vbsp/detailobjects.cpp
rename to src/utils/vbsp/detailobjects.cpp
diff --git a/mp/src/utils/vbsp/disp_ivp.cpp b/src/utils/vbsp/disp_ivp.cpp
similarity index 100%
rename from mp/src/utils/vbsp/disp_ivp.cpp
rename to src/utils/vbsp/disp_ivp.cpp
diff --git a/mp/src/utils/vbsp/disp_ivp.h b/src/utils/vbsp/disp_ivp.h
similarity index 100%
rename from mp/src/utils/vbsp/disp_ivp.h
rename to src/utils/vbsp/disp_ivp.h
diff --git a/mp/src/utils/vbsp/disp_vbsp.cpp b/src/utils/vbsp/disp_vbsp.cpp
similarity index 100%
rename from mp/src/utils/vbsp/disp_vbsp.cpp
rename to src/utils/vbsp/disp_vbsp.cpp
diff --git a/mp/src/utils/vbsp/disp_vbsp.h b/src/utils/vbsp/disp_vbsp.h
similarity index 100%
rename from mp/src/utils/vbsp/disp_vbsp.h
rename to src/utils/vbsp/disp_vbsp.h
diff --git a/mp/src/utils/vbsp/faces.cpp b/src/utils/vbsp/faces.cpp
similarity index 100%
rename from mp/src/utils/vbsp/faces.cpp
rename to src/utils/vbsp/faces.cpp
diff --git a/mp/src/utils/vbsp/faces.h b/src/utils/vbsp/faces.h
similarity index 100%
rename from mp/src/utils/vbsp/faces.h
rename to src/utils/vbsp/faces.h
diff --git a/mp/src/utils/vbsp/glfile.cpp b/src/utils/vbsp/glfile.cpp
similarity index 100%
rename from mp/src/utils/vbsp/glfile.cpp
rename to src/utils/vbsp/glfile.cpp
diff --git a/mp/src/utils/vbsp/ivp.cpp b/src/utils/vbsp/ivp.cpp
similarity index 100%
rename from mp/src/utils/vbsp/ivp.cpp
rename to src/utils/vbsp/ivp.cpp
diff --git a/mp/src/utils/vbsp/ivp.h b/src/utils/vbsp/ivp.h
similarity index 100%
rename from mp/src/utils/vbsp/ivp.h
rename to src/utils/vbsp/ivp.h
diff --git a/mp/src/utils/vbsp/leakfile.cpp b/src/utils/vbsp/leakfile.cpp
similarity index 100%
rename from mp/src/utils/vbsp/leakfile.cpp
rename to src/utils/vbsp/leakfile.cpp
diff --git a/mp/src/utils/vbsp/manifest.cpp b/src/utils/vbsp/manifest.cpp
similarity index 100%
rename from mp/src/utils/vbsp/manifest.cpp
rename to src/utils/vbsp/manifest.cpp
diff --git a/mp/src/utils/vbsp/manifest.h b/src/utils/vbsp/manifest.h
similarity index 100%
rename from mp/src/utils/vbsp/manifest.h
rename to src/utils/vbsp/manifest.h
diff --git a/mp/src/utils/vbsp/map.cpp b/src/utils/vbsp/map.cpp
similarity index 100%
rename from mp/src/utils/vbsp/map.cpp
rename to src/utils/vbsp/map.cpp
diff --git a/mp/src/utils/vbsp/map.h b/src/utils/vbsp/map.h
similarity index 100%
rename from mp/src/utils/vbsp/map.h
rename to src/utils/vbsp/map.h
diff --git a/mp/src/utils/vbsp/materialpatch.cpp b/src/utils/vbsp/materialpatch.cpp
similarity index 100%
rename from mp/src/utils/vbsp/materialpatch.cpp
rename to src/utils/vbsp/materialpatch.cpp
diff --git a/mp/src/utils/vbsp/materialpatch.h b/src/utils/vbsp/materialpatch.h
similarity index 100%
rename from mp/src/utils/vbsp/materialpatch.h
rename to src/utils/vbsp/materialpatch.h
diff --git a/mp/src/utils/vbsp/materialsub.cpp b/src/utils/vbsp/materialsub.cpp
similarity index 100%
rename from mp/src/utils/vbsp/materialsub.cpp
rename to src/utils/vbsp/materialsub.cpp
diff --git a/mp/src/utils/vbsp/materialsub.h b/src/utils/vbsp/materialsub.h
similarity index 100%
rename from mp/src/utils/vbsp/materialsub.h
rename to src/utils/vbsp/materialsub.h
diff --git a/mp/src/utils/vbsp/nodraw.cpp b/src/utils/vbsp/nodraw.cpp
similarity index 100%
rename from mp/src/utils/vbsp/nodraw.cpp
rename to src/utils/vbsp/nodraw.cpp
diff --git a/mp/src/utils/vbsp/normals.cpp b/src/utils/vbsp/normals.cpp
similarity index 100%
rename from mp/src/utils/vbsp/normals.cpp
rename to src/utils/vbsp/normals.cpp
diff --git a/mp/src/utils/vbsp/notes.txt b/src/utils/vbsp/notes.txt
similarity index 100%
rename from mp/src/utils/vbsp/notes.txt
rename to src/utils/vbsp/notes.txt
diff --git a/mp/src/utils/vbsp/overlay.cpp b/src/utils/vbsp/overlay.cpp
similarity index 100%
rename from mp/src/utils/vbsp/overlay.cpp
rename to src/utils/vbsp/overlay.cpp
diff --git a/mp/src/utils/vbsp/portals.cpp b/src/utils/vbsp/portals.cpp
similarity index 100%
rename from mp/src/utils/vbsp/portals.cpp
rename to src/utils/vbsp/portals.cpp
diff --git a/mp/src/utils/vbsp/portals.h b/src/utils/vbsp/portals.h
similarity index 100%
rename from mp/src/utils/vbsp/portals.h
rename to src/utils/vbsp/portals.h
diff --git a/mp/src/utils/vbsp/prtfile.cpp b/src/utils/vbsp/prtfile.cpp
similarity index 100%
rename from mp/src/utils/vbsp/prtfile.cpp
rename to src/utils/vbsp/prtfile.cpp
diff --git a/mp/src/utils/vbsp/staticprop.cpp b/src/utils/vbsp/staticprop.cpp
similarity index 100%
rename from mp/src/utils/vbsp/staticprop.cpp
rename to src/utils/vbsp/staticprop.cpp
diff --git a/mp/src/utils/vbsp/textures.cpp b/src/utils/vbsp/textures.cpp
similarity index 100%
rename from mp/src/utils/vbsp/textures.cpp
rename to src/utils/vbsp/textures.cpp
diff --git a/mp/src/utils/vbsp/tree.cpp b/src/utils/vbsp/tree.cpp
similarity index 100%
rename from mp/src/utils/vbsp/tree.cpp
rename to src/utils/vbsp/tree.cpp
diff --git a/mp/src/utils/vbsp/vbsp.cpp b/src/utils/vbsp/vbsp.cpp
similarity index 100%
rename from mp/src/utils/vbsp/vbsp.cpp
rename to src/utils/vbsp/vbsp.cpp
diff --git a/mp/src/utils/vbsp/vbsp.h b/src/utils/vbsp/vbsp.h
similarity index 100%
rename from mp/src/utils/vbsp/vbsp.h
rename to src/utils/vbsp/vbsp.h
diff --git a/mp/src/utils/vbsp/vbsp.vpc b/src/utils/vbsp/vbsp.vpc
similarity index 100%
rename from mp/src/utils/vbsp/vbsp.vpc
rename to src/utils/vbsp/vbsp.vpc
diff --git a/mp/src/utils/vbsp/worldvertextransitionfixup.cpp b/src/utils/vbsp/worldvertextransitionfixup.cpp
similarity index 100%
rename from mp/src/utils/vbsp/worldvertextransitionfixup.cpp
rename to src/utils/vbsp/worldvertextransitionfixup.cpp
diff --git a/mp/src/utils/vbsp/worldvertextransitionfixup.h b/src/utils/vbsp/worldvertextransitionfixup.h
similarity index 100%
rename from mp/src/utils/vbsp/worldvertextransitionfixup.h
rename to src/utils/vbsp/worldvertextransitionfixup.h
diff --git a/mp/src/utils/vbsp/writebsp.cpp b/src/utils/vbsp/writebsp.cpp
similarity index 100%
rename from mp/src/utils/vbsp/writebsp.cpp
rename to src/utils/vbsp/writebsp.cpp
diff --git a/mp/src/utils/vbsp/writebsp.h b/src/utils/vbsp/writebsp.h
similarity index 100%
rename from mp/src/utils/vbsp/writebsp.h
rename to src/utils/vbsp/writebsp.h
diff --git a/mp/src/utils/vice/vice.cpp b/src/utils/vice/vice.cpp
similarity index 100%
rename from mp/src/utils/vice/vice.cpp
rename to src/utils/vice/vice.cpp
diff --git a/mp/src/utils/vice/vice.vpc b/src/utils/vice/vice.vpc
similarity index 100%
rename from mp/src/utils/vice/vice.vpc
rename to src/utils/vice/vice.vpc
diff --git a/mp/src/utils/vmpi/ichannel.h b/src/utils/vmpi/ichannel.h
similarity index 100%
rename from mp/src/utils/vmpi/ichannel.h
rename to src/utils/vmpi/ichannel.h
diff --git a/mp/src/utils/vmpi/imysqlwrapper.h b/src/utils/vmpi/imysqlwrapper.h
similarity index 100%
rename from mp/src/utils/vmpi/imysqlwrapper.h
rename to src/utils/vmpi/imysqlwrapper.h
diff --git a/mp/src/utils/vmpi/iphelpers.h b/src/utils/vmpi/iphelpers.h
similarity index 100%
rename from mp/src/utils/vmpi/iphelpers.h
rename to src/utils/vmpi/iphelpers.h
diff --git a/mp/src/utils/vmpi/messbuf.h b/src/utils/vmpi/messbuf.h
similarity index 100%
rename from mp/src/utils/vmpi/messbuf.h
rename to src/utils/vmpi/messbuf.h
diff --git a/mp/src/utils/vmpi/threadhelpers.h b/src/utils/vmpi/threadhelpers.h
similarity index 100%
rename from mp/src/utils/vmpi/threadhelpers.h
rename to src/utils/vmpi/threadhelpers.h
diff --git a/mp/src/utils/vmpi/vmpi.h b/src/utils/vmpi/vmpi.h
similarity index 100%
rename from mp/src/utils/vmpi/vmpi.h
rename to src/utils/vmpi/vmpi.h
diff --git a/mp/src/utils/vmpi/vmpi_defs.h b/src/utils/vmpi/vmpi_defs.h
similarity index 100%
rename from mp/src/utils/vmpi/vmpi_defs.h
rename to src/utils/vmpi/vmpi_defs.h
diff --git a/mp/src/utils/vmpi/vmpi_dispatch.h b/src/utils/vmpi/vmpi_dispatch.h
similarity index 100%
rename from mp/src/utils/vmpi/vmpi_dispatch.h
rename to src/utils/vmpi/vmpi_dispatch.h
diff --git a/mp/src/utils/vmpi/vmpi_distribute_work.h b/src/utils/vmpi/vmpi_distribute_work.h
similarity index 100%
rename from mp/src/utils/vmpi/vmpi_distribute_work.h
rename to src/utils/vmpi/vmpi_distribute_work.h
diff --git a/mp/src/utils/vmpi/vmpi_filesystem.h b/src/utils/vmpi/vmpi_filesystem.h
similarity index 100%
rename from mp/src/utils/vmpi/vmpi_filesystem.h
rename to src/utils/vmpi/vmpi_filesystem.h
diff --git a/mp/src/utils/vmpi/vmpi_parameters.h b/src/utils/vmpi/vmpi_parameters.h
similarity index 100%
rename from mp/src/utils/vmpi/vmpi_parameters.h
rename to src/utils/vmpi/vmpi_parameters.h
diff --git a/mp/src/utils/vrad/disp_vrad.cpp b/src/utils/vrad/disp_vrad.cpp
similarity index 100%
rename from mp/src/utils/vrad/disp_vrad.cpp
rename to src/utils/vrad/disp_vrad.cpp
diff --git a/mp/src/utils/vrad/disp_vrad.h b/src/utils/vrad/disp_vrad.h
similarity index 100%
rename from mp/src/utils/vrad/disp_vrad.h
rename to src/utils/vrad/disp_vrad.h
diff --git a/mp/src/utils/vrad/iincremental.h b/src/utils/vrad/iincremental.h
similarity index 100%
rename from mp/src/utils/vrad/iincremental.h
rename to src/utils/vrad/iincremental.h
diff --git a/mp/src/utils/vrad/imagepacker.cpp b/src/utils/vrad/imagepacker.cpp
similarity index 100%
rename from mp/src/utils/vrad/imagepacker.cpp
rename to src/utils/vrad/imagepacker.cpp
diff --git a/mp/src/utils/vrad/imagepacker.h b/src/utils/vrad/imagepacker.h
similarity index 100%
rename from mp/src/utils/vrad/imagepacker.h
rename to src/utils/vrad/imagepacker.h
diff --git a/mp/src/utils/vrad/incremental.cpp b/src/utils/vrad/incremental.cpp
similarity index 100%
rename from mp/src/utils/vrad/incremental.cpp
rename to src/utils/vrad/incremental.cpp
diff --git a/mp/src/utils/vrad/incremental.h b/src/utils/vrad/incremental.h
similarity index 100%
rename from mp/src/utils/vrad/incremental.h
rename to src/utils/vrad/incremental.h
diff --git a/mp/src/utils/vrad/leaf_ambient_lighting.cpp b/src/utils/vrad/leaf_ambient_lighting.cpp
similarity index 100%
rename from mp/src/utils/vrad/leaf_ambient_lighting.cpp
rename to src/utils/vrad/leaf_ambient_lighting.cpp
diff --git a/mp/src/utils/vrad/leaf_ambient_lighting.h b/src/utils/vrad/leaf_ambient_lighting.h
similarity index 100%
rename from mp/src/utils/vrad/leaf_ambient_lighting.h
rename to src/utils/vrad/leaf_ambient_lighting.h
diff --git a/mp/src/utils/vrad/lightmap.cpp b/src/utils/vrad/lightmap.cpp
similarity index 100%
rename from mp/src/utils/vrad/lightmap.cpp
rename to src/utils/vrad/lightmap.cpp
diff --git a/mp/src/utils/vrad/lightmap.h b/src/utils/vrad/lightmap.h
similarity index 100%
rename from mp/src/utils/vrad/lightmap.h
rename to src/utils/vrad/lightmap.h
diff --git a/mp/src/utils/vrad/macro_texture.cpp b/src/utils/vrad/macro_texture.cpp
similarity index 100%
rename from mp/src/utils/vrad/macro_texture.cpp
rename to src/utils/vrad/macro_texture.cpp
diff --git a/mp/src/utils/vrad/macro_texture.h b/src/utils/vrad/macro_texture.h
similarity index 100%
rename from mp/src/utils/vrad/macro_texture.h
rename to src/utils/vrad/macro_texture.h
diff --git a/mp/src/utils/vrad/mpivrad.cpp b/src/utils/vrad/mpivrad.cpp
similarity index 100%
rename from mp/src/utils/vrad/mpivrad.cpp
rename to src/utils/vrad/mpivrad.cpp
diff --git a/mp/src/utils/vrad/mpivrad.h b/src/utils/vrad/mpivrad.h
similarity index 100%
rename from mp/src/utils/vrad/mpivrad.h
rename to src/utils/vrad/mpivrad.h
diff --git a/mp/src/utils/vrad/notes.txt b/src/utils/vrad/notes.txt
similarity index 100%
rename from mp/src/utils/vrad/notes.txt
rename to src/utils/vrad/notes.txt
diff --git a/mp/src/utils/vrad/origface.cpp b/src/utils/vrad/origface.cpp
similarity index 100%
rename from mp/src/utils/vrad/origface.cpp
rename to src/utils/vrad/origface.cpp
diff --git a/mp/src/utils/vrad/radial.cpp b/src/utils/vrad/radial.cpp
similarity index 100%
rename from mp/src/utils/vrad/radial.cpp
rename to src/utils/vrad/radial.cpp
diff --git a/mp/src/utils/vrad/radial.h b/src/utils/vrad/radial.h
similarity index 100%
rename from mp/src/utils/vrad/radial.h
rename to src/utils/vrad/radial.h
diff --git a/mp/src/utils/vrad/samplehash.cpp b/src/utils/vrad/samplehash.cpp
similarity index 100%
rename from mp/src/utils/vrad/samplehash.cpp
rename to src/utils/vrad/samplehash.cpp
diff --git a/mp/src/utils/vrad/trace.cpp b/src/utils/vrad/trace.cpp
similarity index 100%
rename from mp/src/utils/vrad/trace.cpp
rename to src/utils/vrad/trace.cpp
diff --git a/mp/src/utils/vrad/vismat.cpp b/src/utils/vrad/vismat.cpp
similarity index 100%
rename from mp/src/utils/vrad/vismat.cpp
rename to src/utils/vrad/vismat.cpp
diff --git a/mp/src/utils/vrad/vismat.h b/src/utils/vrad/vismat.h
similarity index 100%
rename from mp/src/utils/vrad/vismat.h
rename to src/utils/vrad/vismat.h
diff --git a/mp/src/utils/vrad/vrad.cpp b/src/utils/vrad/vrad.cpp
similarity index 100%
rename from mp/src/utils/vrad/vrad.cpp
rename to src/utils/vrad/vrad.cpp
diff --git a/mp/src/utils/vrad/vrad.h b/src/utils/vrad/vrad.h
similarity index 100%
rename from mp/src/utils/vrad/vrad.h
rename to src/utils/vrad/vrad.h
diff --git a/mp/src/utils/vrad/vrad_dispcoll.cpp b/src/utils/vrad/vrad_dispcoll.cpp
similarity index 100%
rename from mp/src/utils/vrad/vrad_dispcoll.cpp
rename to src/utils/vrad/vrad_dispcoll.cpp
diff --git a/mp/src/utils/vrad/vrad_dispcoll.h b/src/utils/vrad/vrad_dispcoll.h
similarity index 100%
rename from mp/src/utils/vrad/vrad_dispcoll.h
rename to src/utils/vrad/vrad_dispcoll.h
diff --git a/mp/src/utils/vrad/vrad_dll.vpc b/src/utils/vrad/vrad_dll.vpc
similarity index 100%
rename from mp/src/utils/vrad/vrad_dll.vpc
rename to src/utils/vrad/vrad_dll.vpc
diff --git a/mp/src/utils/vrad/vraddetailprops.cpp b/src/utils/vrad/vraddetailprops.cpp
similarity index 100%
rename from mp/src/utils/vrad/vraddetailprops.cpp
rename to src/utils/vrad/vraddetailprops.cpp
diff --git a/mp/src/utils/vrad/vraddetailprops.h b/src/utils/vrad/vraddetailprops.h
similarity index 100%
rename from mp/src/utils/vrad/vraddetailprops.h
rename to src/utils/vrad/vraddetailprops.h
diff --git a/mp/src/utils/vrad/vraddisps.cpp b/src/utils/vrad/vraddisps.cpp
similarity index 100%
rename from mp/src/utils/vrad/vraddisps.cpp
rename to src/utils/vrad/vraddisps.cpp
diff --git a/mp/src/utils/vrad/vraddll.cpp b/src/utils/vrad/vraddll.cpp
similarity index 100%
rename from mp/src/utils/vrad/vraddll.cpp
rename to src/utils/vrad/vraddll.cpp
diff --git a/mp/src/utils/vrad/vraddll.h b/src/utils/vrad/vraddll.h
similarity index 100%
rename from mp/src/utils/vrad/vraddll.h
rename to src/utils/vrad/vraddll.h
diff --git a/mp/src/utils/vrad/vradstaticprops.cpp b/src/utils/vrad/vradstaticprops.cpp
similarity index 100%
rename from mp/src/utils/vrad/vradstaticprops.cpp
rename to src/utils/vrad/vradstaticprops.cpp
diff --git a/mp/src/utils/vrad_launcher/stdafx.cpp b/src/utils/vrad_launcher/stdafx.cpp
similarity index 100%
rename from mp/src/utils/vrad_launcher/stdafx.cpp
rename to src/utils/vrad_launcher/stdafx.cpp
diff --git a/mp/src/utils/vrad_launcher/stdafx.h b/src/utils/vrad_launcher/stdafx.h
similarity index 100%
rename from mp/src/utils/vrad_launcher/stdafx.h
rename to src/utils/vrad_launcher/stdafx.h
diff --git a/mp/src/utils/vrad_launcher/vrad_launcher.cpp b/src/utils/vrad_launcher/vrad_launcher.cpp
similarity index 100%
rename from mp/src/utils/vrad_launcher/vrad_launcher.cpp
rename to src/utils/vrad_launcher/vrad_launcher.cpp
diff --git a/mp/src/utils/vrad_launcher/vrad_launcher.vpc b/src/utils/vrad_launcher/vrad_launcher.vpc
similarity index 100%
rename from mp/src/utils/vrad_launcher/vrad_launcher.vpc
rename to src/utils/vrad_launcher/vrad_launcher.vpc
diff --git a/mp/src/utils/vtf2tga/vtf2tga.cpp b/src/utils/vtf2tga/vtf2tga.cpp
similarity index 100%
rename from mp/src/utils/vtf2tga/vtf2tga.cpp
rename to src/utils/vtf2tga/vtf2tga.cpp
diff --git a/mp/src/utils/vtf2tga/vtf2tga.vpc b/src/utils/vtf2tga/vtf2tga.vpc
similarity index 100%
rename from mp/src/utils/vtf2tga/vtf2tga.vpc
rename to src/utils/vtf2tga/vtf2tga.vpc
diff --git a/mp/src/utils/vtfdiff/vtfdiff.cpp b/src/utils/vtfdiff/vtfdiff.cpp
similarity index 100%
rename from mp/src/utils/vtfdiff/vtfdiff.cpp
rename to src/utils/vtfdiff/vtfdiff.cpp
diff --git a/mp/src/utils/vtfdiff/vtfdiff.vpc b/src/utils/vtfdiff/vtfdiff.vpc
similarity index 100%
rename from mp/src/utils/vtfdiff/vtfdiff.vpc
rename to src/utils/vtfdiff/vtfdiff.vpc
diff --git a/mp/src/utils/vvis/WaterDist.cpp b/src/utils/vvis/WaterDist.cpp
similarity index 100%
rename from mp/src/utils/vvis/WaterDist.cpp
rename to src/utils/vvis/WaterDist.cpp
diff --git a/mp/src/utils/vvis/flow.cpp b/src/utils/vvis/flow.cpp
similarity index 100%
rename from mp/src/utils/vvis/flow.cpp
rename to src/utils/vvis/flow.cpp
diff --git a/mp/src/utils/vvis/mpivis.cpp b/src/utils/vvis/mpivis.cpp
similarity index 100%
rename from mp/src/utils/vvis/mpivis.cpp
rename to src/utils/vvis/mpivis.cpp
diff --git a/mp/src/utils/vvis/mpivis.h b/src/utils/vvis/mpivis.h
similarity index 100%
rename from mp/src/utils/vvis/mpivis.h
rename to src/utils/vvis/mpivis.h
diff --git a/mp/src/utils/vvis/vis.h b/src/utils/vvis/vis.h
similarity index 100%
rename from mp/src/utils/vvis/vis.h
rename to src/utils/vvis/vis.h
diff --git a/mp/src/utils/vvis/vvis.cpp b/src/utils/vvis/vvis.cpp
similarity index 100%
rename from mp/src/utils/vvis/vvis.cpp
rename to src/utils/vvis/vvis.cpp
diff --git a/mp/src/utils/vvis/vvis_dll.vpc b/src/utils/vvis/vvis_dll.vpc
similarity index 100%
rename from mp/src/utils/vvis/vvis_dll.vpc
rename to src/utils/vvis/vvis_dll.vpc
diff --git a/mp/src/utils/vvis_launcher/StdAfx.cpp b/src/utils/vvis_launcher/StdAfx.cpp
similarity index 100%
rename from mp/src/utils/vvis_launcher/StdAfx.cpp
rename to src/utils/vvis_launcher/StdAfx.cpp
diff --git a/mp/src/utils/vvis_launcher/StdAfx.h b/src/utils/vvis_launcher/StdAfx.h
similarity index 100%
rename from mp/src/utils/vvis_launcher/StdAfx.h
rename to src/utils/vvis_launcher/StdAfx.h
diff --git a/mp/src/utils/vvis_launcher/vvis_launcher.cpp b/src/utils/vvis_launcher/vvis_launcher.cpp
similarity index 100%
rename from mp/src/utils/vvis_launcher/vvis_launcher.cpp
rename to src/utils/vvis_launcher/vvis_launcher.cpp
diff --git a/mp/src/utils/vvis_launcher/vvis_launcher.vpc b/src/utils/vvis_launcher/vvis_launcher.vpc
similarity index 100%
rename from mp/src/utils/vvis_launcher/vvis_launcher.vpc
rename to src/utils/vvis_launcher/vvis_launcher.vpc
diff --git a/mp/src/vgui2/src/vgui_key_translation.cpp b/src/vgui2/src/vgui_key_translation.cpp
similarity index 100%
rename from mp/src/vgui2/src/vgui_key_translation.cpp
rename to src/vgui2/src/vgui_key_translation.cpp
diff --git a/mp/src/vgui2/src/vgui_key_translation.h b/src/vgui2/src/vgui_key_translation.h
similarity index 100%
rename from mp/src/vgui2/src/vgui_key_translation.h
rename to src/vgui2/src/vgui_key_translation.h
diff --git a/mp/src/vgui2/vgui_controls/AnalogBar.cpp b/src/vgui2/vgui_controls/AnalogBar.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/AnalogBar.cpp
rename to src/vgui2/vgui_controls/AnalogBar.cpp
diff --git a/mp/src/vgui2/vgui_controls/AnimatingImagePanel.cpp b/src/vgui2/vgui_controls/AnimatingImagePanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/AnimatingImagePanel.cpp
rename to src/vgui2/vgui_controls/AnimatingImagePanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/AnimationController.cpp b/src/vgui2/vgui_controls/AnimationController.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/AnimationController.cpp
rename to src/vgui2/vgui_controls/AnimationController.cpp
diff --git a/mp/src/vgui2/vgui_controls/BitmapImagePanel.cpp b/src/vgui2/vgui_controls/BitmapImagePanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/BitmapImagePanel.cpp
rename to src/vgui2/vgui_controls/BitmapImagePanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/BuildFactoryHelper.cpp b/src/vgui2/vgui_controls/BuildFactoryHelper.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/BuildFactoryHelper.cpp
rename to src/vgui2/vgui_controls/BuildFactoryHelper.cpp
diff --git a/mp/src/vgui2/vgui_controls/BuildGroup.cpp b/src/vgui2/vgui_controls/BuildGroup.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/BuildGroup.cpp
rename to src/vgui2/vgui_controls/BuildGroup.cpp
diff --git a/mp/src/vgui2/vgui_controls/BuildModeDialog.cpp b/src/vgui2/vgui_controls/BuildModeDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/BuildModeDialog.cpp
rename to src/vgui2/vgui_controls/BuildModeDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/Button.cpp b/src/vgui2/vgui_controls/Button.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Button.cpp
rename to src/vgui2/vgui_controls/Button.cpp
diff --git a/mp/src/vgui2/vgui_controls/CheckButton.cpp b/src/vgui2/vgui_controls/CheckButton.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/CheckButton.cpp
rename to src/vgui2/vgui_controls/CheckButton.cpp
diff --git a/mp/src/vgui2/vgui_controls/CheckButtonList.cpp b/src/vgui2/vgui_controls/CheckButtonList.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/CheckButtonList.cpp
rename to src/vgui2/vgui_controls/CheckButtonList.cpp
diff --git a/mp/src/vgui2/vgui_controls/CircularProgressBar.cpp b/src/vgui2/vgui_controls/CircularProgressBar.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/CircularProgressBar.cpp
rename to src/vgui2/vgui_controls/CircularProgressBar.cpp
diff --git a/mp/src/vgui2/vgui_controls/ComboBox.cpp b/src/vgui2/vgui_controls/ComboBox.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ComboBox.cpp
rename to src/vgui2/vgui_controls/ComboBox.cpp
diff --git a/mp/src/vgui2/vgui_controls/ControllerMap.cpp b/src/vgui2/vgui_controls/ControllerMap.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ControllerMap.cpp
rename to src/vgui2/vgui_controls/ControllerMap.cpp
diff --git a/mp/src/vgui2/vgui_controls/DirectorySelectDialog.cpp b/src/vgui2/vgui_controls/DirectorySelectDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/DirectorySelectDialog.cpp
rename to src/vgui2/vgui_controls/DirectorySelectDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/Divider.cpp b/src/vgui2/vgui_controls/Divider.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Divider.cpp
rename to src/vgui2/vgui_controls/Divider.cpp
diff --git a/mp/src/vgui2/vgui_controls/EditablePanel.cpp b/src/vgui2/vgui_controls/EditablePanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/EditablePanel.cpp
rename to src/vgui2/vgui_controls/EditablePanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/ExpandButton.cpp b/src/vgui2/vgui_controls/ExpandButton.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ExpandButton.cpp
rename to src/vgui2/vgui_controls/ExpandButton.cpp
diff --git a/mp/src/vgui2/vgui_controls/FileOpenDialog.cpp b/src/vgui2/vgui_controls/FileOpenDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/FileOpenDialog.cpp
rename to src/vgui2/vgui_controls/FileOpenDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/FileOpenStateMachine.cpp b/src/vgui2/vgui_controls/FileOpenStateMachine.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/FileOpenStateMachine.cpp
rename to src/vgui2/vgui_controls/FileOpenStateMachine.cpp
diff --git a/mp/src/vgui2/vgui_controls/FocusNavGroup.cpp b/src/vgui2/vgui_controls/FocusNavGroup.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/FocusNavGroup.cpp
rename to src/vgui2/vgui_controls/FocusNavGroup.cpp
diff --git a/mp/src/vgui2/vgui_controls/Frame.cpp b/src/vgui2/vgui_controls/Frame.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Frame.cpp
rename to src/vgui2/vgui_controls/Frame.cpp
diff --git a/mp/src/vgui2/vgui_controls/GraphPanel.cpp b/src/vgui2/vgui_controls/GraphPanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/GraphPanel.cpp
rename to src/vgui2/vgui_controls/GraphPanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/HTML.cpp b/src/vgui2/vgui_controls/HTML.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/HTML.cpp
rename to src/vgui2/vgui_controls/HTML.cpp
diff --git a/mp/src/vgui2/vgui_controls/Image.cpp b/src/vgui2/vgui_controls/Image.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Image.cpp
rename to src/vgui2/vgui_controls/Image.cpp
diff --git a/mp/src/vgui2/vgui_controls/ImageList.cpp b/src/vgui2/vgui_controls/ImageList.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ImageList.cpp
rename to src/vgui2/vgui_controls/ImageList.cpp
diff --git a/mp/src/vgui2/vgui_controls/ImagePanel.cpp b/src/vgui2/vgui_controls/ImagePanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ImagePanel.cpp
rename to src/vgui2/vgui_controls/ImagePanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/InputDialog.cpp b/src/vgui2/vgui_controls/InputDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/InputDialog.cpp
rename to src/vgui2/vgui_controls/InputDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/KeyBindingHelpDialog.cpp b/src/vgui2/vgui_controls/KeyBindingHelpDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/KeyBindingHelpDialog.cpp
rename to src/vgui2/vgui_controls/KeyBindingHelpDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/KeyBoardEditorDialog.cpp b/src/vgui2/vgui_controls/KeyBoardEditorDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/KeyBoardEditorDialog.cpp
rename to src/vgui2/vgui_controls/KeyBoardEditorDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/KeyRepeat.cpp b/src/vgui2/vgui_controls/KeyRepeat.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/KeyRepeat.cpp
rename to src/vgui2/vgui_controls/KeyRepeat.cpp
diff --git a/mp/src/vgui2/vgui_controls/Label.cpp b/src/vgui2/vgui_controls/Label.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Label.cpp
rename to src/vgui2/vgui_controls/Label.cpp
diff --git a/mp/src/vgui2/vgui_controls/ListPanel.cpp b/src/vgui2/vgui_controls/ListPanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ListPanel.cpp
rename to src/vgui2/vgui_controls/ListPanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/ListViewPanel.cpp b/src/vgui2/vgui_controls/ListViewPanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ListViewPanel.cpp
rename to src/vgui2/vgui_controls/ListViewPanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/Menu.cpp b/src/vgui2/vgui_controls/Menu.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Menu.cpp
rename to src/vgui2/vgui_controls/Menu.cpp
diff --git a/mp/src/vgui2/vgui_controls/MenuBar.cpp b/src/vgui2/vgui_controls/MenuBar.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/MenuBar.cpp
rename to src/vgui2/vgui_controls/MenuBar.cpp
diff --git a/mp/src/vgui2/vgui_controls/MenuButton.cpp b/src/vgui2/vgui_controls/MenuButton.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/MenuButton.cpp
rename to src/vgui2/vgui_controls/MenuButton.cpp
diff --git a/mp/src/vgui2/vgui_controls/MenuItem.cpp b/src/vgui2/vgui_controls/MenuItem.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/MenuItem.cpp
rename to src/vgui2/vgui_controls/MenuItem.cpp
diff --git a/mp/src/vgui2/vgui_controls/MessageBox.cpp b/src/vgui2/vgui_controls/MessageBox.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/MessageBox.cpp
rename to src/vgui2/vgui_controls/MessageBox.cpp
diff --git a/mp/src/vgui2/vgui_controls/MessageDialog.cpp b/src/vgui2/vgui_controls/MessageDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/MessageDialog.cpp
rename to src/vgui2/vgui_controls/MessageDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/Panel.cpp b/src/vgui2/vgui_controls/Panel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Panel.cpp
rename to src/vgui2/vgui_controls/Panel.cpp
diff --git a/mp/src/vgui2/vgui_controls/PanelListPanel.cpp b/src/vgui2/vgui_controls/PanelListPanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/PanelListPanel.cpp
rename to src/vgui2/vgui_controls/PanelListPanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/PerforceFileExplorer.cpp b/src/vgui2/vgui_controls/PerforceFileExplorer.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/PerforceFileExplorer.cpp
rename to src/vgui2/vgui_controls/PerforceFileExplorer.cpp
diff --git a/mp/src/vgui2/vgui_controls/PerforceFileList.cpp b/src/vgui2/vgui_controls/PerforceFileList.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/PerforceFileList.cpp
rename to src/vgui2/vgui_controls/PerforceFileList.cpp
diff --git a/mp/src/vgui2/vgui_controls/ProgressBar.cpp b/src/vgui2/vgui_controls/ProgressBar.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ProgressBar.cpp
rename to src/vgui2/vgui_controls/ProgressBar.cpp
diff --git a/mp/src/vgui2/vgui_controls/ProgressBox.cpp b/src/vgui2/vgui_controls/ProgressBox.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ProgressBox.cpp
rename to src/vgui2/vgui_controls/ProgressBox.cpp
diff --git a/mp/src/vgui2/vgui_controls/PropertyDialog.cpp b/src/vgui2/vgui_controls/PropertyDialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/PropertyDialog.cpp
rename to src/vgui2/vgui_controls/PropertyDialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/PropertyPage.cpp b/src/vgui2/vgui_controls/PropertyPage.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/PropertyPage.cpp
rename to src/vgui2/vgui_controls/PropertyPage.cpp
diff --git a/mp/src/vgui2/vgui_controls/PropertySheet.cpp b/src/vgui2/vgui_controls/PropertySheet.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/PropertySheet.cpp
rename to src/vgui2/vgui_controls/PropertySheet.cpp
diff --git a/mp/src/vgui2/vgui_controls/QueryBox.cpp b/src/vgui2/vgui_controls/QueryBox.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/QueryBox.cpp
rename to src/vgui2/vgui_controls/QueryBox.cpp
diff --git a/mp/src/vgui2/vgui_controls/RadioButton.cpp b/src/vgui2/vgui_controls/RadioButton.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/RadioButton.cpp
rename to src/vgui2/vgui_controls/RadioButton.cpp
diff --git a/mp/src/vgui2/vgui_controls/RichText.cpp b/src/vgui2/vgui_controls/RichText.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/RichText.cpp
rename to src/vgui2/vgui_controls/RichText.cpp
diff --git a/mp/src/vgui2/vgui_controls/RotatingProgressBar.cpp b/src/vgui2/vgui_controls/RotatingProgressBar.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/RotatingProgressBar.cpp
rename to src/vgui2/vgui_controls/RotatingProgressBar.cpp
diff --git a/mp/src/vgui2/vgui_controls/ScalableImagePanel.cpp b/src/vgui2/vgui_controls/ScalableImagePanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ScalableImagePanel.cpp
rename to src/vgui2/vgui_controls/ScalableImagePanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/ScrollBar.cpp b/src/vgui2/vgui_controls/ScrollBar.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ScrollBar.cpp
rename to src/vgui2/vgui_controls/ScrollBar.cpp
diff --git a/mp/src/vgui2/vgui_controls/ScrollBarSlider.cpp b/src/vgui2/vgui_controls/ScrollBarSlider.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ScrollBarSlider.cpp
rename to src/vgui2/vgui_controls/ScrollBarSlider.cpp
diff --git a/mp/src/vgui2/vgui_controls/ScrollableEditablePanel.cpp b/src/vgui2/vgui_controls/ScrollableEditablePanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ScrollableEditablePanel.cpp
rename to src/vgui2/vgui_controls/ScrollableEditablePanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/SectionedListPanel.cpp b/src/vgui2/vgui_controls/SectionedListPanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/SectionedListPanel.cpp
rename to src/vgui2/vgui_controls/SectionedListPanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/Slider.cpp b/src/vgui2/vgui_controls/Slider.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Slider.cpp
rename to src/vgui2/vgui_controls/Slider.cpp
diff --git a/mp/src/vgui2/vgui_controls/Splitter.cpp b/src/vgui2/vgui_controls/Splitter.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Splitter.cpp
rename to src/vgui2/vgui_controls/Splitter.cpp
diff --git a/mp/src/vgui2/vgui_controls/TextEntry.cpp b/src/vgui2/vgui_controls/TextEntry.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/TextEntry.cpp
rename to src/vgui2/vgui_controls/TextEntry.cpp
diff --git a/mp/src/vgui2/vgui_controls/TextImage.cpp b/src/vgui2/vgui_controls/TextImage.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/TextImage.cpp
rename to src/vgui2/vgui_controls/TextImage.cpp
diff --git a/mp/src/vgui2/vgui_controls/ToggleButton.cpp b/src/vgui2/vgui_controls/ToggleButton.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ToggleButton.cpp
rename to src/vgui2/vgui_controls/ToggleButton.cpp
diff --git a/mp/src/vgui2/vgui_controls/ToolWindow.cpp b/src/vgui2/vgui_controls/ToolWindow.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/ToolWindow.cpp
rename to src/vgui2/vgui_controls/ToolWindow.cpp
diff --git a/mp/src/vgui2/vgui_controls/Tooltip.cpp b/src/vgui2/vgui_controls/Tooltip.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/Tooltip.cpp
rename to src/vgui2/vgui_controls/Tooltip.cpp
diff --git a/mp/src/vgui2/vgui_controls/TreeView.cpp b/src/vgui2/vgui_controls/TreeView.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/TreeView.cpp
rename to src/vgui2/vgui_controls/TreeView.cpp
diff --git a/mp/src/vgui2/vgui_controls/TreeViewListControl.cpp b/src/vgui2/vgui_controls/TreeViewListControl.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/TreeViewListControl.cpp
rename to src/vgui2/vgui_controls/TreeViewListControl.cpp
diff --git a/mp/src/vgui2/vgui_controls/URLLabel.cpp b/src/vgui2/vgui_controls/URLLabel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/URLLabel.cpp
rename to src/vgui2/vgui_controls/URLLabel.cpp
diff --git a/mp/src/vgui2/vgui_controls/WizardPanel.cpp b/src/vgui2/vgui_controls/WizardPanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/WizardPanel.cpp
rename to src/vgui2/vgui_controls/WizardPanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/WizardSubPanel.cpp b/src/vgui2/vgui_controls/WizardSubPanel.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/WizardSubPanel.cpp
rename to src/vgui2/vgui_controls/WizardSubPanel.cpp
diff --git a/mp/src/vgui2/vgui_controls/consoledialog.cpp b/src/vgui2/vgui_controls/consoledialog.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/consoledialog.cpp
rename to src/vgui2/vgui_controls/consoledialog.cpp
diff --git a/mp/src/vgui2/vgui_controls/controls.cpp b/src/vgui2/vgui_controls/controls.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/controls.cpp
rename to src/vgui2/vgui_controls/controls.cpp
diff --git a/mp/src/vgui2/vgui_controls/cvartogglecheckbutton.cpp b/src/vgui2/vgui_controls/cvartogglecheckbutton.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/cvartogglecheckbutton.cpp
rename to src/vgui2/vgui_controls/cvartogglecheckbutton.cpp
diff --git a/mp/src/vgui2/vgui_controls/perforcefilelistframe.cpp b/src/vgui2/vgui_controls/perforcefilelistframe.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/perforcefilelistframe.cpp
rename to src/vgui2/vgui_controls/perforcefilelistframe.cpp
diff --git a/mp/src/vgui2/vgui_controls/savedocumentquery.cpp b/src/vgui2/vgui_controls/savedocumentquery.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/savedocumentquery.cpp
rename to src/vgui2/vgui_controls/savedocumentquery.cpp
diff --git a/mp/src/vgui2/vgui_controls/subrectimage.cpp b/src/vgui2/vgui_controls/subrectimage.cpp
similarity index 100%
rename from mp/src/vgui2/vgui_controls/subrectimage.cpp
rename to src/vgui2/vgui_controls/subrectimage.cpp
diff --git a/mp/src/vgui2/vgui_controls/vgui_controls.vpc b/src/vgui2/vgui_controls/vgui_controls.vpc
similarity index 100%
rename from mp/src/vgui2/vgui_controls/vgui_controls.vpc
rename to src/vgui2/vgui_controls/vgui_controls.vpc
diff --git a/mp/src/vpc_scripts/default.vgc b/src/vpc_scripts/default.vgc
similarity index 100%
rename from mp/src/vpc_scripts/default.vgc
rename to src/vpc_scripts/default.vgc
diff --git a/mp/src/vpc_scripts/definitions/win32_2010.def b/src/vpc_scripts/definitions/win32_2010.def
similarity index 100%
rename from mp/src/vpc_scripts/definitions/win32_2010.def
rename to src/vpc_scripts/definitions/win32_2010.def
diff --git a/mp/src/vpc_scripts/dllbase.txt b/src/vpc_scripts/dllbase.txt
similarity index 100%
rename from mp/src/vpc_scripts/dllbase.txt
rename to src/vpc_scripts/dllbase.txt
diff --git a/mp/src/vpc_scripts/groups.vgc b/src/vpc_scripts/groups.vgc
similarity index 100%
rename from mp/src/vpc_scripts/groups.vgc
rename to src/vpc_scripts/groups.vgc
diff --git a/mp/src/vpc_scripts/loadaddress.vpc b/src/vpc_scripts/loadaddress.vpc
similarity index 100%
rename from mp/src/vpc_scripts/loadaddress.vpc
rename to src/vpc_scripts/loadaddress.vpc
diff --git a/mp/src/vpc_scripts/platform_dirs.vpc b/src/vpc_scripts/platform_dirs.vpc
similarity index 100%
rename from mp/src/vpc_scripts/platform_dirs.vpc
rename to src/vpc_scripts/platform_dirs.vpc
diff --git a/mp/src/vpc_scripts/projects.vgc b/src/vpc_scripts/projects.vgc
similarity index 100%
rename from mp/src/vpc_scripts/projects.vgc
rename to src/vpc_scripts/projects.vgc
diff --git a/mp/src/vpc_scripts/protobuf_builder.vpc b/src/vpc_scripts/protobuf_builder.vpc
similarity index 100%
rename from mp/src/vpc_scripts/protobuf_builder.vpc
rename to src/vpc_scripts/protobuf_builder.vpc
diff --git a/mp/src/vpc_scripts/source_base.vpc b/src/vpc_scripts/source_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_base.vpc
rename to src/vpc_scripts/source_base.vpc
diff --git a/mp/src/vpc_scripts/source_dll_base.vpc b/src/vpc_scripts/source_dll_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_dll_base.vpc
rename to src/vpc_scripts/source_dll_base.vpc
diff --git a/mp/src/vpc_scripts/source_dll_linux_base.vpc b/src/vpc_scripts/source_dll_linux_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_dll_linux_base.vpc
rename to src/vpc_scripts/source_dll_linux_base.vpc
diff --git a/mp/src/vpc_scripts/source_dll_posix_base.vpc b/src/vpc_scripts/source_dll_posix_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_dll_posix_base.vpc
rename to src/vpc_scripts/source_dll_posix_base.vpc
diff --git a/mp/src/vpc_scripts/source_dll_qt_base.vpc b/src/vpc_scripts/source_dll_qt_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_dll_qt_base.vpc
rename to src/vpc_scripts/source_dll_qt_base.vpc
diff --git a/mp/src/vpc_scripts/source_dll_win32_base.vpc b/src/vpc_scripts/source_dll_win32_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_dll_win32_base.vpc
rename to src/vpc_scripts/source_dll_win32_base.vpc
diff --git a/mp/src/vpc_scripts/source_dll_win32_debug.vpc b/src/vpc_scripts/source_dll_win32_debug.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_dll_win32_debug.vpc
rename to src/vpc_scripts/source_dll_win32_debug.vpc
diff --git a/mp/src/vpc_scripts/source_dll_win32_release.vpc b/src/vpc_scripts/source_dll_win32_release.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_dll_win32_release.vpc
rename to src/vpc_scripts/source_dll_win32_release.vpc
diff --git a/mp/src/vpc_scripts/source_exe_base.vpc b/src/vpc_scripts/source_exe_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_base.vpc
rename to src/vpc_scripts/source_exe_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_con_base.vpc b/src/vpc_scripts/source_exe_con_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_con_base.vpc
rename to src/vpc_scripts/source_exe_con_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_con_win32_base.vpc b/src/vpc_scripts/source_exe_con_win32_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_con_win32_base.vpc
rename to src/vpc_scripts/source_exe_con_win32_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_linux_base.vpc b/src/vpc_scripts/source_exe_linux_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_linux_base.vpc
rename to src/vpc_scripts/source_exe_linux_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_posix_base.vpc b/src/vpc_scripts/source_exe_posix_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_posix_base.vpc
rename to src/vpc_scripts/source_exe_posix_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_qt_base.vpc b/src/vpc_scripts/source_exe_qt_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_qt_base.vpc
rename to src/vpc_scripts/source_exe_qt_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_qt_con_base.vpc b/src/vpc_scripts/source_exe_qt_con_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_qt_con_base.vpc
rename to src/vpc_scripts/source_exe_qt_con_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_qt_win32_base.vpc b/src/vpc_scripts/source_exe_qt_win32_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_qt_win32_base.vpc
rename to src/vpc_scripts/source_exe_qt_win32_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_win_win32_base.vpc b/src/vpc_scripts/source_exe_win_win32_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_win_win32_base.vpc
rename to src/vpc_scripts/source_exe_win_win32_base.vpc
diff --git a/mp/src/vpc_scripts/source_exe_win_win32_debug.vpc b/src/vpc_scripts/source_exe_win_win32_debug.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_win_win32_debug.vpc
rename to src/vpc_scripts/source_exe_win_win32_debug.vpc
diff --git a/mp/src/vpc_scripts/source_exe_win_win32_release.vpc b/src/vpc_scripts/source_exe_win_win32_release.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_exe_win_win32_release.vpc
rename to src/vpc_scripts/source_exe_win_win32_release.vpc
diff --git a/mp/src/vpc_scripts/source_lib_base.vpc b/src/vpc_scripts/source_lib_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_base.vpc
rename to src/vpc_scripts/source_lib_base.vpc
diff --git a/mp/src/vpc_scripts/source_lib_linux_base.vpc b/src/vpc_scripts/source_lib_linux_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_linux_base.vpc
rename to src/vpc_scripts/source_lib_linux_base.vpc
diff --git a/mp/src/vpc_scripts/source_lib_posix_base.vpc b/src/vpc_scripts/source_lib_posix_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_posix_base.vpc
rename to src/vpc_scripts/source_lib_posix_base.vpc
diff --git a/mp/src/vpc_scripts/source_lib_qt_base.vpc b/src/vpc_scripts/source_lib_qt_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_qt_base.vpc
rename to src/vpc_scripts/source_lib_qt_base.vpc
diff --git a/mp/src/vpc_scripts/source_lib_qt_win32_base.vpc b/src/vpc_scripts/source_lib_qt_win32_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_qt_win32_base.vpc
rename to src/vpc_scripts/source_lib_qt_win32_base.vpc
diff --git a/mp/src/vpc_scripts/source_lib_win32_base.vpc b/src/vpc_scripts/source_lib_win32_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_win32_base.vpc
rename to src/vpc_scripts/source_lib_win32_base.vpc
diff --git a/mp/src/vpc_scripts/source_lib_win32_debug.vpc b/src/vpc_scripts/source_lib_win32_debug.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_win32_debug.vpc
rename to src/vpc_scripts/source_lib_win32_debug.vpc
diff --git a/mp/src/vpc_scripts/source_lib_win32_release.vpc b/src/vpc_scripts/source_lib_win32_release.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_lib_win32_release.vpc
rename to src/vpc_scripts/source_lib_win32_release.vpc
diff --git a/mp/src/vpc_scripts/source_linux_base_project.vpc b/src/vpc_scripts/source_linux_base_project.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_linux_base_project.vpc
rename to src/vpc_scripts/source_linux_base_project.vpc
diff --git a/mp/src/vpc_scripts/source_mll_qt_base.vpc b/src/vpc_scripts/source_mll_qt_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_mll_qt_base.vpc
rename to src/vpc_scripts/source_mll_qt_base.vpc
diff --git a/mp/src/vpc_scripts/source_posix_base.vpc b/src/vpc_scripts/source_posix_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_posix_base.vpc
rename to src/vpc_scripts/source_posix_base.vpc
diff --git a/mp/src/vpc_scripts/source_video_base.vpc b/src/vpc_scripts/source_video_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_video_base.vpc
rename to src/vpc_scripts/source_video_base.vpc
diff --git a/mp/src/vpc_scripts/source_win32_analyze.vpc b/src/vpc_scripts/source_win32_analyze.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_win32_analyze.vpc
rename to src/vpc_scripts/source_win32_analyze.vpc
diff --git a/mp/src/vpc_scripts/source_win32_base.vpc b/src/vpc_scripts/source_win32_base.vpc
similarity index 100%
rename from mp/src/vpc_scripts/source_win32_base.vpc
rename to src/vpc_scripts/source_win32_base.vpc
diff --git a/mp/src/vpc_scripts/version.vpc b/src/vpc_scripts/version.vpc
similarity index 100%
rename from mp/src/vpc_scripts/version.vpc
rename to src/vpc_scripts/version.vpc
diff --git a/mp/src/vstdlib/vstdlib_exclude.vpc b/src/vstdlib/vstdlib_exclude.vpc
similarity index 100%
rename from mp/src/vstdlib/vstdlib_exclude.vpc
rename to src/vstdlib/vstdlib_exclude.vpc