diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50b8e39a..b4ebfb7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required( VERSION 3.16 )
 project( r5sdk )
 
-set( ENGINE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/r5dev" CACHE PATH "Engine source directory" )
+set( ENGINE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src" CACHE PATH "Engine source directory" )
 
 include( "${ENGINE_SOURCE_DIR}/cmake/Configure.cmake" )
 include( "${ENGINE_SOURCE_DIR}/cmake/Macros.cmake" )
diff --git a/r5dev/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from r5dev/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/r5dev/ClientSDK.def b/src/ClientSDK.def
similarity index 100%
rename from r5dev/ClientSDK.def
rename to src/ClientSDK.def
diff --git a/r5dev/Dedicated.def b/src/Dedicated.def
similarity index 100%
rename from r5dev/Dedicated.def
rename to src/Dedicated.def
diff --git a/r5dev/GameSDK.def b/src/GameSDK.def
similarity index 100%
rename from r5dev/GameSDK.def
rename to src/GameSDK.def
diff --git a/r5dev/PropertySheet.props b/src/PropertySheet.props
similarity index 100%
rename from r5dev/PropertySheet.props
rename to src/PropertySheet.props
diff --git a/r5dev/R5Dev.props b/src/R5Dev.props
similarity index 100%
rename from r5dev/R5Dev.props
rename to src/R5Dev.props
diff --git a/r5dev/appframework/CMakeLists.txt b/src/appframework/CMakeLists.txt
similarity index 100%
rename from r5dev/appframework/CMakeLists.txt
rename to src/appframework/CMakeLists.txt
diff --git a/r5dev/appframework/IAppSystemGroup.cpp b/src/appframework/IAppSystemGroup.cpp
similarity index 100%
rename from r5dev/appframework/IAppSystemGroup.cpp
rename to src/appframework/IAppSystemGroup.cpp
diff --git a/r5dev/cmake/Configure.cmake b/src/cmake/Configure.cmake
similarity index 100%
rename from r5dev/cmake/Configure.cmake
rename to src/cmake/Configure.cmake
diff --git a/r5dev/cmake/Macros.cmake b/src/cmake/Macros.cmake
similarity index 100%
rename from r5dev/cmake/Macros.cmake
rename to src/cmake/Macros.cmake
diff --git a/r5dev/cmake/Options.cmake b/src/cmake/Options.cmake
similarity index 100%
rename from r5dev/cmake/Options.cmake
rename to src/cmake/Options.cmake
diff --git a/r5dev/cmake/PostBuild.cmake b/src/cmake/PostBuild.cmake
similarity index 100%
rename from r5dev/cmake/PostBuild.cmake
rename to src/cmake/PostBuild.cmake
diff --git a/r5dev/codecs/CMakeLists.txt b/src/codecs/CMakeLists.txt
similarity index 100%
rename from r5dev/codecs/CMakeLists.txt
rename to src/codecs/CMakeLists.txt
diff --git a/r5dev/codecs/bink/bink_impl.cpp b/src/codecs/bink/bink_impl.cpp
similarity index 100%
rename from r5dev/codecs/bink/bink_impl.cpp
rename to src/codecs/bink/bink_impl.cpp
diff --git a/r5dev/codecs/bink/bink_impl.h b/src/codecs/bink/bink_impl.h
similarity index 100%
rename from r5dev/codecs/bink/bink_impl.h
rename to src/codecs/bink/bink_impl.h
diff --git a/r5dev/codecs/Miles/miles_impl.cpp b/src/codecs/miles/miles_impl.cpp
similarity index 100%
rename from r5dev/codecs/Miles/miles_impl.cpp
rename to src/codecs/miles/miles_impl.cpp
diff --git a/r5dev/codecs/Miles/miles_impl.h b/src/codecs/miles/miles_impl.h
similarity index 100%
rename from r5dev/codecs/Miles/miles_impl.h
rename to src/codecs/miles/miles_impl.h
diff --git a/r5dev/codecs/Miles/miles_types.h b/src/codecs/miles/miles_types.h
similarity index 100%
rename from r5dev/codecs/Miles/miles_types.h
rename to src/codecs/miles/miles_types.h
diff --git a/r5dev/codecs/Miles/radshal_wasapi.h b/src/codecs/miles/radshal_wasapi.h
similarity index 100%
rename from r5dev/codecs/Miles/radshal_wasapi.h
rename to src/codecs/miles/radshal_wasapi.h
diff --git a/r5dev/common/callback.cpp b/src/common/callback.cpp
similarity index 100%
rename from r5dev/common/callback.cpp
rename to src/common/callback.cpp
diff --git a/r5dev/common/callback.h b/src/common/callback.h
similarity index 100%
rename from r5dev/common/callback.h
rename to src/common/callback.h
diff --git a/r5dev/common/completion.cpp b/src/common/completion.cpp
similarity index 100%
rename from r5dev/common/completion.cpp
rename to src/common/completion.cpp
diff --git a/r5dev/common/completion.h b/src/common/completion.h
similarity index 100%
rename from r5dev/common/completion.h
rename to src/common/completion.h
diff --git a/r5dev/common/engine_launcher_api.h b/src/common/engine_launcher_api.h
similarity index 100%
rename from r5dev/common/engine_launcher_api.h
rename to src/common/engine_launcher_api.h
diff --git a/r5dev/common/experimental.h b/src/common/experimental.h
similarity index 100%
rename from r5dev/common/experimental.h
rename to src/common/experimental.h
diff --git a/r5dev/common/global.cpp b/src/common/global.cpp
similarity index 100%
rename from r5dev/common/global.cpp
rename to src/common/global.cpp
diff --git a/r5dev/common/global.h b/src/common/global.h
similarity index 100%
rename from r5dev/common/global.h
rename to src/common/global.h
diff --git a/r5dev/common/igameserverdata.h b/src/common/igameserverdata.h
similarity index 100%
rename from r5dev/common/igameserverdata.h
rename to src/common/igameserverdata.h
diff --git a/r5dev/common/netmessages.cpp b/src/common/netmessages.cpp
similarity index 100%
rename from r5dev/common/netmessages.cpp
rename to src/common/netmessages.cpp
diff --git a/r5dev/common/netmessages.h b/src/common/netmessages.h
similarity index 100%
rename from r5dev/common/netmessages.h
rename to src/common/netmessages.h
diff --git a/r5dev/common/opcodes.cpp b/src/common/opcodes.cpp
similarity index 100%
rename from r5dev/common/opcodes.cpp
rename to src/common/opcodes.cpp
diff --git a/r5dev/common/opcodes.h b/src/common/opcodes.h
similarity index 100%
rename from r5dev/common/opcodes.h
rename to src/common/opcodes.h
diff --git a/r5dev/common/protocol.h b/src/common/protocol.h
similarity index 100%
rename from r5dev/common/protocol.h
rename to src/common/protocol.h
diff --git a/r5dev/common/pseudodefs.h b/src/common/pseudodefs.h
similarity index 100%
rename from r5dev/common/pseudodefs.h
rename to src/common/pseudodefs.h
diff --git a/r5dev/common/qlimits.h b/src/common/qlimits.h
similarity index 100%
rename from r5dev/common/qlimits.h
rename to src/common/qlimits.h
diff --git a/r5dev/common/sdkdefs.h b/src/common/sdkdefs.h
similarity index 100%
rename from r5dev/common/sdkdefs.h
rename to src/common/sdkdefs.h
diff --git a/r5dev/common/x86defs.h b/src/common/x86defs.h
similarity index 100%
rename from r5dev/common/x86defs.h
rename to src/common/x86defs.h
diff --git a/r5dev/core/CMakeLists.txt b/src/core/CMakeLists.txt
similarity index 100%
rename from r5dev/core/CMakeLists.txt
rename to src/core/CMakeLists.txt
diff --git a/r5dev/core/assert.h b/src/core/assert.h
similarity index 100%
rename from r5dev/core/assert.h
rename to src/core/assert.h
diff --git a/r5dev/core/dllmain.cpp b/src/core/dllmain.cpp
similarity index 100%
rename from r5dev/core/dllmain.cpp
rename to src/core/dllmain.cpp
diff --git a/r5dev/core/init.cpp b/src/core/init.cpp
similarity index 100%
rename from r5dev/core/init.cpp
rename to src/core/init.cpp
diff --git a/r5dev/core/init.h b/src/core/init.h
similarity index 100%
rename from r5dev/core/init.h
rename to src/core/init.h
diff --git a/r5dev/core/logdef.cpp b/src/core/logdef.cpp
similarity index 100%
rename from r5dev/core/logdef.cpp
rename to src/core/logdef.cpp
diff --git a/r5dev/core/logdef.h b/src/core/logdef.h
similarity index 100%
rename from r5dev/core/logdef.h
rename to src/core/logdef.h
diff --git a/r5dev/core/logger.cpp b/src/core/logger.cpp
similarity index 100%
rename from r5dev/core/logger.cpp
rename to src/core/logger.cpp
diff --git a/r5dev/core/logger.h b/src/core/logger.h
similarity index 100%
rename from r5dev/core/logger.h
rename to src/core/logger.h
diff --git a/r5dev/core/r5dev.h b/src/core/r5dev.h
similarity index 100%
rename from r5dev/core/r5dev.h
rename to src/core/r5dev.h
diff --git a/r5dev/core/resource.h b/src/core/resource.h
similarity index 100%
rename from r5dev/core/resource.h
rename to src/core/resource.h
diff --git a/r5dev/core/shared_pch.h b/src/core/shared_pch.h
similarity index 100%
rename from r5dev/core/shared_pch.h
rename to src/core/shared_pch.h
diff --git a/r5dev/core/stdafx.cpp b/src/core/stdafx.cpp
similarity index 100%
rename from r5dev/core/stdafx.cpp
rename to src/core/stdafx.cpp
diff --git a/r5dev/core/stdafx.h b/src/core/stdafx.h
similarity index 100%
rename from r5dev/core/stdafx.h
rename to src/core/stdafx.h
diff --git a/r5dev/core/termutil.cpp b/src/core/termutil.cpp
similarity index 100%
rename from r5dev/core/termutil.cpp
rename to src/core/termutil.cpp
diff --git a/r5dev/core/termutil.h b/src/core/termutil.h
similarity index 100%
rename from r5dev/core/termutil.h
rename to src/core/termutil.h
diff --git a/r5dev/cpp.hint b/src/cpp.hint
similarity index 100%
rename from r5dev/cpp.hint
rename to src/cpp.hint
diff --git a/r5dev/datacache/CMakeLists.txt b/src/datacache/CMakeLists.txt
similarity index 100%
rename from r5dev/datacache/CMakeLists.txt
rename to src/datacache/CMakeLists.txt
diff --git a/r5dev/datacache/mdlcache.cpp b/src/datacache/mdlcache.cpp
similarity index 100%
rename from r5dev/datacache/mdlcache.cpp
rename to src/datacache/mdlcache.cpp
diff --git a/r5dev/datacache/mdlcache.h b/src/datacache/mdlcache.h
similarity index 100%
rename from r5dev/datacache/mdlcache.h
rename to src/datacache/mdlcache.h
diff --git a/r5dev/ebisusdk/CMakeLists.txt b/src/ebisusdk/CMakeLists.txt
similarity index 100%
rename from r5dev/ebisusdk/CMakeLists.txt
rename to src/ebisusdk/CMakeLists.txt
diff --git a/r5dev/ebisusdk/EbisuSDK.cpp b/src/ebisusdk/EbisuSDK.cpp
similarity index 100%
rename from r5dev/ebisusdk/EbisuSDK.cpp
rename to src/ebisusdk/EbisuSDK.cpp
diff --git a/r5dev/ebisusdk/EbisuSDK.h b/src/ebisusdk/EbisuSDK.h
similarity index 100%
rename from r5dev/ebisusdk/EbisuSDK.h
rename to src/ebisusdk/EbisuSDK.h
diff --git a/r5dev/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
similarity index 100%
rename from r5dev/engine/CMakeLists.txt
rename to src/engine/CMakeLists.txt
diff --git a/r5dev/engine/client/cdll_engine_int.cpp b/src/engine/client/cdll_engine_int.cpp
similarity index 100%
rename from r5dev/engine/client/cdll_engine_int.cpp
rename to src/engine/client/cdll_engine_int.cpp
diff --git a/r5dev/engine/client/cdll_engine_int.h b/src/engine/client/cdll_engine_int.h
similarity index 100%
rename from r5dev/engine/client/cdll_engine_int.h
rename to src/engine/client/cdll_engine_int.h
diff --git a/r5dev/engine/client/cl_ents_parse.cpp b/src/engine/client/cl_ents_parse.cpp
similarity index 100%
rename from r5dev/engine/client/cl_ents_parse.cpp
rename to src/engine/client/cl_ents_parse.cpp
diff --git a/r5dev/engine/client/cl_ents_parse.h b/src/engine/client/cl_ents_parse.h
similarity index 100%
rename from r5dev/engine/client/cl_ents_parse.h
rename to src/engine/client/cl_ents_parse.h
diff --git a/r5dev/engine/client/cl_main.cpp b/src/engine/client/cl_main.cpp
similarity index 100%
rename from r5dev/engine/client/cl_main.cpp
rename to src/engine/client/cl_main.cpp
diff --git a/r5dev/engine/client/cl_main.h b/src/engine/client/cl_main.h
similarity index 100%
rename from r5dev/engine/client/cl_main.h
rename to src/engine/client/cl_main.h
diff --git a/r5dev/engine/client/cl_rcon.cpp b/src/engine/client/cl_rcon.cpp
similarity index 100%
rename from r5dev/engine/client/cl_rcon.cpp
rename to src/engine/client/cl_rcon.cpp
diff --git a/r5dev/engine/client/cl_rcon.h b/src/engine/client/cl_rcon.h
similarity index 100%
rename from r5dev/engine/client/cl_rcon.h
rename to src/engine/client/cl_rcon.h
diff --git a/r5dev/engine/client/cl_splitscreen.cpp b/src/engine/client/cl_splitscreen.cpp
similarity index 100%
rename from r5dev/engine/client/cl_splitscreen.cpp
rename to src/engine/client/cl_splitscreen.cpp
diff --git a/r5dev/engine/client/cl_splitscreen.h b/src/engine/client/cl_splitscreen.h
similarity index 100%
rename from r5dev/engine/client/cl_splitscreen.h
rename to src/engine/client/cl_splitscreen.h
diff --git a/r5dev/engine/client/client.cpp b/src/engine/client/client.cpp
similarity index 100%
rename from r5dev/engine/client/client.cpp
rename to src/engine/client/client.cpp
diff --git a/r5dev/engine/client/client.h b/src/engine/client/client.h
similarity index 100%
rename from r5dev/engine/client/client.h
rename to src/engine/client/client.h
diff --git a/r5dev/engine/client/clientstate.cpp b/src/engine/client/clientstate.cpp
similarity index 100%
rename from r5dev/engine/client/clientstate.cpp
rename to src/engine/client/clientstate.cpp
diff --git a/r5dev/engine/client/clientstate.h b/src/engine/client/clientstate.h
similarity index 100%
rename from r5dev/engine/client/clientstate.h
rename to src/engine/client/clientstate.h
diff --git a/r5dev/engine/client/datablock_receiver.cpp b/src/engine/client/datablock_receiver.cpp
similarity index 100%
rename from r5dev/engine/client/datablock_receiver.cpp
rename to src/engine/client/datablock_receiver.cpp
diff --git a/r5dev/engine/client/datablock_receiver.h b/src/engine/client/datablock_receiver.h
similarity index 100%
rename from r5dev/engine/client/datablock_receiver.h
rename to src/engine/client/datablock_receiver.h
diff --git a/r5dev/engine/client/vengineclient_impl.cpp b/src/engine/client/vengineclient_impl.cpp
similarity index 100%
rename from r5dev/engine/client/vengineclient_impl.cpp
rename to src/engine/client/vengineclient_impl.cpp
diff --git a/r5dev/engine/client/vengineclient_impl.h b/src/engine/client/vengineclient_impl.h
similarity index 100%
rename from r5dev/engine/client/vengineclient_impl.h
rename to src/engine/client/vengineclient_impl.h
diff --git a/r5dev/engine/clockdriftmgr.cpp b/src/engine/clockdriftmgr.cpp
similarity index 100%
rename from r5dev/engine/clockdriftmgr.cpp
rename to src/engine/clockdriftmgr.cpp
diff --git a/r5dev/engine/clockdriftmgr.h b/src/engine/clockdriftmgr.h
similarity index 100%
rename from r5dev/engine/clockdriftmgr.h
rename to src/engine/clockdriftmgr.h
diff --git a/r5dev/engine/cmd.cpp b/src/engine/cmd.cpp
similarity index 100%
rename from r5dev/engine/cmd.cpp
rename to src/engine/cmd.cpp
diff --git a/r5dev/engine/cmd.h b/src/engine/cmd.h
similarity index 100%
rename from r5dev/engine/cmd.h
rename to src/engine/cmd.h
diff --git a/r5dev/engine/cmodel_bsp.cpp b/src/engine/cmodel_bsp.cpp
similarity index 100%
rename from r5dev/engine/cmodel_bsp.cpp
rename to src/engine/cmodel_bsp.cpp
diff --git a/r5dev/engine/cmodel_bsp.h b/src/engine/cmodel_bsp.h
similarity index 100%
rename from r5dev/engine/cmodel_bsp.h
rename to src/engine/cmodel_bsp.h
diff --git a/r5dev/engine/common.cpp b/src/engine/common.cpp
similarity index 100%
rename from r5dev/engine/common.cpp
rename to src/engine/common.cpp
diff --git a/r5dev/engine/common.h b/src/engine/common.h
similarity index 100%
rename from r5dev/engine/common.h
rename to src/engine/common.h
diff --git a/r5dev/engine/datamap.cpp b/src/engine/datamap.cpp
similarity index 100%
rename from r5dev/engine/datamap.cpp
rename to src/engine/datamap.cpp
diff --git a/r5dev/engine/debugoverlay.cpp b/src/engine/debugoverlay.cpp
similarity index 100%
rename from r5dev/engine/debugoverlay.cpp
rename to src/engine/debugoverlay.cpp
diff --git a/r5dev/engine/debugoverlay.h b/src/engine/debugoverlay.h
similarity index 100%
rename from r5dev/engine/debugoverlay.h
rename to src/engine/debugoverlay.h
diff --git a/r5dev/engine/dt_recv.cpp b/src/engine/dt_recv.cpp
similarity index 100%
rename from r5dev/engine/dt_recv.cpp
rename to src/engine/dt_recv.cpp
diff --git a/r5dev/engine/enginetrace.cpp b/src/engine/enginetrace.cpp
similarity index 100%
rename from r5dev/engine/enginetrace.cpp
rename to src/engine/enginetrace.cpp
diff --git a/r5dev/engine/enginetrace.h b/src/engine/enginetrace.h
similarity index 100%
rename from r5dev/engine/enginetrace.h
rename to src/engine/enginetrace.h
diff --git a/r5dev/engine/framelimit.cpp b/src/engine/framelimit.cpp
similarity index 100%
rename from r5dev/engine/framelimit.cpp
rename to src/engine/framelimit.cpp
diff --git a/r5dev/engine/framelimit.h b/src/engine/framelimit.h
similarity index 100%
rename from r5dev/engine/framelimit.h
rename to src/engine/framelimit.h
diff --git a/r5dev/engine/framesnapshot.h b/src/engine/framesnapshot.h
similarity index 100%
rename from r5dev/engine/framesnapshot.h
rename to src/engine/framesnapshot.h
diff --git a/r5dev/engine/gl_matsysiface.h b/src/engine/gl_matsysiface.h
similarity index 100%
rename from r5dev/engine/gl_matsysiface.h
rename to src/engine/gl_matsysiface.h
diff --git a/r5dev/engine/gl_model_private.h b/src/engine/gl_model_private.h
similarity index 100%
rename from r5dev/engine/gl_model_private.h
rename to src/engine/gl_model_private.h
diff --git a/r5dev/engine/gl_rmain.cpp b/src/engine/gl_rmain.cpp
similarity index 100%
rename from r5dev/engine/gl_rmain.cpp
rename to src/engine/gl_rmain.cpp
diff --git a/r5dev/engine/gl_rmain.h b/src/engine/gl_rmain.h
similarity index 100%
rename from r5dev/engine/gl_rmain.h
rename to src/engine/gl_rmain.h
diff --git a/r5dev/engine/gl_rsurf.cpp b/src/engine/gl_rsurf.cpp
similarity index 100%
rename from r5dev/engine/gl_rsurf.cpp
rename to src/engine/gl_rsurf.cpp
diff --git a/r5dev/engine/gl_rsurf.h b/src/engine/gl_rsurf.h
similarity index 100%
rename from r5dev/engine/gl_rsurf.h
rename to src/engine/gl_rsurf.h
diff --git a/r5dev/engine/gl_screen.cpp b/src/engine/gl_screen.cpp
similarity index 100%
rename from r5dev/engine/gl_screen.cpp
rename to src/engine/gl_screen.cpp
diff --git a/r5dev/engine/gl_screen.h b/src/engine/gl_screen.h
similarity index 100%
rename from r5dev/engine/gl_screen.h
rename to src/engine/gl_screen.h
diff --git a/r5dev/engine/host.cpp b/src/engine/host.cpp
similarity index 100%
rename from r5dev/engine/host.cpp
rename to src/engine/host.cpp
diff --git a/r5dev/engine/host.h b/src/engine/host.h
similarity index 100%
rename from r5dev/engine/host.h
rename to src/engine/host.h
diff --git a/r5dev/engine/host_cmd.cpp b/src/engine/host_cmd.cpp
similarity index 100%
rename from r5dev/engine/host_cmd.cpp
rename to src/engine/host_cmd.cpp
diff --git a/r5dev/engine/host_cmd.h b/src/engine/host_cmd.h
similarity index 100%
rename from r5dev/engine/host_cmd.h
rename to src/engine/host_cmd.h
diff --git a/r5dev/engine/host_state.cpp b/src/engine/host_state.cpp
similarity index 100%
rename from r5dev/engine/host_state.cpp
rename to src/engine/host_state.cpp
diff --git a/r5dev/engine/host_state.h b/src/engine/host_state.h
similarity index 100%
rename from r5dev/engine/host_state.h
rename to src/engine/host_state.h
diff --git a/r5dev/engine/matsys_interface.cpp b/src/engine/matsys_interface.cpp
similarity index 100%
rename from r5dev/engine/matsys_interface.cpp
rename to src/engine/matsys_interface.cpp
diff --git a/r5dev/engine/matsys_interface.h b/src/engine/matsys_interface.h
similarity index 100%
rename from r5dev/engine/matsys_interface.h
rename to src/engine/matsys_interface.h
diff --git a/r5dev/engine/modelinfo.cpp b/src/engine/modelinfo.cpp
similarity index 100%
rename from r5dev/engine/modelinfo.cpp
rename to src/engine/modelinfo.cpp
diff --git a/r5dev/engine/modelinfo.h b/src/engine/modelinfo.h
similarity index 100%
rename from r5dev/engine/modelinfo.h
rename to src/engine/modelinfo.h
diff --git a/r5dev/engine/modelloader.cpp b/src/engine/modelloader.cpp
similarity index 100%
rename from r5dev/engine/modelloader.cpp
rename to src/engine/modelloader.cpp
diff --git a/r5dev/engine/modelloader.h b/src/engine/modelloader.h
similarity index 100%
rename from r5dev/engine/modelloader.h
rename to src/engine/modelloader.h
diff --git a/r5dev/engine/net.cpp b/src/engine/net.cpp
similarity index 100%
rename from r5dev/engine/net.cpp
rename to src/engine/net.cpp
diff --git a/r5dev/engine/net.h b/src/engine/net.h
similarity index 100%
rename from r5dev/engine/net.h
rename to src/engine/net.h
diff --git a/r5dev/engine/net_chan.cpp b/src/engine/net_chan.cpp
similarity index 100%
rename from r5dev/engine/net_chan.cpp
rename to src/engine/net_chan.cpp
diff --git a/r5dev/engine/net_chan.h b/src/engine/net_chan.h
similarity index 100%
rename from r5dev/engine/net_chan.h
rename to src/engine/net_chan.h
diff --git a/r5dev/engine/networkstringtable.cpp b/src/engine/networkstringtable.cpp
similarity index 100%
rename from r5dev/engine/networkstringtable.cpp
rename to src/engine/networkstringtable.cpp
diff --git a/r5dev/engine/networkstringtable.h b/src/engine/networkstringtable.h
similarity index 100%
rename from r5dev/engine/networkstringtable.h
rename to src/engine/networkstringtable.h
diff --git a/r5dev/engine/networkvar.cpp b/src/engine/networkvar.cpp
similarity index 100%
rename from r5dev/engine/networkvar.cpp
rename to src/engine/networkvar.cpp
diff --git a/r5dev/engine/packed_entity.h b/src/engine/packed_entity.h
similarity index 100%
rename from r5dev/engine/packed_entity.h
rename to src/engine/packed_entity.h
diff --git a/r5dev/engine/sdk_dll.cpp b/src/engine/sdk_dll.cpp
similarity index 100%
rename from r5dev/engine/sdk_dll.cpp
rename to src/engine/sdk_dll.cpp
diff --git a/r5dev/engine/sdk_dll.h b/src/engine/sdk_dll.h
similarity index 100%
rename from r5dev/engine/sdk_dll.h
rename to src/engine/sdk_dll.h
diff --git a/r5dev/engine/server/datablock_sender.cpp b/src/engine/server/datablock_sender.cpp
similarity index 100%
rename from r5dev/engine/server/datablock_sender.cpp
rename to src/engine/server/datablock_sender.cpp
diff --git a/r5dev/engine/server/datablock_sender.h b/src/engine/server/datablock_sender.h
similarity index 100%
rename from r5dev/engine/server/datablock_sender.h
rename to src/engine/server/datablock_sender.h
diff --git a/r5dev/engine/server/persistence.cpp b/src/engine/server/persistence.cpp
similarity index 100%
rename from r5dev/engine/server/persistence.cpp
rename to src/engine/server/persistence.cpp
diff --git a/r5dev/engine/server/persistence.h b/src/engine/server/persistence.h
similarity index 100%
rename from r5dev/engine/server/persistence.h
rename to src/engine/server/persistence.h
diff --git a/r5dev/engine/server/server.cpp b/src/engine/server/server.cpp
similarity index 100%
rename from r5dev/engine/server/server.cpp
rename to src/engine/server/server.cpp
diff --git a/r5dev/engine/server/server.h b/src/engine/server/server.h
similarity index 100%
rename from r5dev/engine/server/server.h
rename to src/engine/server/server.h
diff --git a/r5dev/engine/server/sv_main.cpp b/src/engine/server/sv_main.cpp
similarity index 100%
rename from r5dev/engine/server/sv_main.cpp
rename to src/engine/server/sv_main.cpp
diff --git a/r5dev/engine/server/sv_main.h b/src/engine/server/sv_main.h
similarity index 100%
rename from r5dev/engine/server/sv_main.h
rename to src/engine/server/sv_main.h
diff --git a/r5dev/engine/server/sv_rcon.cpp b/src/engine/server/sv_rcon.cpp
similarity index 100%
rename from r5dev/engine/server/sv_rcon.cpp
rename to src/engine/server/sv_rcon.cpp
diff --git a/r5dev/engine/server/sv_rcon.h b/src/engine/server/sv_rcon.h
similarity index 100%
rename from r5dev/engine/server/sv_rcon.h
rename to src/engine/server/sv_rcon.h
diff --git a/r5dev/engine/server/vengineserver_impl.cpp b/src/engine/server/vengineserver_impl.cpp
similarity index 100%
rename from r5dev/engine/server/vengineserver_impl.cpp
rename to src/engine/server/vengineserver_impl.cpp
diff --git a/r5dev/engine/server/vengineserver_impl.h b/src/engine/server/vengineserver_impl.h
similarity index 100%
rename from r5dev/engine/server/vengineserver_impl.h
rename to src/engine/server/vengineserver_impl.h
diff --git a/r5dev/engine/shared/base_rcon.cpp b/src/engine/shared/base_rcon.cpp
similarity index 100%
rename from r5dev/engine/shared/base_rcon.cpp
rename to src/engine/shared/base_rcon.cpp
diff --git a/r5dev/engine/shared/base_rcon.h b/src/engine/shared/base_rcon.h
similarity index 100%
rename from r5dev/engine/shared/base_rcon.h
rename to src/engine/shared/base_rcon.h
diff --git a/r5dev/engine/shared/shared_rcon.cpp b/src/engine/shared/shared_rcon.cpp
similarity index 100%
rename from r5dev/engine/shared/shared_rcon.cpp
rename to src/engine/shared/shared_rcon.cpp
diff --git a/r5dev/engine/shared/shared_rcon.h b/src/engine/shared/shared_rcon.h
similarity index 100%
rename from r5dev/engine/shared/shared_rcon.h
rename to src/engine/shared/shared_rcon.h
diff --git a/r5dev/engine/staticpropmgr.cpp b/src/engine/staticpropmgr.cpp
similarity index 100%
rename from r5dev/engine/staticpropmgr.cpp
rename to src/engine/staticpropmgr.cpp
diff --git a/r5dev/engine/staticpropmgr.h b/src/engine/staticpropmgr.h
similarity index 100%
rename from r5dev/engine/staticpropmgr.h
rename to src/engine/staticpropmgr.h
diff --git a/r5dev/engine/sys_dll.cpp b/src/engine/sys_dll.cpp
similarity index 100%
rename from r5dev/engine/sys_dll.cpp
rename to src/engine/sys_dll.cpp
diff --git a/r5dev/engine/sys_dll.h b/src/engine/sys_dll.h
similarity index 100%
rename from r5dev/engine/sys_dll.h
rename to src/engine/sys_dll.h
diff --git a/r5dev/engine/sys_dll2.cpp b/src/engine/sys_dll2.cpp
similarity index 100%
rename from r5dev/engine/sys_dll2.cpp
rename to src/engine/sys_dll2.cpp
diff --git a/r5dev/engine/sys_dll2.h b/src/engine/sys_dll2.h
similarity index 100%
rename from r5dev/engine/sys_dll2.h
rename to src/engine/sys_dll2.h
diff --git a/r5dev/engine/sys_engine.cpp b/src/engine/sys_engine.cpp
similarity index 100%
rename from r5dev/engine/sys_engine.cpp
rename to src/engine/sys_engine.cpp
diff --git a/r5dev/engine/sys_engine.h b/src/engine/sys_engine.h
similarity index 100%
rename from r5dev/engine/sys_engine.h
rename to src/engine/sys_engine.h
diff --git a/r5dev/engine/sys_getmodes.cpp b/src/engine/sys_getmodes.cpp
similarity index 100%
rename from r5dev/engine/sys_getmodes.cpp
rename to src/engine/sys_getmodes.cpp
diff --git a/r5dev/engine/sys_getmodes.h b/src/engine/sys_getmodes.h
similarity index 100%
rename from r5dev/engine/sys_getmodes.h
rename to src/engine/sys_getmodes.h
diff --git a/r5dev/engine/sys_mainwind.cpp b/src/engine/sys_mainwind.cpp
similarity index 100%
rename from r5dev/engine/sys_mainwind.cpp
rename to src/engine/sys_mainwind.cpp
diff --git a/r5dev/engine/sys_mainwind.h b/src/engine/sys_mainwind.h
similarity index 100%
rename from r5dev/engine/sys_mainwind.h
rename to src/engine/sys_mainwind.h
diff --git a/r5dev/engine/sys_utils.cpp b/src/engine/sys_utils.cpp
similarity index 100%
rename from r5dev/engine/sys_utils.cpp
rename to src/engine/sys_utils.cpp
diff --git a/r5dev/engine/sys_utils.h b/src/engine/sys_utils.h
similarity index 100%
rename from r5dev/engine/sys_utils.h
rename to src/engine/sys_utils.h
diff --git a/r5dev/engine/traceinit.h b/src/engine/traceinit.h
similarity index 100%
rename from r5dev/engine/traceinit.h
rename to src/engine/traceinit.h
diff --git a/r5dev/filesystem/CMakeLists.txt b/src/filesystem/CMakeLists.txt
similarity index 100%
rename from r5dev/filesystem/CMakeLists.txt
rename to src/filesystem/CMakeLists.txt
diff --git a/r5dev/filesystem/basefilesystem.cpp b/src/filesystem/basefilesystem.cpp
similarity index 100%
rename from r5dev/filesystem/basefilesystem.cpp
rename to src/filesystem/basefilesystem.cpp
diff --git a/r5dev/filesystem/basefilesystem.h b/src/filesystem/basefilesystem.h
similarity index 100%
rename from r5dev/filesystem/basefilesystem.h
rename to src/filesystem/basefilesystem.h
diff --git a/r5dev/filesystem/filesystem.cpp b/src/filesystem/filesystem.cpp
similarity index 100%
rename from r5dev/filesystem/filesystem.cpp
rename to src/filesystem/filesystem.cpp
diff --git a/r5dev/filesystem/filesystem.h b/src/filesystem/filesystem.h
similarity index 100%
rename from r5dev/filesystem/filesystem.h
rename to src/filesystem/filesystem.h
diff --git a/r5dev/game/CMakeLists.txt b/src/game/CMakeLists.txt
similarity index 100%
rename from r5dev/game/CMakeLists.txt
rename to src/game/CMakeLists.txt
diff --git a/r5dev/game/client/c_baseentity.cpp b/src/game/client/c_baseentity.cpp
similarity index 100%
rename from r5dev/game/client/c_baseentity.cpp
rename to src/game/client/c_baseentity.cpp
diff --git a/r5dev/game/client/c_baseentity.h b/src/game/client/c_baseentity.h
similarity index 100%
rename from r5dev/game/client/c_baseentity.h
rename to src/game/client/c_baseentity.h
diff --git a/r5dev/game/client/c_baseplayer.h b/src/game/client/c_baseplayer.h
similarity index 100%
rename from r5dev/game/client/c_baseplayer.h
rename to src/game/client/c_baseplayer.h
diff --git a/r5dev/game/client/cliententitylist.h b/src/game/client/cliententitylist.h
similarity index 100%
rename from r5dev/game/client/cliententitylist.h
rename to src/game/client/cliententitylist.h
diff --git a/r5dev/game/client/enginesprite.h b/src/game/client/enginesprite.h
similarity index 100%
rename from r5dev/game/client/enginesprite.h
rename to src/game/client/enginesprite.h
diff --git a/r5dev/game/client/hud.h b/src/game/client/hud.h
similarity index 100%
rename from r5dev/game/client/hud.h
rename to src/game/client/hud.h
diff --git a/r5dev/game/client/input.cpp b/src/game/client/input.cpp
similarity index 100%
rename from r5dev/game/client/input.cpp
rename to src/game/client/input.cpp
diff --git a/r5dev/game/client/input.h b/src/game/client/input.h
similarity index 100%
rename from r5dev/game/client/input.h
rename to src/game/client/input.h
diff --git a/r5dev/game/client/movehelper_client.cpp b/src/game/client/movehelper_client.cpp
similarity index 100%
rename from r5dev/game/client/movehelper_client.cpp
rename to src/game/client/movehelper_client.cpp
diff --git a/r5dev/game/client/movehelper_client.h b/src/game/client/movehelper_client.h
similarity index 100%
rename from r5dev/game/client/movehelper_client.h
rename to src/game/client/movehelper_client.h
diff --git a/r5dev/game/client/spritemodel.cpp b/src/game/client/spritemodel.cpp
similarity index 100%
rename from r5dev/game/client/spritemodel.cpp
rename to src/game/client/spritemodel.cpp
diff --git a/r5dev/game/client/util_client.cpp b/src/game/client/util_client.cpp
similarity index 100%
rename from r5dev/game/client/util_client.cpp
rename to src/game/client/util_client.cpp
diff --git a/r5dev/game/client/util_client.h b/src/game/client/util_client.h
similarity index 100%
rename from r5dev/game/client/util_client.h
rename to src/game/client/util_client.h
diff --git a/r5dev/game/client/viewrender.cpp b/src/game/client/viewrender.cpp
similarity index 100%
rename from r5dev/game/client/viewrender.cpp
rename to src/game/client/viewrender.cpp
diff --git a/r5dev/game/client/viewrender.h b/src/game/client/viewrender.h
similarity index 100%
rename from r5dev/game/client/viewrender.h
rename to src/game/client/viewrender.h
diff --git a/r5dev/game/client/vscript_client.cpp b/src/game/client/vscript_client.cpp
similarity index 100%
rename from r5dev/game/client/vscript_client.cpp
rename to src/game/client/vscript_client.cpp
diff --git a/r5dev/game/client/vscript_client.h b/src/game/client/vscript_client.h
similarity index 100%
rename from r5dev/game/client/vscript_client.h
rename to src/game/client/vscript_client.h
diff --git a/r5dev/game/server/ai_network.cpp b/src/game/server/ai_network.cpp
similarity index 100%
rename from r5dev/game/server/ai_network.cpp
rename to src/game/server/ai_network.cpp
diff --git a/r5dev/game/server/ai_network.h b/src/game/server/ai_network.h
similarity index 100%
rename from r5dev/game/server/ai_network.h
rename to src/game/server/ai_network.h
diff --git a/r5dev/game/server/ai_networkmanager.cpp b/src/game/server/ai_networkmanager.cpp
similarity index 100%
rename from r5dev/game/server/ai_networkmanager.cpp
rename to src/game/server/ai_networkmanager.cpp
diff --git a/r5dev/game/server/ai_networkmanager.h b/src/game/server/ai_networkmanager.h
similarity index 100%
rename from r5dev/game/server/ai_networkmanager.h
rename to src/game/server/ai_networkmanager.h
diff --git a/r5dev/game/server/ai_node.h b/src/game/server/ai_node.h
similarity index 100%
rename from r5dev/game/server/ai_node.h
rename to src/game/server/ai_node.h
diff --git a/r5dev/game/server/ai_utility.cpp b/src/game/server/ai_utility.cpp
similarity index 100%
rename from r5dev/game/server/ai_utility.cpp
rename to src/game/server/ai_utility.cpp
diff --git a/r5dev/game/server/ai_utility.h b/src/game/server/ai_utility.h
similarity index 100%
rename from r5dev/game/server/ai_utility.h
rename to src/game/server/ai_utility.h
diff --git a/r5dev/game/server/baseanimating.cpp b/src/game/server/baseanimating.cpp
similarity index 100%
rename from r5dev/game/server/baseanimating.cpp
rename to src/game/server/baseanimating.cpp
diff --git a/r5dev/game/server/baseanimating.h b/src/game/server/baseanimating.h
similarity index 100%
rename from r5dev/game/server/baseanimating.h
rename to src/game/server/baseanimating.h
diff --git a/r5dev/game/server/baseanimatingoverlay.h b/src/game/server/baseanimatingoverlay.h
similarity index 100%
rename from r5dev/game/server/baseanimatingoverlay.h
rename to src/game/server/baseanimatingoverlay.h
diff --git a/r5dev/game/server/basecombatcharacter.h b/src/game/server/basecombatcharacter.h
similarity index 100%
rename from r5dev/game/server/basecombatcharacter.h
rename to src/game/server/basecombatcharacter.h
diff --git a/r5dev/game/server/baseentity.cpp b/src/game/server/baseentity.cpp
similarity index 100%
rename from r5dev/game/server/baseentity.cpp
rename to src/game/server/baseentity.cpp
diff --git a/r5dev/game/server/baseentity.h b/src/game/server/baseentity.h
similarity index 100%
rename from r5dev/game/server/baseentity.h
rename to src/game/server/baseentity.h
diff --git a/r5dev/game/server/cbase.cpp b/src/game/server/cbase.cpp
similarity index 100%
rename from r5dev/game/server/cbase.cpp
rename to src/game/server/cbase.cpp
diff --git a/r5dev/game/server/cbase.h b/src/game/server/cbase.h
similarity index 100%
rename from r5dev/game/server/cbase.h
rename to src/game/server/cbase.h
diff --git a/r5dev/game/server/detour_impl.h b/src/game/server/detour_impl.h
similarity index 100%
rename from r5dev/game/server/detour_impl.h
rename to src/game/server/detour_impl.h
diff --git a/r5dev/game/server/entitylist.cpp b/src/game/server/entitylist.cpp
similarity index 100%
rename from r5dev/game/server/entitylist.cpp
rename to src/game/server/entitylist.cpp
diff --git a/r5dev/game/server/entitylist.h b/src/game/server/entitylist.h
similarity index 100%
rename from r5dev/game/server/entitylist.h
rename to src/game/server/entitylist.h
diff --git a/r5dev/game/server/entityoutput.cpp b/src/game/server/entityoutput.cpp
similarity index 100%
rename from r5dev/game/server/entityoutput.cpp
rename to src/game/server/entityoutput.cpp
diff --git a/r5dev/game/server/entityoutput.h b/src/game/server/entityoutput.h
similarity index 100%
rename from r5dev/game/server/entityoutput.h
rename to src/game/server/entityoutput.h
diff --git a/r5dev/game/server/gameinterface.cpp b/src/game/server/gameinterface.cpp
similarity index 100%
rename from r5dev/game/server/gameinterface.cpp
rename to src/game/server/gameinterface.cpp
diff --git a/r5dev/game/server/gameinterface.h b/src/game/server/gameinterface.h
similarity index 100%
rename from r5dev/game/server/gameinterface.h
rename to src/game/server/gameinterface.h
diff --git a/r5dev/game/server/movehelper_server.cpp b/src/game/server/movehelper_server.cpp
similarity index 100%
rename from r5dev/game/server/movehelper_server.cpp
rename to src/game/server/movehelper_server.cpp
diff --git a/r5dev/game/server/movehelper_server.h b/src/game/server/movehelper_server.h
similarity index 100%
rename from r5dev/game/server/movehelper_server.h
rename to src/game/server/movehelper_server.h
diff --git a/r5dev/game/server/networkproperty.cpp b/src/game/server/networkproperty.cpp
similarity index 100%
rename from r5dev/game/server/networkproperty.cpp
rename to src/game/server/networkproperty.cpp
diff --git a/r5dev/game/server/networkproperty.h b/src/game/server/networkproperty.h
similarity index 100%
rename from r5dev/game/server/networkproperty.h
rename to src/game/server/networkproperty.h
diff --git a/r5dev/game/server/physics_main.cpp b/src/game/server/physics_main.cpp
similarity index 100%
rename from r5dev/game/server/physics_main.cpp
rename to src/game/server/physics_main.cpp
diff --git a/r5dev/game/server/physics_main.h b/src/game/server/physics_main.h
similarity index 100%
rename from r5dev/game/server/physics_main.h
rename to src/game/server/physics_main.h
diff --git a/r5dev/game/server/player.cpp b/src/game/server/player.cpp
similarity index 100%
rename from r5dev/game/server/player.cpp
rename to src/game/server/player.cpp
diff --git a/r5dev/game/server/player.h b/src/game/server/player.h
similarity index 100%
rename from r5dev/game/server/player.h
rename to src/game/server/player.h
diff --git a/r5dev/game/server/playerlocaldata.h b/src/game/server/playerlocaldata.h
similarity index 100%
rename from r5dev/game/server/playerlocaldata.h
rename to src/game/server/playerlocaldata.h
diff --git a/r5dev/game/server/util_server.cpp b/src/game/server/util_server.cpp
similarity index 100%
rename from r5dev/game/server/util_server.cpp
rename to src/game/server/util_server.cpp
diff --git a/r5dev/game/server/util_server.h b/src/game/server/util_server.h
similarity index 100%
rename from r5dev/game/server/util_server.h
rename to src/game/server/util_server.h
diff --git a/r5dev/game/server/variant_t.cpp b/src/game/server/variant_t.cpp
similarity index 100%
rename from r5dev/game/server/variant_t.cpp
rename to src/game/server/variant_t.cpp
diff --git a/r5dev/game/server/variant_t.h b/src/game/server/variant_t.h
similarity index 100%
rename from r5dev/game/server/variant_t.h
rename to src/game/server/variant_t.h
diff --git a/r5dev/game/server/vscript_server.cpp b/src/game/server/vscript_server.cpp
similarity index 100%
rename from r5dev/game/server/vscript_server.cpp
rename to src/game/server/vscript_server.cpp
diff --git a/r5dev/game/server/vscript_server.h b/src/game/server/vscript_server.h
similarity index 100%
rename from r5dev/game/server/vscript_server.h
rename to src/game/server/vscript_server.h
diff --git a/r5dev/game/shared/ai_utility_shared.cpp b/src/game/shared/ai_utility_shared.cpp
similarity index 100%
rename from r5dev/game/shared/ai_utility_shared.cpp
rename to src/game/shared/ai_utility_shared.cpp
diff --git a/r5dev/game/shared/ai_utility_shared.h b/src/game/shared/ai_utility_shared.h
similarity index 100%
rename from r5dev/game/shared/ai_utility_shared.h
rename to src/game/shared/ai_utility_shared.h
diff --git a/r5dev/game/shared/animation.cpp b/src/game/shared/animation.cpp
similarity index 100%
rename from r5dev/game/shared/animation.cpp
rename to src/game/shared/animation.cpp
diff --git a/r5dev/game/shared/animation.h b/src/game/shared/animation.h
similarity index 100%
rename from r5dev/game/shared/animation.h
rename to src/game/shared/animation.h
diff --git a/r5dev/game/shared/collisionproperty.cpp b/src/game/shared/collisionproperty.cpp
similarity index 100%
rename from r5dev/game/shared/collisionproperty.cpp
rename to src/game/shared/collisionproperty.cpp
diff --git a/r5dev/game/shared/collisionproperty.h b/src/game/shared/collisionproperty.h
similarity index 100%
rename from r5dev/game/shared/collisionproperty.h
rename to src/game/shared/collisionproperty.h
diff --git a/r5dev/game/shared/ehandle.h b/src/game/shared/ehandle.h
similarity index 100%
rename from r5dev/game/shared/ehandle.h
rename to src/game/shared/ehandle.h
diff --git a/r5dev/game/shared/entitylist_base.cpp b/src/game/shared/entitylist_base.cpp
similarity index 100%
rename from r5dev/game/shared/entitylist_base.cpp
rename to src/game/shared/entitylist_base.cpp
diff --git a/r5dev/game/shared/entitylist_base.h b/src/game/shared/entitylist_base.h
similarity index 100%
rename from r5dev/game/shared/entitylist_base.h
rename to src/game/shared/entitylist_base.h
diff --git a/r5dev/game/shared/imovehelper.h b/src/game/shared/imovehelper.h
similarity index 100%
rename from r5dev/game/shared/imovehelper.h
rename to src/game/shared/imovehelper.h
diff --git a/r5dev/game/shared/playernet_vars.h b/src/game/shared/playernet_vars.h
similarity index 100%
rename from r5dev/game/shared/playernet_vars.h
rename to src/game/shared/playernet_vars.h
diff --git a/r5dev/game/shared/predictioncopy.h b/src/game/shared/predictioncopy.h
similarity index 100%
rename from r5dev/game/shared/predictioncopy.h
rename to src/game/shared/predictioncopy.h
diff --git a/r5dev/game/shared/r1/weapon_bolt.cpp b/src/game/shared/r1/weapon_bolt.cpp
similarity index 100%
rename from r5dev/game/shared/r1/weapon_bolt.cpp
rename to src/game/shared/r1/weapon_bolt.cpp
diff --git a/r5dev/game/shared/r1/weapon_bolt.h b/src/game/shared/r1/weapon_bolt.h
similarity index 100%
rename from r5dev/game/shared/r1/weapon_bolt.h
rename to src/game/shared/r1/weapon_bolt.h
diff --git a/r5dev/game/shared/shared_classnames.h b/src/game/shared/shared_classnames.h
similarity index 100%
rename from r5dev/game/shared/shared_classnames.h
rename to src/game/shared/shared_classnames.h
diff --git a/r5dev/game/shared/shareddefs.h b/src/game/shared/shareddefs.h
similarity index 100%
rename from r5dev/game/shared/shareddefs.h
rename to src/game/shared/shareddefs.h
diff --git a/r5dev/game/shared/takedamageinfo.h b/src/game/shared/takedamageinfo.h
similarity index 100%
rename from r5dev/game/shared/takedamageinfo.h
rename to src/game/shared/takedamageinfo.h
diff --git a/r5dev/game/shared/usercmd.cpp b/src/game/shared/usercmd.cpp
similarity index 100%
rename from r5dev/game/shared/usercmd.cpp
rename to src/game/shared/usercmd.cpp
diff --git a/r5dev/game/shared/usercmd.h b/src/game/shared/usercmd.h
similarity index 100%
rename from r5dev/game/shared/usercmd.h
rename to src/game/shared/usercmd.h
diff --git a/r5dev/game/shared/usermessages.h b/src/game/shared/usermessages.h
similarity index 100%
rename from r5dev/game/shared/usermessages.h
rename to src/game/shared/usermessages.h
diff --git a/r5dev/game/shared/util_shared.cpp b/src/game/shared/util_shared.cpp
similarity index 100%
rename from r5dev/game/shared/util_shared.cpp
rename to src/game/shared/util_shared.cpp
diff --git a/r5dev/game/shared/util_shared.h b/src/game/shared/util_shared.h
similarity index 100%
rename from r5dev/game/shared/util_shared.h
rename to src/game/shared/util_shared.h
diff --git a/r5dev/game/shared/vscript_shared.cpp b/src/game/shared/vscript_shared.cpp
similarity index 100%
rename from r5dev/game/shared/vscript_shared.cpp
rename to src/game/shared/vscript_shared.cpp
diff --git a/r5dev/game/shared/vscript_shared.h b/src/game/shared/vscript_shared.h
similarity index 100%
rename from r5dev/game/shared/vscript_shared.h
rename to src/game/shared/vscript_shared.h
diff --git a/r5dev/gameui/CMakeLists.txt b/src/gameui/CMakeLists.txt
similarity index 100%
rename from r5dev/gameui/CMakeLists.txt
rename to src/gameui/CMakeLists.txt
diff --git a/r5dev/gameui/IBrowser.cpp b/src/gameui/IBrowser.cpp
similarity index 100%
rename from r5dev/gameui/IBrowser.cpp
rename to src/gameui/IBrowser.cpp
diff --git a/r5dev/gameui/IBrowser.h b/src/gameui/IBrowser.h
similarity index 100%
rename from r5dev/gameui/IBrowser.h
rename to src/gameui/IBrowser.h
diff --git a/r5dev/gameui/IConsole.cpp b/src/gameui/IConsole.cpp
similarity index 100%
rename from r5dev/gameui/IConsole.cpp
rename to src/gameui/IConsole.cpp
diff --git a/r5dev/gameui/IConsole.h b/src/gameui/IConsole.h
similarity index 100%
rename from r5dev/gameui/IConsole.h
rename to src/gameui/IConsole.h
diff --git a/r5dev/geforce/CMakeLists.txt b/src/geforce/CMakeLists.txt
similarity index 100%
rename from r5dev/geforce/CMakeLists.txt
rename to src/geforce/CMakeLists.txt
diff --git a/r5dev/geforce/reflex.cpp b/src/geforce/reflex.cpp
similarity index 100%
rename from r5dev/geforce/reflex.cpp
rename to src/geforce/reflex.cpp
diff --git a/r5dev/geforce/reflex.h b/src/geforce/reflex.h
similarity index 100%
rename from r5dev/geforce/reflex.h
rename to src/geforce/reflex.h
diff --git a/r5dev/inputsystem/CMakeLists.txt b/src/inputsystem/CMakeLists.txt
similarity index 100%
rename from r5dev/inputsystem/CMakeLists.txt
rename to src/inputsystem/CMakeLists.txt
diff --git a/r5dev/inputsystem/inputsystem.cpp b/src/inputsystem/inputsystem.cpp
similarity index 100%
rename from r5dev/inputsystem/inputsystem.cpp
rename to src/inputsystem/inputsystem.cpp
diff --git a/r5dev/inputsystem/inputsystem.h b/src/inputsystem/inputsystem.h
similarity index 100%
rename from r5dev/inputsystem/inputsystem.h
rename to src/inputsystem/inputsystem.h
diff --git a/r5dev/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt
similarity index 100%
rename from r5dev/launcher/CMakeLists.txt
rename to src/launcher/CMakeLists.txt
diff --git a/r5dev/launcher/launcher.cpp b/src/launcher/launcher.cpp
similarity index 100%
rename from r5dev/launcher/launcher.cpp
rename to src/launcher/launcher.cpp
diff --git a/r5dev/launcher/launcher.h b/src/launcher/launcher.h
similarity index 100%
rename from r5dev/launcher/launcher.h
rename to src/launcher/launcher.h
diff --git a/r5dev/launcher/prx.cpp b/src/launcher/prx.cpp
similarity index 100%
rename from r5dev/launcher/prx.cpp
rename to src/launcher/prx.cpp
diff --git a/r5dev/launcher/prx.h b/src/launcher/prx.h
similarity index 100%
rename from r5dev/launcher/prx.h
rename to src/launcher/prx.h
diff --git a/r5dev/loader/CMakeLists.txt b/src/loader/CMakeLists.txt
similarity index 100%
rename from r5dev/loader/CMakeLists.txt
rename to src/loader/CMakeLists.txt
diff --git a/r5dev/loader/loader.cpp b/src/loader/loader.cpp
similarity index 100%
rename from r5dev/loader/loader.cpp
rename to src/loader/loader.cpp
diff --git a/r5dev/loader/loader.h b/src/loader/loader.h
similarity index 100%
rename from r5dev/loader/loader.h
rename to src/loader/loader.h
diff --git a/r5dev/localize/CMakeLists.txt b/src/localize/CMakeLists.txt
similarity index 100%
rename from r5dev/localize/CMakeLists.txt
rename to src/localize/CMakeLists.txt
diff --git a/r5dev/localize/localize.cpp b/src/localize/localize.cpp
similarity index 100%
rename from r5dev/localize/localize.cpp
rename to src/localize/localize.cpp
diff --git a/r5dev/localize/localize.h b/src/localize/localize.h
similarity index 100%
rename from r5dev/localize/localize.h
rename to src/localize/localize.h
diff --git a/r5dev/materialsystem/CMakeLists.txt b/src/materialsystem/CMakeLists.txt
similarity index 100%
rename from r5dev/materialsystem/CMakeLists.txt
rename to src/materialsystem/CMakeLists.txt
diff --git a/r5dev/materialsystem/cmaterialglue.cpp b/src/materialsystem/cmaterialglue.cpp
similarity index 100%
rename from r5dev/materialsystem/cmaterialglue.cpp
rename to src/materialsystem/cmaterialglue.cpp
diff --git a/r5dev/materialsystem/cmaterialglue.h b/src/materialsystem/cmaterialglue.h
similarity index 100%
rename from r5dev/materialsystem/cmaterialglue.h
rename to src/materialsystem/cmaterialglue.h
diff --git a/r5dev/materialsystem/cmaterialsystem.cpp b/src/materialsystem/cmaterialsystem.cpp
similarity index 100%
rename from r5dev/materialsystem/cmaterialsystem.cpp
rename to src/materialsystem/cmaterialsystem.cpp
diff --git a/r5dev/materialsystem/cmaterialsystem.h b/src/materialsystem/cmaterialsystem.h
similarity index 100%
rename from r5dev/materialsystem/cmaterialsystem.h
rename to src/materialsystem/cmaterialsystem.h
diff --git a/r5dev/materialsystem/cshaderglue.cpp b/src/materialsystem/cshaderglue.cpp
similarity index 100%
rename from r5dev/materialsystem/cshaderglue.cpp
rename to src/materialsystem/cshaderglue.cpp
diff --git a/r5dev/materialsystem/cshaderglue.h b/src/materialsystem/cshaderglue.h
similarity index 100%
rename from r5dev/materialsystem/cshaderglue.h
rename to src/materialsystem/cshaderglue.h
diff --git a/r5dev/mathlib/CMakeLists.txt b/src/mathlib/CMakeLists.txt
similarity index 100%
rename from r5dev/mathlib/CMakeLists.txt
rename to src/mathlib/CMakeLists.txt
diff --git a/r5dev/mathlib/IceKey.H b/src/mathlib/IceKey.H
similarity index 100%
rename from r5dev/mathlib/IceKey.H
rename to src/mathlib/IceKey.H
diff --git a/r5dev/mathlib/IceKey.cpp b/src/mathlib/IceKey.cpp
similarity index 100%
rename from r5dev/mathlib/IceKey.cpp
rename to src/mathlib/IceKey.cpp
diff --git a/r5dev/mathlib/adler32.cpp b/src/mathlib/adler32.cpp
similarity index 100%
rename from r5dev/mathlib/adler32.cpp
rename to src/mathlib/adler32.cpp
diff --git a/r5dev/mathlib/adler32.h b/src/mathlib/adler32.h
similarity index 100%
rename from r5dev/mathlib/adler32.h
rename to src/mathlib/adler32.h
diff --git a/r5dev/mathlib/almostequal.cpp b/src/mathlib/almostequal.cpp
similarity index 100%
rename from r5dev/mathlib/almostequal.cpp
rename to src/mathlib/almostequal.cpp
diff --git a/r5dev/mathlib/bits.h b/src/mathlib/bits.h
similarity index 100%
rename from r5dev/mathlib/bits.h
rename to src/mathlib/bits.h
diff --git a/r5dev/mathlib/bitvec.h b/src/mathlib/bitvec.h
similarity index 100%
rename from r5dev/mathlib/bitvec.h
rename to src/mathlib/bitvec.h
diff --git a/r5dev/mathlib/color.h b/src/mathlib/color.h
similarity index 100%
rename from r5dev/mathlib/color.h
rename to src/mathlib/color.h
diff --git a/r5dev/mathlib/color_conversion.cpp b/src/mathlib/color_conversion.cpp
similarity index 100%
rename from r5dev/mathlib/color_conversion.cpp
rename to src/mathlib/color_conversion.cpp
diff --git a/r5dev/mathlib/compressed_vector.h b/src/mathlib/compressed_vector.h
similarity index 100%
rename from r5dev/mathlib/compressed_vector.h
rename to src/mathlib/compressed_vector.h
diff --git a/r5dev/mathlib/crc32.cpp b/src/mathlib/crc32.cpp
similarity index 100%
rename from r5dev/mathlib/crc32.cpp
rename to src/mathlib/crc32.cpp
diff --git a/r5dev/mathlib/crc32.h b/src/mathlib/crc32.h
similarity index 100%
rename from r5dev/mathlib/crc32.h
rename to src/mathlib/crc32.h
diff --git a/r5dev/mathlib/fbits.h b/src/mathlib/fbits.h
similarity index 100%
rename from r5dev/mathlib/fbits.h
rename to src/mathlib/fbits.h
diff --git a/r5dev/mathlib/fltx4.h b/src/mathlib/fltx4.h
similarity index 100%
rename from r5dev/mathlib/fltx4.h
rename to src/mathlib/fltx4.h
diff --git a/r5dev/mathlib/halton.cpp b/src/mathlib/halton.cpp
similarity index 100%
rename from r5dev/mathlib/halton.cpp
rename to src/mathlib/halton.cpp
diff --git a/r5dev/mathlib/halton.h b/src/mathlib/halton.h
similarity index 100%
rename from r5dev/mathlib/halton.h
rename to src/mathlib/halton.h
diff --git a/r5dev/mathlib/math_pfns.h b/src/mathlib/math_pfns.h
similarity index 100%
rename from r5dev/mathlib/math_pfns.h
rename to src/mathlib/math_pfns.h
diff --git a/r5dev/mathlib/mathlib.h b/src/mathlib/mathlib.h
similarity index 100%
rename from r5dev/mathlib/mathlib.h
rename to src/mathlib/mathlib.h
diff --git a/r5dev/mathlib/mathlib_base.cpp b/src/mathlib/mathlib_base.cpp
similarity index 100%
rename from r5dev/mathlib/mathlib_base.cpp
rename to src/mathlib/mathlib_base.cpp
diff --git a/r5dev/mathlib/mathlib_pch.h b/src/mathlib/mathlib_pch.h
similarity index 100%
rename from r5dev/mathlib/mathlib_pch.h
rename to src/mathlib/mathlib_pch.h
diff --git a/r5dev/mathlib/noisedata.h b/src/mathlib/noisedata.h
similarity index 100%
rename from r5dev/mathlib/noisedata.h
rename to src/mathlib/noisedata.h
diff --git a/r5dev/mathlib/parallel_for.h b/src/mathlib/parallel_for.h
similarity index 100%
rename from r5dev/mathlib/parallel_for.h
rename to src/mathlib/parallel_for.h
diff --git a/r5dev/mathlib/powsse.cpp b/src/mathlib/powsse.cpp
similarity index 100%
rename from r5dev/mathlib/powsse.cpp
rename to src/mathlib/powsse.cpp
diff --git a/r5dev/mathlib/randsse.cpp b/src/mathlib/randsse.cpp
similarity index 100%
rename from r5dev/mathlib/randsse.cpp
rename to src/mathlib/randsse.cpp
diff --git a/r5dev/mathlib/sha1.cpp b/src/mathlib/sha1.cpp
similarity index 100%
rename from r5dev/mathlib/sha1.cpp
rename to src/mathlib/sha1.cpp
diff --git a/r5dev/mathlib/sha1.h b/src/mathlib/sha1.h
similarity index 100%
rename from r5dev/mathlib/sha1.h
rename to src/mathlib/sha1.h
diff --git a/r5dev/mathlib/sha256.cpp b/src/mathlib/sha256.cpp
similarity index 100%
rename from r5dev/mathlib/sha256.cpp
rename to src/mathlib/sha256.cpp
diff --git a/r5dev/mathlib/sha256.h b/src/mathlib/sha256.h
similarity index 100%
rename from r5dev/mathlib/sha256.h
rename to src/mathlib/sha256.h
diff --git a/r5dev/mathlib/sseconst.cpp b/src/mathlib/sseconst.cpp
similarity index 100%
rename from r5dev/mathlib/sseconst.cpp
rename to src/mathlib/sseconst.cpp
diff --git a/r5dev/mathlib/ssemath.h b/src/mathlib/ssemath.h
similarity index 100%
rename from r5dev/mathlib/ssemath.h
rename to src/mathlib/ssemath.h
diff --git a/r5dev/mathlib/ssenoise.cpp b/src/mathlib/ssenoise.cpp
similarity index 100%
rename from r5dev/mathlib/ssenoise.cpp
rename to src/mathlib/ssenoise.cpp
diff --git a/r5dev/mathlib/ssequaternion.h b/src/mathlib/ssequaternion.h
similarity index 100%
rename from r5dev/mathlib/ssequaternion.h
rename to src/mathlib/ssequaternion.h
diff --git a/r5dev/mathlib/swap.h b/src/mathlib/swap.h
similarity index 100%
rename from r5dev/mathlib/swap.h
rename to src/mathlib/swap.h
diff --git a/r5dev/mathlib/transform.cpp b/src/mathlib/transform.cpp
similarity index 100%
rename from r5dev/mathlib/transform.cpp
rename to src/mathlib/transform.cpp
diff --git a/r5dev/mathlib/transform.h b/src/mathlib/transform.h
similarity index 100%
rename from r5dev/mathlib/transform.h
rename to src/mathlib/transform.h
diff --git a/r5dev/mathlib/vector.h b/src/mathlib/vector.h
similarity index 100%
rename from r5dev/mathlib/vector.h
rename to src/mathlib/vector.h
diff --git a/r5dev/mathlib/vector2d.h b/src/mathlib/vector2d.h
similarity index 100%
rename from r5dev/mathlib/vector2d.h
rename to src/mathlib/vector2d.h
diff --git a/r5dev/mathlib/vector4d.h b/src/mathlib/vector4d.h
similarity index 100%
rename from r5dev/mathlib/vector4d.h
rename to src/mathlib/vector4d.h
diff --git a/r5dev/mathlib/vmatrix.cpp b/src/mathlib/vmatrix.cpp
similarity index 100%
rename from r5dev/mathlib/vmatrix.cpp
rename to src/mathlib/vmatrix.cpp
diff --git a/r5dev/mathlib/vmatrix.h b/src/mathlib/vmatrix.h
similarity index 100%
rename from r5dev/mathlib/vmatrix.h
rename to src/mathlib/vmatrix.h
diff --git a/r5dev/mathlib/vplane.h b/src/mathlib/vplane.h
similarity index 100%
rename from r5dev/mathlib/vplane.h
rename to src/mathlib/vplane.h
diff --git a/r5dev/naveditor/CMakeLists.txt b/src/naveditor/CMakeLists.txt
similarity index 100%
rename from r5dev/naveditor/CMakeLists.txt
rename to src/naveditor/CMakeLists.txt
diff --git a/r5dev/naveditor/ChunkyTriMesh.cpp b/src/naveditor/ChunkyTriMesh.cpp
similarity index 100%
rename from r5dev/naveditor/ChunkyTriMesh.cpp
rename to src/naveditor/ChunkyTriMesh.cpp
diff --git a/r5dev/naveditor/ConvexVolumeTool.cpp b/src/naveditor/ConvexVolumeTool.cpp
similarity index 100%
rename from r5dev/naveditor/ConvexVolumeTool.cpp
rename to src/naveditor/ConvexVolumeTool.cpp
diff --git a/r5dev/naveditor/CrowdTool.cpp b/src/naveditor/CrowdTool.cpp
similarity index 100%
rename from r5dev/naveditor/CrowdTool.cpp
rename to src/naveditor/CrowdTool.cpp
diff --git a/r5dev/naveditor/Editor.cpp b/src/naveditor/Editor.cpp
similarity index 100%
rename from r5dev/naveditor/Editor.cpp
rename to src/naveditor/Editor.cpp
diff --git a/r5dev/naveditor/EditorInterfaces.cpp b/src/naveditor/EditorInterfaces.cpp
similarity index 100%
rename from r5dev/naveditor/EditorInterfaces.cpp
rename to src/naveditor/EditorInterfaces.cpp
diff --git a/r5dev/naveditor/Editor_Debug.cpp b/src/naveditor/Editor_Debug.cpp
similarity index 100%
rename from r5dev/naveditor/Editor_Debug.cpp
rename to src/naveditor/Editor_Debug.cpp
diff --git a/r5dev/naveditor/Editor_SoloMesh.cpp b/src/naveditor/Editor_SoloMesh.cpp
similarity index 100%
rename from r5dev/naveditor/Editor_SoloMesh.cpp
rename to src/naveditor/Editor_SoloMesh.cpp
diff --git a/r5dev/naveditor/Editor_TempObstacles.cpp b/src/naveditor/Editor_TempObstacles.cpp
similarity index 100%
rename from r5dev/naveditor/Editor_TempObstacles.cpp
rename to src/naveditor/Editor_TempObstacles.cpp
diff --git a/r5dev/naveditor/Editor_TileMesh.cpp b/src/naveditor/Editor_TileMesh.cpp
similarity index 100%
rename from r5dev/naveditor/Editor_TileMesh.cpp
rename to src/naveditor/Editor_TileMesh.cpp
diff --git a/r5dev/naveditor/Filelist.cpp b/src/naveditor/Filelist.cpp
similarity index 100%
rename from r5dev/naveditor/Filelist.cpp
rename to src/naveditor/Filelist.cpp
diff --git a/r5dev/naveditor/GameUtils.cpp b/src/naveditor/GameUtils.cpp
similarity index 100%
rename from r5dev/naveditor/GameUtils.cpp
rename to src/naveditor/GameUtils.cpp
diff --git a/r5dev/naveditor/InputGeom.cpp b/src/naveditor/InputGeom.cpp
similarity index 100%
rename from r5dev/naveditor/InputGeom.cpp
rename to src/naveditor/InputGeom.cpp
diff --git a/r5dev/naveditor/MeshLoaderBsp.cpp b/src/naveditor/MeshLoaderBsp.cpp
similarity index 100%
rename from r5dev/naveditor/MeshLoaderBsp.cpp
rename to src/naveditor/MeshLoaderBsp.cpp
diff --git a/r5dev/naveditor/MeshLoaderObj.cpp b/src/naveditor/MeshLoaderObj.cpp
similarity index 100%
rename from r5dev/naveditor/MeshLoaderObj.cpp
rename to src/naveditor/MeshLoaderObj.cpp
diff --git a/r5dev/naveditor/MeshLoaderPly.cpp b/src/naveditor/MeshLoaderPly.cpp
similarity index 100%
rename from r5dev/naveditor/MeshLoaderPly.cpp
rename to src/naveditor/MeshLoaderPly.cpp
diff --git a/r5dev/naveditor/NavMeshPruneTool.cpp b/src/naveditor/NavMeshPruneTool.cpp
similarity index 100%
rename from r5dev/naveditor/NavMeshPruneTool.cpp
rename to src/naveditor/NavMeshPruneTool.cpp
diff --git a/r5dev/naveditor/NavMeshTesterTool.cpp b/src/naveditor/NavMeshTesterTool.cpp
similarity index 100%
rename from r5dev/naveditor/NavMeshTesterTool.cpp
rename to src/naveditor/NavMeshTesterTool.cpp
diff --git a/r5dev/naveditor/OffMeshConnectionTool.cpp b/src/naveditor/OffMeshConnectionTool.cpp
similarity index 100%
rename from r5dev/naveditor/OffMeshConnectionTool.cpp
rename to src/naveditor/OffMeshConnectionTool.cpp
diff --git a/r5dev/naveditor/PerfTimer.cpp b/src/naveditor/PerfTimer.cpp
similarity index 100%
rename from r5dev/naveditor/PerfTimer.cpp
rename to src/naveditor/PerfTimer.cpp
diff --git a/r5dev/naveditor/Sample_TempObstacles.cpp b/src/naveditor/Sample_TempObstacles.cpp
similarity index 100%
rename from r5dev/naveditor/Sample_TempObstacles.cpp
rename to src/naveditor/Sample_TempObstacles.cpp
diff --git a/r5dev/naveditor/TestCase.cpp b/src/naveditor/TestCase.cpp
similarity index 100%
rename from r5dev/naveditor/TestCase.cpp
rename to src/naveditor/TestCase.cpp
diff --git a/r5dev/naveditor/ValueHistory.cpp b/src/naveditor/ValueHistory.cpp
similarity index 100%
rename from r5dev/naveditor/ValueHistory.cpp
rename to src/naveditor/ValueHistory.cpp
diff --git a/r5dev/naveditor/imgui.cpp b/src/naveditor/imgui.cpp
similarity index 100%
rename from r5dev/naveditor/imgui.cpp
rename to src/naveditor/imgui.cpp
diff --git a/r5dev/naveditor/imguiRenderGL.cpp b/src/naveditor/imguiRenderGL.cpp
similarity index 100%
rename from r5dev/naveditor/imguiRenderGL.cpp
rename to src/naveditor/imguiRenderGL.cpp
diff --git a/r5dev/naveditor/include/ChunkyTriMesh.h b/src/naveditor/include/ChunkyTriMesh.h
similarity index 100%
rename from r5dev/naveditor/include/ChunkyTriMesh.h
rename to src/naveditor/include/ChunkyTriMesh.h
diff --git a/r5dev/naveditor/include/ConvexVolumeTool.h b/src/naveditor/include/ConvexVolumeTool.h
similarity index 100%
rename from r5dev/naveditor/include/ConvexVolumeTool.h
rename to src/naveditor/include/ConvexVolumeTool.h
diff --git a/r5dev/naveditor/include/CrowdTool.h b/src/naveditor/include/CrowdTool.h
similarity index 100%
rename from r5dev/naveditor/include/CrowdTool.h
rename to src/naveditor/include/CrowdTool.h
diff --git a/r5dev/naveditor/include/DroidSans.h b/src/naveditor/include/DroidSans.h
similarity index 100%
rename from r5dev/naveditor/include/DroidSans.h
rename to src/naveditor/include/DroidSans.h
diff --git a/r5dev/naveditor/include/Editor.h b/src/naveditor/include/Editor.h
similarity index 100%
rename from r5dev/naveditor/include/Editor.h
rename to src/naveditor/include/Editor.h
diff --git a/r5dev/naveditor/include/EditorInterfaces.h b/src/naveditor/include/EditorInterfaces.h
similarity index 100%
rename from r5dev/naveditor/include/EditorInterfaces.h
rename to src/naveditor/include/EditorInterfaces.h
diff --git a/r5dev/naveditor/include/Editor_Debug.h b/src/naveditor/include/Editor_Debug.h
similarity index 100%
rename from r5dev/naveditor/include/Editor_Debug.h
rename to src/naveditor/include/Editor_Debug.h
diff --git a/r5dev/naveditor/include/Editor_SoloMesh.h b/src/naveditor/include/Editor_SoloMesh.h
similarity index 100%
rename from r5dev/naveditor/include/Editor_SoloMesh.h
rename to src/naveditor/include/Editor_SoloMesh.h
diff --git a/r5dev/naveditor/include/Editor_TempObstacles.h b/src/naveditor/include/Editor_TempObstacles.h
similarity index 100%
rename from r5dev/naveditor/include/Editor_TempObstacles.h
rename to src/naveditor/include/Editor_TempObstacles.h
diff --git a/r5dev/naveditor/include/Editor_TileMesh.h b/src/naveditor/include/Editor_TileMesh.h
similarity index 100%
rename from r5dev/naveditor/include/Editor_TileMesh.h
rename to src/naveditor/include/Editor_TileMesh.h
diff --git a/r5dev/naveditor/include/FileTypes.h b/src/naveditor/include/FileTypes.h
similarity index 100%
rename from r5dev/naveditor/include/FileTypes.h
rename to src/naveditor/include/FileTypes.h
diff --git a/r5dev/naveditor/include/Filelist.h b/src/naveditor/include/Filelist.h
similarity index 100%
rename from r5dev/naveditor/include/Filelist.h
rename to src/naveditor/include/Filelist.h
diff --git a/r5dev/naveditor/include/GameUtils.h b/src/naveditor/include/GameUtils.h
similarity index 100%
rename from r5dev/naveditor/include/GameUtils.h
rename to src/naveditor/include/GameUtils.h
diff --git a/r5dev/naveditor/include/InputGeom.h b/src/naveditor/include/InputGeom.h
similarity index 100%
rename from r5dev/naveditor/include/InputGeom.h
rename to src/naveditor/include/InputGeom.h
diff --git a/r5dev/naveditor/include/MeshLoaderBsp.h b/src/naveditor/include/MeshLoaderBsp.h
similarity index 100%
rename from r5dev/naveditor/include/MeshLoaderBsp.h
rename to src/naveditor/include/MeshLoaderBsp.h
diff --git a/r5dev/naveditor/include/MeshLoaderObj.h b/src/naveditor/include/MeshLoaderObj.h
similarity index 100%
rename from r5dev/naveditor/include/MeshLoaderObj.h
rename to src/naveditor/include/MeshLoaderObj.h
diff --git a/r5dev/naveditor/include/MeshLoaderPly.h b/src/naveditor/include/MeshLoaderPly.h
similarity index 100%
rename from r5dev/naveditor/include/MeshLoaderPly.h
rename to src/naveditor/include/MeshLoaderPly.h
diff --git a/r5dev/naveditor/include/NavMeshPruneTool.h b/src/naveditor/include/NavMeshPruneTool.h
similarity index 100%
rename from r5dev/naveditor/include/NavMeshPruneTool.h
rename to src/naveditor/include/NavMeshPruneTool.h
diff --git a/r5dev/naveditor/include/NavMeshTesterTool.h b/src/naveditor/include/NavMeshTesterTool.h
similarity index 100%
rename from r5dev/naveditor/include/NavMeshTesterTool.h
rename to src/naveditor/include/NavMeshTesterTool.h
diff --git a/r5dev/naveditor/include/OffMeshConnectionTool.h b/src/naveditor/include/OffMeshConnectionTool.h
similarity index 100%
rename from r5dev/naveditor/include/OffMeshConnectionTool.h
rename to src/naveditor/include/OffMeshConnectionTool.h
diff --git a/r5dev/naveditor/include/PerfTimer.h b/src/naveditor/include/PerfTimer.h
similarity index 100%
rename from r5dev/naveditor/include/PerfTimer.h
rename to src/naveditor/include/PerfTimer.h
diff --git a/r5dev/naveditor/include/TestCase.h b/src/naveditor/include/TestCase.h
similarity index 100%
rename from r5dev/naveditor/include/TestCase.h
rename to src/naveditor/include/TestCase.h
diff --git a/r5dev/naveditor/include/ValueHistory.h b/src/naveditor/include/ValueHistory.h
similarity index 100%
rename from r5dev/naveditor/include/ValueHistory.h
rename to src/naveditor/include/ValueHistory.h
diff --git a/r5dev/naveditor/include/imgui.h b/src/naveditor/include/imgui.h
similarity index 100%
rename from r5dev/naveditor/include/imgui.h
rename to src/naveditor/include/imgui.h
diff --git a/r5dev/naveditor/include/imguiRenderGL.h b/src/naveditor/include/imguiRenderGL.h
similarity index 100%
rename from r5dev/naveditor/include/imguiRenderGL.h
rename to src/naveditor/include/imguiRenderGL.h
diff --git a/r5dev/naveditor/main.cpp b/src/naveditor/main.cpp
similarity index 100%
rename from r5dev/naveditor/main.cpp
rename to src/naveditor/main.cpp
diff --git a/r5dev/netconsole/CMakeLists.txt b/src/netconsole/CMakeLists.txt
similarity index 100%
rename from r5dev/netconsole/CMakeLists.txt
rename to src/netconsole/CMakeLists.txt
diff --git a/r5dev/netconsole/netconsole.cpp b/src/netconsole/netconsole.cpp
similarity index 100%
rename from r5dev/netconsole/netconsole.cpp
rename to src/netconsole/netconsole.cpp
diff --git a/r5dev/netconsole/netconsole.h b/src/netconsole/netconsole.h
similarity index 100%
rename from r5dev/netconsole/netconsole.h
rename to src/netconsole/netconsole.h
diff --git a/r5dev/netconsole/plat_time.cpp b/src/netconsole/plat_time.cpp
similarity index 100%
rename from r5dev/netconsole/plat_time.cpp
rename to src/netconsole/plat_time.cpp
diff --git a/r5dev/networksystem/CMakeLists.txt b/src/networksystem/CMakeLists.txt
similarity index 100%
rename from r5dev/networksystem/CMakeLists.txt
rename to src/networksystem/CMakeLists.txt
diff --git a/r5dev/networksystem/bansystem.cpp b/src/networksystem/bansystem.cpp
similarity index 100%
rename from r5dev/networksystem/bansystem.cpp
rename to src/networksystem/bansystem.cpp
diff --git a/r5dev/networksystem/bansystem.h b/src/networksystem/bansystem.h
similarity index 100%
rename from r5dev/networksystem/bansystem.h
rename to src/networksystem/bansystem.h
diff --git a/r5dev/networksystem/listmanager.cpp b/src/networksystem/listmanager.cpp
similarity index 100%
rename from r5dev/networksystem/listmanager.cpp
rename to src/networksystem/listmanager.cpp
diff --git a/r5dev/networksystem/listmanager.h b/src/networksystem/listmanager.h
similarity index 100%
rename from r5dev/networksystem/listmanager.h
rename to src/networksystem/listmanager.h
diff --git a/r5dev/networksystem/pylon.cpp b/src/networksystem/pylon.cpp
similarity index 100%
rename from r5dev/networksystem/pylon.cpp
rename to src/networksystem/pylon.cpp
diff --git a/r5dev/networksystem/pylon.h b/src/networksystem/pylon.h
similarity index 100%
rename from r5dev/networksystem/pylon.h
rename to src/networksystem/pylon.h
diff --git a/r5dev/networksystem/serverlisting.h b/src/networksystem/serverlisting.h
similarity index 100%
rename from r5dev/networksystem/serverlisting.h
rename to src/networksystem/serverlisting.h
diff --git a/r5dev/networksystem/sm_protocol.h b/src/networksystem/sm_protocol.h
similarity index 100%
rename from r5dev/networksystem/sm_protocol.h
rename to src/networksystem/sm_protocol.h
diff --git a/r5dev/pluginsdk/CMakeLists.txt b/src/pluginsdk/CMakeLists.txt
similarity index 100%
rename from r5dev/pluginsdk/CMakeLists.txt
rename to src/pluginsdk/CMakeLists.txt
diff --git a/r5dev/pluginsdk/dllmain.cpp b/src/pluginsdk/dllmain.cpp
similarity index 100%
rename from r5dev/pluginsdk/dllmain.cpp
rename to src/pluginsdk/dllmain.cpp
diff --git a/r5dev/pluginsdk/ifactory.h b/src/pluginsdk/ifactory.h
similarity index 100%
rename from r5dev/pluginsdk/ifactory.h
rename to src/pluginsdk/ifactory.h
diff --git a/r5dev/pluginsdk/pluginsdk.cpp b/src/pluginsdk/pluginsdk.cpp
similarity index 100%
rename from r5dev/pluginsdk/pluginsdk.cpp
rename to src/pluginsdk/pluginsdk.cpp
diff --git a/r5dev/pluginsdk/pluginsdk.h b/src/pluginsdk/pluginsdk.h
similarity index 100%
rename from r5dev/pluginsdk/pluginsdk.h
rename to src/pluginsdk/pluginsdk.h
diff --git a/r5dev/pluginsystem/CMakeLists.txt b/src/pluginsystem/CMakeLists.txt
similarity index 100%
rename from r5dev/pluginsystem/CMakeLists.txt
rename to src/pluginsystem/CMakeLists.txt
diff --git a/r5dev/pluginsystem/ipluginsystem.h b/src/pluginsystem/ipluginsystem.h
similarity index 100%
rename from r5dev/pluginsystem/ipluginsystem.h
rename to src/pluginsystem/ipluginsystem.h
diff --git a/r5dev/pluginsystem/modsystem.cpp b/src/pluginsystem/modsystem.cpp
similarity index 100%
rename from r5dev/pluginsystem/modsystem.cpp
rename to src/pluginsystem/modsystem.cpp
diff --git a/r5dev/pluginsystem/modsystem.h b/src/pluginsystem/modsystem.h
similarity index 100%
rename from r5dev/pluginsystem/modsystem.h
rename to src/pluginsystem/modsystem.h
diff --git a/r5dev/pluginsystem/pluginsystem.cpp b/src/pluginsystem/pluginsystem.cpp
similarity index 100%
rename from r5dev/pluginsystem/pluginsystem.cpp
rename to src/pluginsystem/pluginsystem.cpp
diff --git a/r5dev/pluginsystem/pluginsystem.h b/src/pluginsystem/pluginsystem.h
similarity index 100%
rename from r5dev/pluginsystem/pluginsystem.h
rename to src/pluginsystem/pluginsystem.h
diff --git a/r5dev/protoc/CMakeLists.txt b/src/protoc/CMakeLists.txt
similarity index 100%
rename from r5dev/protoc/CMakeLists.txt
rename to src/protoc/CMakeLists.txt
diff --git a/r5dev/protoc/cl_rcon.pb.cc b/src/protoc/cl_rcon.pb.cc
similarity index 100%
rename from r5dev/protoc/cl_rcon.pb.cc
rename to src/protoc/cl_rcon.pb.cc
diff --git a/r5dev/protoc/cl_rcon.pb.h b/src/protoc/cl_rcon.pb.h
similarity index 100%
rename from r5dev/protoc/cl_rcon.pb.h
rename to src/protoc/cl_rcon.pb.h
diff --git a/r5dev/protoc/sig_map.pb.cc b/src/protoc/sig_map.pb.cc
similarity index 100%
rename from r5dev/protoc/sig_map.pb.cc
rename to src/protoc/sig_map.pb.cc
diff --git a/r5dev/protoc/sig_map.pb.h b/src/protoc/sig_map.pb.h
similarity index 100%
rename from r5dev/protoc/sig_map.pb.h
rename to src/protoc/sig_map.pb.h
diff --git a/r5dev/protoc/sv_rcon.pb.cc b/src/protoc/sv_rcon.pb.cc
similarity index 100%
rename from r5dev/protoc/sv_rcon.pb.cc
rename to src/protoc/sv_rcon.pb.cc
diff --git a/r5dev/protoc/sv_rcon.pb.h b/src/protoc/sv_rcon.pb.h
similarity index 100%
rename from r5dev/protoc/sv_rcon.pb.h
rename to src/protoc/sv_rcon.pb.h
diff --git a/r5dev/public/appframework/IAppSystem.h b/src/public/appframework/IAppSystem.h
similarity index 100%
rename from r5dev/public/appframework/IAppSystem.h
rename to src/public/appframework/IAppSystem.h
diff --git a/r5dev/public/appframework/IAppSystemGroup.h b/src/public/appframework/IAppSystemGroup.h
similarity index 100%
rename from r5dev/public/appframework/IAppSystemGroup.h
rename to src/public/appframework/IAppSystemGroup.h
diff --git a/r5dev/public/avi/iavi.h b/src/public/avi/iavi.h
similarity index 100%
rename from r5dev/public/avi/iavi.h
rename to src/public/avi/iavi.h
diff --git a/r5dev/public/avi/ibik.h b/src/public/avi/ibik.h
similarity index 100%
rename from r5dev/public/avi/ibik.h
rename to src/public/avi/ibik.h
diff --git a/r5dev/public/basehandle.h b/src/public/basehandle.h
similarity index 100%
rename from r5dev/public/basehandle.h
rename to src/public/basehandle.h
diff --git a/r5dev/public/bitmap/stb_image.h b/src/public/bitmap/stb_image.h
similarity index 100%
rename from r5dev/public/bitmap/stb_image.h
rename to src/public/bitmap/stb_image.h
diff --git a/r5dev/public/bspfile.h b/src/public/bspfile.h
similarity index 100%
rename from r5dev/public/bspfile.h
rename to src/public/bspfile.h
diff --git a/r5dev/public/bspflags.h b/src/public/bspflags.h
similarity index 100%
rename from r5dev/public/bspflags.h
rename to src/public/bspflags.h
diff --git a/r5dev/public/client_class.h b/src/public/client_class.h
similarity index 100%
rename from r5dev/public/client_class.h
rename to src/public/client_class.h
diff --git a/r5dev/public/cmodel.h b/src/public/cmodel.h
similarity index 100%
rename from r5dev/public/cmodel.h
rename to src/public/cmodel.h
diff --git a/r5dev/public/const.h b/src/public/const.h
similarity index 100%
rename from r5dev/public/const.h
rename to src/public/const.h
diff --git a/r5dev/public/datacache/idatacache.h b/src/public/datacache/idatacache.h
similarity index 100%
rename from r5dev/public/datacache/idatacache.h
rename to src/public/datacache/idatacache.h
diff --git a/r5dev/public/datacache/imdlcache.h b/src/public/datacache/imdlcache.h
similarity index 100%
rename from r5dev/public/datacache/imdlcache.h
rename to src/public/datacache/imdlcache.h
diff --git a/r5dev/public/datamap.h b/src/public/datamap.h
similarity index 100%
rename from r5dev/public/datamap.h
rename to src/public/datamap.h
diff --git a/r5dev/public/dt_common.h b/src/public/dt_common.h
similarity index 100%
rename from r5dev/public/dt_common.h
rename to src/public/dt_common.h
diff --git a/r5dev/public/dt_recv.h b/src/public/dt_recv.h
similarity index 100%
rename from r5dev/public/dt_recv.h
rename to src/public/dt_recv.h
diff --git a/r5dev/public/dt_send.h b/src/public/dt_send.h
similarity index 100%
rename from r5dev/public/dt_send.h
rename to src/public/dt_send.h
diff --git a/r5dev/public/ebisusdk/EbisuTypes.h b/src/public/ebisusdk/EbisuTypes.h
similarity index 100%
rename from r5dev/public/ebisusdk/EbisuTypes.h
rename to src/public/ebisusdk/EbisuTypes.h
diff --git a/r5dev/public/edict.h b/src/public/edict.h
similarity index 100%
rename from r5dev/public/edict.h
rename to src/public/edict.h
diff --git a/r5dev/public/eiface.h b/src/public/eiface.h
similarity index 100%
rename from r5dev/public/eiface.h
rename to src/public/eiface.h
diff --git a/r5dev/public/engine/ICollideable.h b/src/public/engine/ICollideable.h
similarity index 100%
rename from r5dev/public/engine/ICollideable.h
rename to src/public/engine/ICollideable.h
diff --git a/r5dev/public/engine/IEngineTrace.h b/src/public/engine/IEngineTrace.h
similarity index 100%
rename from r5dev/public/engine/IEngineTrace.h
rename to src/public/engine/IEngineTrace.h
diff --git a/r5dev/public/engine/IVModelInfo.h b/src/public/engine/IVModelInfo.h
similarity index 100%
rename from r5dev/public/engine/IVModelInfo.h
rename to src/public/engine/IVModelInfo.h
diff --git a/r5dev/public/game/client/iinput.h b/src/public/game/client/iinput.h
similarity index 100%
rename from r5dev/public/game/client/iinput.h
rename to src/public/game/client/iinput.h
diff --git a/r5dev/public/game/shared/in_buttons.h b/src/public/game/shared/in_buttons.h
similarity index 100%
rename from r5dev/public/game/shared/in_buttons.h
rename to src/public/game/shared/in_buttons.h
diff --git a/r5dev/public/game/shared/weapon_types.h b/src/public/game/shared/weapon_types.h
similarity index 100%
rename from r5dev/public/game/shared/weapon_types.h
rename to src/public/game/shared/weapon_types.h
diff --git a/r5dev/public/gamebspfile.h b/src/public/gamebspfile.h
similarity index 100%
rename from r5dev/public/gamebspfile.h
rename to src/public/gamebspfile.h
diff --git a/r5dev/public/gametrace.h b/src/public/gametrace.h
similarity index 100%
rename from r5dev/public/gametrace.h
rename to src/public/gametrace.h
diff --git a/r5dev/public/globalvars_base.h b/src/public/globalvars_base.h
similarity index 100%
rename from r5dev/public/globalvars_base.h
rename to src/public/globalvars_base.h
diff --git a/r5dev/public/icliententity.h b/src/public/icliententity.h
similarity index 100%
rename from r5dev/public/icliententity.h
rename to src/public/icliententity.h
diff --git a/r5dev/public/icliententitylist.h b/src/public/icliententitylist.h
similarity index 100%
rename from r5dev/public/icliententitylist.h
rename to src/public/icliententitylist.h
diff --git a/r5dev/public/iclientnetworkable.h b/src/public/iclientnetworkable.h
similarity index 100%
rename from r5dev/public/iclientnetworkable.h
rename to src/public/iclientnetworkable.h
diff --git a/r5dev/public/iclientrenderable.h b/src/public/iclientrenderable.h
similarity index 100%
rename from r5dev/public/iclientrenderable.h
rename to src/public/iclientrenderable.h
diff --git a/r5dev/public/iclientthinkable.h b/src/public/iclientthinkable.h
similarity index 100%
rename from r5dev/public/iclientthinkable.h
rename to src/public/iclientthinkable.h
diff --git a/r5dev/public/iclientunknown.h b/src/public/iclientunknown.h
similarity index 100%
rename from r5dev/public/iclientunknown.h
rename to src/public/iclientunknown.h
diff --git a/r5dev/public/icommandline.h b/src/public/icommandline.h
similarity index 100%
rename from r5dev/public/icommandline.h
rename to src/public/icommandline.h
diff --git a/r5dev/public/iconcommand.h b/src/public/iconcommand.h
similarity index 100%
rename from r5dev/public/iconcommand.h
rename to src/public/iconcommand.h
diff --git a/r5dev/public/iconvar.h b/src/public/iconvar.h
similarity index 100%
rename from r5dev/public/iconvar.h
rename to src/public/iconvar.h
diff --git a/r5dev/public/icvar.h b/src/public/icvar.h
similarity index 100%
rename from r5dev/public/icvar.h
rename to src/public/icvar.h
diff --git a/r5dev/public/idatablock.h b/src/public/idatablock.h
similarity index 100%
rename from r5dev/public/idatablock.h
rename to src/public/idatablock.h
diff --git a/r5dev/public/idebugoverlay.h b/src/public/idebugoverlay.h
similarity index 100%
rename from r5dev/public/idebugoverlay.h
rename to src/public/idebugoverlay.h
diff --git a/r5dev/public/iengine.h b/src/public/iengine.h
similarity index 100%
rename from r5dev/public/iengine.h
rename to src/public/iengine.h
diff --git a/r5dev/public/ifile.h b/src/public/ifile.h
similarity index 100%
rename from r5dev/public/ifile.h
rename to src/public/ifile.h
diff --git a/r5dev/public/ifilesystem.h b/src/public/ifilesystem.h
similarity index 100%
rename from r5dev/public/ifilesystem.h
rename to src/public/ifilesystem.h
diff --git a/r5dev/public/iframetask.h b/src/public/iframetask.h
similarity index 100%
rename from r5dev/public/iframetask.h
rename to src/public/iframetask.h
diff --git a/r5dev/public/ihandleentity.h b/src/public/ihandleentity.h
similarity index 100%
rename from r5dev/public/ihandleentity.h
rename to src/public/ihandleentity.h
diff --git a/r5dev/public/ikeyvaluessystem.h b/src/public/ikeyvaluessystem.h
similarity index 100%
rename from r5dev/public/ikeyvaluessystem.h
rename to src/public/ikeyvaluessystem.h
diff --git a/r5dev/public/imaterial.h b/src/public/imaterial.h
similarity index 100%
rename from r5dev/public/imaterial.h
rename to src/public/imaterial.h
diff --git a/r5dev/public/imaterialinternal.h b/src/public/imaterialinternal.h
similarity index 100%
rename from r5dev/public/imaterialinternal.h
rename to src/public/imaterialinternal.h
diff --git a/r5dev/public/imaterialsystem.h b/src/public/imaterialsystem.h
similarity index 100%
rename from r5dev/public/imaterialsystem.h
rename to src/public/imaterialsystem.h
diff --git a/r5dev/public/inetchannel.h b/src/public/inetchannel.h
similarity index 100%
rename from r5dev/public/inetchannel.h
rename to src/public/inetchannel.h
diff --git a/r5dev/public/inetmessage.h b/src/public/inetmessage.h
similarity index 100%
rename from r5dev/public/inetmessage.h
rename to src/public/inetmessage.h
diff --git a/r5dev/public/inetmsghandler.h b/src/public/inetmsghandler.h
similarity index 100%
rename from r5dev/public/inetmsghandler.h
rename to src/public/inetmsghandler.h
diff --git a/r5dev/public/inputsystem/ButtonCode.h b/src/public/inputsystem/ButtonCode.h
similarity index 100%
rename from r5dev/public/inputsystem/ButtonCode.h
rename to src/public/inputsystem/ButtonCode.h
diff --git a/r5dev/public/inputsystem/InputEnums.h b/src/public/inputsystem/InputEnums.h
similarity index 100%
rename from r5dev/public/inputsystem/InputEnums.h
rename to src/public/inputsystem/InputEnums.h
diff --git a/r5dev/public/ipackedstore.h b/src/public/ipackedstore.h
similarity index 100%
rename from r5dev/public/ipackedstore.h
rename to src/public/ipackedstore.h
diff --git a/r5dev/public/iserver.h b/src/public/iserver.h
similarity index 100%
rename from r5dev/public/iserver.h
rename to src/public/iserver.h
diff --git a/r5dev/public/iserverentity.h b/src/public/iserverentity.h
similarity index 100%
rename from r5dev/public/iserverentity.h
rename to src/public/iserverentity.h
diff --git a/r5dev/public/iservernetworkable.h b/src/public/iservernetworkable.h
similarity index 100%
rename from r5dev/public/iservernetworkable.h
rename to src/public/iservernetworkable.h
diff --git a/r5dev/public/iserverunknown.h b/src/public/iserverunknown.h
similarity index 100%
rename from r5dev/public/iserverunknown.h
rename to src/public/iserverunknown.h
diff --git a/r5dev/public/isnapshotmgr.h b/src/public/isnapshotmgr.h
similarity index 100%
rename from r5dev/public/isnapshotmgr.h
rename to src/public/isnapshotmgr.h
diff --git a/r5dev/public/isurfacesystem.h b/src/public/isurfacesystem.h
similarity index 100%
rename from r5dev/public/isurfacesystem.h
rename to src/public/isurfacesystem.h
diff --git a/r5dev/public/ivrenderview.h b/src/public/ivrenderview.h
similarity index 100%
rename from r5dev/public/ivrenderview.h
rename to src/public/ivrenderview.h
diff --git a/r5dev/public/localize/ilocalize.h b/src/public/localize/ilocalize.h
similarity index 100%
rename from r5dev/public/localize/ilocalize.h
rename to src/public/localize/ilocalize.h
diff --git a/r5dev/public/materialsystem/shader_vcs_version.h b/src/public/materialsystem/shader_vcs_version.h
similarity index 100%
rename from r5dev/public/materialsystem/shader_vcs_version.h
rename to src/public/materialsystem/shader_vcs_version.h
diff --git a/r5dev/public/model_types.h b/src/public/model_types.h
similarity index 100%
rename from r5dev/public/model_types.h
rename to src/public/model_types.h
diff --git a/r5dev/public/networkvar.h b/src/public/networkvar.h
similarity index 100%
rename from r5dev/public/networkvar.h
rename to src/public/networkvar.h
diff --git a/r5dev/public/playerstate.h b/src/public/playerstate.h
similarity index 100%
rename from r5dev/public/playerstate.h
rename to src/public/playerstate.h
diff --git a/r5dev/public/rendersystem/schema/texture.g.h b/src/public/rendersystem/schema/texture.g.h
similarity index 100%
rename from r5dev/public/rendersystem/schema/texture.g.h
rename to src/public/rendersystem/schema/texture.g.h
diff --git a/r5dev/public/rtech/ipakfile.h b/src/public/rtech/ipakfile.h
similarity index 100%
rename from r5dev/public/rtech/ipakfile.h
rename to src/public/rtech/ipakfile.h
diff --git a/r5dev/public/server_class.h b/src/public/server_class.h
similarity index 100%
rename from r5dev/public/server_class.h
rename to src/public/server_class.h
diff --git a/r5dev/public/studio.h b/src/public/studio.h
similarity index 100%
rename from r5dev/public/studio.h
rename to src/public/studio.h
diff --git a/r5dev/public/tier0/annotations.h b/src/public/tier0/annotations.h
similarity index 100%
rename from r5dev/public/tier0/annotations.h
rename to src/public/tier0/annotations.h
diff --git a/r5dev/public/tier0/basetypes.h b/src/public/tier0/basetypes.h
similarity index 100%
rename from r5dev/public/tier0/basetypes.h
rename to src/public/tier0/basetypes.h
diff --git a/r5dev/public/tier0/binstream.h b/src/public/tier0/binstream.h
similarity index 100%
rename from r5dev/public/tier0/binstream.h
rename to src/public/tier0/binstream.h
diff --git a/r5dev/public/tier0/commonmacros.h b/src/public/tier0/commonmacros.h
similarity index 100%
rename from r5dev/public/tier0/commonmacros.h
rename to src/public/tier0/commonmacros.h
diff --git a/r5dev/public/tier0/crashhandler.h b/src/public/tier0/crashhandler.h
similarity index 100%
rename from r5dev/public/tier0/crashhandler.h
rename to src/public/tier0/crashhandler.h
diff --git a/r5dev/public/tier0/dbg.h b/src/public/tier0/dbg.h
similarity index 100%
rename from r5dev/public/tier0/dbg.h
rename to src/public/tier0/dbg.h
diff --git a/r5dev/public/tier0/dbgflag.h b/src/public/tier0/dbgflag.h
similarity index 100%
rename from r5dev/public/tier0/dbgflag.h
rename to src/public/tier0/dbgflag.h
diff --git a/r5dev/public/tier0/fasttimer.h b/src/public/tier0/fasttimer.h
similarity index 100%
rename from r5dev/public/tier0/fasttimer.h
rename to src/public/tier0/fasttimer.h
diff --git a/r5dev/public/tier0/frametask.h b/src/public/tier0/frametask.h
similarity index 100%
rename from r5dev/public/tier0/frametask.h
rename to src/public/tier0/frametask.h
diff --git a/r5dev/public/tier0/imemalloc.h b/src/public/tier0/imemalloc.h
similarity index 100%
rename from r5dev/public/tier0/imemalloc.h
rename to src/public/tier0/imemalloc.h
diff --git a/r5dev/public/tier0/jobthread.h b/src/public/tier0/jobthread.h
similarity index 100%
rename from r5dev/public/tier0/jobthread.h
rename to src/public/tier0/jobthread.h
diff --git a/r5dev/public/tier0/memaddr.h b/src/public/tier0/memaddr.h
similarity index 100%
rename from r5dev/public/tier0/memaddr.h
rename to src/public/tier0/memaddr.h
diff --git a/r5dev/public/tier0/memalloc.h b/src/public/tier0/memalloc.h
similarity index 100%
rename from r5dev/public/tier0/memalloc.h
rename to src/public/tier0/memalloc.h
diff --git a/r5dev/public/tier0/memdbgoff.h b/src/public/tier0/memdbgoff.h
similarity index 100%
rename from r5dev/public/tier0/memdbgoff.h
rename to src/public/tier0/memdbgoff.h
diff --git a/r5dev/public/tier0/memdbgon.h b/src/public/tier0/memdbgon.h
similarity index 100%
rename from r5dev/public/tier0/memdbgon.h
rename to src/public/tier0/memdbgon.h
diff --git a/r5dev/public/tier0/module.h b/src/public/tier0/module.h
similarity index 100%
rename from r5dev/public/tier0/module.h
rename to src/public/tier0/module.h
diff --git a/r5dev/public/tier0/platform.h b/src/public/tier0/platform.h
similarity index 100%
rename from r5dev/public/tier0/platform.h
rename to src/public/tier0/platform.h
diff --git a/r5dev/public/tier0/platform_internal.h b/src/public/tier0/platform_internal.h
similarity index 100%
rename from r5dev/public/tier0/platform_internal.h
rename to src/public/tier0/platform_internal.h
diff --git a/r5dev/public/tier0/sigcache.h b/src/public/tier0/sigcache.h
similarity index 100%
rename from r5dev/public/tier0/sigcache.h
rename to src/public/tier0/sigcache.h
diff --git a/r5dev/public/tier0/threadtools.h b/src/public/tier0/threadtools.h
similarity index 100%
rename from r5dev/public/tier0/threadtools.h
rename to src/public/tier0/threadtools.h
diff --git a/r5dev/public/tier0/tier0_iface.h b/src/public/tier0/tier0_iface.h
similarity index 100%
rename from r5dev/public/tier0/tier0_iface.h
rename to src/public/tier0/tier0_iface.h
diff --git a/r5dev/public/tier0/tslist.h b/src/public/tier0/tslist.h
similarity index 100%
rename from r5dev/public/tier0/tslist.h
rename to src/public/tier0/tslist.h
diff --git a/r5dev/public/tier0/utility.h b/src/public/tier0/utility.h
similarity index 100%
rename from r5dev/public/tier0/utility.h
rename to src/public/tier0/utility.h
diff --git a/r5dev/public/tier0/valve_off.h b/src/public/tier0/valve_off.h
similarity index 100%
rename from r5dev/public/tier0/valve_off.h
rename to src/public/tier0/valve_off.h
diff --git a/r5dev/public/tier0/valve_on.h b/src/public/tier0/valve_on.h
similarity index 100%
rename from r5dev/public/tier0/valve_on.h
rename to src/public/tier0/valve_on.h
diff --git a/r5dev/public/tier0/vtable.h b/src/public/tier0/vtable.h
similarity index 100%
rename from r5dev/public/tier0/vtable.h
rename to src/public/tier0/vtable.h
diff --git a/r5dev/public/tier0/wchartypes.h b/src/public/tier0/wchartypes.h
similarity index 100%
rename from r5dev/public/tier0/wchartypes.h
rename to src/public/tier0/wchartypes.h
diff --git a/r5dev/public/tier1/NetAdr.h b/src/public/tier1/NetAdr.h
similarity index 100%
rename from r5dev/public/tier1/NetAdr.h
rename to src/public/tier1/NetAdr.h
diff --git a/r5dev/public/tier1/NetKey.h b/src/public/tier1/NetKey.h
similarity index 100%
rename from r5dev/public/tier1/NetKey.h
rename to src/public/tier1/NetKey.h
diff --git a/r5dev/public/tier1/bitbuf.h b/src/public/tier1/bitbuf.h
similarity index 100%
rename from r5dev/public/tier1/bitbuf.h
rename to src/public/tier1/bitbuf.h
diff --git a/r5dev/public/tier1/byteswap.h b/src/public/tier1/byteswap.h
similarity index 100%
rename from r5dev/public/tier1/byteswap.h
rename to src/public/tier1/byteswap.h
diff --git a/r5dev/public/tier1/characterset.h b/src/public/tier1/characterset.h
similarity index 100%
rename from r5dev/public/tier1/characterset.h
rename to src/public/tier1/characterset.h
diff --git a/r5dev/public/tier1/cmd.h b/src/public/tier1/cmd.h
similarity index 100%
rename from r5dev/public/tier1/cmd.h
rename to src/public/tier1/cmd.h
diff --git a/r5dev/public/tier1/convar.h b/src/public/tier1/convar.h
similarity index 100%
rename from r5dev/public/tier1/convar.h
rename to src/public/tier1/convar.h
diff --git a/r5dev/public/tier1/cvar.h b/src/public/tier1/cvar.h
similarity index 100%
rename from r5dev/public/tier1/cvar.h
rename to src/public/tier1/cvar.h
diff --git a/r5dev/public/tier1/generichash.h b/src/public/tier1/generichash.h
similarity index 100%
rename from r5dev/public/tier1/generichash.h
rename to src/public/tier1/generichash.h
diff --git a/r5dev/public/tier1/interface.h b/src/public/tier1/interface.h
similarity index 100%
rename from r5dev/public/tier1/interface.h
rename to src/public/tier1/interface.h
diff --git a/r5dev/public/tier1/lzss.h b/src/public/tier1/lzss.h
similarity index 100%
rename from r5dev/public/tier1/lzss.h
rename to src/public/tier1/lzss.h
diff --git a/r5dev/public/tier1/mempool.h b/src/public/tier1/mempool.h
similarity index 100%
rename from r5dev/public/tier1/mempool.h
rename to src/public/tier1/mempool.h
diff --git a/r5dev/public/tier1/memstack.h b/src/public/tier1/memstack.h
similarity index 100%
rename from r5dev/public/tier1/memstack.h
rename to src/public/tier1/memstack.h
diff --git a/r5dev/public/tier1/string_t.h b/src/public/tier1/string_t.h
similarity index 100%
rename from r5dev/public/tier1/string_t.h
rename to src/public/tier1/string_t.h
diff --git a/r5dev/public/tier1/stringpool.h b/src/public/tier1/stringpool.h
similarity index 100%
rename from r5dev/public/tier1/stringpool.h
rename to src/public/tier1/stringpool.h
diff --git a/r5dev/public/tier1/strtools.h b/src/public/tier1/strtools.h
similarity index 100%
rename from r5dev/public/tier1/strtools.h
rename to src/public/tier1/strtools.h
diff --git a/r5dev/public/tier1/utlblockmemory.h b/src/public/tier1/utlblockmemory.h
similarity index 100%
rename from r5dev/public/tier1/utlblockmemory.h
rename to src/public/tier1/utlblockmemory.h
diff --git a/r5dev/public/tier1/utlbuffer.h b/src/public/tier1/utlbuffer.h
similarity index 100%
rename from r5dev/public/tier1/utlbuffer.h
rename to src/public/tier1/utlbuffer.h
diff --git a/r5dev/public/tier1/utldict.h b/src/public/tier1/utldict.h
similarity index 100%
rename from r5dev/public/tier1/utldict.h
rename to src/public/tier1/utldict.h
diff --git a/r5dev/public/tier1/utlfixedmemory.h b/src/public/tier1/utlfixedmemory.h
similarity index 100%
rename from r5dev/public/tier1/utlfixedmemory.h
rename to src/public/tier1/utlfixedmemory.h
diff --git a/r5dev/public/tier1/utllinkedlist.h b/src/public/tier1/utllinkedlist.h
similarity index 100%
rename from r5dev/public/tier1/utllinkedlist.h
rename to src/public/tier1/utllinkedlist.h
diff --git a/r5dev/public/tier1/utlmap.h b/src/public/tier1/utlmap.h
similarity index 100%
rename from r5dev/public/tier1/utlmap.h
rename to src/public/tier1/utlmap.h
diff --git a/r5dev/public/tier1/utlmemory.h b/src/public/tier1/utlmemory.h
similarity index 100%
rename from r5dev/public/tier1/utlmemory.h
rename to src/public/tier1/utlmemory.h
diff --git a/r5dev/public/tier1/utlrbtree.h b/src/public/tier1/utlrbtree.h
similarity index 100%
rename from r5dev/public/tier1/utlrbtree.h
rename to src/public/tier1/utlrbtree.h
diff --git a/r5dev/public/tier1/utlstring.h b/src/public/tier1/utlstring.h
similarity index 100%
rename from r5dev/public/tier1/utlstring.h
rename to src/public/tier1/utlstring.h
diff --git a/r5dev/public/tier1/utlsymbol.h b/src/public/tier1/utlsymbol.h
similarity index 100%
rename from r5dev/public/tier1/utlsymbol.h
rename to src/public/tier1/utlsymbol.h
diff --git a/r5dev/public/tier1/utlvector.h b/src/public/tier1/utlvector.h
similarity index 100%
rename from r5dev/public/tier1/utlvector.h
rename to src/public/tier1/utlvector.h
diff --git a/r5dev/public/tier2/curlutils.h b/src/public/tier2/curlutils.h
similarity index 100%
rename from r5dev/public/tier2/curlutils.h
rename to src/public/tier2/curlutils.h
diff --git a/r5dev/public/tier2/fileutils.h b/src/public/tier2/fileutils.h
similarity index 100%
rename from r5dev/public/tier2/fileutils.h
rename to src/public/tier2/fileutils.h
diff --git a/r5dev/public/tier2/meshutils.h b/src/public/tier2/meshutils.h
similarity index 100%
rename from r5dev/public/tier2/meshutils.h
rename to src/public/tier2/meshutils.h
diff --git a/r5dev/public/tier2/renderutils.h b/src/public/tier2/renderutils.h
similarity index 100%
rename from r5dev/public/tier2/renderutils.h
rename to src/public/tier2/renderutils.h
diff --git a/r5dev/public/tier2/socketcreator.h b/src/public/tier2/socketcreator.h
similarity index 100%
rename from r5dev/public/tier2/socketcreator.h
rename to src/public/tier2/socketcreator.h
diff --git a/r5dev/public/trace.h b/src/public/trace.h
similarity index 100%
rename from r5dev/public/trace.h
rename to src/public/trace.h
diff --git a/r5dev/public/utility/vdf_parser.h b/src/public/utility/vdf_parser.h
similarity index 100%
rename from r5dev/public/utility/vdf_parser.h
rename to src/public/utility/vdf_parser.h
diff --git a/r5dev/public/vscript/ivscript.h b/src/public/vscript/ivscript.h
similarity index 100%
rename from r5dev/public/vscript/ivscript.h
rename to src/public/vscript/ivscript.h
diff --git a/r5dev/public/worldsize.h b/src/public/worldsize.h
similarity index 100%
rename from r5dev/public/worldsize.h
rename to src/public/worldsize.h
diff --git a/r5dev/resource/batch/bspconv.bat b/src/resource/batch/bspconv.bat
similarity index 100%
rename from r5dev/resource/batch/bspconv.bat
rename to src/resource/batch/bspconv.bat
diff --git a/r5dev/resource/batch/clean_sdk.bat b/src/resource/batch/clean_sdk.bat
similarity index 100%
rename from r5dev/resource/batch/clean_sdk.bat
rename to src/resource/batch/clean_sdk.bat
diff --git a/r5dev/resource/batch/diagnose.bat b/src/resource/batch/diagnose.bat
similarity index 100%
rename from r5dev/resource/batch/diagnose.bat
rename to src/resource/batch/diagnose.bat
diff --git a/r5dev/resource/batch/nav_build.bat b/src/resource/batch/nav_build.bat
similarity index 100%
rename from r5dev/resource/batch/nav_build.bat
rename to src/resource/batch/nav_build.bat
diff --git a/r5dev/resource/cfg/bind.cfg b/src/resource/cfg/bind.cfg
similarity index 100%
rename from r5dev/resource/cfg/bind.cfg
rename to src/resource/cfg/bind.cfg
diff --git a/r5dev/resource/cfg/game.cfg b/src/resource/cfg/game.cfg
similarity index 100%
rename from r5dev/resource/cfg/game.cfg
rename to src/resource/cfg/game.cfg
diff --git a/r5dev/resource/cfg/server/persistent_player_data_manifest.rson b/src/resource/cfg/server/persistent_player_data_manifest.rson
similarity index 100%
rename from r5dev/resource/cfg/server/persistent_player_data_manifest.rson
rename to src/resource/cfg/server/persistent_player_data_manifest.rson
diff --git a/r5dev/resource/cfg/server/persistent_player_data_version_512.pdef b/src/resource/cfg/server/persistent_player_data_version_512.pdef
similarity index 100%
rename from r5dev/resource/cfg/server/persistent_player_data_version_512.pdef
rename to src/resource/cfg/server/persistent_player_data_version_512.pdef
diff --git a/r5dev/resource/cfg/speed.cfg b/src/resource/cfg/speed.cfg
similarity index 100%
rename from r5dev/resource/cfg/speed.cfg
rename to src/resource/cfg/speed.cfg
diff --git a/r5dev/resource/cfg/system/autoexec.cfg b/src/resource/cfg/system/autoexec.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/autoexec.cfg
rename to src/resource/cfg/system/autoexec.cfg
diff --git a/r5dev/resource/cfg/system/autoexec_client.cfg b/src/resource/cfg/system/autoexec_client.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/autoexec_client.cfg
rename to src/resource/cfg/system/autoexec_client.cfg
diff --git a/r5dev/resource/cfg/system/autoexec_client_dev.cfg b/src/resource/cfg/system/autoexec_client_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/autoexec_client_dev.cfg
rename to src/resource/cfg/system/autoexec_client_dev.cfg
diff --git a/r5dev/resource/cfg/system/autoexec_dev.cfg b/src/resource/cfg/system/autoexec_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/autoexec_dev.cfg
rename to src/resource/cfg/system/autoexec_dev.cfg
diff --git a/r5dev/resource/cfg/system/autoexec_server.cfg b/src/resource/cfg/system/autoexec_server.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/autoexec_server.cfg
rename to src/resource/cfg/system/autoexec_server.cfg
diff --git a/r5dev/resource/cfg/system/autoexec_server_dev.cfg b/src/resource/cfg/system/autoexec_server_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/autoexec_server_dev.cfg
rename to src/resource/cfg/system/autoexec_server_dev.cfg
diff --git a/r5dev/resource/cfg/system/startup_client_dev.cfg b/src/resource/cfg/system/startup_client_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_client_dev.cfg
rename to src/resource/cfg/system/startup_client_dev.cfg
diff --git a/r5dev/resource/cfg/system/startup_client_retail.cfg b/src/resource/cfg/system/startup_client_retail.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_client_retail.cfg
rename to src/resource/cfg/system/startup_client_retail.cfg
diff --git a/r5dev/resource/cfg/system/startup_dedi_default.cfg b/src/resource/cfg/system/startup_dedi_default.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_dedi_default.cfg
rename to src/resource/cfg/system/startup_dedi_default.cfg
diff --git a/r5dev/resource/cfg/system/startup_dedi_dev.cfg b/src/resource/cfg/system/startup_dedi_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_dedi_dev.cfg
rename to src/resource/cfg/system/startup_dedi_dev.cfg
diff --git a/r5dev/resource/cfg/system/startup_dedi_retail.cfg b/src/resource/cfg/system/startup_dedi_retail.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_dedi_retail.cfg
rename to src/resource/cfg/system/startup_dedi_retail.cfg
diff --git a/r5dev/resource/cfg/system/startup_default.cfg b/src/resource/cfg/system/startup_default.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_default.cfg
rename to src/resource/cfg/system/startup_default.cfg
diff --git a/r5dev/resource/cfg/system/startup_dev.cfg b/src/resource/cfg/system/startup_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_dev.cfg
rename to src/resource/cfg/system/startup_dev.cfg
diff --git a/r5dev/resource/cfg/system/startup_launcher.cfg b/src/resource/cfg/system/startup_launcher.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_launcher.cfg
rename to src/resource/cfg/system/startup_launcher.cfg
diff --git a/r5dev/resource/cfg/system/startup_retail.cfg b/src/resource/cfg/system/startup_retail.cfg
similarity index 100%
rename from r5dev/resource/cfg/system/startup_retail.cfg
rename to src/resource/cfg/system/startup_retail.cfg
diff --git a/r5dev/resource/cfg/tools/build_all_vpk.cfg b/src/resource/cfg/tools/build_all_vpk.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/build_all_vpk.cfg
rename to src/resource/cfg/tools/build_all_vpk.cfg
diff --git a/r5dev/resource/cfg/tools/englishclient_build_vpk.cfg b/src/resource/cfg/tools/englishclient_build_vpk.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/englishclient_build_vpk.cfg
rename to src/resource/cfg/tools/englishclient_build_vpk.cfg
diff --git a/r5dev/resource/cfg/tools/englishclient_extract_vpk.cfg b/src/resource/cfg/tools/englishclient_extract_vpk.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/englishclient_extract_vpk.cfg
rename to src/resource/cfg/tools/englishclient_extract_vpk.cfg
diff --git a/r5dev/resource/cfg/tools/englishserver_build_vpk.cfg b/src/resource/cfg/tools/englishserver_build_vpk.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/englishserver_build_vpk.cfg
rename to src/resource/cfg/tools/englishserver_build_vpk.cfg
diff --git a/r5dev/resource/cfg/tools/englishserver_extract_vpk.cfg b/src/resource/cfg/tools/englishserver_extract_vpk.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/englishserver_extract_vpk.cfg
rename to src/resource/cfg/tools/englishserver_extract_vpk.cfg
diff --git a/r5dev/resource/cfg/tools/rcon_client.cfg b/src/resource/cfg/tools/rcon_client.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/rcon_client.cfg
rename to src/resource/cfg/tools/rcon_client.cfg
diff --git a/r5dev/resource/cfg/tools/rcon_client_dev.cfg b/src/resource/cfg/tools/rcon_client_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/rcon_client_dev.cfg
rename to src/resource/cfg/tools/rcon_client_dev.cfg
diff --git a/r5dev/resource/cfg/tools/rcon_server.cfg b/src/resource/cfg/tools/rcon_server.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/rcon_server.cfg
rename to src/resource/cfg/tools/rcon_server.cfg
diff --git a/r5dev/resource/cfg/tools/rcon_server_dev.cfg b/src/resource/cfg/tools/rcon_server_dev.cfg
similarity index 100%
rename from r5dev/resource/cfg/tools/rcon_server_dev.cfg
rename to src/resource/cfg/tools/rcon_server_dev.cfg
diff --git a/r5dev/resource/ico/sdklauncher_dbg.ico b/src/resource/ico/sdklauncher_dbg.ico
similarity index 100%
rename from r5dev/resource/ico/sdklauncher_dbg.ico
rename to src/resource/ico/sdklauncher_dbg.ico
diff --git a/r5dev/resource/ico/sdklauncher_rel.ico b/src/resource/ico/sdklauncher_rel.ico
similarity index 100%
rename from r5dev/resource/ico/sdklauncher_rel.ico
rename to src/resource/ico/sdklauncher_rel.ico
diff --git a/r5dev/resource/patch/r5apex.patch b/src/resource/patch/r5apex.patch
similarity index 100%
rename from r5dev/resource/patch/r5apex.patch
rename to src/resource/patch/r5apex.patch
diff --git a/r5dev/resource/patch/r5apex_ds.patch b/src/resource/patch/r5apex_ds.patch
similarity index 100%
rename from r5dev/resource/patch/r5apex_ds.patch
rename to src/resource/patch/r5apex_ds.patch
diff --git a/r5dev/resource/playlist/playlists_r5_patch.txt b/src/resource/playlist/playlists_r5_patch.txt
similarity index 100%
rename from r5dev/resource/playlist/playlists_r5_patch.txt
rename to src/resource/playlist/playlists_r5_patch.txt
diff --git a/r5dev/resource/png/completion_marker.png b/src/resource/png/completion_marker.png
similarity index 100%
rename from r5dev/resource/png/completion_marker.png
rename to src/resource/png/completion_marker.png
diff --git a/r5dev/resource/png/debugempty.png b/src/resource/png/debugempty.png
similarity index 100%
rename from r5dev/resource/png/debugempty.png
rename to src/resource/png/debugempty.png
diff --git a/r5dev/resource/png/lockedserver.png b/src/resource/png/lockedserver.png
similarity index 100%
rename from r5dev/resource/png/lockedserver.png
rename to src/resource/png/lockedserver.png
diff --git a/r5dev/resource/png/vf_cheat.png b/src/resource/png/vf_cheat.png
similarity index 100%
rename from r5dev/resource/png/vf_cheat.png
rename to src/resource/png/vf_cheat.png
diff --git a/r5dev/resource/png/vf_cheat_unknown.png b/src/resource/png/vf_cheat_unknown.png
similarity index 100%
rename from r5dev/resource/png/vf_cheat_unknown.png
rename to src/resource/png/vf_cheat_unknown.png
diff --git a/r5dev/resource/png/vf_cheat_unknown_e.png b/src/resource/png/vf_cheat_unknown_e.png
similarity index 100%
rename from r5dev/resource/png/vf_cheat_unknown_e.png
rename to src/resource/png/vf_cheat_unknown_e.png
diff --git a/r5dev/resource/png/vf_clientdll.png b/src/resource/png/vf_clientdll.png
similarity index 100%
rename from r5dev/resource/png/vf_clientdll.png
rename to src/resource/png/vf_clientdll.png
diff --git a/r5dev/resource/png/vf_clientdll_cheat.png b/src/resource/png/vf_clientdll_cheat.png
similarity index 100%
rename from r5dev/resource/png/vf_clientdll_cheat.png
rename to src/resource/png/vf_clientdll_cheat.png
diff --git a/r5dev/resource/png/vf_clientdll_release.png b/src/resource/png/vf_clientdll_release.png
similarity index 100%
rename from r5dev/resource/png/vf_clientdll_release.png
rename to src/resource/png/vf_clientdll_release.png
diff --git a/r5dev/resource/png/vf_developmentonly.png b/src/resource/png/vf_developmentonly.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly.png
rename to src/resource/png/vf_developmentonly.png
diff --git a/r5dev/resource/png/vf_developmentonly_cheat.png b/src/resource/png/vf_developmentonly_cheat.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly_cheat.png
rename to src/resource/png/vf_developmentonly_cheat.png
diff --git a/r5dev/resource/png/vf_developmentonly_clientdll.png b/src/resource/png/vf_developmentonly_clientdll.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly_clientdll.png
rename to src/resource/png/vf_developmentonly_clientdll.png
diff --git a/r5dev/resource/png/vf_developmentonly_gamedll.png b/src/resource/png/vf_developmentonly_gamedll.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly_gamedll.png
rename to src/resource/png/vf_developmentonly_gamedll.png
diff --git a/r5dev/resource/png/vf_developmentonly_msthread.png b/src/resource/png/vf_developmentonly_msthread.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly_msthread.png
rename to src/resource/png/vf_developmentonly_msthread.png
diff --git a/r5dev/resource/png/vf_developmentonly_replicated.png b/src/resource/png/vf_developmentonly_replicated.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly_replicated.png
rename to src/resource/png/vf_developmentonly_replicated.png
diff --git a/r5dev/resource/png/vf_developmentonly_unknown.png b/src/resource/png/vf_developmentonly_unknown.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly_unknown.png
rename to src/resource/png/vf_developmentonly_unknown.png
diff --git a/r5dev/resource/png/vf_developmentonly_unknown_e.png b/src/resource/png/vf_developmentonly_unknown_e.png
similarity index 100%
rename from r5dev/resource/png/vf_developmentonly_unknown_e.png
rename to src/resource/png/vf_developmentonly_unknown_e.png
diff --git a/r5dev/resource/png/vf_gamedll.png b/src/resource/png/vf_gamedll.png
similarity index 100%
rename from r5dev/resource/png/vf_gamedll.png
rename to src/resource/png/vf_gamedll.png
diff --git a/r5dev/resource/png/vf_gamedll_cheat.png b/src/resource/png/vf_gamedll_cheat.png
similarity index 100%
rename from r5dev/resource/png/vf_gamedll_cheat.png
rename to src/resource/png/vf_gamedll_cheat.png
diff --git a/r5dev/resource/png/vf_gamedll_release.png b/src/resource/png/vf_gamedll_release.png
similarity index 100%
rename from r5dev/resource/png/vf_gamedll_release.png
rename to src/resource/png/vf_gamedll_release.png
diff --git a/r5dev/resource/png/vf_msthread.png b/src/resource/png/vf_msthread.png
similarity index 100%
rename from r5dev/resource/png/vf_msthread.png
rename to src/resource/png/vf_msthread.png
diff --git a/r5dev/resource/png/vf_msthread_cheat.png b/src/resource/png/vf_msthread_cheat.png
similarity index 100%
rename from r5dev/resource/png/vf_msthread_cheat.png
rename to src/resource/png/vf_msthread_cheat.png
diff --git a/r5dev/resource/png/vf_msthread_release.png b/src/resource/png/vf_msthread_release.png
similarity index 100%
rename from r5dev/resource/png/vf_msthread_release.png
rename to src/resource/png/vf_msthread_release.png
diff --git a/r5dev/resource/png/vf_none.png b/src/resource/png/vf_none.png
similarity index 100%
rename from r5dev/resource/png/vf_none.png
rename to src/resource/png/vf_none.png
diff --git a/r5dev/resource/png/vf_release.png b/src/resource/png/vf_release.png
similarity index 100%
rename from r5dev/resource/png/vf_release.png
rename to src/resource/png/vf_release.png
diff --git a/r5dev/resource/png/vf_release_unknown.png b/src/resource/png/vf_release_unknown.png
similarity index 100%
rename from r5dev/resource/png/vf_release_unknown.png
rename to src/resource/png/vf_release_unknown.png
diff --git a/r5dev/resource/png/vf_release_unknown_e.png b/src/resource/png/vf_release_unknown_e.png
similarity index 100%
rename from r5dev/resource/png/vf_release_unknown_e.png
rename to src/resource/png/vf_release_unknown_e.png
diff --git a/r5dev/resource/png/vf_replicated.png b/src/resource/png/vf_replicated.png
similarity index 100%
rename from r5dev/resource/png/vf_replicated.png
rename to src/resource/png/vf_replicated.png
diff --git a/r5dev/resource/png/vf_replicated_cheat.png b/src/resource/png/vf_replicated_cheat.png
similarity index 100%
rename from r5dev/resource/png/vf_replicated_cheat.png
rename to src/resource/png/vf_replicated_cheat.png
diff --git a/r5dev/resource/png/vf_replicated_release.png b/src/resource/png/vf_replicated_release.png
similarity index 100%
rename from r5dev/resource/png/vf_replicated_release.png
rename to src/resource/png/vf_replicated_release.png
diff --git a/r5dev/resource/png/vf_unknown.png b/src/resource/png/vf_unknown.png
similarity index 100%
rename from r5dev/resource/png/vf_unknown.png
rename to src/resource/png/vf_unknown.png
diff --git a/r5dev/resource/png/vf_unknown_e.png b/src/resource/png/vf_unknown_e.png
similarity index 100%
rename from r5dev/resource/png/vf_unknown_e.png
rename to src/resource/png/vf_unknown_e.png
diff --git a/r5dev/resource/protobuf/cl_rcon.proto b/src/resource/protobuf/cl_rcon.proto
similarity index 100%
rename from r5dev/resource/protobuf/cl_rcon.proto
rename to src/resource/protobuf/cl_rcon.proto
diff --git a/r5dev/resource/protobuf/generate.bat b/src/resource/protobuf/generate.bat
similarity index 100%
rename from r5dev/resource/protobuf/generate.bat
rename to src/resource/protobuf/generate.bat
diff --git a/r5dev/resource/protobuf/sig_map.proto b/src/resource/protobuf/sig_map.proto
similarity index 100%
rename from r5dev/resource/protobuf/sig_map.proto
rename to src/resource/protobuf/sig_map.proto
diff --git a/r5dev/resource/protobuf/sv_rcon.proto b/src/resource/protobuf/sv_rcon.proto
similarity index 100%
rename from r5dev/resource/protobuf/sv_rcon.proto
rename to src/resource/protobuf/sv_rcon.proto
diff --git a/r5dev/resource/r5dev.rc b/src/resource/r5dev.rc
similarity index 100%
rename from r5dev/resource/r5dev.rc
rename to src/resource/r5dev.rc
diff --git a/r5dev/resource/script/bld_man.py b/src/resource/script/bld_man.py
similarity index 100%
rename from r5dev/resource/script/bld_man.py
rename to src/resource/script/bld_man.py
diff --git a/r5dev/resource/script/ren_map.py b/src/resource/script/ren_map.py
similarity index 100%
rename from r5dev/resource/script/ren_map.py
rename to src/resource/script/ren_map.py
diff --git a/r5dev/resource/sdklauncher.rc b/src/resource/sdklauncher.rc
similarity index 100%
rename from r5dev/resource/sdklauncher.rc
rename to src/resource/sdklauncher.rc
diff --git a/r5dev/rtech/CMakeLists.txt b/src/rtech/CMakeLists.txt
similarity index 100%
rename from r5dev/rtech/CMakeLists.txt
rename to src/rtech/CMakeLists.txt
diff --git a/r5dev/rtech/rtech_game.cpp b/src/rtech/rtech_game.cpp
similarity index 100%
rename from r5dev/rtech/rtech_game.cpp
rename to src/rtech/rtech_game.cpp
diff --git a/r5dev/rtech/rtech_game.h b/src/rtech/rtech_game.h
similarity index 100%
rename from r5dev/rtech/rtech_game.h
rename to src/rtech/rtech_game.h
diff --git a/r5dev/rtech/rtech_utils.cpp b/src/rtech/rtech_utils.cpp
similarity index 100%
rename from r5dev/rtech/rtech_utils.cpp
rename to src/rtech/rtech_utils.cpp
diff --git a/r5dev/rtech/rtech_utils.h b/src/rtech/rtech_utils.h
similarity index 100%
rename from r5dev/rtech/rtech_utils.h
rename to src/rtech/rtech_utils.h
diff --git a/r5dev/rtech/rui/rui.cpp b/src/rtech/rui/rui.cpp
similarity index 100%
rename from r5dev/rtech/rui/rui.cpp
rename to src/rtech/rui/rui.cpp
diff --git a/r5dev/rtech/rui/rui.h b/src/rtech/rui/rui.h
similarity index 100%
rename from r5dev/rtech/rui/rui.h
rename to src/rtech/rui/rui.h
diff --git a/r5dev/rtech/stryder/stryder.cpp b/src/rtech/stryder/stryder.cpp
similarity index 100%
rename from r5dev/rtech/stryder/stryder.cpp
rename to src/rtech/stryder/stryder.cpp
diff --git a/r5dev/rtech/stryder/stryder.h b/src/rtech/stryder/stryder.h
similarity index 100%
rename from r5dev/rtech/stryder/stryder.h
rename to src/rtech/stryder/stryder.h
diff --git a/r5dev/sdklauncher/CMakeLists.txt b/src/sdklauncher/CMakeLists.txt
similarity index 100%
rename from r5dev/sdklauncher/CMakeLists.txt
rename to src/sdklauncher/CMakeLists.txt
diff --git a/r5dev/sdklauncher/basepanel.cpp b/src/sdklauncher/basepanel.cpp
similarity index 100%
rename from r5dev/sdklauncher/basepanel.cpp
rename to src/sdklauncher/basepanel.cpp
diff --git a/r5dev/sdklauncher/basepanel.h b/src/sdklauncher/basepanel.h
similarity index 100%
rename from r5dev/sdklauncher/basepanel.h
rename to src/sdklauncher/basepanel.h
diff --git a/r5dev/sdklauncher/sdklauncher.cpp b/src/sdklauncher/sdklauncher.cpp
similarity index 100%
rename from r5dev/sdklauncher/sdklauncher.cpp
rename to src/sdklauncher/sdklauncher.cpp
diff --git a/r5dev/sdklauncher/sdklauncher.h b/src/sdklauncher/sdklauncher.h
similarity index 100%
rename from r5dev/sdklauncher/sdklauncher.h
rename to src/sdklauncher/sdklauncher.h
diff --git a/r5dev/sdklauncher/sdklauncher_const.h b/src/sdklauncher/sdklauncher_const.h
similarity index 100%
rename from r5dev/sdklauncher/sdklauncher_const.h
rename to src/sdklauncher/sdklauncher_const.h
diff --git a/r5dev/sdklauncher/sdklauncher_pch.h b/src/sdklauncher/sdklauncher_pch.h
similarity index 100%
rename from r5dev/sdklauncher/sdklauncher_pch.h
rename to src/sdklauncher/sdklauncher_pch.h
diff --git a/r5dev/sdklauncher/sdklauncher_res.h b/src/sdklauncher/sdklauncher_res.h
similarity index 100%
rename from r5dev/sdklauncher/sdklauncher_res.h
rename to src/sdklauncher/sdklauncher_res.h
diff --git a/r5dev/studiorender/CMakeLists.txt b/src/studiorender/CMakeLists.txt
similarity index 100%
rename from r5dev/studiorender/CMakeLists.txt
rename to src/studiorender/CMakeLists.txt
diff --git a/r5dev/studiorender/studiorendercontext.cpp b/src/studiorender/studiorendercontext.cpp
similarity index 100%
rename from r5dev/studiorender/studiorendercontext.cpp
rename to src/studiorender/studiorendercontext.cpp
diff --git a/r5dev/studiorender/studiorendercontext.h b/src/studiorender/studiorendercontext.h
similarity index 100%
rename from r5dev/studiorender/studiorendercontext.h
rename to src/studiorender/studiorendercontext.h
diff --git a/r5dev/thirdparty/cppnet/CMakeLists.txt b/src/thirdparty/cppnet/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/cppnet/CMakeLists.txt
rename to src/thirdparty/cppnet/CMakeLists.txt
diff --git a/r5dev/thirdparty/cppnet/LICENSE.md b/src/thirdparty/cppnet/LICENSE.md
similarity index 100%
rename from r5dev/thirdparty/cppnet/LICENSE.md
rename to src/thirdparty/cppnet/LICENSE.md
diff --git a/r5dev/thirdparty/cppnet/README.md b/src/thirdparty/cppnet/README.md
similarity index 100%
rename from r5dev/thirdparty/cppnet/README.md
rename to src/thirdparty/cppnet/README.md
diff --git a/r5dev/thirdparty/cppnet/cppkore/Action.h b/src/thirdparty/cppnet/cppkore/Action.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Action.h
rename to src/thirdparty/cppnet/cppkore/Action.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Adler32.cpp b/src/thirdparty/cppnet/cppkore/Adler32.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Adler32.cpp
rename to src/thirdparty/cppnet/cppkore/Adler32.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Adler32.h b/src/thirdparty/cppnet/cppkore/Adler32.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Adler32.h
rename to src/thirdparty/cppnet/cppkore/Adler32.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/AnchorStyles.h b/src/thirdparty/cppnet/cppkore/AnchorStyles.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AnchorStyles.h
rename to src/thirdparty/cppnet/cppkore/AnchorStyles.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Animation.cpp b/src/thirdparty/cppnet/cppkore/Animation.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Animation.cpp
rename to src/thirdparty/cppnet/cppkore/Animation.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Animation.h b/src/thirdparty/cppnet/cppkore/Animation.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Animation.h
rename to src/thirdparty/cppnet/cppkore/Animation.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/AnimationTypes.h b/src/thirdparty/cppnet/cppkore/AnimationTypes.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AnimationTypes.h
rename to src/thirdparty/cppnet/cppkore/AnimationTypes.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Appearence.h b/src/thirdparty/cppnet/cppkore/Appearence.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Appearence.h
rename to src/thirdparty/cppnet/cppkore/Appearence.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Application.cpp b/src/thirdparty/cppnet/cppkore/Application.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Application.cpp
rename to src/thirdparty/cppnet/cppkore/Application.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Application.h b/src/thirdparty/cppnet/cppkore/Application.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Application.h
rename to src/thirdparty/cppnet/cppkore/Application.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/AssetRenderer.cpp b/src/thirdparty/cppnet/cppkore/AssetRenderer.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AssetRenderer.cpp
rename to src/thirdparty/cppnet/cppkore/AssetRenderer.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/AssetRenderer.h b/src/thirdparty/cppnet/cppkore/AssetRenderer.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AssetRenderer.h
rename to src/thirdparty/cppnet/cppkore/AssetRenderer.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/AtomicListBase.h b/src/thirdparty/cppnet/cppkore/AtomicListBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AtomicListBase.h
rename to src/thirdparty/cppnet/cppkore/AtomicListBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/AtomicQueueBase.h b/src/thirdparty/cppnet/cppkore/AtomicQueueBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AtomicQueueBase.h
rename to src/thirdparty/cppnet/cppkore/AtomicQueueBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/AutoScaleMode.h b/src/thirdparty/cppnet/cppkore/AutoScaleMode.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AutoScaleMode.h
rename to src/thirdparty/cppnet/cppkore/AutoScaleMode.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/AutodeskMaya.cpp b/src/thirdparty/cppnet/cppkore/AutodeskMaya.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AutodeskMaya.cpp
rename to src/thirdparty/cppnet/cppkore/AutodeskMaya.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/AutodeskMaya.h b/src/thirdparty/cppnet/cppkore/AutodeskMaya.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/AutodeskMaya.h
rename to src/thirdparty/cppnet/cppkore/AutodeskMaya.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/BinaryReader.cpp b/src/thirdparty/cppnet/cppkore/BinaryReader.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BinaryReader.cpp
rename to src/thirdparty/cppnet/cppkore/BinaryReader.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/BinaryReader.h b/src/thirdparty/cppnet/cppkore/BinaryReader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BinaryReader.h
rename to src/thirdparty/cppnet/cppkore/BinaryReader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/BinaryWriter.cpp b/src/thirdparty/cppnet/cppkore/BinaryWriter.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BinaryWriter.cpp
rename to src/thirdparty/cppnet/cppkore/BinaryWriter.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/BinaryWriter.h b/src/thirdparty/cppnet/cppkore/BinaryWriter.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BinaryWriter.h
rename to src/thirdparty/cppnet/cppkore/BinaryWriter.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Bone.cpp b/src/thirdparty/cppnet/cppkore/Bone.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Bone.cpp
rename to src/thirdparty/cppnet/cppkore/Bone.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Bone.h b/src/thirdparty/cppnet/cppkore/Bone.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Bone.h
rename to src/thirdparty/cppnet/cppkore/Bone.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/BoneFlags.h b/src/thirdparty/cppnet/cppkore/BoneFlags.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BoneFlags.h
rename to src/thirdparty/cppnet/cppkore/BoneFlags.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/BorderStyle.h b/src/thirdparty/cppnet/cppkore/BorderStyle.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BorderStyle.h
rename to src/thirdparty/cppnet/cppkore/BorderStyle.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/BoundsSpecified.h b/src/thirdparty/cppnet/cppkore/BoundsSpecified.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BoundsSpecified.h
rename to src/thirdparty/cppnet/cppkore/BoundsSpecified.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/BufferedGraphics.cpp b/src/thirdparty/cppnet/cppkore/BufferedGraphics.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BufferedGraphics.cpp
rename to src/thirdparty/cppnet/cppkore/BufferedGraphics.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/BufferedGraphics.h b/src/thirdparty/cppnet/cppkore/BufferedGraphics.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/BufferedGraphics.h
rename to src/thirdparty/cppnet/cppkore/BufferedGraphics.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Button.cpp b/src/thirdparty/cppnet/cppkore/Button.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Button.cpp
rename to src/thirdparty/cppnet/cppkore/Button.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Button.h b/src/thirdparty/cppnet/cppkore/Button.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Button.h
rename to src/thirdparty/cppnet/cppkore/Button.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ButtonBase.cpp b/src/thirdparty/cppnet/cppkore/ButtonBase.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ButtonBase.cpp
rename to src/thirdparty/cppnet/cppkore/ButtonBase.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ButtonBase.h b/src/thirdparty/cppnet/cppkore/ButtonBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ButtonBase.h
rename to src/thirdparty/cppnet/cppkore/ButtonBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ButtonFlags.h b/src/thirdparty/cppnet/cppkore/ButtonFlags.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ButtonFlags.h
rename to src/thirdparty/cppnet/cppkore/ButtonFlags.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CRC32.cpp b/src/thirdparty/cppnet/cppkore/CRC32.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CRC32.cpp
rename to src/thirdparty/cppnet/cppkore/CRC32.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/CRC32.h b/src/thirdparty/cppnet/cppkore/CRC32.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CRC32.h
rename to src/thirdparty/cppnet/cppkore/CRC32.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.cpp b/src/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.h b/src/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.h
rename to src/thirdparty/cppnet/cppkore/CacheVirtualItemsEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CancelEventArgs.cpp b/src/thirdparty/cppnet/cppkore/CancelEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CancelEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/CancelEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/CancelEventArgs.h b/src/thirdparty/cppnet/cppkore/CancelEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CancelEventArgs.h
rename to src/thirdparty/cppnet/cppkore/CancelEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CastAsset.cpp b/src/thirdparty/cppnet/cppkore/CastAsset.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CastAsset.cpp
rename to src/thirdparty/cppnet/cppkore/CastAsset.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/CastAsset.h b/src/thirdparty/cppnet/cppkore/CastAsset.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CastAsset.h
rename to src/thirdparty/cppnet/cppkore/CastAsset.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CastNode.cpp b/src/thirdparty/cppnet/cppkore/CastNode.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CastNode.cpp
rename to src/thirdparty/cppnet/cppkore/CastNode.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/CastNode.h b/src/thirdparty/cppnet/cppkore/CastNode.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CastNode.h
rename to src/thirdparty/cppnet/cppkore/CastNode.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CharacterCasing.h b/src/thirdparty/cppnet/cppkore/CharacterCasing.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CharacterCasing.h
rename to src/thirdparty/cppnet/cppkore/CharacterCasing.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CheckBox.cpp b/src/thirdparty/cppnet/cppkore/CheckBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CheckBox.cpp
rename to src/thirdparty/cppnet/cppkore/CheckBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/CheckBox.h b/src/thirdparty/cppnet/cppkore/CheckBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CheckBox.h
rename to src/thirdparty/cppnet/cppkore/CheckBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CheckBoxImage.h b/src/thirdparty/cppnet/cppkore/CheckBoxImage.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CheckBoxImage.h
rename to src/thirdparty/cppnet/cppkore/CheckBoxImage.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CheckState.h b/src/thirdparty/cppnet/cppkore/CheckState.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CheckState.h
rename to src/thirdparty/cppnet/cppkore/CheckState.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CloseReason.h b/src/thirdparty/cppnet/cppkore/CloseReason.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CloseReason.h
rename to src/thirdparty/cppnet/cppkore/CloseReason.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CoDXAssetExport.cpp b/src/thirdparty/cppnet/cppkore/CoDXAssetExport.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CoDXAssetExport.cpp
rename to src/thirdparty/cppnet/cppkore/CoDXAssetExport.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/CoDXAssetExport.h b/src/thirdparty/cppnet/cppkore/CoDXAssetExport.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CoDXAssetExport.h
rename to src/thirdparty/cppnet/cppkore/CoDXAssetExport.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ColumnClickEventArgs.cpp b/src/thirdparty/cppnet/cppkore/ColumnClickEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ColumnClickEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/ColumnClickEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ColumnClickEventArgs.h b/src/thirdparty/cppnet/cppkore/ColumnClickEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ColumnClickEventArgs.h
rename to src/thirdparty/cppnet/cppkore/ColumnClickEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ColumnHeader.cpp b/src/thirdparty/cppnet/cppkore/ColumnHeader.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ColumnHeader.cpp
rename to src/thirdparty/cppnet/cppkore/ColumnHeader.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ColumnHeader.h b/src/thirdparty/cppnet/cppkore/ColumnHeader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ColumnHeader.h
rename to src/thirdparty/cppnet/cppkore/ColumnHeader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ColumnHeaderStyle.h b/src/thirdparty/cppnet/cppkore/ColumnHeaderStyle.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ColumnHeaderStyle.h
rename to src/thirdparty/cppnet/cppkore/ColumnHeaderStyle.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ComboBox.cpp b/src/thirdparty/cppnet/cppkore/ComboBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ComboBox.cpp
rename to src/thirdparty/cppnet/cppkore/ComboBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ComboBox.h b/src/thirdparty/cppnet/cppkore/ComboBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ComboBox.h
rename to src/thirdparty/cppnet/cppkore/ComboBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ComboBoxStyle.h b/src/thirdparty/cppnet/cppkore/ComboBoxStyle.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ComboBoxStyle.h
rename to src/thirdparty/cppnet/cppkore/ComboBoxStyle.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CompressionMode.h b/src/thirdparty/cppnet/cppkore/CompressionMode.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CompressionMode.h
rename to src/thirdparty/cppnet/cppkore/CompressionMode.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Console.cpp b/src/thirdparty/cppnet/cppkore/Console.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Console.cpp
rename to src/thirdparty/cppnet/cppkore/Console.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Console.h b/src/thirdparty/cppnet/cppkore/Console.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Console.h
rename to src/thirdparty/cppnet/cppkore/Console.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ConsoleColor.cpp b/src/thirdparty/cppnet/cppkore/ConsoleColor.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ConsoleColor.cpp
rename to src/thirdparty/cppnet/cppkore/ConsoleColor.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ConsoleColor.h b/src/thirdparty/cppnet/cppkore/ConsoleColor.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ConsoleColor.h
rename to src/thirdparty/cppnet/cppkore/ConsoleColor.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ConsoleKey.h b/src/thirdparty/cppnet/cppkore/ConsoleKey.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ConsoleKey.h
rename to src/thirdparty/cppnet/cppkore/ConsoleKey.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ConsoleKeyInfo.h b/src/thirdparty/cppnet/cppkore/ConsoleKeyInfo.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ConsoleKeyInfo.h
rename to src/thirdparty/cppnet/cppkore/ConsoleKeyInfo.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ConsoleStream.cpp b/src/thirdparty/cppnet/cppkore/ConsoleStream.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ConsoleStream.cpp
rename to src/thirdparty/cppnet/cppkore/ConsoleStream.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ConsoleStream.h b/src/thirdparty/cppnet/cppkore/ConsoleStream.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ConsoleStream.h
rename to src/thirdparty/cppnet/cppkore/ConsoleStream.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ContainerControl.cpp b/src/thirdparty/cppnet/cppkore/ContainerControl.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ContainerControl.cpp
rename to src/thirdparty/cppnet/cppkore/ContainerControl.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ContainerControl.h b/src/thirdparty/cppnet/cppkore/ContainerControl.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ContainerControl.h
rename to src/thirdparty/cppnet/cppkore/ContainerControl.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ContentAlignment.h b/src/thirdparty/cppnet/cppkore/ContentAlignment.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ContentAlignment.h
rename to src/thirdparty/cppnet/cppkore/ContentAlignment.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Control.cpp b/src/thirdparty/cppnet/cppkore/Control.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Control.cpp
rename to src/thirdparty/cppnet/cppkore/Control.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Control.h b/src/thirdparty/cppnet/cppkore/Control.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Control.h
rename to src/thirdparty/cppnet/cppkore/Control.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ControlCollection.cpp b/src/thirdparty/cppnet/cppkore/ControlCollection.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ControlCollection.cpp
rename to src/thirdparty/cppnet/cppkore/ControlCollection.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ControlCollection.h b/src/thirdparty/cppnet/cppkore/ControlCollection.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ControlCollection.h
rename to src/thirdparty/cppnet/cppkore/ControlCollection.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ControlStates.h b/src/thirdparty/cppnet/cppkore/ControlStates.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ControlStates.h
rename to src/thirdparty/cppnet/cppkore/ControlStates.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ControlStyles.h b/src/thirdparty/cppnet/cppkore/ControlStyles.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ControlStyles.h
rename to src/thirdparty/cppnet/cppkore/ControlStyles.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ControlTypes.h b/src/thirdparty/cppnet/cppkore/ControlTypes.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ControlTypes.h
rename to src/thirdparty/cppnet/cppkore/ControlTypes.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/CppKore.natvis b/src/thirdparty/cppnet/cppkore/CppKore.natvis
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CppKore.natvis
rename to src/thirdparty/cppnet/cppkore/CppKore.natvis
diff --git a/r5dev/thirdparty/cppnet/cppkore/CreateParams.h b/src/thirdparty/cppnet/cppkore/CreateParams.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/CreateParams.h
rename to src/thirdparty/cppnet/cppkore/CreateParams.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Curve.cpp b/src/thirdparty/cppnet/cppkore/Curve.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Curve.cpp
rename to src/thirdparty/cppnet/cppkore/Curve.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Curve.h b/src/thirdparty/cppnet/cppkore/Curve.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Curve.h
rename to src/thirdparty/cppnet/cppkore/Curve.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DDS.cpp b/src/thirdparty/cppnet/cppkore/DDS.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DDS.cpp
rename to src/thirdparty/cppnet/cppkore/DDS.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DDS.h b/src/thirdparty/cppnet/cppkore/DDS.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DDS.h
rename to src/thirdparty/cppnet/cppkore/DDS.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DeflateCodec.cpp b/src/thirdparty/cppnet/cppkore/DeflateCodec.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DeflateCodec.cpp
rename to src/thirdparty/cppnet/cppkore/DeflateCodec.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DeflateCodec.h b/src/thirdparty/cppnet/cppkore/DeflateCodec.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DeflateCodec.h
rename to src/thirdparty/cppnet/cppkore/DeflateCodec.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DeflateStream.cpp b/src/thirdparty/cppnet/cppkore/DeflateStream.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DeflateStream.cpp
rename to src/thirdparty/cppnet/cppkore/DeflateStream.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DeflateStream.h b/src/thirdparty/cppnet/cppkore/DeflateStream.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DeflateStream.h
rename to src/thirdparty/cppnet/cppkore/DeflateStream.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DialogResult.h b/src/thirdparty/cppnet/cppkore/DialogResult.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DialogResult.h
rename to src/thirdparty/cppnet/cppkore/DialogResult.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DictionaryBase.h b/src/thirdparty/cppnet/cppkore/DictionaryBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DictionaryBase.h
rename to src/thirdparty/cppnet/cppkore/DictionaryBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Directory.cpp b/src/thirdparty/cppnet/cppkore/Directory.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Directory.cpp
rename to src/thirdparty/cppnet/cppkore/Directory.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Directory.h b/src/thirdparty/cppnet/cppkore/Directory.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Directory.h
rename to src/thirdparty/cppnet/cppkore/Directory.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DragDropEffects.h b/src/thirdparty/cppnet/cppkore/DragDropEffects.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DragDropEffects.h
rename to src/thirdparty/cppnet/cppkore/DragDropEffects.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DragEventArgs.cpp b/src/thirdparty/cppnet/cppkore/DragEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DragEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/DragEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DragEventArgs.h b/src/thirdparty/cppnet/cppkore/DragEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DragEventArgs.h
rename to src/thirdparty/cppnet/cppkore/DragEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.cpp b/src/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.h b/src/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.h
rename to src/thirdparty/cppnet/cppkore/DrawListViewColumnHeaderEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.cpp b/src/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.h b/src/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.h
rename to src/thirdparty/cppnet/cppkore/DrawListViewItemEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.cpp b/src/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.h b/src/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.h
rename to src/thirdparty/cppnet/cppkore/DrawListViewSubItemEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawMode.h b/src/thirdparty/cppnet/cppkore/DrawMode.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawMode.h
rename to src/thirdparty/cppnet/cppkore/DrawMode.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.cpp b/src/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.h b/src/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.h
rename to src/thirdparty/cppnet/cppkore/DrawToolTipEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DrawingBase.h b/src/thirdparty/cppnet/cppkore/DrawingBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DrawingBase.h
rename to src/thirdparty/cppnet/cppkore/DrawingBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/DropTarget.cpp b/src/thirdparty/cppnet/cppkore/DropTarget.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DropTarget.cpp
rename to src/thirdparty/cppnet/cppkore/DropTarget.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/DropTarget.h b/src/thirdparty/cppnet/cppkore/DropTarget.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/DropTarget.h
rename to src/thirdparty/cppnet/cppkore/DropTarget.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Environment.cpp b/src/thirdparty/cppnet/cppkore/Environment.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Environment.cpp
rename to src/thirdparty/cppnet/cppkore/Environment.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Environment.h b/src/thirdparty/cppnet/cppkore/Environment.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Environment.h
rename to src/thirdparty/cppnet/cppkore/Environment.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/EventBase.h b/src/thirdparty/cppnet/cppkore/EventBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/EventBase.h
rename to src/thirdparty/cppnet/cppkore/EventBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Exporter.h b/src/thirdparty/cppnet/cppkore/Exporter.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Exporter.h
rename to src/thirdparty/cppnet/cppkore/Exporter.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Face.cpp b/src/thirdparty/cppnet/cppkore/Face.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Face.cpp
rename to src/thirdparty/cppnet/cppkore/Face.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Face.h b/src/thirdparty/cppnet/cppkore/Face.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Face.h
rename to src/thirdparty/cppnet/cppkore/Face.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/File.cpp b/src/thirdparty/cppnet/cppkore/File.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/File.cpp
rename to src/thirdparty/cppnet/cppkore/File.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/File.h b/src/thirdparty/cppnet/cppkore/File.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/File.h
rename to src/thirdparty/cppnet/cppkore/File.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FileAccess.h b/src/thirdparty/cppnet/cppkore/FileAccess.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FileAccess.h
rename to src/thirdparty/cppnet/cppkore/FileAccess.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FileMode.h b/src/thirdparty/cppnet/cppkore/FileMode.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FileMode.h
rename to src/thirdparty/cppnet/cppkore/FileMode.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FileShare.h b/src/thirdparty/cppnet/cppkore/FileShare.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FileShare.h
rename to src/thirdparty/cppnet/cppkore/FileShare.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FileStream.cpp b/src/thirdparty/cppnet/cppkore/FileStream.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FileStream.cpp
rename to src/thirdparty/cppnet/cppkore/FileStream.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/FileStream.h b/src/thirdparty/cppnet/cppkore/FileStream.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FileStream.h
rename to src/thirdparty/cppnet/cppkore/FileStream.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FlatStyle.h b/src/thirdparty/cppnet/cppkore/FlatStyle.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FlatStyle.h
rename to src/thirdparty/cppnet/cppkore/FlatStyle.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Font.cpp b/src/thirdparty/cppnet/cppkore/Font.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Font.cpp
rename to src/thirdparty/cppnet/cppkore/Font.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Font.h b/src/thirdparty/cppnet/cppkore/Font.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Font.h
rename to src/thirdparty/cppnet/cppkore/Font.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FontArial.h b/src/thirdparty/cppnet/cppkore/FontArial.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FontArial.h
rename to src/thirdparty/cppnet/cppkore/FontArial.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Form.cpp b/src/thirdparty/cppnet/cppkore/Form.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Form.cpp
rename to src/thirdparty/cppnet/cppkore/Form.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Form.h b/src/thirdparty/cppnet/cppkore/Form.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Form.h
rename to src/thirdparty/cppnet/cppkore/Form.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FormBorderStyle.h b/src/thirdparty/cppnet/cppkore/FormBorderStyle.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FormBorderStyle.h
rename to src/thirdparty/cppnet/cppkore/FormBorderStyle.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FormClosedEventArgs.cpp b/src/thirdparty/cppnet/cppkore/FormClosedEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FormClosedEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/FormClosedEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/FormClosedEventArgs.h b/src/thirdparty/cppnet/cppkore/FormClosedEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FormClosedEventArgs.h
rename to src/thirdparty/cppnet/cppkore/FormClosedEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FormClosingEventArgs.cpp b/src/thirdparty/cppnet/cppkore/FormClosingEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FormClosingEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/FormClosingEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/FormClosingEventArgs.h b/src/thirdparty/cppnet/cppkore/FormClosingEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FormClosingEventArgs.h
rename to src/thirdparty/cppnet/cppkore/FormClosingEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FormStartPosition.h b/src/thirdparty/cppnet/cppkore/FormStartPosition.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FormStartPosition.h
rename to src/thirdparty/cppnet/cppkore/FormStartPosition.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/FormWindowState.h b/src/thirdparty/cppnet/cppkore/FormWindowState.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/FormWindowState.h
rename to src/thirdparty/cppnet/cppkore/FormWindowState.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/GroupBox.cpp b/src/thirdparty/cppnet/cppkore/GroupBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/GroupBox.cpp
rename to src/thirdparty/cppnet/cppkore/GroupBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/GroupBox.h b/src/thirdparty/cppnet/cppkore/GroupBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/GroupBox.h
rename to src/thirdparty/cppnet/cppkore/GroupBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Half.cpp b/src/thirdparty/cppnet/cppkore/Half.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Half.cpp
rename to src/thirdparty/cppnet/cppkore/Half.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Half.h b/src/thirdparty/cppnet/cppkore/Half.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Half.h
rename to src/thirdparty/cppnet/cppkore/Half.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/HandledMouseEventArgs.cpp b/src/thirdparty/cppnet/cppkore/HandledMouseEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/HandledMouseEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/HandledMouseEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/HandledMouseEventArgs.h b/src/thirdparty/cppnet/cppkore/HandledMouseEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/HandledMouseEventArgs.h
rename to src/thirdparty/cppnet/cppkore/HandledMouseEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/HashComparer.h b/src/thirdparty/cppnet/cppkore/HashComparer.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/HashComparer.h
rename to src/thirdparty/cppnet/cppkore/HashComparer.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/HashHelpers.h b/src/thirdparty/cppnet/cppkore/HashHelpers.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/HashHelpers.h
rename to src/thirdparty/cppnet/cppkore/HashHelpers.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/HorizontalAlignment.h b/src/thirdparty/cppnet/cppkore/HorizontalAlignment.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/HorizontalAlignment.h
rename to src/thirdparty/cppnet/cppkore/HorizontalAlignment.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/IOError.cpp b/src/thirdparty/cppnet/cppkore/IOError.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/IOError.cpp
rename to src/thirdparty/cppnet/cppkore/IOError.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/IOError.h b/src/thirdparty/cppnet/cppkore/IOError.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/IOError.h
rename to src/thirdparty/cppnet/cppkore/IOError.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Icon.cpp b/src/thirdparty/cppnet/cppkore/Icon.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Icon.cpp
rename to src/thirdparty/cppnet/cppkore/Icon.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Icon.h b/src/thirdparty/cppnet/cppkore/Icon.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Icon.h
rename to src/thirdparty/cppnet/cppkore/Icon.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ImmutableStringBase.h b/src/thirdparty/cppnet/cppkore/ImmutableStringBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ImmutableStringBase.h
rename to src/thirdparty/cppnet/cppkore/ImmutableStringBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/InternetPortType.h b/src/thirdparty/cppnet/cppkore/InternetPortType.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/InternetPortType.h
rename to src/thirdparty/cppnet/cppkore/InternetPortType.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/InvalidateEventArgs.cpp b/src/thirdparty/cppnet/cppkore/InvalidateEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/InvalidateEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/InvalidateEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/InvalidateEventArgs.h b/src/thirdparty/cppnet/cppkore/InvalidateEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/InvalidateEventArgs.h
rename to src/thirdparty/cppnet/cppkore/InvalidateEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ItemActivation.h b/src/thirdparty/cppnet/cppkore/ItemActivation.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ItemActivation.h
rename to src/thirdparty/cppnet/cppkore/ItemActivation.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Job.cpp b/src/thirdparty/cppnet/cppkore/Job.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Job.cpp
rename to src/thirdparty/cppnet/cppkore/Job.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Job.h b/src/thirdparty/cppnet/cppkore/Job.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Job.h
rename to src/thirdparty/cppnet/cppkore/Job.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/JobManager.cpp b/src/thirdparty/cppnet/cppkore/JobManager.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/JobManager.cpp
rename to src/thirdparty/cppnet/cppkore/JobManager.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/JobManager.h b/src/thirdparty/cppnet/cppkore/JobManager.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/JobManager.h
rename to src/thirdparty/cppnet/cppkore/JobManager.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/JobWorker.cpp b/src/thirdparty/cppnet/cppkore/JobWorker.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/JobWorker.cpp
rename to src/thirdparty/cppnet/cppkore/JobWorker.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/JobWorker.h b/src/thirdparty/cppnet/cppkore/JobWorker.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/JobWorker.h
rename to src/thirdparty/cppnet/cppkore/JobWorker.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/KaydaraFBX.cpp b/src/thirdparty/cppnet/cppkore/KaydaraFBX.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KaydaraFBX.cpp
rename to src/thirdparty/cppnet/cppkore/KaydaraFBX.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/KaydaraFBX.h b/src/thirdparty/cppnet/cppkore/KaydaraFBX.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KaydaraFBX.h
rename to src/thirdparty/cppnet/cppkore/KaydaraFBX.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/KaydaraFBXContainer.cpp b/src/thirdparty/cppnet/cppkore/KaydaraFBXContainer.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KaydaraFBXContainer.cpp
rename to src/thirdparty/cppnet/cppkore/KaydaraFBXContainer.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/KaydaraFBXContainer.h b/src/thirdparty/cppnet/cppkore/KaydaraFBXContainer.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KaydaraFBXContainer.h
rename to src/thirdparty/cppnet/cppkore/KaydaraFBXContainer.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/KeyEventArgs.cpp b/src/thirdparty/cppnet/cppkore/KeyEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KeyEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/KeyEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/KeyEventArgs.h b/src/thirdparty/cppnet/cppkore/KeyEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KeyEventArgs.h
rename to src/thirdparty/cppnet/cppkore/KeyEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/KeyPressEventArgs.cpp b/src/thirdparty/cppnet/cppkore/KeyPressEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KeyPressEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/KeyPressEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/KeyPressEventArgs.h b/src/thirdparty/cppnet/cppkore/KeyPressEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KeyPressEventArgs.h
rename to src/thirdparty/cppnet/cppkore/KeyPressEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Keys.h b/src/thirdparty/cppnet/cppkore/Keys.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Keys.h
rename to src/thirdparty/cppnet/cppkore/Keys.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Kore.h b/src/thirdparty/cppnet/cppkore/Kore.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Kore.h
rename to src/thirdparty/cppnet/cppkore/Kore.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/KoreTheme.cpp b/src/thirdparty/cppnet/cppkore/KoreTheme.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KoreTheme.cpp
rename to src/thirdparty/cppnet/cppkore/KoreTheme.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/KoreTheme.h b/src/thirdparty/cppnet/cppkore/KoreTheme.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/KoreTheme.h
rename to src/thirdparty/cppnet/cppkore/KoreTheme.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZ4Codec.cpp b/src/thirdparty/cppnet/cppkore/LZ4Codec.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZ4Codec.cpp
rename to src/thirdparty/cppnet/cppkore/LZ4Codec.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZ4Codec.h b/src/thirdparty/cppnet/cppkore/LZ4Codec.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZ4Codec.h
rename to src/thirdparty/cppnet/cppkore/LZ4Codec.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZ4Stream.cpp b/src/thirdparty/cppnet/cppkore/LZ4Stream.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZ4Stream.cpp
rename to src/thirdparty/cppnet/cppkore/LZ4Stream.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZ4Stream.h b/src/thirdparty/cppnet/cppkore/LZ4Stream.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZ4Stream.h
rename to src/thirdparty/cppnet/cppkore/LZ4Stream.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZHAMCodec.cpp b/src/thirdparty/cppnet/cppkore/LZHAMCodec.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZHAMCodec.cpp
rename to src/thirdparty/cppnet/cppkore/LZHAMCodec.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZHAMCodec.h b/src/thirdparty/cppnet/cppkore/LZHAMCodec.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZHAMCodec.h
rename to src/thirdparty/cppnet/cppkore/LZHAMCodec.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZO1XCodec.cpp b/src/thirdparty/cppnet/cppkore/LZO1XCodec.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZO1XCodec.cpp
rename to src/thirdparty/cppnet/cppkore/LZO1XCodec.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/LZO1XCodec.h b/src/thirdparty/cppnet/cppkore/LZO1XCodec.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LZO1XCodec.h
rename to src/thirdparty/cppnet/cppkore/LZO1XCodec.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Label.cpp b/src/thirdparty/cppnet/cppkore/Label.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Label.cpp
rename to src/thirdparty/cppnet/cppkore/Label.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Label.h b/src/thirdparty/cppnet/cppkore/Label.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Label.h
rename to src/thirdparty/cppnet/cppkore/Label.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/LabelEditEventArgs.cpp b/src/thirdparty/cppnet/cppkore/LabelEditEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LabelEditEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/LabelEditEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/LabelEditEventArgs.h b/src/thirdparty/cppnet/cppkore/LabelEditEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/LabelEditEventArgs.h
rename to src/thirdparty/cppnet/cppkore/LabelEditEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListBase.h b/src/thirdparty/cppnet/cppkore/ListBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListBase.h
rename to src/thirdparty/cppnet/cppkore/ListBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListView.cpp b/src/thirdparty/cppnet/cppkore/ListView.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListView.cpp
rename to src/thirdparty/cppnet/cppkore/ListView.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListView.h b/src/thirdparty/cppnet/cppkore/ListView.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListView.h
rename to src/thirdparty/cppnet/cppkore/ListView.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListViewAlignment.h b/src/thirdparty/cppnet/cppkore/ListViewAlignment.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListViewAlignment.h
rename to src/thirdparty/cppnet/cppkore/ListViewAlignment.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListViewFlags.h b/src/thirdparty/cppnet/cppkore/ListViewFlags.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListViewFlags.h
rename to src/thirdparty/cppnet/cppkore/ListViewFlags.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListViewItem.cpp b/src/thirdparty/cppnet/cppkore/ListViewItem.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListViewItem.cpp
rename to src/thirdparty/cppnet/cppkore/ListViewItem.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListViewItem.h b/src/thirdparty/cppnet/cppkore/ListViewItem.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListViewItem.h
rename to src/thirdparty/cppnet/cppkore/ListViewItem.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListViewItemStates.h b/src/thirdparty/cppnet/cppkore/ListViewItemStates.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListViewItemStates.h
rename to src/thirdparty/cppnet/cppkore/ListViewItemStates.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.cpp b/src/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.h b/src/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.h
rename to src/thirdparty/cppnet/cppkore/ListViewVirtualItemsSelectionRangeChangedEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Mangle.cpp b/src/thirdparty/cppnet/cppkore/Mangle.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Mangle.cpp
rename to src/thirdparty/cppnet/cppkore/Mangle.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Mangle.h b/src/thirdparty/cppnet/cppkore/Mangle.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Mangle.h
rename to src/thirdparty/cppnet/cppkore/Mangle.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Mangler.cpp b/src/thirdparty/cppnet/cppkore/Mangler.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Mangler.cpp
rename to src/thirdparty/cppnet/cppkore/Mangler.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Mangler.h b/src/thirdparty/cppnet/cppkore/Mangler.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Mangler.h
rename to src/thirdparty/cppnet/cppkore/Mangler.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Material.cpp b/src/thirdparty/cppnet/cppkore/Material.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Material.cpp
rename to src/thirdparty/cppnet/cppkore/Material.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Material.h b/src/thirdparty/cppnet/cppkore/Material.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Material.h
rename to src/thirdparty/cppnet/cppkore/Material.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MathHelper.h b/src/thirdparty/cppnet/cppkore/MathHelper.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MathHelper.h
rename to src/thirdparty/cppnet/cppkore/MathHelper.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Matrix.cpp b/src/thirdparty/cppnet/cppkore/Matrix.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Matrix.cpp
rename to src/thirdparty/cppnet/cppkore/Matrix.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Matrix.h b/src/thirdparty/cppnet/cppkore/Matrix.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Matrix.h
rename to src/thirdparty/cppnet/cppkore/Matrix.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MemoryStream.cpp b/src/thirdparty/cppnet/cppkore/MemoryStream.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MemoryStream.cpp
rename to src/thirdparty/cppnet/cppkore/MemoryStream.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/MemoryStream.h b/src/thirdparty/cppnet/cppkore/MemoryStream.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MemoryStream.h
rename to src/thirdparty/cppnet/cppkore/MemoryStream.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Mesh.cpp b/src/thirdparty/cppnet/cppkore/Mesh.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Mesh.cpp
rename to src/thirdparty/cppnet/cppkore/Mesh.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Mesh.h b/src/thirdparty/cppnet/cppkore/Mesh.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Mesh.h
rename to src/thirdparty/cppnet/cppkore/Mesh.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Message.h b/src/thirdparty/cppnet/cppkore/Message.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Message.h
rename to src/thirdparty/cppnet/cppkore/Message.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MessageBox.cpp b/src/thirdparty/cppnet/cppkore/MessageBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MessageBox.cpp
rename to src/thirdparty/cppnet/cppkore/MessageBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/MessageBox.h b/src/thirdparty/cppnet/cppkore/MessageBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MessageBox.h
rename to src/thirdparty/cppnet/cppkore/MessageBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MessageBoxButtons.h b/src/thirdparty/cppnet/cppkore/MessageBoxButtons.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MessageBoxButtons.h
rename to src/thirdparty/cppnet/cppkore/MessageBoxButtons.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MessageBoxDefaultButton.h b/src/thirdparty/cppnet/cppkore/MessageBoxDefaultButton.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MessageBoxDefaultButton.h
rename to src/thirdparty/cppnet/cppkore/MessageBoxDefaultButton.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MessageBoxIcon.h b/src/thirdparty/cppnet/cppkore/MessageBoxIcon.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MessageBoxIcon.h
rename to src/thirdparty/cppnet/cppkore/MessageBoxIcon.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MessageBoxOptions.h b/src/thirdparty/cppnet/cppkore/MessageBoxOptions.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MessageBoxOptions.h
rename to src/thirdparty/cppnet/cppkore/MessageBoxOptions.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Model.cpp b/src/thirdparty/cppnet/cppkore/Model.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Model.cpp
rename to src/thirdparty/cppnet/cppkore/Model.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Model.h b/src/thirdparty/cppnet/cppkore/Model.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Model.h
rename to src/thirdparty/cppnet/cppkore/Model.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ModelFragmentShader.h b/src/thirdparty/cppnet/cppkore/ModelFragmentShader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ModelFragmentShader.h
rename to src/thirdparty/cppnet/cppkore/ModelFragmentShader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ModelVertexShader.h b/src/thirdparty/cppnet/cppkore/ModelVertexShader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ModelVertexShader.h
rename to src/thirdparty/cppnet/cppkore/ModelVertexShader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MouseButtons.h b/src/thirdparty/cppnet/cppkore/MouseButtons.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MouseButtons.h
rename to src/thirdparty/cppnet/cppkore/MouseButtons.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/MouseEventArgs.cpp b/src/thirdparty/cppnet/cppkore/MouseEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MouseEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/MouseEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/MouseEventArgs.h b/src/thirdparty/cppnet/cppkore/MouseEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/MouseEventArgs.h
rename to src/thirdparty/cppnet/cppkore/MouseEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/OpenFileDialog.cpp b/src/thirdparty/cppnet/cppkore/OpenFileDialog.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/OpenFileDialog.cpp
rename to src/thirdparty/cppnet/cppkore/OpenFileDialog.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/OpenFileDialog.h b/src/thirdparty/cppnet/cppkore/OpenFileDialog.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/OpenFileDialog.h
rename to src/thirdparty/cppnet/cppkore/OpenFileDialog.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/OpenGLViewport.cpp b/src/thirdparty/cppnet/cppkore/OpenGLViewport.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/OpenGLViewport.cpp
rename to src/thirdparty/cppnet/cppkore/OpenGLViewport.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/OpenGLViewport.h b/src/thirdparty/cppnet/cppkore/OpenGLViewport.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/OpenGLViewport.h
rename to src/thirdparty/cppnet/cppkore/OpenGLViewport.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/PaintEventArgs.cpp b/src/thirdparty/cppnet/cppkore/PaintEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/PaintEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/PaintEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/PaintEventArgs.h b/src/thirdparty/cppnet/cppkore/PaintEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/PaintEventArgs.h
rename to src/thirdparty/cppnet/cppkore/PaintEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/PaintFrameEventArgs.cpp b/src/thirdparty/cppnet/cppkore/PaintFrameEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/PaintFrameEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/PaintFrameEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/PaintFrameEventArgs.h b/src/thirdparty/cppnet/cppkore/PaintFrameEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/PaintFrameEventArgs.h
rename to src/thirdparty/cppnet/cppkore/PaintFrameEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Panel.cpp b/src/thirdparty/cppnet/cppkore/Panel.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Panel.cpp
rename to src/thirdparty/cppnet/cppkore/Panel.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Panel.h b/src/thirdparty/cppnet/cppkore/Panel.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Panel.h
rename to src/thirdparty/cppnet/cppkore/Panel.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ParallelTask.h b/src/thirdparty/cppnet/cppkore/ParallelTask.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ParallelTask.h
rename to src/thirdparty/cppnet/cppkore/ParallelTask.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Path.cpp b/src/thirdparty/cppnet/cppkore/Path.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Path.cpp
rename to src/thirdparty/cppnet/cppkore/Path.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Path.h b/src/thirdparty/cppnet/cppkore/Path.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Path.h
rename to src/thirdparty/cppnet/cppkore/Path.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Pattern.cpp b/src/thirdparty/cppnet/cppkore/Pattern.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Pattern.cpp
rename to src/thirdparty/cppnet/cppkore/Pattern.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Pattern.h b/src/thirdparty/cppnet/cppkore/Pattern.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Pattern.h
rename to src/thirdparty/cppnet/cppkore/Pattern.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/PopupEventArgs.cpp b/src/thirdparty/cppnet/cppkore/PopupEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/PopupEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/PopupEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/PopupEventArgs.h b/src/thirdparty/cppnet/cppkore/PopupEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/PopupEventArgs.h
rename to src/thirdparty/cppnet/cppkore/PopupEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Process.cpp b/src/thirdparty/cppnet/cppkore/Process.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Process.cpp
rename to src/thirdparty/cppnet/cppkore/Process.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Process.h b/src/thirdparty/cppnet/cppkore/Process.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Process.h
rename to src/thirdparty/cppnet/cppkore/Process.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessInfo.h b/src/thirdparty/cppnet/cppkore/ProcessInfo.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessInfo.h
rename to src/thirdparty/cppnet/cppkore/ProcessInfo.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessModule.h b/src/thirdparty/cppnet/cppkore/ProcessModule.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessModule.h
rename to src/thirdparty/cppnet/cppkore/ProcessModule.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessReader.cpp b/src/thirdparty/cppnet/cppkore/ProcessReader.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessReader.cpp
rename to src/thirdparty/cppnet/cppkore/ProcessReader.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessReader.h b/src/thirdparty/cppnet/cppkore/ProcessReader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessReader.h
rename to src/thirdparty/cppnet/cppkore/ProcessReader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessStartInfo.h b/src/thirdparty/cppnet/cppkore/ProcessStartInfo.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessStartInfo.h
rename to src/thirdparty/cppnet/cppkore/ProcessStartInfo.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessStream.cpp b/src/thirdparty/cppnet/cppkore/ProcessStream.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessStream.cpp
rename to src/thirdparty/cppnet/cppkore/ProcessStream.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessStream.h b/src/thirdparty/cppnet/cppkore/ProcessStream.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessStream.h
rename to src/thirdparty/cppnet/cppkore/ProcessStream.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProcessThread.h b/src/thirdparty/cppnet/cppkore/ProcessThread.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProcessThread.h
rename to src/thirdparty/cppnet/cppkore/ProcessThread.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProgressBar.cpp b/src/thirdparty/cppnet/cppkore/ProgressBar.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProgressBar.cpp
rename to src/thirdparty/cppnet/cppkore/ProgressBar.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProgressBar.h b/src/thirdparty/cppnet/cppkore/ProgressBar.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProgressBar.h
rename to src/thirdparty/cppnet/cppkore/ProgressBar.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ProgressBarStyle.h b/src/thirdparty/cppnet/cppkore/ProgressBarStyle.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ProgressBarStyle.h
rename to src/thirdparty/cppnet/cppkore/ProgressBarStyle.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Quaternion.cpp b/src/thirdparty/cppnet/cppkore/Quaternion.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Quaternion.cpp
rename to src/thirdparty/cppnet/cppkore/Quaternion.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Quaternion.h b/src/thirdparty/cppnet/cppkore/Quaternion.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Quaternion.h
rename to src/thirdparty/cppnet/cppkore/Quaternion.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RadioButton.cpp b/src/thirdparty/cppnet/cppkore/RadioButton.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RadioButton.cpp
rename to src/thirdparty/cppnet/cppkore/RadioButton.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/RadioButton.h b/src/thirdparty/cppnet/cppkore/RadioButton.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RadioButton.h
rename to src/thirdparty/cppnet/cppkore/RadioButton.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Registry.cpp b/src/thirdparty/cppnet/cppkore/Registry.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Registry.cpp
rename to src/thirdparty/cppnet/cppkore/Registry.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Registry.h b/src/thirdparty/cppnet/cppkore/Registry.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Registry.h
rename to src/thirdparty/cppnet/cppkore/Registry.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RegistryHive.h b/src/thirdparty/cppnet/cppkore/RegistryHive.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RegistryHive.h
rename to src/thirdparty/cppnet/cppkore/RegistryHive.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RegistryKey.cpp b/src/thirdparty/cppnet/cppkore/RegistryKey.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RegistryKey.cpp
rename to src/thirdparty/cppnet/cppkore/RegistryKey.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/RegistryKey.h b/src/thirdparty/cppnet/cppkore/RegistryKey.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RegistryKey.h
rename to src/thirdparty/cppnet/cppkore/RegistryKey.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RegistryValueType.h b/src/thirdparty/cppnet/cppkore/RegistryValueType.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RegistryValueType.h
rename to src/thirdparty/cppnet/cppkore/RegistryValueType.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RegistryView.h b/src/thirdparty/cppnet/cppkore/RegistryView.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RegistryView.h
rename to src/thirdparty/cppnet/cppkore/RegistryView.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RenderFont.cpp b/src/thirdparty/cppnet/cppkore/RenderFont.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RenderFont.cpp
rename to src/thirdparty/cppnet/cppkore/RenderFont.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/RenderFont.h b/src/thirdparty/cppnet/cppkore/RenderFont.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RenderFont.h
rename to src/thirdparty/cppnet/cppkore/RenderFont.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RenderShader.cpp b/src/thirdparty/cppnet/cppkore/RenderShader.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RenderShader.cpp
rename to src/thirdparty/cppnet/cppkore/RenderShader.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/RenderShader.h b/src/thirdparty/cppnet/cppkore/RenderShader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RenderShader.h
rename to src/thirdparty/cppnet/cppkore/RenderShader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RenderViewCamera.cpp b/src/thirdparty/cppnet/cppkore/RenderViewCamera.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RenderViewCamera.cpp
rename to src/thirdparty/cppnet/cppkore/RenderViewCamera.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/RenderViewCamera.h b/src/thirdparty/cppnet/cppkore/RenderViewCamera.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RenderViewCamera.h
rename to src/thirdparty/cppnet/cppkore/RenderViewCamera.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.cpp b/src/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.cpp
rename to src/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.h b/src/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.h
rename to src/thirdparty/cppnet/cppkore/RetrieveVirtualItemEventArgs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/SEAsset.cpp b/src/thirdparty/cppnet/cppkore/SEAsset.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SEAsset.cpp
rename to src/thirdparty/cppnet/cppkore/SEAsset.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/SEAsset.h b/src/thirdparty/cppnet/cppkore/SEAsset.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SEAsset.h
rename to src/thirdparty/cppnet/cppkore/SEAsset.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/SaveFileDialog.cpp b/src/thirdparty/cppnet/cppkore/SaveFileDialog.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SaveFileDialog.cpp
rename to src/thirdparty/cppnet/cppkore/SaveFileDialog.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/SaveFileDialog.h b/src/thirdparty/cppnet/cppkore/SaveFileDialog.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SaveFileDialog.h
rename to src/thirdparty/cppnet/cppkore/SaveFileDialog.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ScrollBars.h b/src/thirdparty/cppnet/cppkore/ScrollBars.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ScrollBars.h
rename to src/thirdparty/cppnet/cppkore/ScrollBars.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/SecureString.h b/src/thirdparty/cppnet/cppkore/SecureString.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SecureString.h
rename to src/thirdparty/cppnet/cppkore/SecureString.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/SeekOrigin.h b/src/thirdparty/cppnet/cppkore/SeekOrigin.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SeekOrigin.h
rename to src/thirdparty/cppnet/cppkore/SeekOrigin.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Settings.cpp b/src/thirdparty/cppnet/cppkore/Settings.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Settings.cpp
rename to src/thirdparty/cppnet/cppkore/Settings.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Settings.h b/src/thirdparty/cppnet/cppkore/Settings.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Settings.h
rename to src/thirdparty/cppnet/cppkore/Settings.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/SortOrder.h b/src/thirdparty/cppnet/cppkore/SortOrder.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SortOrder.h
rename to src/thirdparty/cppnet/cppkore/SortOrder.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/SpecialFolder.h b/src/thirdparty/cppnet/cppkore/SpecialFolder.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/SpecialFolder.h
rename to src/thirdparty/cppnet/cppkore/SpecialFolder.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Stream.h b/src/thirdparty/cppnet/cppkore/Stream.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Stream.h
rename to src/thirdparty/cppnet/cppkore/Stream.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/StreamReader.cpp b/src/thirdparty/cppnet/cppkore/StreamReader.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/StreamReader.cpp
rename to src/thirdparty/cppnet/cppkore/StreamReader.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/StreamReader.h b/src/thirdparty/cppnet/cppkore/StreamReader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/StreamReader.h
rename to src/thirdparty/cppnet/cppkore/StreamReader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/StreamWriter.cpp b/src/thirdparty/cppnet/cppkore/StreamWriter.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/StreamWriter.cpp
rename to src/thirdparty/cppnet/cppkore/StreamWriter.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/StreamWriter.h b/src/thirdparty/cppnet/cppkore/StreamWriter.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/StreamWriter.h
rename to src/thirdparty/cppnet/cppkore/StreamWriter.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/StringBase.h b/src/thirdparty/cppnet/cppkore/StringBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/StringBase.h
rename to src/thirdparty/cppnet/cppkore/StringBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Task.h b/src/thirdparty/cppnet/cppkore/Task.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Task.h
rename to src/thirdparty/cppnet/cppkore/Task.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextBox.cpp b/src/thirdparty/cppnet/cppkore/TextBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextBox.cpp
rename to src/thirdparty/cppnet/cppkore/TextBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextBox.h b/src/thirdparty/cppnet/cppkore/TextBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextBox.h
rename to src/thirdparty/cppnet/cppkore/TextBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextBoxBase.cpp b/src/thirdparty/cppnet/cppkore/TextBoxBase.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextBoxBase.cpp
rename to src/thirdparty/cppnet/cppkore/TextBoxBase.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextBoxBase.h b/src/thirdparty/cppnet/cppkore/TextBoxBase.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextBoxBase.h
rename to src/thirdparty/cppnet/cppkore/TextBoxBase.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextBoxFlags.h b/src/thirdparty/cppnet/cppkore/TextBoxFlags.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextBoxFlags.h
rename to src/thirdparty/cppnet/cppkore/TextBoxFlags.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextFormatFlags.h b/src/thirdparty/cppnet/cppkore/TextFormatFlags.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextFormatFlags.h
rename to src/thirdparty/cppnet/cppkore/TextFormatFlags.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextReader.cpp b/src/thirdparty/cppnet/cppkore/TextReader.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextReader.cpp
rename to src/thirdparty/cppnet/cppkore/TextReader.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextReader.h b/src/thirdparty/cppnet/cppkore/TextReader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextReader.h
rename to src/thirdparty/cppnet/cppkore/TextReader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextRenderer.cpp b/src/thirdparty/cppnet/cppkore/TextRenderer.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextRenderer.cpp
rename to src/thirdparty/cppnet/cppkore/TextRenderer.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextRenderer.h b/src/thirdparty/cppnet/cppkore/TextRenderer.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextRenderer.h
rename to src/thirdparty/cppnet/cppkore/TextRenderer.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextWriter.cpp b/src/thirdparty/cppnet/cppkore/TextWriter.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextWriter.cpp
rename to src/thirdparty/cppnet/cppkore/TextWriter.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextWriter.h b/src/thirdparty/cppnet/cppkore/TextWriter.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextWriter.h
rename to src/thirdparty/cppnet/cppkore/TextWriter.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Texture.cpp b/src/thirdparty/cppnet/cppkore/Texture.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Texture.cpp
rename to src/thirdparty/cppnet/cppkore/Texture.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Texture.h b/src/thirdparty/cppnet/cppkore/Texture.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Texture.h
rename to src/thirdparty/cppnet/cppkore/Texture.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextureGPUDecoder.cpp b/src/thirdparty/cppnet/cppkore/TextureGPUDecoder.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextureGPUDecoder.cpp
rename to src/thirdparty/cppnet/cppkore/TextureGPUDecoder.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/TextureGPUDecoder.h b/src/thirdparty/cppnet/cppkore/TextureGPUDecoder.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/TextureGPUDecoder.h
rename to src/thirdparty/cppnet/cppkore/TextureGPUDecoder.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Thread.cpp b/src/thirdparty/cppnet/cppkore/Thread.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Thread.cpp
rename to src/thirdparty/cppnet/cppkore/Thread.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Thread.h b/src/thirdparty/cppnet/cppkore/Thread.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Thread.h
rename to src/thirdparty/cppnet/cppkore/Thread.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ThreadStart.h b/src/thirdparty/cppnet/cppkore/ThreadStart.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ThreadStart.h
rename to src/thirdparty/cppnet/cppkore/ThreadStart.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ToolTip.cpp b/src/thirdparty/cppnet/cppkore/ToolTip.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ToolTip.cpp
rename to src/thirdparty/cppnet/cppkore/ToolTip.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ToolTip.h b/src/thirdparty/cppnet/cppkore/ToolTip.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ToolTip.h
rename to src/thirdparty/cppnet/cppkore/ToolTip.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ToolTipIcon.h b/src/thirdparty/cppnet/cppkore/ToolTipIcon.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ToolTipIcon.h
rename to src/thirdparty/cppnet/cppkore/ToolTipIcon.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXButton.cpp b/src/thirdparty/cppnet/cppkore/UIXButton.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXButton.cpp
rename to src/thirdparty/cppnet/cppkore/UIXButton.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXButton.h b/src/thirdparty/cppnet/cppkore/UIXButton.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXButton.h
rename to src/thirdparty/cppnet/cppkore/UIXButton.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXCheckBox.cpp b/src/thirdparty/cppnet/cppkore/UIXCheckBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXCheckBox.cpp
rename to src/thirdparty/cppnet/cppkore/UIXCheckBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXCheckBox.h b/src/thirdparty/cppnet/cppkore/UIXCheckBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXCheckBox.h
rename to src/thirdparty/cppnet/cppkore/UIXCheckBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXComboBox.cpp b/src/thirdparty/cppnet/cppkore/UIXComboBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXComboBox.cpp
rename to src/thirdparty/cppnet/cppkore/UIXComboBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXComboBox.h b/src/thirdparty/cppnet/cppkore/UIXComboBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXComboBox.h
rename to src/thirdparty/cppnet/cppkore/UIXComboBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXControls.h b/src/thirdparty/cppnet/cppkore/UIXControls.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXControls.h
rename to src/thirdparty/cppnet/cppkore/UIXControls.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXGroupBox.cpp b/src/thirdparty/cppnet/cppkore/UIXGroupBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXGroupBox.cpp
rename to src/thirdparty/cppnet/cppkore/UIXGroupBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXGroupBox.h b/src/thirdparty/cppnet/cppkore/UIXGroupBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXGroupBox.h
rename to src/thirdparty/cppnet/cppkore/UIXGroupBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXLabel.cpp b/src/thirdparty/cppnet/cppkore/UIXLabel.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXLabel.cpp
rename to src/thirdparty/cppnet/cppkore/UIXLabel.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXLabel.h b/src/thirdparty/cppnet/cppkore/UIXLabel.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXLabel.h
rename to src/thirdparty/cppnet/cppkore/UIXLabel.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXListView.cpp b/src/thirdparty/cppnet/cppkore/UIXListView.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXListView.cpp
rename to src/thirdparty/cppnet/cppkore/UIXListView.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXListView.h b/src/thirdparty/cppnet/cppkore/UIXListView.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXListView.h
rename to src/thirdparty/cppnet/cppkore/UIXListView.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXListViewHeader.cpp b/src/thirdparty/cppnet/cppkore/UIXListViewHeader.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXListViewHeader.cpp
rename to src/thirdparty/cppnet/cppkore/UIXListViewHeader.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXListViewHeader.h b/src/thirdparty/cppnet/cppkore/UIXListViewHeader.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXListViewHeader.h
rename to src/thirdparty/cppnet/cppkore/UIXListViewHeader.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXProgressBar.cpp b/src/thirdparty/cppnet/cppkore/UIXProgressBar.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXProgressBar.cpp
rename to src/thirdparty/cppnet/cppkore/UIXProgressBar.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXProgressBar.h b/src/thirdparty/cppnet/cppkore/UIXProgressBar.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXProgressBar.h
rename to src/thirdparty/cppnet/cppkore/UIXProgressBar.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXRadioButton.cpp b/src/thirdparty/cppnet/cppkore/UIXRadioButton.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXRadioButton.cpp
rename to src/thirdparty/cppnet/cppkore/UIXRadioButton.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXRadioButton.h b/src/thirdparty/cppnet/cppkore/UIXRadioButton.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXRadioButton.h
rename to src/thirdparty/cppnet/cppkore/UIXRadioButton.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXRenderer.h b/src/thirdparty/cppnet/cppkore/UIXRenderer.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXRenderer.h
rename to src/thirdparty/cppnet/cppkore/UIXRenderer.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXTextBox.cpp b/src/thirdparty/cppnet/cppkore/UIXTextBox.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXTextBox.cpp
rename to src/thirdparty/cppnet/cppkore/UIXTextBox.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXTextBox.h b/src/thirdparty/cppnet/cppkore/UIXTextBox.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXTextBox.h
rename to src/thirdparty/cppnet/cppkore/UIXTextBox.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXTheme.cpp b/src/thirdparty/cppnet/cppkore/UIXTheme.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXTheme.cpp
rename to src/thirdparty/cppnet/cppkore/UIXTheme.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXTheme.h b/src/thirdparty/cppnet/cppkore/UIXTheme.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXTheme.h
rename to src/thirdparty/cppnet/cppkore/UIXTheme.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXToolTip.cpp b/src/thirdparty/cppnet/cppkore/UIXToolTip.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXToolTip.cpp
rename to src/thirdparty/cppnet/cppkore/UIXToolTip.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UIXToolTip.h b/src/thirdparty/cppnet/cppkore/UIXToolTip.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UIXToolTip.h
rename to src/thirdparty/cppnet/cppkore/UIXToolTip.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/UnrealEngine.cpp b/src/thirdparty/cppnet/cppkore/UnrealEngine.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UnrealEngine.cpp
rename to src/thirdparty/cppnet/cppkore/UnrealEngine.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/UnrealEngine.h b/src/thirdparty/cppnet/cppkore/UnrealEngine.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/UnrealEngine.h
rename to src/thirdparty/cppnet/cppkore/UnrealEngine.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Uri.cpp b/src/thirdparty/cppnet/cppkore/Uri.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Uri.cpp
rename to src/thirdparty/cppnet/cppkore/Uri.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Uri.h b/src/thirdparty/cppnet/cppkore/Uri.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Uri.h
rename to src/thirdparty/cppnet/cppkore/Uri.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ValveSMD.cpp b/src/thirdparty/cppnet/cppkore/ValveSMD.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ValveSMD.cpp
rename to src/thirdparty/cppnet/cppkore/ValveSMD.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ValveSMD.h b/src/thirdparty/cppnet/cppkore/ValveSMD.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ValveSMD.h
rename to src/thirdparty/cppnet/cppkore/ValveSMD.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Vector2.cpp b/src/thirdparty/cppnet/cppkore/Vector2.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Vector2.cpp
rename to src/thirdparty/cppnet/cppkore/Vector2.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Vector2.h b/src/thirdparty/cppnet/cppkore/Vector2.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Vector2.h
rename to src/thirdparty/cppnet/cppkore/Vector2.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Vector3.cpp b/src/thirdparty/cppnet/cppkore/Vector3.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Vector3.cpp
rename to src/thirdparty/cppnet/cppkore/Vector3.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Vector3.h b/src/thirdparty/cppnet/cppkore/Vector3.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Vector3.h
rename to src/thirdparty/cppnet/cppkore/Vector3.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Vertex.cpp b/src/thirdparty/cppnet/cppkore/Vertex.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Vertex.cpp
rename to src/thirdparty/cppnet/cppkore/Vertex.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Vertex.h b/src/thirdparty/cppnet/cppkore/Vertex.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Vertex.h
rename to src/thirdparty/cppnet/cppkore/Vertex.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/VertexBuffer.cpp b/src/thirdparty/cppnet/cppkore/VertexBuffer.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/VertexBuffer.cpp
rename to src/thirdparty/cppnet/cppkore/VertexBuffer.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/VertexBuffer.h b/src/thirdparty/cppnet/cppkore/VertexBuffer.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/VertexBuffer.h
rename to src/thirdparty/cppnet/cppkore/VertexBuffer.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/View.h b/src/thirdparty/cppnet/cppkore/View.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/View.h
rename to src/thirdparty/cppnet/cppkore/View.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/WAV.cpp b/src/thirdparty/cppnet/cppkore/WAV.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/WAV.cpp
rename to src/thirdparty/cppnet/cppkore/WAV.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/WAV.h b/src/thirdparty/cppnet/cppkore/WAV.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/WAV.h
rename to src/thirdparty/cppnet/cppkore/WAV.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/WavefrontOBJ.cpp b/src/thirdparty/cppnet/cppkore/WavefrontOBJ.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/WavefrontOBJ.cpp
rename to src/thirdparty/cppnet/cppkore/WavefrontOBJ.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/WavefrontOBJ.h b/src/thirdparty/cppnet/cppkore/WavefrontOBJ.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/WavefrontOBJ.h
rename to src/thirdparty/cppnet/cppkore/WavefrontOBJ.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/Win32Error.cpp b/src/thirdparty/cppnet/cppkore/Win32Error.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Win32Error.cpp
rename to src/thirdparty/cppnet/cppkore/Win32Error.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/Win32Error.h b/src/thirdparty/cppnet/cppkore/Win32Error.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/Win32Error.h
rename to src/thirdparty/cppnet/cppkore/Win32Error.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/WraithTheme.cpp b/src/thirdparty/cppnet/cppkore/WraithTheme.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/WraithTheme.cpp
rename to src/thirdparty/cppnet/cppkore/WraithTheme.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/WraithTheme.h b/src/thirdparty/cppnet/cppkore/WraithTheme.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/WraithTheme.h
rename to src/thirdparty/cppnet/cppkore/WraithTheme.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/XNALaraAscii.cpp b/src/thirdparty/cppnet/cppkore/XNALaraAscii.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/XNALaraAscii.cpp
rename to src/thirdparty/cppnet/cppkore/XNALaraAscii.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/XNALaraAscii.h b/src/thirdparty/cppnet/cppkore/XNALaraAscii.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/XNALaraAscii.h
rename to src/thirdparty/cppnet/cppkore/XNALaraAscii.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/XNALaraBinary.cpp b/src/thirdparty/cppnet/cppkore/XNALaraBinary.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/XNALaraBinary.cpp
rename to src/thirdparty/cppnet/cppkore/XNALaraBinary.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/XNALaraBinary.h b/src/thirdparty/cppnet/cppkore/XNALaraBinary.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/XNALaraBinary.h
rename to src/thirdparty/cppnet/cppkore/XNALaraBinary.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/XXHash.cpp b/src/thirdparty/cppnet/cppkore/XXHash.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/XXHash.cpp
rename to src/thirdparty/cppnet/cppkore/XXHash.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/XXHash.h b/src/thirdparty/cppnet/cppkore/XXHash.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/XXHash.h
rename to src/thirdparty/cppnet/cppkore/XXHash.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ZLibCodec.cpp b/src/thirdparty/cppnet/cppkore/ZLibCodec.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ZLibCodec.cpp
rename to src/thirdparty/cppnet/cppkore/ZLibCodec.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ZLibCodec.h b/src/thirdparty/cppnet/cppkore/ZLibCodec.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ZLibCodec.h
rename to src/thirdparty/cppnet/cppkore/ZLibCodec.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ZipArchive.cpp b/src/thirdparty/cppnet/cppkore/ZipArchive.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ZipArchive.cpp
rename to src/thirdparty/cppnet/cppkore/ZipArchive.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/ZipArchive.h b/src/thirdparty/cppnet/cppkore/ZipArchive.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ZipArchive.h
rename to src/thirdparty/cppnet/cppkore/ZipArchive.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/ZipEntry.h b/src/thirdparty/cppnet/cppkore/ZipEntry.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/ZipEntry.h
rename to src/thirdparty/cppnet/cppkore/ZipEntry.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/__ConsoleInit.cpp b/src/thirdparty/cppnet/cppkore/__ConsoleInit.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/__ConsoleInit.cpp
rename to src/thirdparty/cppnet/cppkore/__ConsoleInit.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/__ConsoleInit.h b/src/thirdparty/cppnet/cppkore/__ConsoleInit.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/__ConsoleInit.h
rename to src/thirdparty/cppnet/cppkore/__ConsoleInit.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/clipboard/clip.cpp b/src/thirdparty/cppnet/cppkore/clipboard/clip.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/clipboard/clip.cpp
rename to src/thirdparty/cppnet/cppkore/clipboard/clip.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/clipboard/clip.h b/src/thirdparty/cppnet/cppkore/clipboard/clip.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/clipboard/clip.h
rename to src/thirdparty/cppnet/cppkore/clipboard/clip.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/clipboard/clip_lock_impl.h b/src/thirdparty/cppnet/cppkore/clipboard/clip_lock_impl.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/clipboard/clip_lock_impl.h
rename to src/thirdparty/cppnet/cppkore/clipboard/clip_lock_impl.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/clipboard/clip_win.cpp b/src/thirdparty/cppnet/cppkore/clipboard/clip_win.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/clipboard/clip_win.cpp
rename to src/thirdparty/cppnet/cppkore/clipboard/clip_win.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/resource.h b/src/thirdparty/cppnet/cppkore/resource.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/resource.h
rename to src/thirdparty/cppnet/cppkore/resource.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/stdafx.cpp b/src/thirdparty/cppnet/cppkore/stdafx.cpp
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/stdafx.cpp
rename to src/thirdparty/cppnet/cppkore/stdafx.cpp
diff --git a/r5dev/thirdparty/cppnet/cppkore/stdafx.h b/src/thirdparty/cppnet/cppkore/stdafx.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/stdafx.h
rename to src/thirdparty/cppnet/cppkore/stdafx.h
diff --git a/r5dev/thirdparty/cppnet/cppkore/stdext.h b/src/thirdparty/cppnet/cppkore/stdext.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore/stdext.h
rename to src/thirdparty/cppnet/cppkore/stdext.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_docs/console_colors.txt b/src/thirdparty/cppnet/cppkore_docs/console_colors.txt
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_docs/console_colors.txt
rename to src/thirdparty/cppnet/cppkore_docs/console_colors.txt
diff --git a/r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/eglew.h b/src/thirdparty/cppnet/cppkore_docs/glew_reference/eglew.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/eglew.h
rename to src/thirdparty/cppnet/cppkore_docs/glew_reference/eglew.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/glew.h b/src/thirdparty/cppnet/cppkore_docs/glew_reference/glew.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/glew.h
rename to src/thirdparty/cppnet/cppkore_docs/glew_reference/glew.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/glxew.h b/src/thirdparty/cppnet/cppkore_docs/glew_reference/glxew.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/glxew.h
rename to src/thirdparty/cppnet/cppkore_docs/glew_reference/glxew.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/wglew.h b/src/thirdparty/cppnet/cppkore_docs/glew_reference/wglew.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_docs/glew_reference/wglew.h
rename to src/thirdparty/cppnet/cppkore_docs/glew_reference/wglew.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_docs/korefunctionbinary.txt b/src/thirdparty/cppnet/cppkore_docs/korefunctionbinary.txt
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_docs/korefunctionbinary.txt
rename to src/thirdparty/cppnet/cppkore_docs/korefunctionbinary.txt
diff --git a/r5dev/thirdparty/cppnet/cppkore_fonts/Arial.ptrf b/src/thirdparty/cppnet/cppkore_fonts/Arial.ptrf
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_fonts/Arial.ptrf
rename to src/thirdparty/cppnet/cppkore_fonts/Arial.ptrf
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.h b/src/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.h
rename to src/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.inl b/src/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.inl
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.inl
rename to src/thirdparty/cppnet/cppkore_incl/DirectXTex/DirectXTex.inl
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4.h b/src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4.h
rename to src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4frame.h b/src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4frame.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4frame.h
rename to src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4frame.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4hc.h b/src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4hc.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4hc.h
rename to src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/lz4hc.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/xxhash.h b/src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/xxhash.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/xxhash.h
rename to src/thirdparty/cppnet/cppkore_incl/LZ4_XXHash/xxhash.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZHAM/lzham.h b/src/thirdparty/cppnet/cppkore_incl/LZHAM/lzham.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZHAM/lzham.h
rename to src/thirdparty/cppnet/cppkore_incl/LZHAM/lzham.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZHAM_ALPHA/lzham.h b/src/thirdparty/cppnet/cppkore_incl/LZHAM_ALPHA/lzham.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZHAM_ALPHA/lzham.h
rename to src/thirdparty/cppnet/cppkore_incl/LZHAM_ALPHA/lzham.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZO1X/lzoconf.h b/src/thirdparty/cppnet/cppkore_incl/LZO1X/lzoconf.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZO1X/lzoconf.h
rename to src/thirdparty/cppnet/cppkore_incl/LZO1X/lzoconf.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZO1X/lzodefs.h b/src/thirdparty/cppnet/cppkore_incl/LZO1X/lzodefs.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZO1X/lzodefs.h
rename to src/thirdparty/cppnet/cppkore_incl/LZO1X/lzodefs.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/LZO1X/minilzo.h b/src/thirdparty/cppnet/cppkore_incl/LZO1X/minilzo.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/LZO1X/minilzo.h
rename to src/thirdparty/cppnet/cppkore_incl/LZO1X/minilzo.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz.h b/src/thirdparty/cppnet/cppkore_incl/ZLib/miniz.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz.h
rename to src/thirdparty/cppnet/cppkore_incl/ZLib/miniz.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_common.h b/src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_common.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_common.h
rename to src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_common.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tdef.h b/src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tdef.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tdef.h
rename to src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tdef.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tinfl.h b/src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tinfl.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tinfl.h
rename to src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_tinfl.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_zip.h b/src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_zip.h
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_incl/ZLib/miniz_zip.h
rename to src/thirdparty/cppnet/cppkore_incl/ZLib/miniz_zip.h
diff --git a/r5dev/thirdparty/cppnet/cppkore_shaders/preview.frag b/src/thirdparty/cppnet/cppkore_shaders/preview.frag
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_shaders/preview.frag
rename to src/thirdparty/cppnet/cppkore_shaders/preview.frag
diff --git a/r5dev/thirdparty/cppnet/cppkore_shaders/preview.vert b/src/thirdparty/cppnet/cppkore_shaders/preview.vert
similarity index 100%
rename from r5dev/thirdparty/cppnet/cppkore_shaders/preview.vert
rename to src/thirdparty/cppnet/cppkore_shaders/preview.vert
diff --git a/r5dev/thirdparty/curl/CMakeLists.txt b/src/thirdparty/curl/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/curl/CMakeLists.txt
rename to src/thirdparty/curl/CMakeLists.txt
diff --git a/r5dev/thirdparty/curl/Makefile.Watcom b/src/thirdparty/curl/Makefile.Watcom
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.Watcom
rename to src/thirdparty/curl/Makefile.Watcom
diff --git a/r5dev/thirdparty/curl/Makefile.am b/src/thirdparty/curl/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.am
rename to src/thirdparty/curl/Makefile.am
diff --git a/r5dev/thirdparty/curl/Makefile.b32 b/src/thirdparty/curl/Makefile.b32
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.b32
rename to src/thirdparty/curl/Makefile.b32
diff --git a/r5dev/thirdparty/curl/Makefile.in b/src/thirdparty/curl/Makefile.in
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.in
rename to src/thirdparty/curl/Makefile.in
diff --git a/r5dev/thirdparty/curl/Makefile.inc b/src/thirdparty/curl/Makefile.inc
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.inc
rename to src/thirdparty/curl/Makefile.inc
diff --git a/r5dev/thirdparty/curl/Makefile.m32 b/src/thirdparty/curl/Makefile.m32
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.m32
rename to src/thirdparty/curl/Makefile.m32
diff --git a/r5dev/thirdparty/curl/Makefile.netware b/src/thirdparty/curl/Makefile.netware
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.netware
rename to src/thirdparty/curl/Makefile.netware
diff --git a/r5dev/thirdparty/curl/Makefile.vxworks b/src/thirdparty/curl/Makefile.vxworks
similarity index 100%
rename from r5dev/thirdparty/curl/Makefile.vxworks
rename to src/thirdparty/curl/Makefile.vxworks
diff --git a/r5dev/thirdparty/curl/amigaos.c b/src/thirdparty/curl/amigaos.c
similarity index 100%
rename from r5dev/thirdparty/curl/amigaos.c
rename to src/thirdparty/curl/amigaos.c
diff --git a/r5dev/thirdparty/curl/amigaos.h b/src/thirdparty/curl/amigaos.h
similarity index 100%
rename from r5dev/thirdparty/curl/amigaos.h
rename to src/thirdparty/curl/amigaos.h
diff --git a/r5dev/thirdparty/curl/arpa_telnet.h b/src/thirdparty/curl/arpa_telnet.h
similarity index 100%
rename from r5dev/thirdparty/curl/arpa_telnet.h
rename to src/thirdparty/curl/arpa_telnet.h
diff --git a/r5dev/thirdparty/curl/asyn-ares.c b/src/thirdparty/curl/asyn-ares.c
similarity index 100%
rename from r5dev/thirdparty/curl/asyn-ares.c
rename to src/thirdparty/curl/asyn-ares.c
diff --git a/r5dev/thirdparty/curl/asyn-thread.c b/src/thirdparty/curl/asyn-thread.c
similarity index 100%
rename from r5dev/thirdparty/curl/asyn-thread.c
rename to src/thirdparty/curl/asyn-thread.c
diff --git a/r5dev/thirdparty/curl/asyn.h b/src/thirdparty/curl/asyn.h
similarity index 100%
rename from r5dev/thirdparty/curl/asyn.h
rename to src/thirdparty/curl/asyn.h
diff --git a/r5dev/thirdparty/curl/base64.c b/src/thirdparty/curl/base64.c
similarity index 100%
rename from r5dev/thirdparty/curl/base64.c
rename to src/thirdparty/curl/base64.c
diff --git a/r5dev/thirdparty/curl/checksrc.pl b/src/thirdparty/curl/checksrc.pl
similarity index 100%
rename from r5dev/thirdparty/curl/checksrc.pl
rename to src/thirdparty/curl/checksrc.pl
diff --git a/r5dev/thirdparty/curl/config-amigaos.h b/src/thirdparty/curl/config-amigaos.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-amigaos.h
rename to src/thirdparty/curl/config-amigaos.h
diff --git a/r5dev/thirdparty/curl/config-dos.h b/src/thirdparty/curl/config-dos.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-dos.h
rename to src/thirdparty/curl/config-dos.h
diff --git a/r5dev/thirdparty/curl/config-mac.h b/src/thirdparty/curl/config-mac.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-mac.h
rename to src/thirdparty/curl/config-mac.h
diff --git a/r5dev/thirdparty/curl/config-os400.h b/src/thirdparty/curl/config-os400.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-os400.h
rename to src/thirdparty/curl/config-os400.h
diff --git a/r5dev/thirdparty/curl/config-riscos.h b/src/thirdparty/curl/config-riscos.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-riscos.h
rename to src/thirdparty/curl/config-riscos.h
diff --git a/r5dev/thirdparty/curl/config-symbian.h b/src/thirdparty/curl/config-symbian.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-symbian.h
rename to src/thirdparty/curl/config-symbian.h
diff --git a/r5dev/thirdparty/curl/config-tpf.h b/src/thirdparty/curl/config-tpf.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-tpf.h
rename to src/thirdparty/curl/config-tpf.h
diff --git a/r5dev/thirdparty/curl/config-vxworks.h b/src/thirdparty/curl/config-vxworks.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-vxworks.h
rename to src/thirdparty/curl/config-vxworks.h
diff --git a/r5dev/thirdparty/curl/config-win32.h b/src/thirdparty/curl/config-win32.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-win32.h
rename to src/thirdparty/curl/config-win32.h
diff --git a/r5dev/thirdparty/curl/config-win32ce.h b/src/thirdparty/curl/config-win32ce.h
similarity index 100%
rename from r5dev/thirdparty/curl/config-win32ce.h
rename to src/thirdparty/curl/config-win32ce.h
diff --git a/r5dev/thirdparty/curl/conncache.c b/src/thirdparty/curl/conncache.c
similarity index 100%
rename from r5dev/thirdparty/curl/conncache.c
rename to src/thirdparty/curl/conncache.c
diff --git a/r5dev/thirdparty/curl/conncache.h b/src/thirdparty/curl/conncache.h
similarity index 100%
rename from r5dev/thirdparty/curl/conncache.h
rename to src/thirdparty/curl/conncache.h
diff --git a/r5dev/thirdparty/curl/connect.c b/src/thirdparty/curl/connect.c
similarity index 100%
rename from r5dev/thirdparty/curl/connect.c
rename to src/thirdparty/curl/connect.c
diff --git a/r5dev/thirdparty/curl/connect.h b/src/thirdparty/curl/connect.h
similarity index 100%
rename from r5dev/thirdparty/curl/connect.h
rename to src/thirdparty/curl/connect.h
diff --git a/r5dev/thirdparty/curl/content_encoding.c b/src/thirdparty/curl/content_encoding.c
similarity index 100%
rename from r5dev/thirdparty/curl/content_encoding.c
rename to src/thirdparty/curl/content_encoding.c
diff --git a/r5dev/thirdparty/curl/content_encoding.h b/src/thirdparty/curl/content_encoding.h
similarity index 100%
rename from r5dev/thirdparty/curl/content_encoding.h
rename to src/thirdparty/curl/content_encoding.h
diff --git a/r5dev/thirdparty/curl/cookie.c b/src/thirdparty/curl/cookie.c
similarity index 100%
rename from r5dev/thirdparty/curl/cookie.c
rename to src/thirdparty/curl/cookie.c
diff --git a/r5dev/thirdparty/curl/cookie.h b/src/thirdparty/curl/cookie.h
similarity index 100%
rename from r5dev/thirdparty/curl/cookie.h
rename to src/thirdparty/curl/cookie.h
diff --git a/r5dev/thirdparty/curl/curl_addrinfo.c b/src/thirdparty/curl/curl_addrinfo.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_addrinfo.c
rename to src/thirdparty/curl/curl_addrinfo.c
diff --git a/r5dev/thirdparty/curl/curl_addrinfo.h b/src/thirdparty/curl/curl_addrinfo.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_addrinfo.h
rename to src/thirdparty/curl/curl_addrinfo.h
diff --git a/r5dev/thirdparty/curl/curl_base64.h b/src/thirdparty/curl/curl_base64.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_base64.h
rename to src/thirdparty/curl/curl_base64.h
diff --git a/r5dev/thirdparty/curl/curl_config.h.cmake b/src/thirdparty/curl/curl_config.h.cmake
similarity index 100%
rename from r5dev/thirdparty/curl/curl_config.h.cmake
rename to src/thirdparty/curl/curl_config.h.cmake
diff --git a/r5dev/thirdparty/curl/curl_config.h.in b/src/thirdparty/curl/curl_config.h.in
similarity index 100%
rename from r5dev/thirdparty/curl/curl_config.h.in
rename to src/thirdparty/curl/curl_config.h.in
diff --git a/r5dev/thirdparty/curl/curl_des.c b/src/thirdparty/curl/curl_des.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_des.c
rename to src/thirdparty/curl/curl_des.c
diff --git a/r5dev/thirdparty/curl/curl_des.h b/src/thirdparty/curl/curl_des.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_des.h
rename to src/thirdparty/curl/curl_des.h
diff --git a/r5dev/thirdparty/curl/curl_endian.c b/src/thirdparty/curl/curl_endian.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_endian.c
rename to src/thirdparty/curl/curl_endian.c
diff --git a/r5dev/thirdparty/curl/curl_endian.h b/src/thirdparty/curl/curl_endian.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_endian.h
rename to src/thirdparty/curl/curl_endian.h
diff --git a/r5dev/thirdparty/curl/curl_fnmatch.c b/src/thirdparty/curl/curl_fnmatch.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_fnmatch.c
rename to src/thirdparty/curl/curl_fnmatch.c
diff --git a/r5dev/thirdparty/curl/curl_fnmatch.h b/src/thirdparty/curl/curl_fnmatch.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_fnmatch.h
rename to src/thirdparty/curl/curl_fnmatch.h
diff --git a/r5dev/thirdparty/curl/curl_gethostname.c b/src/thirdparty/curl/curl_gethostname.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_gethostname.c
rename to src/thirdparty/curl/curl_gethostname.c
diff --git a/r5dev/thirdparty/curl/curl_gethostname.h b/src/thirdparty/curl/curl_gethostname.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_gethostname.h
rename to src/thirdparty/curl/curl_gethostname.h
diff --git a/r5dev/thirdparty/curl/curl_gssapi.c b/src/thirdparty/curl/curl_gssapi.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_gssapi.c
rename to src/thirdparty/curl/curl_gssapi.c
diff --git a/r5dev/thirdparty/curl/curl_gssapi.h b/src/thirdparty/curl/curl_gssapi.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_gssapi.h
rename to src/thirdparty/curl/curl_gssapi.h
diff --git a/r5dev/thirdparty/curl/curl_hmac.h b/src/thirdparty/curl/curl_hmac.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_hmac.h
rename to src/thirdparty/curl/curl_hmac.h
diff --git a/r5dev/thirdparty/curl/curl_ldap.h b/src/thirdparty/curl/curl_ldap.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_ldap.h
rename to src/thirdparty/curl/curl_ldap.h
diff --git a/r5dev/thirdparty/curl/curl_md4.h b/src/thirdparty/curl/curl_md4.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_md4.h
rename to src/thirdparty/curl/curl_md4.h
diff --git a/r5dev/thirdparty/curl/curl_md5.h b/src/thirdparty/curl/curl_md5.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_md5.h
rename to src/thirdparty/curl/curl_md5.h
diff --git a/r5dev/thirdparty/curl/curl_memory.h b/src/thirdparty/curl/curl_memory.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_memory.h
rename to src/thirdparty/curl/curl_memory.h
diff --git a/r5dev/thirdparty/curl/curl_memrchr.c b/src/thirdparty/curl/curl_memrchr.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_memrchr.c
rename to src/thirdparty/curl/curl_memrchr.c
diff --git a/r5dev/thirdparty/curl/curl_memrchr.h b/src/thirdparty/curl/curl_memrchr.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_memrchr.h
rename to src/thirdparty/curl/curl_memrchr.h
diff --git a/r5dev/thirdparty/curl/curl_multibyte.c b/src/thirdparty/curl/curl_multibyte.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_multibyte.c
rename to src/thirdparty/curl/curl_multibyte.c
diff --git a/r5dev/thirdparty/curl/curl_multibyte.h b/src/thirdparty/curl/curl_multibyte.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_multibyte.h
rename to src/thirdparty/curl/curl_multibyte.h
diff --git a/r5dev/thirdparty/curl/curl_ntlm_core.c b/src/thirdparty/curl/curl_ntlm_core.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_ntlm_core.c
rename to src/thirdparty/curl/curl_ntlm_core.c
diff --git a/r5dev/thirdparty/curl/curl_ntlm_core.h b/src/thirdparty/curl/curl_ntlm_core.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_ntlm_core.h
rename to src/thirdparty/curl/curl_ntlm_core.h
diff --git a/r5dev/thirdparty/curl/curl_ntlm_wb.c b/src/thirdparty/curl/curl_ntlm_wb.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_ntlm_wb.c
rename to src/thirdparty/curl/curl_ntlm_wb.c
diff --git a/r5dev/thirdparty/curl/curl_ntlm_wb.h b/src/thirdparty/curl/curl_ntlm_wb.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_ntlm_wb.h
rename to src/thirdparty/curl/curl_ntlm_wb.h
diff --git a/r5dev/thirdparty/curl/curl_printf.h b/src/thirdparty/curl/curl_printf.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_printf.h
rename to src/thirdparty/curl/curl_printf.h
diff --git a/r5dev/thirdparty/curl/curl_rtmp.c b/src/thirdparty/curl/curl_rtmp.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_rtmp.c
rename to src/thirdparty/curl/curl_rtmp.c
diff --git a/r5dev/thirdparty/curl/curl_rtmp.h b/src/thirdparty/curl/curl_rtmp.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_rtmp.h
rename to src/thirdparty/curl/curl_rtmp.h
diff --git a/r5dev/thirdparty/curl/curl_sasl.c b/src/thirdparty/curl/curl_sasl.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_sasl.c
rename to src/thirdparty/curl/curl_sasl.c
diff --git a/r5dev/thirdparty/curl/curl_sasl.h b/src/thirdparty/curl/curl_sasl.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_sasl.h
rename to src/thirdparty/curl/curl_sasl.h
diff --git a/r5dev/thirdparty/curl/curl_sec.h b/src/thirdparty/curl/curl_sec.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_sec.h
rename to src/thirdparty/curl/curl_sec.h
diff --git a/r5dev/thirdparty/curl/curl_setup.h b/src/thirdparty/curl/curl_setup.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_setup.h
rename to src/thirdparty/curl/curl_setup.h
diff --git a/r5dev/thirdparty/curl/curl_setup_once.h b/src/thirdparty/curl/curl_setup_once.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_setup_once.h
rename to src/thirdparty/curl/curl_setup_once.h
diff --git a/r5dev/thirdparty/curl/curl_sspi.c b/src/thirdparty/curl/curl_sspi.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_sspi.c
rename to src/thirdparty/curl/curl_sspi.c
diff --git a/r5dev/thirdparty/curl/curl_sspi.h b/src/thirdparty/curl/curl_sspi.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_sspi.h
rename to src/thirdparty/curl/curl_sspi.h
diff --git a/r5dev/thirdparty/curl/curl_threads.c b/src/thirdparty/curl/curl_threads.c
similarity index 100%
rename from r5dev/thirdparty/curl/curl_threads.c
rename to src/thirdparty/curl/curl_threads.c
diff --git a/r5dev/thirdparty/curl/curl_threads.h b/src/thirdparty/curl/curl_threads.h
similarity index 100%
rename from r5dev/thirdparty/curl/curl_threads.h
rename to src/thirdparty/curl/curl_threads.h
diff --git a/r5dev/thirdparty/curl/curlx.h b/src/thirdparty/curl/curlx.h
similarity index 100%
rename from r5dev/thirdparty/curl/curlx.h
rename to src/thirdparty/curl/curlx.h
diff --git a/r5dev/thirdparty/curl/dict.c b/src/thirdparty/curl/dict.c
similarity index 100%
rename from r5dev/thirdparty/curl/dict.c
rename to src/thirdparty/curl/dict.c
diff --git a/r5dev/thirdparty/curl/dict.h b/src/thirdparty/curl/dict.h
similarity index 100%
rename from r5dev/thirdparty/curl/dict.h
rename to src/thirdparty/curl/dict.h
diff --git a/r5dev/thirdparty/curl/dotdot.c b/src/thirdparty/curl/dotdot.c
similarity index 100%
rename from r5dev/thirdparty/curl/dotdot.c
rename to src/thirdparty/curl/dotdot.c
diff --git a/r5dev/thirdparty/curl/dotdot.h b/src/thirdparty/curl/dotdot.h
similarity index 100%
rename from r5dev/thirdparty/curl/dotdot.h
rename to src/thirdparty/curl/dotdot.h
diff --git a/r5dev/thirdparty/curl/easy.c b/src/thirdparty/curl/easy.c
similarity index 100%
rename from r5dev/thirdparty/curl/easy.c
rename to src/thirdparty/curl/easy.c
diff --git a/r5dev/thirdparty/curl/easyif.h b/src/thirdparty/curl/easyif.h
similarity index 100%
rename from r5dev/thirdparty/curl/easyif.h
rename to src/thirdparty/curl/easyif.h
diff --git a/r5dev/thirdparty/curl/escape.c b/src/thirdparty/curl/escape.c
similarity index 100%
rename from r5dev/thirdparty/curl/escape.c
rename to src/thirdparty/curl/escape.c
diff --git a/r5dev/thirdparty/curl/escape.h b/src/thirdparty/curl/escape.h
similarity index 100%
rename from r5dev/thirdparty/curl/escape.h
rename to src/thirdparty/curl/escape.h
diff --git a/r5dev/thirdparty/curl/file.c b/src/thirdparty/curl/file.c
similarity index 100%
rename from r5dev/thirdparty/curl/file.c
rename to src/thirdparty/curl/file.c
diff --git a/r5dev/thirdparty/curl/file.h b/src/thirdparty/curl/file.h
similarity index 100%
rename from r5dev/thirdparty/curl/file.h
rename to src/thirdparty/curl/file.h
diff --git a/r5dev/thirdparty/curl/fileinfo.c b/src/thirdparty/curl/fileinfo.c
similarity index 100%
rename from r5dev/thirdparty/curl/fileinfo.c
rename to src/thirdparty/curl/fileinfo.c
diff --git a/r5dev/thirdparty/curl/fileinfo.h b/src/thirdparty/curl/fileinfo.h
similarity index 100%
rename from r5dev/thirdparty/curl/fileinfo.h
rename to src/thirdparty/curl/fileinfo.h
diff --git a/r5dev/thirdparty/curl/firefox-db2pem.sh b/src/thirdparty/curl/firefox-db2pem.sh
similarity index 100%
rename from r5dev/thirdparty/curl/firefox-db2pem.sh
rename to src/thirdparty/curl/firefox-db2pem.sh
diff --git a/r5dev/thirdparty/curl/formdata.c b/src/thirdparty/curl/formdata.c
similarity index 100%
rename from r5dev/thirdparty/curl/formdata.c
rename to src/thirdparty/curl/formdata.c
diff --git a/r5dev/thirdparty/curl/formdata.h b/src/thirdparty/curl/formdata.h
similarity index 100%
rename from r5dev/thirdparty/curl/formdata.h
rename to src/thirdparty/curl/formdata.h
diff --git a/r5dev/thirdparty/curl/ftp.c b/src/thirdparty/curl/ftp.c
similarity index 100%
rename from r5dev/thirdparty/curl/ftp.c
rename to src/thirdparty/curl/ftp.c
diff --git a/r5dev/thirdparty/curl/ftp.h b/src/thirdparty/curl/ftp.h
similarity index 100%
rename from r5dev/thirdparty/curl/ftp.h
rename to src/thirdparty/curl/ftp.h
diff --git a/r5dev/thirdparty/curl/ftplistparser.c b/src/thirdparty/curl/ftplistparser.c
similarity index 100%
rename from r5dev/thirdparty/curl/ftplistparser.c
rename to src/thirdparty/curl/ftplistparser.c
diff --git a/r5dev/thirdparty/curl/ftplistparser.h b/src/thirdparty/curl/ftplistparser.h
similarity index 100%
rename from r5dev/thirdparty/curl/ftplistparser.h
rename to src/thirdparty/curl/ftplistparser.h
diff --git a/r5dev/thirdparty/curl/getenv.c b/src/thirdparty/curl/getenv.c
similarity index 100%
rename from r5dev/thirdparty/curl/getenv.c
rename to src/thirdparty/curl/getenv.c
diff --git a/r5dev/thirdparty/curl/getinfo.c b/src/thirdparty/curl/getinfo.c
similarity index 100%
rename from r5dev/thirdparty/curl/getinfo.c
rename to src/thirdparty/curl/getinfo.c
diff --git a/r5dev/thirdparty/curl/getinfo.h b/src/thirdparty/curl/getinfo.h
similarity index 100%
rename from r5dev/thirdparty/curl/getinfo.h
rename to src/thirdparty/curl/getinfo.h
diff --git a/r5dev/thirdparty/curl/gopher.c b/src/thirdparty/curl/gopher.c
similarity index 100%
rename from r5dev/thirdparty/curl/gopher.c
rename to src/thirdparty/curl/gopher.c
diff --git a/r5dev/thirdparty/curl/gopher.h b/src/thirdparty/curl/gopher.h
similarity index 100%
rename from r5dev/thirdparty/curl/gopher.h
rename to src/thirdparty/curl/gopher.h
diff --git a/r5dev/thirdparty/curl/hash.c b/src/thirdparty/curl/hash.c
similarity index 100%
rename from r5dev/thirdparty/curl/hash.c
rename to src/thirdparty/curl/hash.c
diff --git a/r5dev/thirdparty/curl/hash.h b/src/thirdparty/curl/hash.h
similarity index 100%
rename from r5dev/thirdparty/curl/hash.h
rename to src/thirdparty/curl/hash.h
diff --git a/r5dev/thirdparty/curl/hmac.c b/src/thirdparty/curl/hmac.c
similarity index 100%
rename from r5dev/thirdparty/curl/hmac.c
rename to src/thirdparty/curl/hmac.c
diff --git a/r5dev/thirdparty/curl/hostasyn.c b/src/thirdparty/curl/hostasyn.c
similarity index 100%
rename from r5dev/thirdparty/curl/hostasyn.c
rename to src/thirdparty/curl/hostasyn.c
diff --git a/r5dev/thirdparty/curl/hostcheck.c b/src/thirdparty/curl/hostcheck.c
similarity index 100%
rename from r5dev/thirdparty/curl/hostcheck.c
rename to src/thirdparty/curl/hostcheck.c
diff --git a/r5dev/thirdparty/curl/hostcheck.h b/src/thirdparty/curl/hostcheck.h
similarity index 100%
rename from r5dev/thirdparty/curl/hostcheck.h
rename to src/thirdparty/curl/hostcheck.h
diff --git a/r5dev/thirdparty/curl/hostip.c b/src/thirdparty/curl/hostip.c
similarity index 100%
rename from r5dev/thirdparty/curl/hostip.c
rename to src/thirdparty/curl/hostip.c
diff --git a/r5dev/thirdparty/curl/hostip.h b/src/thirdparty/curl/hostip.h
similarity index 100%
rename from r5dev/thirdparty/curl/hostip.h
rename to src/thirdparty/curl/hostip.h
diff --git a/r5dev/thirdparty/curl/hostip4.c b/src/thirdparty/curl/hostip4.c
similarity index 100%
rename from r5dev/thirdparty/curl/hostip4.c
rename to src/thirdparty/curl/hostip4.c
diff --git a/r5dev/thirdparty/curl/hostip6.c b/src/thirdparty/curl/hostip6.c
similarity index 100%
rename from r5dev/thirdparty/curl/hostip6.c
rename to src/thirdparty/curl/hostip6.c
diff --git a/r5dev/thirdparty/curl/hostsyn.c b/src/thirdparty/curl/hostsyn.c
similarity index 100%
rename from r5dev/thirdparty/curl/hostsyn.c
rename to src/thirdparty/curl/hostsyn.c
diff --git a/r5dev/thirdparty/curl/http.c b/src/thirdparty/curl/http.c
similarity index 100%
rename from r5dev/thirdparty/curl/http.c
rename to src/thirdparty/curl/http.c
diff --git a/r5dev/thirdparty/curl/http.h b/src/thirdparty/curl/http.h
similarity index 100%
rename from r5dev/thirdparty/curl/http.h
rename to src/thirdparty/curl/http.h
diff --git a/r5dev/thirdparty/curl/http2.c b/src/thirdparty/curl/http2.c
similarity index 100%
rename from r5dev/thirdparty/curl/http2.c
rename to src/thirdparty/curl/http2.c
diff --git a/r5dev/thirdparty/curl/http2.h b/src/thirdparty/curl/http2.h
similarity index 100%
rename from r5dev/thirdparty/curl/http2.h
rename to src/thirdparty/curl/http2.h
diff --git a/r5dev/thirdparty/curl/http_chunks.c b/src/thirdparty/curl/http_chunks.c
similarity index 100%
rename from r5dev/thirdparty/curl/http_chunks.c
rename to src/thirdparty/curl/http_chunks.c
diff --git a/r5dev/thirdparty/curl/http_chunks.h b/src/thirdparty/curl/http_chunks.h
similarity index 100%
rename from r5dev/thirdparty/curl/http_chunks.h
rename to src/thirdparty/curl/http_chunks.h
diff --git a/r5dev/thirdparty/curl/http_digest.c b/src/thirdparty/curl/http_digest.c
similarity index 100%
rename from r5dev/thirdparty/curl/http_digest.c
rename to src/thirdparty/curl/http_digest.c
diff --git a/r5dev/thirdparty/curl/http_digest.h b/src/thirdparty/curl/http_digest.h
similarity index 100%
rename from r5dev/thirdparty/curl/http_digest.h
rename to src/thirdparty/curl/http_digest.h
diff --git a/r5dev/thirdparty/curl/http_negotiate.c b/src/thirdparty/curl/http_negotiate.c
similarity index 100%
rename from r5dev/thirdparty/curl/http_negotiate.c
rename to src/thirdparty/curl/http_negotiate.c
diff --git a/r5dev/thirdparty/curl/http_negotiate.h b/src/thirdparty/curl/http_negotiate.h
similarity index 100%
rename from r5dev/thirdparty/curl/http_negotiate.h
rename to src/thirdparty/curl/http_negotiate.h
diff --git a/r5dev/thirdparty/curl/http_ntlm.c b/src/thirdparty/curl/http_ntlm.c
similarity index 100%
rename from r5dev/thirdparty/curl/http_ntlm.c
rename to src/thirdparty/curl/http_ntlm.c
diff --git a/r5dev/thirdparty/curl/http_ntlm.h b/src/thirdparty/curl/http_ntlm.h
similarity index 100%
rename from r5dev/thirdparty/curl/http_ntlm.h
rename to src/thirdparty/curl/http_ntlm.h
diff --git a/r5dev/thirdparty/curl/http_proxy.c b/src/thirdparty/curl/http_proxy.c
similarity index 100%
rename from r5dev/thirdparty/curl/http_proxy.c
rename to src/thirdparty/curl/http_proxy.c
diff --git a/r5dev/thirdparty/curl/http_proxy.h b/src/thirdparty/curl/http_proxy.h
similarity index 100%
rename from r5dev/thirdparty/curl/http_proxy.h
rename to src/thirdparty/curl/http_proxy.h
diff --git a/r5dev/thirdparty/curl/idn_win32.c b/src/thirdparty/curl/idn_win32.c
similarity index 100%
rename from r5dev/thirdparty/curl/idn_win32.c
rename to src/thirdparty/curl/idn_win32.c
diff --git a/r5dev/thirdparty/curl/if2ip.c b/src/thirdparty/curl/if2ip.c
similarity index 100%
rename from r5dev/thirdparty/curl/if2ip.c
rename to src/thirdparty/curl/if2ip.c
diff --git a/r5dev/thirdparty/curl/if2ip.h b/src/thirdparty/curl/if2ip.h
similarity index 100%
rename from r5dev/thirdparty/curl/if2ip.h
rename to src/thirdparty/curl/if2ip.h
diff --git a/r5dev/thirdparty/curl/imap.c b/src/thirdparty/curl/imap.c
similarity index 100%
rename from r5dev/thirdparty/curl/imap.c
rename to src/thirdparty/curl/imap.c
diff --git a/r5dev/thirdparty/curl/imap.h b/src/thirdparty/curl/imap.h
similarity index 100%
rename from r5dev/thirdparty/curl/imap.h
rename to src/thirdparty/curl/imap.h
diff --git a/r5dev/thirdparty/curl/include/Makefile.am b/src/thirdparty/curl/include/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/curl/include/Makefile.am
rename to src/thirdparty/curl/include/Makefile.am
diff --git a/r5dev/thirdparty/curl/include/Makefile.in b/src/thirdparty/curl/include/Makefile.in
similarity index 100%
rename from r5dev/thirdparty/curl/include/Makefile.in
rename to src/thirdparty/curl/include/Makefile.in
diff --git a/r5dev/thirdparty/curl/include/README b/src/thirdparty/curl/include/README
similarity index 100%
rename from r5dev/thirdparty/curl/include/README
rename to src/thirdparty/curl/include/README
diff --git a/r5dev/thirdparty/curl/include/curl/Makefile.am b/src/thirdparty/curl/include/curl/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/Makefile.am
rename to src/thirdparty/curl/include/curl/Makefile.am
diff --git a/r5dev/thirdparty/curl/include/curl/Makefile.in b/src/thirdparty/curl/include/curl/Makefile.in
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/Makefile.in
rename to src/thirdparty/curl/include/curl/Makefile.in
diff --git a/r5dev/thirdparty/curl/include/curl/curl.h b/src/thirdparty/curl/include/curl/curl.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/curl.h
rename to src/thirdparty/curl/include/curl/curl.h
diff --git a/r5dev/thirdparty/curl/include/curl/curlbuild.h b/src/thirdparty/curl/include/curl/curlbuild.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/curlbuild.h
rename to src/thirdparty/curl/include/curl/curlbuild.h
diff --git a/r5dev/thirdparty/curl/include/curl/curlbuild.h.cmake b/src/thirdparty/curl/include/curl/curlbuild.h.cmake
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/curlbuild.h.cmake
rename to src/thirdparty/curl/include/curl/curlbuild.h.cmake
diff --git a/r5dev/thirdparty/curl/include/curl/curlbuild.h.in b/src/thirdparty/curl/include/curl/curlbuild.h.in
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/curlbuild.h.in
rename to src/thirdparty/curl/include/curl/curlbuild.h.in
diff --git a/r5dev/thirdparty/curl/include/curl/curlrules.h b/src/thirdparty/curl/include/curl/curlrules.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/curlrules.h
rename to src/thirdparty/curl/include/curl/curlrules.h
diff --git a/r5dev/thirdparty/curl/include/curl/curlver.h b/src/thirdparty/curl/include/curl/curlver.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/curlver.h
rename to src/thirdparty/curl/include/curl/curlver.h
diff --git a/r5dev/thirdparty/curl/include/curl/easy.h b/src/thirdparty/curl/include/curl/easy.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/easy.h
rename to src/thirdparty/curl/include/curl/easy.h
diff --git a/r5dev/thirdparty/curl/include/curl/mprintf.h b/src/thirdparty/curl/include/curl/mprintf.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/mprintf.h
rename to src/thirdparty/curl/include/curl/mprintf.h
diff --git a/r5dev/thirdparty/curl/include/curl/multi.h b/src/thirdparty/curl/include/curl/multi.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/multi.h
rename to src/thirdparty/curl/include/curl/multi.h
diff --git a/r5dev/thirdparty/curl/include/curl/stdcheaders.h b/src/thirdparty/curl/include/curl/stdcheaders.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/stdcheaders.h
rename to src/thirdparty/curl/include/curl/stdcheaders.h
diff --git a/r5dev/thirdparty/curl/include/curl/system.h b/src/thirdparty/curl/include/curl/system.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/system.h
rename to src/thirdparty/curl/include/curl/system.h
diff --git a/r5dev/thirdparty/curl/include/curl/typecheck-gcc.h b/src/thirdparty/curl/include/curl/typecheck-gcc.h
similarity index 100%
rename from r5dev/thirdparty/curl/include/curl/typecheck-gcc.h
rename to src/thirdparty/curl/include/curl/typecheck-gcc.h
diff --git a/r5dev/thirdparty/curl/inet_ntop.c b/src/thirdparty/curl/inet_ntop.c
similarity index 100%
rename from r5dev/thirdparty/curl/inet_ntop.c
rename to src/thirdparty/curl/inet_ntop.c
diff --git a/r5dev/thirdparty/curl/inet_ntop.h b/src/thirdparty/curl/inet_ntop.h
similarity index 100%
rename from r5dev/thirdparty/curl/inet_ntop.h
rename to src/thirdparty/curl/inet_ntop.h
diff --git a/r5dev/thirdparty/curl/inet_pton.c b/src/thirdparty/curl/inet_pton.c
similarity index 100%
rename from r5dev/thirdparty/curl/inet_pton.c
rename to src/thirdparty/curl/inet_pton.c
diff --git a/r5dev/thirdparty/curl/inet_pton.h b/src/thirdparty/curl/inet_pton.h
similarity index 100%
rename from r5dev/thirdparty/curl/inet_pton.h
rename to src/thirdparty/curl/inet_pton.h
diff --git a/r5dev/thirdparty/curl/krb5.c b/src/thirdparty/curl/krb5.c
similarity index 100%
rename from r5dev/thirdparty/curl/krb5.c
rename to src/thirdparty/curl/krb5.c
diff --git a/r5dev/thirdparty/curl/ldap.c b/src/thirdparty/curl/ldap.c
similarity index 100%
rename from r5dev/thirdparty/curl/ldap.c
rename to src/thirdparty/curl/ldap.c
diff --git a/r5dev/thirdparty/curl/libcurl.plist b/src/thirdparty/curl/libcurl.plist
similarity index 100%
rename from r5dev/thirdparty/curl/libcurl.plist
rename to src/thirdparty/curl/libcurl.plist
diff --git a/r5dev/thirdparty/curl/libcurl.rc b/src/thirdparty/curl/libcurl.rc
similarity index 100%
rename from r5dev/thirdparty/curl/libcurl.rc
rename to src/thirdparty/curl/libcurl.rc
diff --git a/r5dev/thirdparty/curl/libcurl.vers.in b/src/thirdparty/curl/libcurl.vers.in
similarity index 100%
rename from r5dev/thirdparty/curl/libcurl.vers.in
rename to src/thirdparty/curl/libcurl.vers.in
diff --git a/r5dev/thirdparty/curl/llist.c b/src/thirdparty/curl/llist.c
similarity index 100%
rename from r5dev/thirdparty/curl/llist.c
rename to src/thirdparty/curl/llist.c
diff --git a/r5dev/thirdparty/curl/llist.h b/src/thirdparty/curl/llist.h
similarity index 100%
rename from r5dev/thirdparty/curl/llist.h
rename to src/thirdparty/curl/llist.h
diff --git a/r5dev/thirdparty/curl/makefile.amiga b/src/thirdparty/curl/makefile.amiga
similarity index 100%
rename from r5dev/thirdparty/curl/makefile.amiga
rename to src/thirdparty/curl/makefile.amiga
diff --git a/r5dev/thirdparty/curl/makefile.dj b/src/thirdparty/curl/makefile.dj
similarity index 100%
rename from r5dev/thirdparty/curl/makefile.dj
rename to src/thirdparty/curl/makefile.dj
diff --git a/r5dev/thirdparty/curl/md4.c b/src/thirdparty/curl/md4.c
similarity index 100%
rename from r5dev/thirdparty/curl/md4.c
rename to src/thirdparty/curl/md4.c
diff --git a/r5dev/thirdparty/curl/md5.c b/src/thirdparty/curl/md5.c
similarity index 100%
rename from r5dev/thirdparty/curl/md5.c
rename to src/thirdparty/curl/md5.c
diff --git a/r5dev/thirdparty/curl/memdebug.c b/src/thirdparty/curl/memdebug.c
similarity index 100%
rename from r5dev/thirdparty/curl/memdebug.c
rename to src/thirdparty/curl/memdebug.c
diff --git a/r5dev/thirdparty/curl/memdebug.h b/src/thirdparty/curl/memdebug.h
similarity index 100%
rename from r5dev/thirdparty/curl/memdebug.h
rename to src/thirdparty/curl/memdebug.h
diff --git a/r5dev/thirdparty/curl/mk-ca-bundle.pl b/src/thirdparty/curl/mk-ca-bundle.pl
similarity index 100%
rename from r5dev/thirdparty/curl/mk-ca-bundle.pl
rename to src/thirdparty/curl/mk-ca-bundle.pl
diff --git a/r5dev/thirdparty/curl/mk-ca-bundle.vbs b/src/thirdparty/curl/mk-ca-bundle.vbs
similarity index 100%
rename from r5dev/thirdparty/curl/mk-ca-bundle.vbs
rename to src/thirdparty/curl/mk-ca-bundle.vbs
diff --git a/r5dev/thirdparty/curl/mprintf.c b/src/thirdparty/curl/mprintf.c
similarity index 100%
rename from r5dev/thirdparty/curl/mprintf.c
rename to src/thirdparty/curl/mprintf.c
diff --git a/r5dev/thirdparty/curl/multi.c b/src/thirdparty/curl/multi.c
similarity index 100%
rename from r5dev/thirdparty/curl/multi.c
rename to src/thirdparty/curl/multi.c
diff --git a/r5dev/thirdparty/curl/multihandle.h b/src/thirdparty/curl/multihandle.h
similarity index 100%
rename from r5dev/thirdparty/curl/multihandle.h
rename to src/thirdparty/curl/multihandle.h
diff --git a/r5dev/thirdparty/curl/multiif.h b/src/thirdparty/curl/multiif.h
similarity index 100%
rename from r5dev/thirdparty/curl/multiif.h
rename to src/thirdparty/curl/multiif.h
diff --git a/r5dev/thirdparty/curl/netrc.c b/src/thirdparty/curl/netrc.c
similarity index 100%
rename from r5dev/thirdparty/curl/netrc.c
rename to src/thirdparty/curl/netrc.c
diff --git a/r5dev/thirdparty/curl/netrc.h b/src/thirdparty/curl/netrc.h
similarity index 100%
rename from r5dev/thirdparty/curl/netrc.h
rename to src/thirdparty/curl/netrc.h
diff --git a/r5dev/thirdparty/curl/non-ascii.c b/src/thirdparty/curl/non-ascii.c
similarity index 100%
rename from r5dev/thirdparty/curl/non-ascii.c
rename to src/thirdparty/curl/non-ascii.c
diff --git a/r5dev/thirdparty/curl/non-ascii.h b/src/thirdparty/curl/non-ascii.h
similarity index 100%
rename from r5dev/thirdparty/curl/non-ascii.h
rename to src/thirdparty/curl/non-ascii.h
diff --git a/r5dev/thirdparty/curl/nonblock.c b/src/thirdparty/curl/nonblock.c
similarity index 100%
rename from r5dev/thirdparty/curl/nonblock.c
rename to src/thirdparty/curl/nonblock.c
diff --git a/r5dev/thirdparty/curl/nonblock.h b/src/thirdparty/curl/nonblock.h
similarity index 100%
rename from r5dev/thirdparty/curl/nonblock.h
rename to src/thirdparty/curl/nonblock.h
diff --git a/r5dev/thirdparty/curl/nwlib.c b/src/thirdparty/curl/nwlib.c
similarity index 100%
rename from r5dev/thirdparty/curl/nwlib.c
rename to src/thirdparty/curl/nwlib.c
diff --git a/r5dev/thirdparty/curl/nwos.c b/src/thirdparty/curl/nwos.c
similarity index 100%
rename from r5dev/thirdparty/curl/nwos.c
rename to src/thirdparty/curl/nwos.c
diff --git a/r5dev/thirdparty/curl/objnames-test08.sh b/src/thirdparty/curl/objnames-test08.sh
similarity index 100%
rename from r5dev/thirdparty/curl/objnames-test08.sh
rename to src/thirdparty/curl/objnames-test08.sh
diff --git a/r5dev/thirdparty/curl/objnames-test10.sh b/src/thirdparty/curl/objnames-test10.sh
similarity index 100%
rename from r5dev/thirdparty/curl/objnames-test10.sh
rename to src/thirdparty/curl/objnames-test10.sh
diff --git a/r5dev/thirdparty/curl/objnames.inc b/src/thirdparty/curl/objnames.inc
similarity index 100%
rename from r5dev/thirdparty/curl/objnames.inc
rename to src/thirdparty/curl/objnames.inc
diff --git a/r5dev/thirdparty/curl/openldap.c b/src/thirdparty/curl/openldap.c
similarity index 100%
rename from r5dev/thirdparty/curl/openldap.c
rename to src/thirdparty/curl/openldap.c
diff --git a/r5dev/thirdparty/curl/parsedate.c b/src/thirdparty/curl/parsedate.c
similarity index 100%
rename from r5dev/thirdparty/curl/parsedate.c
rename to src/thirdparty/curl/parsedate.c
diff --git a/r5dev/thirdparty/curl/parsedate.h b/src/thirdparty/curl/parsedate.h
similarity index 100%
rename from r5dev/thirdparty/curl/parsedate.h
rename to src/thirdparty/curl/parsedate.h
diff --git a/r5dev/thirdparty/curl/pingpong.c b/src/thirdparty/curl/pingpong.c
similarity index 100%
rename from r5dev/thirdparty/curl/pingpong.c
rename to src/thirdparty/curl/pingpong.c
diff --git a/r5dev/thirdparty/curl/pingpong.h b/src/thirdparty/curl/pingpong.h
similarity index 100%
rename from r5dev/thirdparty/curl/pingpong.h
rename to src/thirdparty/curl/pingpong.h
diff --git a/r5dev/thirdparty/curl/pipeline.c b/src/thirdparty/curl/pipeline.c
similarity index 100%
rename from r5dev/thirdparty/curl/pipeline.c
rename to src/thirdparty/curl/pipeline.c
diff --git a/r5dev/thirdparty/curl/pipeline.h b/src/thirdparty/curl/pipeline.h
similarity index 100%
rename from r5dev/thirdparty/curl/pipeline.h
rename to src/thirdparty/curl/pipeline.h
diff --git a/r5dev/thirdparty/curl/pop3.c b/src/thirdparty/curl/pop3.c
similarity index 100%
rename from r5dev/thirdparty/curl/pop3.c
rename to src/thirdparty/curl/pop3.c
diff --git a/r5dev/thirdparty/curl/pop3.h b/src/thirdparty/curl/pop3.h
similarity index 100%
rename from r5dev/thirdparty/curl/pop3.h
rename to src/thirdparty/curl/pop3.h
diff --git a/r5dev/thirdparty/curl/progress.c b/src/thirdparty/curl/progress.c
similarity index 100%
rename from r5dev/thirdparty/curl/progress.c
rename to src/thirdparty/curl/progress.c
diff --git a/r5dev/thirdparty/curl/progress.h b/src/thirdparty/curl/progress.h
similarity index 100%
rename from r5dev/thirdparty/curl/progress.h
rename to src/thirdparty/curl/progress.h
diff --git a/r5dev/thirdparty/curl/rand.c b/src/thirdparty/curl/rand.c
similarity index 100%
rename from r5dev/thirdparty/curl/rand.c
rename to src/thirdparty/curl/rand.c
diff --git a/r5dev/thirdparty/curl/rand.h b/src/thirdparty/curl/rand.h
similarity index 100%
rename from r5dev/thirdparty/curl/rand.h
rename to src/thirdparty/curl/rand.h
diff --git a/r5dev/thirdparty/curl/rtsp.c b/src/thirdparty/curl/rtsp.c
similarity index 100%
rename from r5dev/thirdparty/curl/rtsp.c
rename to src/thirdparty/curl/rtsp.c
diff --git a/r5dev/thirdparty/curl/rtsp.h b/src/thirdparty/curl/rtsp.h
similarity index 100%
rename from r5dev/thirdparty/curl/rtsp.h
rename to src/thirdparty/curl/rtsp.h
diff --git a/r5dev/thirdparty/curl/security.c b/src/thirdparty/curl/security.c
similarity index 100%
rename from r5dev/thirdparty/curl/security.c
rename to src/thirdparty/curl/security.c
diff --git a/r5dev/thirdparty/curl/select.c b/src/thirdparty/curl/select.c
similarity index 100%
rename from r5dev/thirdparty/curl/select.c
rename to src/thirdparty/curl/select.c
diff --git a/r5dev/thirdparty/curl/select.h b/src/thirdparty/curl/select.h
similarity index 100%
rename from r5dev/thirdparty/curl/select.h
rename to src/thirdparty/curl/select.h
diff --git a/r5dev/thirdparty/curl/sendf.c b/src/thirdparty/curl/sendf.c
similarity index 100%
rename from r5dev/thirdparty/curl/sendf.c
rename to src/thirdparty/curl/sendf.c
diff --git a/r5dev/thirdparty/curl/sendf.h b/src/thirdparty/curl/sendf.h
similarity index 100%
rename from r5dev/thirdparty/curl/sendf.h
rename to src/thirdparty/curl/sendf.h
diff --git a/r5dev/thirdparty/curl/setup-os400.h b/src/thirdparty/curl/setup-os400.h
similarity index 100%
rename from r5dev/thirdparty/curl/setup-os400.h
rename to src/thirdparty/curl/setup-os400.h
diff --git a/r5dev/thirdparty/curl/setup-vms.h b/src/thirdparty/curl/setup-vms.h
similarity index 100%
rename from r5dev/thirdparty/curl/setup-vms.h
rename to src/thirdparty/curl/setup-vms.h
diff --git a/r5dev/thirdparty/curl/share.c b/src/thirdparty/curl/share.c
similarity index 100%
rename from r5dev/thirdparty/curl/share.c
rename to src/thirdparty/curl/share.c
diff --git a/r5dev/thirdparty/curl/share.h b/src/thirdparty/curl/share.h
similarity index 100%
rename from r5dev/thirdparty/curl/share.h
rename to src/thirdparty/curl/share.h
diff --git a/r5dev/thirdparty/curl/sigpipe.h b/src/thirdparty/curl/sigpipe.h
similarity index 100%
rename from r5dev/thirdparty/curl/sigpipe.h
rename to src/thirdparty/curl/sigpipe.h
diff --git a/r5dev/thirdparty/curl/slist.c b/src/thirdparty/curl/slist.c
similarity index 100%
rename from r5dev/thirdparty/curl/slist.c
rename to src/thirdparty/curl/slist.c
diff --git a/r5dev/thirdparty/curl/slist.h b/src/thirdparty/curl/slist.h
similarity index 100%
rename from r5dev/thirdparty/curl/slist.h
rename to src/thirdparty/curl/slist.h
diff --git a/r5dev/thirdparty/curl/smb.c b/src/thirdparty/curl/smb.c
similarity index 100%
rename from r5dev/thirdparty/curl/smb.c
rename to src/thirdparty/curl/smb.c
diff --git a/r5dev/thirdparty/curl/smb.h b/src/thirdparty/curl/smb.h
similarity index 100%
rename from r5dev/thirdparty/curl/smb.h
rename to src/thirdparty/curl/smb.h
diff --git a/r5dev/thirdparty/curl/smtp.c b/src/thirdparty/curl/smtp.c
similarity index 100%
rename from r5dev/thirdparty/curl/smtp.c
rename to src/thirdparty/curl/smtp.c
diff --git a/r5dev/thirdparty/curl/smtp.h b/src/thirdparty/curl/smtp.h
similarity index 100%
rename from r5dev/thirdparty/curl/smtp.h
rename to src/thirdparty/curl/smtp.h
diff --git a/r5dev/thirdparty/curl/sockaddr.h b/src/thirdparty/curl/sockaddr.h
similarity index 100%
rename from r5dev/thirdparty/curl/sockaddr.h
rename to src/thirdparty/curl/sockaddr.h
diff --git a/r5dev/thirdparty/curl/socks.c b/src/thirdparty/curl/socks.c
similarity index 100%
rename from r5dev/thirdparty/curl/socks.c
rename to src/thirdparty/curl/socks.c
diff --git a/r5dev/thirdparty/curl/socks.h b/src/thirdparty/curl/socks.h
similarity index 100%
rename from r5dev/thirdparty/curl/socks.h
rename to src/thirdparty/curl/socks.h
diff --git a/r5dev/thirdparty/curl/socks_gssapi.c b/src/thirdparty/curl/socks_gssapi.c
similarity index 100%
rename from r5dev/thirdparty/curl/socks_gssapi.c
rename to src/thirdparty/curl/socks_gssapi.c
diff --git a/r5dev/thirdparty/curl/socks_sspi.c b/src/thirdparty/curl/socks_sspi.c
similarity index 100%
rename from r5dev/thirdparty/curl/socks_sspi.c
rename to src/thirdparty/curl/socks_sspi.c
diff --git a/r5dev/thirdparty/curl/speedcheck.c b/src/thirdparty/curl/speedcheck.c
similarity index 100%
rename from r5dev/thirdparty/curl/speedcheck.c
rename to src/thirdparty/curl/speedcheck.c
diff --git a/r5dev/thirdparty/curl/speedcheck.h b/src/thirdparty/curl/speedcheck.h
similarity index 100%
rename from r5dev/thirdparty/curl/speedcheck.h
rename to src/thirdparty/curl/speedcheck.h
diff --git a/r5dev/thirdparty/curl/splay.c b/src/thirdparty/curl/splay.c
similarity index 100%
rename from r5dev/thirdparty/curl/splay.c
rename to src/thirdparty/curl/splay.c
diff --git a/r5dev/thirdparty/curl/splay.h b/src/thirdparty/curl/splay.h
similarity index 100%
rename from r5dev/thirdparty/curl/splay.h
rename to src/thirdparty/curl/splay.h
diff --git a/r5dev/thirdparty/curl/ssh.c b/src/thirdparty/curl/ssh.c
similarity index 100%
rename from r5dev/thirdparty/curl/ssh.c
rename to src/thirdparty/curl/ssh.c
diff --git a/r5dev/thirdparty/curl/ssh.h b/src/thirdparty/curl/ssh.h
similarity index 100%
rename from r5dev/thirdparty/curl/ssh.h
rename to src/thirdparty/curl/ssh.h
diff --git a/r5dev/thirdparty/curl/strcase.c b/src/thirdparty/curl/strcase.c
similarity index 100%
rename from r5dev/thirdparty/curl/strcase.c
rename to src/thirdparty/curl/strcase.c
diff --git a/r5dev/thirdparty/curl/strcase.h b/src/thirdparty/curl/strcase.h
similarity index 100%
rename from r5dev/thirdparty/curl/strcase.h
rename to src/thirdparty/curl/strcase.h
diff --git a/r5dev/thirdparty/curl/strdup.c b/src/thirdparty/curl/strdup.c
similarity index 100%
rename from r5dev/thirdparty/curl/strdup.c
rename to src/thirdparty/curl/strdup.c
diff --git a/r5dev/thirdparty/curl/strdup.h b/src/thirdparty/curl/strdup.h
similarity index 100%
rename from r5dev/thirdparty/curl/strdup.h
rename to src/thirdparty/curl/strdup.h
diff --git a/r5dev/thirdparty/curl/strerror.c b/src/thirdparty/curl/strerror.c
similarity index 100%
rename from r5dev/thirdparty/curl/strerror.c
rename to src/thirdparty/curl/strerror.c
diff --git a/r5dev/thirdparty/curl/strerror.h b/src/thirdparty/curl/strerror.h
similarity index 100%
rename from r5dev/thirdparty/curl/strerror.h
rename to src/thirdparty/curl/strerror.h
diff --git a/r5dev/thirdparty/curl/strtok.c b/src/thirdparty/curl/strtok.c
similarity index 100%
rename from r5dev/thirdparty/curl/strtok.c
rename to src/thirdparty/curl/strtok.c
diff --git a/r5dev/thirdparty/curl/strtok.h b/src/thirdparty/curl/strtok.h
similarity index 100%
rename from r5dev/thirdparty/curl/strtok.h
rename to src/thirdparty/curl/strtok.h
diff --git a/r5dev/thirdparty/curl/strtoofft.c b/src/thirdparty/curl/strtoofft.c
similarity index 100%
rename from r5dev/thirdparty/curl/strtoofft.c
rename to src/thirdparty/curl/strtoofft.c
diff --git a/r5dev/thirdparty/curl/strtoofft.h b/src/thirdparty/curl/strtoofft.h
similarity index 100%
rename from r5dev/thirdparty/curl/strtoofft.h
rename to src/thirdparty/curl/strtoofft.h
diff --git a/r5dev/thirdparty/curl/system_win32.c b/src/thirdparty/curl/system_win32.c
similarity index 100%
rename from r5dev/thirdparty/curl/system_win32.c
rename to src/thirdparty/curl/system_win32.c
diff --git a/r5dev/thirdparty/curl/system_win32.h b/src/thirdparty/curl/system_win32.h
similarity index 100%
rename from r5dev/thirdparty/curl/system_win32.h
rename to src/thirdparty/curl/system_win32.h
diff --git a/r5dev/thirdparty/curl/telnet.c b/src/thirdparty/curl/telnet.c
similarity index 100%
rename from r5dev/thirdparty/curl/telnet.c
rename to src/thirdparty/curl/telnet.c
diff --git a/r5dev/thirdparty/curl/telnet.h b/src/thirdparty/curl/telnet.h
similarity index 100%
rename from r5dev/thirdparty/curl/telnet.h
rename to src/thirdparty/curl/telnet.h
diff --git a/r5dev/thirdparty/curl/tftp.c b/src/thirdparty/curl/tftp.c
similarity index 100%
rename from r5dev/thirdparty/curl/tftp.c
rename to src/thirdparty/curl/tftp.c
diff --git a/r5dev/thirdparty/curl/tftp.h b/src/thirdparty/curl/tftp.h
similarity index 100%
rename from r5dev/thirdparty/curl/tftp.h
rename to src/thirdparty/curl/tftp.h
diff --git a/r5dev/thirdparty/curl/timeval.c b/src/thirdparty/curl/timeval.c
similarity index 100%
rename from r5dev/thirdparty/curl/timeval.c
rename to src/thirdparty/curl/timeval.c
diff --git a/r5dev/thirdparty/curl/timeval.h b/src/thirdparty/curl/timeval.h
similarity index 100%
rename from r5dev/thirdparty/curl/timeval.h
rename to src/thirdparty/curl/timeval.h
diff --git a/r5dev/thirdparty/curl/transfer.c b/src/thirdparty/curl/transfer.c
similarity index 100%
rename from r5dev/thirdparty/curl/transfer.c
rename to src/thirdparty/curl/transfer.c
diff --git a/r5dev/thirdparty/curl/transfer.h b/src/thirdparty/curl/transfer.h
similarity index 100%
rename from r5dev/thirdparty/curl/transfer.h
rename to src/thirdparty/curl/transfer.h
diff --git a/r5dev/thirdparty/curl/url.c b/src/thirdparty/curl/url.c
similarity index 100%
rename from r5dev/thirdparty/curl/url.c
rename to src/thirdparty/curl/url.c
diff --git a/r5dev/thirdparty/curl/url.h b/src/thirdparty/curl/url.h
similarity index 100%
rename from r5dev/thirdparty/curl/url.h
rename to src/thirdparty/curl/url.h
diff --git a/r5dev/thirdparty/curl/urldata.h b/src/thirdparty/curl/urldata.h
similarity index 100%
rename from r5dev/thirdparty/curl/urldata.h
rename to src/thirdparty/curl/urldata.h
diff --git a/r5dev/thirdparty/curl/vauth/cleartext.c b/src/thirdparty/curl/vauth/cleartext.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/cleartext.c
rename to src/thirdparty/curl/vauth/cleartext.c
diff --git a/r5dev/thirdparty/curl/vauth/cram.c b/src/thirdparty/curl/vauth/cram.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/cram.c
rename to src/thirdparty/curl/vauth/cram.c
diff --git a/r5dev/thirdparty/curl/vauth/digest.c b/src/thirdparty/curl/vauth/digest.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/digest.c
rename to src/thirdparty/curl/vauth/digest.c
diff --git a/r5dev/thirdparty/curl/vauth/digest.h b/src/thirdparty/curl/vauth/digest.h
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/digest.h
rename to src/thirdparty/curl/vauth/digest.h
diff --git a/r5dev/thirdparty/curl/vauth/digest_sspi.c b/src/thirdparty/curl/vauth/digest_sspi.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/digest_sspi.c
rename to src/thirdparty/curl/vauth/digest_sspi.c
diff --git a/r5dev/thirdparty/curl/vauth/krb5_gssapi.c b/src/thirdparty/curl/vauth/krb5_gssapi.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/krb5_gssapi.c
rename to src/thirdparty/curl/vauth/krb5_gssapi.c
diff --git a/r5dev/thirdparty/curl/vauth/krb5_sspi.c b/src/thirdparty/curl/vauth/krb5_sspi.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/krb5_sspi.c
rename to src/thirdparty/curl/vauth/krb5_sspi.c
diff --git a/r5dev/thirdparty/curl/vauth/ntlm.c b/src/thirdparty/curl/vauth/ntlm.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/ntlm.c
rename to src/thirdparty/curl/vauth/ntlm.c
diff --git a/r5dev/thirdparty/curl/vauth/ntlm.h b/src/thirdparty/curl/vauth/ntlm.h
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/ntlm.h
rename to src/thirdparty/curl/vauth/ntlm.h
diff --git a/r5dev/thirdparty/curl/vauth/ntlm_sspi.c b/src/thirdparty/curl/vauth/ntlm_sspi.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/ntlm_sspi.c
rename to src/thirdparty/curl/vauth/ntlm_sspi.c
diff --git a/r5dev/thirdparty/curl/vauth/oauth2.c b/src/thirdparty/curl/vauth/oauth2.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/oauth2.c
rename to src/thirdparty/curl/vauth/oauth2.c
diff --git a/r5dev/thirdparty/curl/vauth/spnego_gssapi.c b/src/thirdparty/curl/vauth/spnego_gssapi.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/spnego_gssapi.c
rename to src/thirdparty/curl/vauth/spnego_gssapi.c
diff --git a/r5dev/thirdparty/curl/vauth/spnego_sspi.c b/src/thirdparty/curl/vauth/spnego_sspi.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/spnego_sspi.c
rename to src/thirdparty/curl/vauth/spnego_sspi.c
diff --git a/r5dev/thirdparty/curl/vauth/vauth.c b/src/thirdparty/curl/vauth/vauth.c
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/vauth.c
rename to src/thirdparty/curl/vauth/vauth.c
diff --git a/r5dev/thirdparty/curl/vauth/vauth.h b/src/thirdparty/curl/vauth/vauth.h
similarity index 100%
rename from r5dev/thirdparty/curl/vauth/vauth.h
rename to src/thirdparty/curl/vauth/vauth.h
diff --git a/r5dev/thirdparty/curl/version.c b/src/thirdparty/curl/version.c
similarity index 100%
rename from r5dev/thirdparty/curl/version.c
rename to src/thirdparty/curl/version.c
diff --git a/r5dev/thirdparty/curl/vtls/axtls.c b/src/thirdparty/curl/vtls/axtls.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/axtls.c
rename to src/thirdparty/curl/vtls/axtls.c
diff --git a/r5dev/thirdparty/curl/vtls/axtls.h b/src/thirdparty/curl/vtls/axtls.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/axtls.h
rename to src/thirdparty/curl/vtls/axtls.h
diff --git a/r5dev/thirdparty/curl/vtls/cyassl.c b/src/thirdparty/curl/vtls/cyassl.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/cyassl.c
rename to src/thirdparty/curl/vtls/cyassl.c
diff --git a/r5dev/thirdparty/curl/vtls/cyassl.h b/src/thirdparty/curl/vtls/cyassl.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/cyassl.h
rename to src/thirdparty/curl/vtls/cyassl.h
diff --git a/r5dev/thirdparty/curl/vtls/darwinssl.c b/src/thirdparty/curl/vtls/darwinssl.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/darwinssl.c
rename to src/thirdparty/curl/vtls/darwinssl.c
diff --git a/r5dev/thirdparty/curl/vtls/darwinssl.h b/src/thirdparty/curl/vtls/darwinssl.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/darwinssl.h
rename to src/thirdparty/curl/vtls/darwinssl.h
diff --git a/r5dev/thirdparty/curl/vtls/gskit.c b/src/thirdparty/curl/vtls/gskit.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/gskit.c
rename to src/thirdparty/curl/vtls/gskit.c
diff --git a/r5dev/thirdparty/curl/vtls/gskit.h b/src/thirdparty/curl/vtls/gskit.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/gskit.h
rename to src/thirdparty/curl/vtls/gskit.h
diff --git a/r5dev/thirdparty/curl/vtls/gtls.c b/src/thirdparty/curl/vtls/gtls.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/gtls.c
rename to src/thirdparty/curl/vtls/gtls.c
diff --git a/r5dev/thirdparty/curl/vtls/gtls.h b/src/thirdparty/curl/vtls/gtls.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/gtls.h
rename to src/thirdparty/curl/vtls/gtls.h
diff --git a/r5dev/thirdparty/curl/vtls/mbedtls.c b/src/thirdparty/curl/vtls/mbedtls.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/mbedtls.c
rename to src/thirdparty/curl/vtls/mbedtls.c
diff --git a/r5dev/thirdparty/curl/vtls/mbedtls.h b/src/thirdparty/curl/vtls/mbedtls.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/mbedtls.h
rename to src/thirdparty/curl/vtls/mbedtls.h
diff --git a/r5dev/thirdparty/curl/vtls/nss.c b/src/thirdparty/curl/vtls/nss.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/nss.c
rename to src/thirdparty/curl/vtls/nss.c
diff --git a/r5dev/thirdparty/curl/vtls/nssg.h b/src/thirdparty/curl/vtls/nssg.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/nssg.h
rename to src/thirdparty/curl/vtls/nssg.h
diff --git a/r5dev/thirdparty/curl/vtls/openssl.c b/src/thirdparty/curl/vtls/openssl.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/openssl.c
rename to src/thirdparty/curl/vtls/openssl.c
diff --git a/r5dev/thirdparty/curl/vtls/openssl.h b/src/thirdparty/curl/vtls/openssl.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/openssl.h
rename to src/thirdparty/curl/vtls/openssl.h
diff --git a/r5dev/thirdparty/curl/vtls/polarssl.c b/src/thirdparty/curl/vtls/polarssl.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/polarssl.c
rename to src/thirdparty/curl/vtls/polarssl.c
diff --git a/r5dev/thirdparty/curl/vtls/polarssl.h b/src/thirdparty/curl/vtls/polarssl.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/polarssl.h
rename to src/thirdparty/curl/vtls/polarssl.h
diff --git a/r5dev/thirdparty/curl/vtls/polarssl_threadlock.c b/src/thirdparty/curl/vtls/polarssl_threadlock.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/polarssl_threadlock.c
rename to src/thirdparty/curl/vtls/polarssl_threadlock.c
diff --git a/r5dev/thirdparty/curl/vtls/polarssl_threadlock.h b/src/thirdparty/curl/vtls/polarssl_threadlock.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/polarssl_threadlock.h
rename to src/thirdparty/curl/vtls/polarssl_threadlock.h
diff --git a/r5dev/thirdparty/curl/vtls/schannel.c b/src/thirdparty/curl/vtls/schannel.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/schannel.c
rename to src/thirdparty/curl/vtls/schannel.c
diff --git a/r5dev/thirdparty/curl/vtls/schannel.h b/src/thirdparty/curl/vtls/schannel.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/schannel.h
rename to src/thirdparty/curl/vtls/schannel.h
diff --git a/r5dev/thirdparty/curl/vtls/vtls.c b/src/thirdparty/curl/vtls/vtls.c
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/vtls.c
rename to src/thirdparty/curl/vtls/vtls.c
diff --git a/r5dev/thirdparty/curl/vtls/vtls.h b/src/thirdparty/curl/vtls/vtls.h
similarity index 100%
rename from r5dev/thirdparty/curl/vtls/vtls.h
rename to src/thirdparty/curl/vtls/vtls.h
diff --git a/r5dev/thirdparty/curl/warnless.c b/src/thirdparty/curl/warnless.c
similarity index 100%
rename from r5dev/thirdparty/curl/warnless.c
rename to src/thirdparty/curl/warnless.c
diff --git a/r5dev/thirdparty/curl/warnless.h b/src/thirdparty/curl/warnless.h
similarity index 100%
rename from r5dev/thirdparty/curl/warnless.h
rename to src/thirdparty/curl/warnless.h
diff --git a/r5dev/thirdparty/curl/wildcard.c b/src/thirdparty/curl/wildcard.c
similarity index 100%
rename from r5dev/thirdparty/curl/wildcard.c
rename to src/thirdparty/curl/wildcard.c
diff --git a/r5dev/thirdparty/curl/wildcard.h b/src/thirdparty/curl/wildcard.h
similarity index 100%
rename from r5dev/thirdparty/curl/wildcard.h
rename to src/thirdparty/curl/wildcard.h
diff --git a/r5dev/thirdparty/curl/x509asn1.c b/src/thirdparty/curl/x509asn1.c
similarity index 100%
rename from r5dev/thirdparty/curl/x509asn1.c
rename to src/thirdparty/curl/x509asn1.c
diff --git a/r5dev/thirdparty/curl/x509asn1.h b/src/thirdparty/curl/x509asn1.h
similarity index 100%
rename from r5dev/thirdparty/curl/x509asn1.h
rename to src/thirdparty/curl/x509asn1.h
diff --git a/r5dev/thirdparty/detours/CMakeLists.txt b/src/thirdparty/detours/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/detours/CMakeLists.txt
rename to src/thirdparty/detours/CMakeLists.txt
diff --git a/r5dev/thirdparty/detours/include/detours.h b/src/thirdparty/detours/include/detours.h
similarity index 100%
rename from r5dev/thirdparty/detours/include/detours.h
rename to src/thirdparty/detours/include/detours.h
diff --git a/r5dev/thirdparty/detours/include/detver.h b/src/thirdparty/detours/include/detver.h
similarity index 100%
rename from r5dev/thirdparty/detours/include/detver.h
rename to src/thirdparty/detours/include/detver.h
diff --git a/r5dev/thirdparty/detours/include/idetour.h b/src/thirdparty/detours/include/idetour.h
similarity index 100%
rename from r5dev/thirdparty/detours/include/idetour.h
rename to src/thirdparty/detours/include/idetour.h
diff --git a/r5dev/thirdparty/detours/include/syelog.h b/src/thirdparty/detours/include/syelog.h
similarity index 100%
rename from r5dev/thirdparty/detours/include/syelog.h
rename to src/thirdparty/detours/include/syelog.h
diff --git a/r5dev/thirdparty/detours/src/creatwth.cpp b/src/thirdparty/detours/src/creatwth.cpp
similarity index 100%
rename from r5dev/thirdparty/detours/src/creatwth.cpp
rename to src/thirdparty/detours/src/creatwth.cpp
diff --git a/r5dev/thirdparty/detours/src/detours.cpp b/src/thirdparty/detours/src/detours.cpp
similarity index 100%
rename from r5dev/thirdparty/detours/src/detours.cpp
rename to src/thirdparty/detours/src/detours.cpp
diff --git a/r5dev/thirdparty/detours/src/disasm.cpp b/src/thirdparty/detours/src/disasm.cpp
similarity index 100%
rename from r5dev/thirdparty/detours/src/disasm.cpp
rename to src/thirdparty/detours/src/disasm.cpp
diff --git a/r5dev/thirdparty/detours/src/idetour.cpp b/src/thirdparty/detours/src/idetour.cpp
similarity index 100%
rename from r5dev/thirdparty/detours/src/idetour.cpp
rename to src/thirdparty/detours/src/idetour.cpp
diff --git a/r5dev/thirdparty/detours/src/modules.cpp b/src/thirdparty/detours/src/modules.cpp
similarity index 100%
rename from r5dev/thirdparty/detours/src/modules.cpp
rename to src/thirdparty/detours/src/modules.cpp
diff --git a/r5dev/thirdparty/detours/src/uimports.cpp b/src/thirdparty/detours/src/uimports.cpp
similarity index 100%
rename from r5dev/thirdparty/detours/src/uimports.cpp
rename to src/thirdparty/detours/src/uimports.cpp
diff --git a/r5dev/thirdparty/fastlz/CMakeLists.txt b/src/thirdparty/fastlz/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/fastlz/CMakeLists.txt
rename to src/thirdparty/fastlz/CMakeLists.txt
diff --git a/r5dev/thirdparty/fastlz/fastlz.c b/src/thirdparty/fastlz/fastlz.c
similarity index 100%
rename from r5dev/thirdparty/fastlz/fastlz.c
rename to src/thirdparty/fastlz/fastlz.c
diff --git a/r5dev/thirdparty/fastlz/fastlz.h b/src/thirdparty/fastlz/fastlz.h
similarity index 100%
rename from r5dev/thirdparty/fastlz/fastlz.h
rename to src/thirdparty/fastlz/fastlz.h
diff --git a/r5dev/thirdparty/imgui/CMakeLists.txt b/src/thirdparty/imgui/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/imgui/CMakeLists.txt
rename to src/thirdparty/imgui/CMakeLists.txt
diff --git a/r5dev/thirdparty/imgui/backends/imgui_impl_dx11.cpp b/src/thirdparty/imgui/backends/imgui_impl_dx11.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/backends/imgui_impl_dx11.cpp
rename to src/thirdparty/imgui/backends/imgui_impl_dx11.cpp
diff --git a/r5dev/thirdparty/imgui/backends/imgui_impl_dx11.h b/src/thirdparty/imgui/backends/imgui_impl_dx11.h
similarity index 100%
rename from r5dev/thirdparty/imgui/backends/imgui_impl_dx11.h
rename to src/thirdparty/imgui/backends/imgui_impl_dx11.h
diff --git a/r5dev/thirdparty/imgui/backends/imgui_impl_win32.cpp b/src/thirdparty/imgui/backends/imgui_impl_win32.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/backends/imgui_impl_win32.cpp
rename to src/thirdparty/imgui/backends/imgui_impl_win32.cpp
diff --git a/r5dev/thirdparty/imgui/backends/imgui_impl_win32.h b/src/thirdparty/imgui/backends/imgui_impl_win32.h
similarity index 100%
rename from r5dev/thirdparty/imgui/backends/imgui_impl_win32.h
rename to src/thirdparty/imgui/backends/imgui_impl_win32.h
diff --git a/r5dev/thirdparty/imgui/imconfig.h b/src/thirdparty/imgui/imconfig.h
similarity index 100%
rename from r5dev/thirdparty/imgui/imconfig.h
rename to src/thirdparty/imgui/imconfig.h
diff --git a/r5dev/thirdparty/imgui/imgui.cpp b/src/thirdparty/imgui/imgui.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/imgui.cpp
rename to src/thirdparty/imgui/imgui.cpp
diff --git a/r5dev/thirdparty/imgui/imgui.h b/src/thirdparty/imgui/imgui.h
similarity index 100%
rename from r5dev/thirdparty/imgui/imgui.h
rename to src/thirdparty/imgui/imgui.h
diff --git a/r5dev/thirdparty/imgui/imgui_demo.cpp b/src/thirdparty/imgui/imgui_demo.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/imgui_demo.cpp
rename to src/thirdparty/imgui/imgui_demo.cpp
diff --git a/r5dev/thirdparty/imgui/imgui_draw.cpp b/src/thirdparty/imgui/imgui_draw.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/imgui_draw.cpp
rename to src/thirdparty/imgui/imgui_draw.cpp
diff --git a/r5dev/thirdparty/imgui/imgui_internal.h b/src/thirdparty/imgui/imgui_internal.h
similarity index 100%
rename from r5dev/thirdparty/imgui/imgui_internal.h
rename to src/thirdparty/imgui/imgui_internal.h
diff --git a/r5dev/thirdparty/imgui/imgui_tables.cpp b/src/thirdparty/imgui/imgui_tables.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/imgui_tables.cpp
rename to src/thirdparty/imgui/imgui_tables.cpp
diff --git a/r5dev/thirdparty/imgui/imgui_widgets.cpp b/src/thirdparty/imgui/imgui_widgets.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/imgui_widgets.cpp
rename to src/thirdparty/imgui/imgui_widgets.cpp
diff --git a/r5dev/thirdparty/imgui/imstb_rectpack.h b/src/thirdparty/imgui/imstb_rectpack.h
similarity index 100%
rename from r5dev/thirdparty/imgui/imstb_rectpack.h
rename to src/thirdparty/imgui/imstb_rectpack.h
diff --git a/r5dev/thirdparty/imgui/imstb_textedit.h b/src/thirdparty/imgui/imstb_textedit.h
similarity index 100%
rename from r5dev/thirdparty/imgui/imstb_textedit.h
rename to src/thirdparty/imgui/imstb_textedit.h
diff --git a/r5dev/thirdparty/imgui/imstb_truetype.h b/src/thirdparty/imgui/imstb_truetype.h
similarity index 100%
rename from r5dev/thirdparty/imgui/imstb_truetype.h
rename to src/thirdparty/imgui/imstb_truetype.h
diff --git a/r5dev/thirdparty/imgui/misc/cpp/README.txt b/src/thirdparty/imgui/misc/cpp/README.txt
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/cpp/README.txt
rename to src/thirdparty/imgui/misc/cpp/README.txt
diff --git a/r5dev/thirdparty/imgui/misc/cpp/imgui_stdlib.cpp b/src/thirdparty/imgui/misc/cpp/imgui_stdlib.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/cpp/imgui_stdlib.cpp
rename to src/thirdparty/imgui/misc/cpp/imgui_stdlib.cpp
diff --git a/r5dev/thirdparty/imgui/misc/cpp/imgui_stdlib.h b/src/thirdparty/imgui/misc/cpp/imgui_stdlib.h
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/cpp/imgui_stdlib.h
rename to src/thirdparty/imgui/misc/cpp/imgui_stdlib.h
diff --git a/r5dev/thirdparty/imgui/misc/imgui_editor.cpp b/src/thirdparty/imgui/misc/imgui_editor.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/imgui_editor.cpp
rename to src/thirdparty/imgui/misc/imgui_editor.cpp
diff --git a/r5dev/thirdparty/imgui/misc/imgui_editor.h b/src/thirdparty/imgui/misc/imgui_editor.h
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/imgui_editor.h
rename to src/thirdparty/imgui/misc/imgui_editor.h
diff --git a/r5dev/thirdparty/imgui/misc/imgui_logger.cpp b/src/thirdparty/imgui/misc/imgui_logger.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/imgui_logger.cpp
rename to src/thirdparty/imgui/misc/imgui_logger.cpp
diff --git a/r5dev/thirdparty/imgui/misc/imgui_logger.h b/src/thirdparty/imgui/misc/imgui_logger.h
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/imgui_logger.h
rename to src/thirdparty/imgui/misc/imgui_logger.h
diff --git a/r5dev/thirdparty/imgui/misc/imgui_utility.cpp b/src/thirdparty/imgui/misc/imgui_utility.cpp
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/imgui_utility.cpp
rename to src/thirdparty/imgui/misc/imgui_utility.cpp
diff --git a/r5dev/thirdparty/imgui/misc/imgui_utility.h b/src/thirdparty/imgui/misc/imgui_utility.h
similarity index 100%
rename from r5dev/thirdparty/imgui/misc/imgui_utility.h
rename to src/thirdparty/imgui/misc/imgui_utility.h
diff --git a/r5dev/thirdparty/lzham/CMakeLists.txt b/src/thirdparty/lzham/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/lzham/CMakeLists.txt
rename to src/thirdparty/lzham/CMakeLists.txt
diff --git a/r5dev/thirdparty/lzham/include/lzham.h b/src/thirdparty/lzham/include/lzham.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham.h
rename to src/thirdparty/lzham/include/lzham.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_assert.h b/src/thirdparty/lzham/include/lzham_assert.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_assert.h
rename to src/thirdparty/lzham/include/lzham_assert.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_checksum.h b/src/thirdparty/lzham/include/lzham_checksum.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_checksum.h
rename to src/thirdparty/lzham/include/lzham_checksum.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_config.h b/src/thirdparty/lzham/include/lzham_config.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_config.h
rename to src/thirdparty/lzham/include/lzham_config.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_core.h b/src/thirdparty/lzham/include/lzham_core.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_core.h
rename to src/thirdparty/lzham/include/lzham_core.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_helpers.h b/src/thirdparty/lzham/include/lzham_helpers.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_helpers.h
rename to src/thirdparty/lzham/include/lzham_helpers.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_huffman_codes.h b/src/thirdparty/lzham/include/lzham_huffman_codes.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_huffman_codes.h
rename to src/thirdparty/lzham/include/lzham_huffman_codes.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_lzbase.h b/src/thirdparty/lzham/include/lzham_lzbase.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_lzbase.h
rename to src/thirdparty/lzham/include/lzham_lzbase.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_match_accel.h b/src/thirdparty/lzham/include/lzham_match_accel.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_match_accel.h
rename to src/thirdparty/lzham/include/lzham_match_accel.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_math.h b/src/thirdparty/lzham/include/lzham_math.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_math.h
rename to src/thirdparty/lzham/include/lzham_math.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_mem.h b/src/thirdparty/lzham/include/lzham_mem.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_mem.h
rename to src/thirdparty/lzham/include/lzham_mem.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_null_threading.h b/src/thirdparty/lzham/include/lzham_null_threading.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_null_threading.h
rename to src/thirdparty/lzham/include/lzham_null_threading.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_platform.h b/src/thirdparty/lzham/include/lzham_platform.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_platform.h
rename to src/thirdparty/lzham/include/lzham_platform.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_polar_codes.h b/src/thirdparty/lzham/include/lzham_polar_codes.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_polar_codes.h
rename to src/thirdparty/lzham/include/lzham_polar_codes.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_prefix_coding.h b/src/thirdparty/lzham/include/lzham_prefix_coding.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_prefix_coding.h
rename to src/thirdparty/lzham/include/lzham_prefix_coding.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_pthreads_threading.h b/src/thirdparty/lzham/include/lzham_pthreads_threading.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_pthreads_threading.h
rename to src/thirdparty/lzham/include/lzham_pthreads_threading.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_static_lib.h b/src/thirdparty/lzham/include/lzham_static_lib.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_static_lib.h
rename to src/thirdparty/lzham/include/lzham_static_lib.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_symbol_codec.h b/src/thirdparty/lzham/include/lzham_symbol_codec.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_symbol_codec.h
rename to src/thirdparty/lzham/include/lzham_symbol_codec.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_threading.h b/src/thirdparty/lzham/include/lzham_threading.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_threading.h
rename to src/thirdparty/lzham/include/lzham_threading.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_timer.h b/src/thirdparty/lzham/include/lzham_timer.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_timer.h
rename to src/thirdparty/lzham/include/lzham_timer.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_traits.h b/src/thirdparty/lzham/include/lzham_traits.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_traits.h
rename to src/thirdparty/lzham/include/lzham_traits.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_types.h b/src/thirdparty/lzham/include/lzham_types.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_types.h
rename to src/thirdparty/lzham/include/lzham_types.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_utils.h b/src/thirdparty/lzham/include/lzham_utils.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_utils.h
rename to src/thirdparty/lzham/include/lzham_utils.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_vector.h b/src/thirdparty/lzham/include/lzham_vector.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_vector.h
rename to src/thirdparty/lzham/include/lzham_vector.h
diff --git a/r5dev/thirdparty/lzham/include/lzham_win32_threading.h b/src/thirdparty/lzham/include/lzham_win32_threading.h
similarity index 100%
rename from r5dev/thirdparty/lzham/include/lzham_win32_threading.h
rename to src/thirdparty/lzham/include/lzham_win32_threading.h
diff --git a/r5dev/thirdparty/lzham/lzham_api.cpp b/src/thirdparty/lzham/lzham_api.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_api.cpp
rename to src/thirdparty/lzham/lzham_api.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_assert.cpp b/src/thirdparty/lzham/lzham_assert.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_assert.cpp
rename to src/thirdparty/lzham/lzham_assert.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_checksum.cpp b/src/thirdparty/lzham/lzham_checksum.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_checksum.cpp
rename to src/thirdparty/lzham/lzham_checksum.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_huffman_codes.cpp b/src/thirdparty/lzham/lzham_huffman_codes.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_huffman_codes.cpp
rename to src/thirdparty/lzham/lzham_huffman_codes.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_lzbase.cpp b/src/thirdparty/lzham/lzham_lzbase.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_lzbase.cpp
rename to src/thirdparty/lzham/lzham_lzbase.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_match_accel.cpp b/src/thirdparty/lzham/lzham_match_accel.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_match_accel.cpp
rename to src/thirdparty/lzham/lzham_match_accel.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_mem.cpp b/src/thirdparty/lzham/lzham_mem.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_mem.cpp
rename to src/thirdparty/lzham/lzham_mem.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_platform.cpp b/src/thirdparty/lzham/lzham_platform.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_platform.cpp
rename to src/thirdparty/lzham/lzham_platform.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_polar_codes.cpp b/src/thirdparty/lzham/lzham_polar_codes.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_polar_codes.cpp
rename to src/thirdparty/lzham/lzham_polar_codes.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_prefix_coding.cpp b/src/thirdparty/lzham/lzham_prefix_coding.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_prefix_coding.cpp
rename to src/thirdparty/lzham/lzham_prefix_coding.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_pthreads_threading.cpp b/src/thirdparty/lzham/lzham_pthreads_threading.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_pthreads_threading.cpp
rename to src/thirdparty/lzham/lzham_pthreads_threading.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_symbol_codec.cpp b/src/thirdparty/lzham/lzham_symbol_codec.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_symbol_codec.cpp
rename to src/thirdparty/lzham/lzham_symbol_codec.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_timer.cpp b/src/thirdparty/lzham/lzham_timer.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_timer.cpp
rename to src/thirdparty/lzham/lzham_timer.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_vector.cpp b/src/thirdparty/lzham/lzham_vector.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_vector.cpp
rename to src/thirdparty/lzham/lzham_vector.cpp
diff --git a/r5dev/thirdparty/lzham/lzham_win32_threading.cpp b/src/thirdparty/lzham/lzham_win32_threading.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzham_win32_threading.cpp
rename to src/thirdparty/lzham/lzham_win32_threading.cpp
diff --git a/r5dev/thirdparty/lzham/lzhamcomp/lzham_comp.h b/src/thirdparty/lzham/lzhamcomp/lzham_comp.h
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamcomp/lzham_comp.h
rename to src/thirdparty/lzham/lzhamcomp/lzham_comp.h
diff --git a/r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp.cpp b/src/thirdparty/lzham/lzhamcomp/lzham_lzcomp.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp.cpp
rename to src/thirdparty/lzham/lzhamcomp/lzham_lzcomp.cpp
diff --git a/r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.cpp b/src/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.cpp
rename to src/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.cpp
diff --git a/r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.h b/src/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.h
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.h
rename to src/thirdparty/lzham/lzhamcomp/lzham_lzcomp_internal.h
diff --git a/r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp_state.cpp b/src/thirdparty/lzham/lzhamcomp/lzham_lzcomp_state.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamcomp/lzham_lzcomp_state.cpp
rename to src/thirdparty/lzham/lzhamcomp/lzham_lzcomp_state.cpp
diff --git a/r5dev/thirdparty/lzham/lzhamdecomp/lzham_decomp.h b/src/thirdparty/lzham/lzhamdecomp/lzham_decomp.h
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamdecomp/lzham_decomp.h
rename to src/thirdparty/lzham/lzhamdecomp/lzham_decomp.h
diff --git a/r5dev/thirdparty/lzham/lzhamdecomp/lzham_lzdecomp.cpp b/src/thirdparty/lzham/lzhamdecomp/lzham_lzdecomp.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamdecomp/lzham_lzdecomp.cpp
rename to src/thirdparty/lzham/lzhamdecomp/lzham_lzdecomp.cpp
diff --git a/r5dev/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.cpp b/src/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.cpp
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.cpp
rename to src/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.cpp
diff --git a/r5dev/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.h b/src/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.h
similarity index 100%
rename from r5dev/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.h
rename to src/thirdparty/lzham/lzhamdecomp/lzham_lzdecompbase.h
diff --git a/r5dev/thirdparty/nvapi/NvApiDriverSettings.c b/src/thirdparty/nvapi/NvApiDriverSettings.c
similarity index 100%
rename from r5dev/thirdparty/nvapi/NvApiDriverSettings.c
rename to src/thirdparty/nvapi/NvApiDriverSettings.c
diff --git a/r5dev/thirdparty/nvapi/NvApiDriverSettings.h b/src/thirdparty/nvapi/NvApiDriverSettings.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/NvApiDriverSettings.h
rename to src/thirdparty/nvapi/NvApiDriverSettings.h
diff --git a/r5dev/thirdparty/nvapi/amd64/nvapi64.lib b/src/thirdparty/nvapi/amd64/nvapi64.lib
similarity index 100%
rename from r5dev/thirdparty/nvapi/amd64/nvapi64.lib
rename to src/thirdparty/nvapi/amd64/nvapi64.lib
diff --git a/r5dev/thirdparty/nvapi/nvHLSLExtns.h b/src/thirdparty/nvapi/nvHLSLExtns.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvHLSLExtns.h
rename to src/thirdparty/nvapi/nvHLSLExtns.h
diff --git a/r5dev/thirdparty/nvapi/nvHLSLExtnsInternal.h b/src/thirdparty/nvapi/nvHLSLExtnsInternal.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvHLSLExtnsInternal.h
rename to src/thirdparty/nvapi/nvHLSLExtnsInternal.h
diff --git a/r5dev/thirdparty/nvapi/nvShaderExtnEnums.h b/src/thirdparty/nvapi/nvShaderExtnEnums.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvShaderExtnEnums.h
rename to src/thirdparty/nvapi/nvShaderExtnEnums.h
diff --git a/r5dev/thirdparty/nvapi/nvapi.h b/src/thirdparty/nvapi/nvapi.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi.h
rename to src/thirdparty/nvapi/nvapi.h
diff --git a/r5dev/thirdparty/nvapi/nvapi_lite_common.h b/src/thirdparty/nvapi/nvapi_lite_common.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi_lite_common.h
rename to src/thirdparty/nvapi/nvapi_lite_common.h
diff --git a/r5dev/thirdparty/nvapi/nvapi_lite_d3dext.h b/src/thirdparty/nvapi/nvapi_lite_d3dext.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi_lite_d3dext.h
rename to src/thirdparty/nvapi/nvapi_lite_d3dext.h
diff --git a/r5dev/thirdparty/nvapi/nvapi_lite_salend.h b/src/thirdparty/nvapi/nvapi_lite_salend.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi_lite_salend.h
rename to src/thirdparty/nvapi/nvapi_lite_salend.h
diff --git a/r5dev/thirdparty/nvapi/nvapi_lite_salstart.h b/src/thirdparty/nvapi/nvapi_lite_salstart.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi_lite_salstart.h
rename to src/thirdparty/nvapi/nvapi_lite_salstart.h
diff --git a/r5dev/thirdparty/nvapi/nvapi_lite_sli.h b/src/thirdparty/nvapi/nvapi_lite_sli.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi_lite_sli.h
rename to src/thirdparty/nvapi/nvapi_lite_sli.h
diff --git a/r5dev/thirdparty/nvapi/nvapi_lite_stereo.h b/src/thirdparty/nvapi/nvapi_lite_stereo.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi_lite_stereo.h
rename to src/thirdparty/nvapi/nvapi_lite_stereo.h
diff --git a/r5dev/thirdparty/nvapi/nvapi_lite_surround.h b/src/thirdparty/nvapi/nvapi_lite_surround.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/nvapi_lite_surround.h
rename to src/thirdparty/nvapi/nvapi_lite_surround.h
diff --git a/r5dev/thirdparty/nvapi/pclstats.h b/src/thirdparty/nvapi/pclstats.h
similarity index 100%
rename from r5dev/thirdparty/nvapi/pclstats.h
rename to src/thirdparty/nvapi/pclstats.h
diff --git a/r5dev/thirdparty/protobuf/CMakeLists.txt b/src/thirdparty/protobuf/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/CMakeLists.txt
rename to src/thirdparty/protobuf/CMakeLists.txt
diff --git a/r5dev/thirdparty/protobuf/any.cc b/src/thirdparty/protobuf/any.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/any.cc
rename to src/thirdparty/protobuf/any.cc
diff --git a/r5dev/thirdparty/protobuf/any.h b/src/thirdparty/protobuf/any.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/any.h
rename to src/thirdparty/protobuf/any.h
diff --git a/r5dev/thirdparty/protobuf/any.pb.cc b/src/thirdparty/protobuf/any.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/any.pb.cc
rename to src/thirdparty/protobuf/any.pb.cc
diff --git a/r5dev/thirdparty/protobuf/any.pb.h b/src/thirdparty/protobuf/any.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/any.pb.h
rename to src/thirdparty/protobuf/any.pb.h
diff --git a/r5dev/thirdparty/protobuf/any.proto b/src/thirdparty/protobuf/any.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/any.proto
rename to src/thirdparty/protobuf/any.proto
diff --git a/r5dev/thirdparty/protobuf/any_lite.cc b/src/thirdparty/protobuf/any_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/any_lite.cc
rename to src/thirdparty/protobuf/any_lite.cc
diff --git a/r5dev/thirdparty/protobuf/any_test.cc b/src/thirdparty/protobuf/any_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/any_test.cc
rename to src/thirdparty/protobuf/any_test.cc
diff --git a/r5dev/thirdparty/protobuf/any_test.proto b/src/thirdparty/protobuf/any_test.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/any_test.proto
rename to src/thirdparty/protobuf/any_test.proto
diff --git a/r5dev/thirdparty/protobuf/api.pb.cc b/src/thirdparty/protobuf/api.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/api.pb.cc
rename to src/thirdparty/protobuf/api.pb.cc
diff --git a/r5dev/thirdparty/protobuf/api.pb.h b/src/thirdparty/protobuf/api.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/api.pb.h
rename to src/thirdparty/protobuf/api.pb.h
diff --git a/r5dev/thirdparty/protobuf/api.proto b/src/thirdparty/protobuf/api.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/api.proto
rename to src/thirdparty/protobuf/api.proto
diff --git a/r5dev/thirdparty/protobuf/arena.cc b/src/thirdparty/protobuf/arena.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/arena.cc
rename to src/thirdparty/protobuf/arena.cc
diff --git a/r5dev/thirdparty/protobuf/arena.h b/src/thirdparty/protobuf/arena.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/arena.h
rename to src/thirdparty/protobuf/arena.h
diff --git a/r5dev/thirdparty/protobuf/arena_impl.h b/src/thirdparty/protobuf/arena_impl.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/arena_impl.h
rename to src/thirdparty/protobuf/arena_impl.h
diff --git a/r5dev/thirdparty/protobuf/arena_test_util.cc b/src/thirdparty/protobuf/arena_test_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/arena_test_util.cc
rename to src/thirdparty/protobuf/arena_test_util.cc
diff --git a/r5dev/thirdparty/protobuf/arena_test_util.h b/src/thirdparty/protobuf/arena_test_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/arena_test_util.h
rename to src/thirdparty/protobuf/arena_test_util.h
diff --git a/r5dev/thirdparty/protobuf/arena_unittest.cc b/src/thirdparty/protobuf/arena_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/arena_unittest.cc
rename to src/thirdparty/protobuf/arena_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/arenastring.cc b/src/thirdparty/protobuf/arenastring.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/arenastring.cc
rename to src/thirdparty/protobuf/arenastring.cc
diff --git a/r5dev/thirdparty/protobuf/arenastring.h b/src/thirdparty/protobuf/arenastring.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/arenastring.h
rename to src/thirdparty/protobuf/arenastring.h
diff --git a/r5dev/thirdparty/protobuf/arenastring_unittest.cc b/src/thirdparty/protobuf/arenastring_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/arenastring_unittest.cc
rename to src/thirdparty/protobuf/arenastring_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/arenaz_sampler.cc b/src/thirdparty/protobuf/arenaz_sampler.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/arenaz_sampler.cc
rename to src/thirdparty/protobuf/arenaz_sampler.cc
diff --git a/r5dev/thirdparty/protobuf/arenaz_sampler.h b/src/thirdparty/protobuf/arenaz_sampler.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/arenaz_sampler.h
rename to src/thirdparty/protobuf/arenaz_sampler.h
diff --git a/r5dev/thirdparty/protobuf/arenaz_sampler_test.cc b/src/thirdparty/protobuf/arenaz_sampler_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/arenaz_sampler_test.cc
rename to src/thirdparty/protobuf/arenaz_sampler_test.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/annotation_test_util.cc b/src/thirdparty/protobuf/compiler/annotation_test_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/annotation_test_util.cc
rename to src/thirdparty/protobuf/compiler/annotation_test_util.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/annotation_test_util.h b/src/thirdparty/protobuf/compiler/annotation_test_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/annotation_test_util.h
rename to src/thirdparty/protobuf/compiler/annotation_test_util.h
diff --git a/r5dev/thirdparty/protobuf/compiler/code_generator.cc b/src/thirdparty/protobuf/compiler/code_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/code_generator.cc
rename to src/thirdparty/protobuf/compiler/code_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/code_generator.h b/src/thirdparty/protobuf/compiler/code_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/code_generator.h
rename to src/thirdparty/protobuf/compiler/code_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/command_line_interface.cc b/src/thirdparty/protobuf/compiler/command_line_interface.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/command_line_interface.cc
rename to src/thirdparty/protobuf/compiler/command_line_interface.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/command_line_interface.h b/src/thirdparty/protobuf/compiler/command_line_interface.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/command_line_interface.h
rename to src/thirdparty/protobuf/compiler/command_line_interface.h
diff --git a/r5dev/thirdparty/protobuf/compiler/command_line_interface_unittest.cc b/src/thirdparty/protobuf/compiler/command_line_interface_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/command_line_interface_unittest.cc
rename to src/thirdparty/protobuf/compiler/command_line_interface_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/bootstrap_unittest.cc b/src/thirdparty/protobuf/compiler/cpp/bootstrap_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/bootstrap_unittest.cc
rename to src/thirdparty/protobuf/compiler/cpp/bootstrap_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/cpp_generator.h b/src/thirdparty/protobuf/compiler/cpp/cpp_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/cpp_generator.h
rename to src/thirdparty/protobuf/compiler/cpp/cpp_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/enum.cc b/src/thirdparty/protobuf/compiler/cpp/enum.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/enum.cc
rename to src/thirdparty/protobuf/compiler/cpp/enum.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/enum.h b/src/thirdparty/protobuf/compiler/cpp/enum.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/enum.h
rename to src/thirdparty/protobuf/compiler/cpp/enum.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/enum_field.cc b/src/thirdparty/protobuf/compiler/cpp/enum_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/enum_field.cc
rename to src/thirdparty/protobuf/compiler/cpp/enum_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/enum_field.h b/src/thirdparty/protobuf/compiler/cpp/enum_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/enum_field.h
rename to src/thirdparty/protobuf/compiler/cpp/enum_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/extension.cc b/src/thirdparty/protobuf/compiler/cpp/extension.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/extension.cc
rename to src/thirdparty/protobuf/compiler/cpp/extension.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/extension.h b/src/thirdparty/protobuf/compiler/cpp/extension.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/extension.h
rename to src/thirdparty/protobuf/compiler/cpp/extension.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/field.cc b/src/thirdparty/protobuf/compiler/cpp/field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/field.cc
rename to src/thirdparty/protobuf/compiler/cpp/field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/field.h b/src/thirdparty/protobuf/compiler/cpp/field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/field.h
rename to src/thirdparty/protobuf/compiler/cpp/field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/file.cc b/src/thirdparty/protobuf/compiler/cpp/file.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/file.cc
rename to src/thirdparty/protobuf/compiler/cpp/file.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/file.h b/src/thirdparty/protobuf/compiler/cpp/file.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/file.h
rename to src/thirdparty/protobuf/compiler/cpp/file.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/generator.cc b/src/thirdparty/protobuf/compiler/cpp/generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/generator.cc
rename to src/thirdparty/protobuf/compiler/cpp/generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/generator.h b/src/thirdparty/protobuf/compiler/cpp/generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/generator.h
rename to src/thirdparty/protobuf/compiler/cpp/generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/helpers.cc b/src/thirdparty/protobuf/compiler/cpp/helpers.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/helpers.cc
rename to src/thirdparty/protobuf/compiler/cpp/helpers.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/helpers.h b/src/thirdparty/protobuf/compiler/cpp/helpers.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/helpers.h
rename to src/thirdparty/protobuf/compiler/cpp/helpers.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/map_field.cc b/src/thirdparty/protobuf/compiler/cpp/map_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/map_field.cc
rename to src/thirdparty/protobuf/compiler/cpp/map_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/map_field.h b/src/thirdparty/protobuf/compiler/cpp/map_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/map_field.h
rename to src/thirdparty/protobuf/compiler/cpp/map_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/message.cc b/src/thirdparty/protobuf/compiler/cpp/message.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/message.cc
rename to src/thirdparty/protobuf/compiler/cpp/message.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/message.h b/src/thirdparty/protobuf/compiler/cpp/message.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/message.h
rename to src/thirdparty/protobuf/compiler/cpp/message.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/message_field.cc b/src/thirdparty/protobuf/compiler/cpp/message_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/message_field.cc
rename to src/thirdparty/protobuf/compiler/cpp/message_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/message_field.h b/src/thirdparty/protobuf/compiler/cpp/message_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/message_field.h
rename to src/thirdparty/protobuf/compiler/cpp/message_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/message_layout_helper.h b/src/thirdparty/protobuf/compiler/cpp/message_layout_helper.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/message_layout_helper.h
rename to src/thirdparty/protobuf/compiler/cpp/message_layout_helper.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/message_size_unittest.cc b/src/thirdparty/protobuf/compiler/cpp/message_size_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/message_size_unittest.cc
rename to src/thirdparty/protobuf/compiler/cpp/message_size_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/metadata_test.cc b/src/thirdparty/protobuf/compiler/cpp/metadata_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/metadata_test.cc
rename to src/thirdparty/protobuf/compiler/cpp/metadata_test.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/move_unittest.cc b/src/thirdparty/protobuf/compiler/cpp/move_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/move_unittest.cc
rename to src/thirdparty/protobuf/compiler/cpp/move_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/names.h b/src/thirdparty/protobuf/compiler/cpp/names.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/names.h
rename to src/thirdparty/protobuf/compiler/cpp/names.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/options.h b/src/thirdparty/protobuf/compiler/cpp/options.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/options.h
rename to src/thirdparty/protobuf/compiler/cpp/options.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/padding_optimizer.cc b/src/thirdparty/protobuf/compiler/cpp/padding_optimizer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/padding_optimizer.cc
rename to src/thirdparty/protobuf/compiler/cpp/padding_optimizer.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/padding_optimizer.h b/src/thirdparty/protobuf/compiler/cpp/padding_optimizer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/padding_optimizer.h
rename to src/thirdparty/protobuf/compiler/cpp/padding_optimizer.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/parse_function_generator.cc b/src/thirdparty/protobuf/compiler/cpp/parse_function_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/parse_function_generator.cc
rename to src/thirdparty/protobuf/compiler/cpp/parse_function_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/parse_function_generator.h b/src/thirdparty/protobuf/compiler/cpp/parse_function_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/parse_function_generator.h
rename to src/thirdparty/protobuf/compiler/cpp/parse_function_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/plugin_unittest.cc b/src/thirdparty/protobuf/compiler/cpp/plugin_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/plugin_unittest.cc
rename to src/thirdparty/protobuf/compiler/cpp/plugin_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/primitive_field.cc b/src/thirdparty/protobuf/compiler/cpp/primitive_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/primitive_field.cc
rename to src/thirdparty/protobuf/compiler/cpp/primitive_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/primitive_field.h b/src/thirdparty/protobuf/compiler/cpp/primitive_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/primitive_field.h
rename to src/thirdparty/protobuf/compiler/cpp/primitive_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/service.cc b/src/thirdparty/protobuf/compiler/cpp/service.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/service.cc
rename to src/thirdparty/protobuf/compiler/cpp/service.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/service.h b/src/thirdparty/protobuf/compiler/cpp/service.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/service.h
rename to src/thirdparty/protobuf/compiler/cpp/service.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/string_field.cc b/src/thirdparty/protobuf/compiler/cpp/string_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/string_field.cc
rename to src/thirdparty/protobuf/compiler/cpp/string_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/string_field.h b/src/thirdparty/protobuf/compiler/cpp/string_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/string_field.h
rename to src/thirdparty/protobuf/compiler/cpp/string_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/test_bad_identifiers.proto b/src/thirdparty/protobuf/compiler/cpp/test_bad_identifiers.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/test_bad_identifiers.proto
rename to src/thirdparty/protobuf/compiler/cpp/test_bad_identifiers.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/test_large_enum_value.proto b/src/thirdparty/protobuf/compiler/cpp/test_large_enum_value.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/test_large_enum_value.proto
rename to src/thirdparty/protobuf/compiler/cpp/test_large_enum_value.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/unittest.cc b/src/thirdparty/protobuf/compiler/cpp/unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/unittest.cc
rename to src/thirdparty/protobuf/compiler/cpp/unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/unittest.h b/src/thirdparty/protobuf/compiler/cpp/unittest.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/unittest.h
rename to src/thirdparty/protobuf/compiler/cpp/unittest.h
diff --git a/r5dev/thirdparty/protobuf/compiler/cpp/unittest.inc b/src/thirdparty/protobuf/compiler/cpp/unittest.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/cpp/unittest.inc
rename to src/thirdparty/protobuf/compiler/cpp/unittest.inc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.h b/src/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_doc_comment.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_enum.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_enum.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum.h b/src/thirdparty/protobuf/compiler/csharp/csharp_enum.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_enum.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_enum_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_enum_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_enum_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_enum_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_enum_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_field_base.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_field_base.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_field_base.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_field_base.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_field_base.h b/src/thirdparty/protobuf/compiler/csharp/csharp_field_base.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_field_base.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_field_base.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_generator.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_generator.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_generator.h b/src/thirdparty/protobuf/compiler/csharp/csharp_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_generator.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_generator_unittest.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_generator_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_generator_unittest.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_generator_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_helpers.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_helpers.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_helpers.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_helpers.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_helpers.h b/src/thirdparty/protobuf/compiler/csharp/csharp_helpers.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_helpers.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_helpers.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_map_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_map_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_map_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_map_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_map_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_map_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_map_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_map_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_message.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_message.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_message.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_message.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_message.h b/src/thirdparty/protobuf/compiler/csharp/csharp_message.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_message.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_message.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_message_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_message_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_message_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_message_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_message_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_message_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_message_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_message_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_names.h b/src/thirdparty/protobuf/compiler/csharp/csharp_names.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_names.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_names.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_options.h b/src/thirdparty/protobuf/compiler/csharp/csharp_options.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_options.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_options.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_primitive_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.h b/src/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_reflection_class.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_repeated_enum_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_repeated_message_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.h b/src/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_source_generator_base.h
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.cc b/src/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.cc
rename to src/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.h b/src/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.h
rename to src/thirdparty/protobuf/compiler/csharp/csharp_wrapper_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/importer.cc b/src/thirdparty/protobuf/compiler/importer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/importer.cc
rename to src/thirdparty/protobuf/compiler/importer.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/importer.h b/src/thirdparty/protobuf/compiler/importer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/importer.h
rename to src/thirdparty/protobuf/compiler/importer.h
diff --git a/r5dev/thirdparty/protobuf/compiler/importer_unittest.cc b/src/thirdparty/protobuf/compiler/importer_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/importer_unittest.cc
rename to src/thirdparty/protobuf/compiler/importer_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/context.cc b/src/thirdparty/protobuf/compiler/java/context.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/context.cc
rename to src/thirdparty/protobuf/compiler/java/context.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/context.h b/src/thirdparty/protobuf/compiler/java/context.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/context.h
rename to src/thirdparty/protobuf/compiler/java/context.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/doc_comment.cc b/src/thirdparty/protobuf/compiler/java/doc_comment.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/doc_comment.cc
rename to src/thirdparty/protobuf/compiler/java/doc_comment.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/doc_comment.h b/src/thirdparty/protobuf/compiler/java/doc_comment.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/doc_comment.h
rename to src/thirdparty/protobuf/compiler/java/doc_comment.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/doc_comment_unittest.cc b/src/thirdparty/protobuf/compiler/java/doc_comment_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/doc_comment_unittest.cc
rename to src/thirdparty/protobuf/compiler/java/doc_comment_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum.cc b/src/thirdparty/protobuf/compiler/java/enum.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum.cc
rename to src/thirdparty/protobuf/compiler/java/enum.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum.h b/src/thirdparty/protobuf/compiler/java/enum.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum.h
rename to src/thirdparty/protobuf/compiler/java/enum.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum_field.cc b/src/thirdparty/protobuf/compiler/java/enum_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum_field.cc
rename to src/thirdparty/protobuf/compiler/java/enum_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum_field.h b/src/thirdparty/protobuf/compiler/java/enum_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum_field.h
rename to src/thirdparty/protobuf/compiler/java/enum_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum_field_lite.cc b/src/thirdparty/protobuf/compiler/java/enum_field_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum_field_lite.cc
rename to src/thirdparty/protobuf/compiler/java/enum_field_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum_field_lite.h b/src/thirdparty/protobuf/compiler/java/enum_field_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum_field_lite.h
rename to src/thirdparty/protobuf/compiler/java/enum_field_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum_lite.cc b/src/thirdparty/protobuf/compiler/java/enum_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum_lite.cc
rename to src/thirdparty/protobuf/compiler/java/enum_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/enum_lite.h b/src/thirdparty/protobuf/compiler/java/enum_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/enum_lite.h
rename to src/thirdparty/protobuf/compiler/java/enum_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/extension.cc b/src/thirdparty/protobuf/compiler/java/extension.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/extension.cc
rename to src/thirdparty/protobuf/compiler/java/extension.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/extension.h b/src/thirdparty/protobuf/compiler/java/extension.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/extension.h
rename to src/thirdparty/protobuf/compiler/java/extension.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/extension_lite.cc b/src/thirdparty/protobuf/compiler/java/extension_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/extension_lite.cc
rename to src/thirdparty/protobuf/compiler/java/extension_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/extension_lite.h b/src/thirdparty/protobuf/compiler/java/extension_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/extension_lite.h
rename to src/thirdparty/protobuf/compiler/java/extension_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/field.cc b/src/thirdparty/protobuf/compiler/java/field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/field.cc
rename to src/thirdparty/protobuf/compiler/java/field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/field.h b/src/thirdparty/protobuf/compiler/java/field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/field.h
rename to src/thirdparty/protobuf/compiler/java/field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/file.cc b/src/thirdparty/protobuf/compiler/java/file.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/file.cc
rename to src/thirdparty/protobuf/compiler/java/file.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/file.h b/src/thirdparty/protobuf/compiler/java/file.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/file.h
rename to src/thirdparty/protobuf/compiler/java/file.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/generator.cc b/src/thirdparty/protobuf/compiler/java/generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/generator.cc
rename to src/thirdparty/protobuf/compiler/java/generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/generator.h b/src/thirdparty/protobuf/compiler/java/generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/generator.h
rename to src/thirdparty/protobuf/compiler/java/generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/generator_factory.cc b/src/thirdparty/protobuf/compiler/java/generator_factory.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/generator_factory.cc
rename to src/thirdparty/protobuf/compiler/java/generator_factory.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/generator_factory.h b/src/thirdparty/protobuf/compiler/java/generator_factory.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/generator_factory.h
rename to src/thirdparty/protobuf/compiler/java/generator_factory.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/helpers.cc b/src/thirdparty/protobuf/compiler/java/helpers.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/helpers.cc
rename to src/thirdparty/protobuf/compiler/java/helpers.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/helpers.h b/src/thirdparty/protobuf/compiler/java/helpers.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/helpers.h
rename to src/thirdparty/protobuf/compiler/java/helpers.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/java_generator.h b/src/thirdparty/protobuf/compiler/java/java_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/java_generator.h
rename to src/thirdparty/protobuf/compiler/java/java_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/kotlin_generator.cc b/src/thirdparty/protobuf/compiler/java/kotlin_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/kotlin_generator.cc
rename to src/thirdparty/protobuf/compiler/java/kotlin_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/kotlin_generator.h b/src/thirdparty/protobuf/compiler/java/kotlin_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/kotlin_generator.h
rename to src/thirdparty/protobuf/compiler/java/kotlin_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/map_field.cc b/src/thirdparty/protobuf/compiler/java/map_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/map_field.cc
rename to src/thirdparty/protobuf/compiler/java/map_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/map_field.h b/src/thirdparty/protobuf/compiler/java/map_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/map_field.h
rename to src/thirdparty/protobuf/compiler/java/map_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/map_field_lite.cc b/src/thirdparty/protobuf/compiler/java/map_field_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/map_field_lite.cc
rename to src/thirdparty/protobuf/compiler/java/map_field_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/map_field_lite.h b/src/thirdparty/protobuf/compiler/java/map_field_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/map_field_lite.h
rename to src/thirdparty/protobuf/compiler/java/map_field_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message.cc b/src/thirdparty/protobuf/compiler/java/message.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message.cc
rename to src/thirdparty/protobuf/compiler/java/message.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message.h b/src/thirdparty/protobuf/compiler/java/message.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message.h
rename to src/thirdparty/protobuf/compiler/java/message.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_builder.cc b/src/thirdparty/protobuf/compiler/java/message_builder.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_builder.cc
rename to src/thirdparty/protobuf/compiler/java/message_builder.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_builder.h b/src/thirdparty/protobuf/compiler/java/message_builder.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_builder.h
rename to src/thirdparty/protobuf/compiler/java/message_builder.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_builder_lite.cc b/src/thirdparty/protobuf/compiler/java/message_builder_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_builder_lite.cc
rename to src/thirdparty/protobuf/compiler/java/message_builder_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_builder_lite.h b/src/thirdparty/protobuf/compiler/java/message_builder_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_builder_lite.h
rename to src/thirdparty/protobuf/compiler/java/message_builder_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_field.cc b/src/thirdparty/protobuf/compiler/java/message_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_field.cc
rename to src/thirdparty/protobuf/compiler/java/message_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_field.h b/src/thirdparty/protobuf/compiler/java/message_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_field.h
rename to src/thirdparty/protobuf/compiler/java/message_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_field_lite.cc b/src/thirdparty/protobuf/compiler/java/message_field_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_field_lite.cc
rename to src/thirdparty/protobuf/compiler/java/message_field_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_field_lite.h b/src/thirdparty/protobuf/compiler/java/message_field_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_field_lite.h
rename to src/thirdparty/protobuf/compiler/java/message_field_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_lite.cc b/src/thirdparty/protobuf/compiler/java/message_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_lite.cc
rename to src/thirdparty/protobuf/compiler/java/message_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/message_lite.h b/src/thirdparty/protobuf/compiler/java/message_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/message_lite.h
rename to src/thirdparty/protobuf/compiler/java/message_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/name_resolver.cc b/src/thirdparty/protobuf/compiler/java/name_resolver.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/name_resolver.cc
rename to src/thirdparty/protobuf/compiler/java/name_resolver.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/name_resolver.h b/src/thirdparty/protobuf/compiler/java/name_resolver.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/name_resolver.h
rename to src/thirdparty/protobuf/compiler/java/name_resolver.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/names.h b/src/thirdparty/protobuf/compiler/java/names.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/names.h
rename to src/thirdparty/protobuf/compiler/java/names.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/options.h b/src/thirdparty/protobuf/compiler/java/options.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/options.h
rename to src/thirdparty/protobuf/compiler/java/options.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/plugin_unittest.cc b/src/thirdparty/protobuf/compiler/java/plugin_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/plugin_unittest.cc
rename to src/thirdparty/protobuf/compiler/java/plugin_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/primitive_field.cc b/src/thirdparty/protobuf/compiler/java/primitive_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/primitive_field.cc
rename to src/thirdparty/protobuf/compiler/java/primitive_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/primitive_field.h b/src/thirdparty/protobuf/compiler/java/primitive_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/primitive_field.h
rename to src/thirdparty/protobuf/compiler/java/primitive_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/primitive_field_lite.cc b/src/thirdparty/protobuf/compiler/java/primitive_field_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/primitive_field_lite.cc
rename to src/thirdparty/protobuf/compiler/java/primitive_field_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/primitive_field_lite.h b/src/thirdparty/protobuf/compiler/java/primitive_field_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/primitive_field_lite.h
rename to src/thirdparty/protobuf/compiler/java/primitive_field_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/service.cc b/src/thirdparty/protobuf/compiler/java/service.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/service.cc
rename to src/thirdparty/protobuf/compiler/java/service.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/service.h b/src/thirdparty/protobuf/compiler/java/service.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/service.h
rename to src/thirdparty/protobuf/compiler/java/service.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/shared_code_generator.cc b/src/thirdparty/protobuf/compiler/java/shared_code_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/shared_code_generator.cc
rename to src/thirdparty/protobuf/compiler/java/shared_code_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/shared_code_generator.h b/src/thirdparty/protobuf/compiler/java/shared_code_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/shared_code_generator.h
rename to src/thirdparty/protobuf/compiler/java/shared_code_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/string_field.cc b/src/thirdparty/protobuf/compiler/java/string_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/string_field.cc
rename to src/thirdparty/protobuf/compiler/java/string_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/string_field.h b/src/thirdparty/protobuf/compiler/java/string_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/string_field.h
rename to src/thirdparty/protobuf/compiler/java/string_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/java/string_field_lite.cc b/src/thirdparty/protobuf/compiler/java/string_field_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/string_field_lite.cc
rename to src/thirdparty/protobuf/compiler/java/string_field_lite.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/java/string_field_lite.h b/src/thirdparty/protobuf/compiler/java/string_field_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/java/string_field_lite.h
rename to src/thirdparty/protobuf/compiler/java/string_field_lite.h
diff --git a/r5dev/thirdparty/protobuf/compiler/main.cc b/src/thirdparty/protobuf/compiler/main.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/main.cc
rename to src/thirdparty/protobuf/compiler/main.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/mock_code_generator.cc b/src/thirdparty/protobuf/compiler/mock_code_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/mock_code_generator.cc
rename to src/thirdparty/protobuf/compiler/mock_code_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/mock_code_generator.h b/src/thirdparty/protobuf/compiler/mock_code_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/mock_code_generator.h
rename to src/thirdparty/protobuf/compiler/mock_code_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_enum.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_enum.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_enum.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_enum.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_enum_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_extension.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_extension.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_extension.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_extension.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_extension.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_extension.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_extension.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_extension.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_field.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_field.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_field.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_field.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_file.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_file.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_file.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_file.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_file.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_file.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_file.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_file.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_generator.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_generator.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_generator.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_generator.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_helpers.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_map_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_message.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_message.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_message.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_message.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_message_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_nsobject_methods.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_nsobject_methods.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_nsobject_methods.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_nsobject_methods.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_oneof.h
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.cc b/src/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.cc
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.h b/src/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.h
rename to src/thirdparty/protobuf/compiler/objectivec/objectivec_primitive_field.h
diff --git a/r5dev/thirdparty/protobuf/compiler/package_info.h b/src/thirdparty/protobuf/compiler/package_info.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/package_info.h
rename to src/thirdparty/protobuf/compiler/package_info.h
diff --git a/r5dev/thirdparty/protobuf/compiler/parser.cc b/src/thirdparty/protobuf/compiler/parser.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/parser.cc
rename to src/thirdparty/protobuf/compiler/parser.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/parser.h b/src/thirdparty/protobuf/compiler/parser.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/parser.h
rename to src/thirdparty/protobuf/compiler/parser.h
diff --git a/r5dev/thirdparty/protobuf/compiler/parser_unittest.cc b/src/thirdparty/protobuf/compiler/parser_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/parser_unittest.cc
rename to src/thirdparty/protobuf/compiler/parser_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/php/php_generator.cc b/src/thirdparty/protobuf/compiler/php/php_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/php/php_generator.cc
rename to src/thirdparty/protobuf/compiler/php/php_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/php/php_generator.h b/src/thirdparty/protobuf/compiler/php/php_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/php/php_generator.h
rename to src/thirdparty/protobuf/compiler/php/php_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/plugin.cc b/src/thirdparty/protobuf/compiler/plugin.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/plugin.cc
rename to src/thirdparty/protobuf/compiler/plugin.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/plugin.h b/src/thirdparty/protobuf/compiler/plugin.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/plugin.h
rename to src/thirdparty/protobuf/compiler/plugin.h
diff --git a/r5dev/thirdparty/protobuf/compiler/plugin.pb.cc b/src/thirdparty/protobuf/compiler/plugin.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/plugin.pb.cc
rename to src/thirdparty/protobuf/compiler/plugin.pb.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/plugin.pb.h b/src/thirdparty/protobuf/compiler/plugin.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/plugin.pb.h
rename to src/thirdparty/protobuf/compiler/plugin.pb.h
diff --git a/r5dev/thirdparty/protobuf/compiler/plugin.proto b/src/thirdparty/protobuf/compiler/plugin.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/plugin.proto
rename to src/thirdparty/protobuf/compiler/plugin.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/python/generator.cc b/src/thirdparty/protobuf/compiler/python/generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/generator.cc
rename to src/thirdparty/protobuf/compiler/python/generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/python/generator.h b/src/thirdparty/protobuf/compiler/python/generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/generator.h
rename to src/thirdparty/protobuf/compiler/python/generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/python/helpers.cc b/src/thirdparty/protobuf/compiler/python/helpers.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/helpers.cc
rename to src/thirdparty/protobuf/compiler/python/helpers.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/python/helpers.h b/src/thirdparty/protobuf/compiler/python/helpers.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/helpers.h
rename to src/thirdparty/protobuf/compiler/python/helpers.h
diff --git a/r5dev/thirdparty/protobuf/compiler/python/plugin_unittest.cc b/src/thirdparty/protobuf/compiler/python/plugin_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/plugin_unittest.cc
rename to src/thirdparty/protobuf/compiler/python/plugin_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/python/pyi_generator.cc b/src/thirdparty/protobuf/compiler/python/pyi_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/pyi_generator.cc
rename to src/thirdparty/protobuf/compiler/python/pyi_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/python/pyi_generator.h b/src/thirdparty/protobuf/compiler/python/pyi_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/pyi_generator.h
rename to src/thirdparty/protobuf/compiler/python/pyi_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/python/python_generator.h b/src/thirdparty/protobuf/compiler/python/python_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/python/python_generator.h
rename to src/thirdparty/protobuf/compiler/python/python_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code.proto b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_code.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code.proto
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_code.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_pb.rb b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_pb.rb
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_pb.rb
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_pb.rb
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2.proto b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2.proto
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb b/src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generator.cc b/src/thirdparty/protobuf/compiler/ruby/ruby_generator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generator.cc
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generator.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generator.h b/src/thirdparty/protobuf/compiler/ruby/ruby_generator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generator.h
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generator.h
diff --git a/r5dev/thirdparty/protobuf/compiler/ruby/ruby_generator_unittest.cc b/src/thirdparty/protobuf/compiler/ruby/ruby_generator_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/ruby/ruby_generator_unittest.cc
rename to src/thirdparty/protobuf/compiler/ruby/ruby_generator_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/scc.h b/src/thirdparty/protobuf/compiler/scc.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/scc.h
rename to src/thirdparty/protobuf/compiler/scc.h
diff --git a/r5dev/thirdparty/protobuf/compiler/subprocess.cc b/src/thirdparty/protobuf/compiler/subprocess.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/subprocess.cc
rename to src/thirdparty/protobuf/compiler/subprocess.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/subprocess.h b/src/thirdparty/protobuf/compiler/subprocess.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/subprocess.h
rename to src/thirdparty/protobuf/compiler/subprocess.h
diff --git a/r5dev/thirdparty/protobuf/compiler/test_plugin.cc b/src/thirdparty/protobuf/compiler/test_plugin.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/test_plugin.cc
rename to src/thirdparty/protobuf/compiler/test_plugin.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/zip_output_unittest.sh b/src/thirdparty/protobuf/compiler/zip_output_unittest.sh
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/zip_output_unittest.sh
rename to src/thirdparty/protobuf/compiler/zip_output_unittest.sh
diff --git a/r5dev/thirdparty/protobuf/compiler/zip_writer.cc b/src/thirdparty/protobuf/compiler/zip_writer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/zip_writer.cc
rename to src/thirdparty/protobuf/compiler/zip_writer.cc
diff --git a/r5dev/thirdparty/protobuf/compiler/zip_writer.h b/src/thirdparty/protobuf/compiler/zip_writer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/compiler/zip_writer.h
rename to src/thirdparty/protobuf/compiler/zip_writer.h
diff --git a/r5dev/thirdparty/protobuf/descriptor.cc b/src/thirdparty/protobuf/descriptor.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor.cc
rename to src/thirdparty/protobuf/descriptor.cc
diff --git a/r5dev/thirdparty/protobuf/descriptor.h b/src/thirdparty/protobuf/descriptor.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor.h
rename to src/thirdparty/protobuf/descriptor.h
diff --git a/r5dev/thirdparty/protobuf/descriptor.pb.cc b/src/thirdparty/protobuf/descriptor.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor.pb.cc
rename to src/thirdparty/protobuf/descriptor.pb.cc
diff --git a/r5dev/thirdparty/protobuf/descriptor.pb.h b/src/thirdparty/protobuf/descriptor.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor.pb.h
rename to src/thirdparty/protobuf/descriptor.pb.h
diff --git a/r5dev/thirdparty/protobuf/descriptor.proto b/src/thirdparty/protobuf/descriptor.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor.proto
rename to src/thirdparty/protobuf/descriptor.proto
diff --git a/r5dev/thirdparty/protobuf/descriptor_database.cc b/src/thirdparty/protobuf/descriptor_database.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor_database.cc
rename to src/thirdparty/protobuf/descriptor_database.cc
diff --git a/r5dev/thirdparty/protobuf/descriptor_database.h b/src/thirdparty/protobuf/descriptor_database.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor_database.h
rename to src/thirdparty/protobuf/descriptor_database.h
diff --git a/r5dev/thirdparty/protobuf/descriptor_database_unittest.cc b/src/thirdparty/protobuf/descriptor_database_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor_database_unittest.cc
rename to src/thirdparty/protobuf/descriptor_database_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/descriptor_unittest.cc b/src/thirdparty/protobuf/descriptor_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/descriptor_unittest.cc
rename to src/thirdparty/protobuf/descriptor_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/drop_unknown_fields_test.cc b/src/thirdparty/protobuf/drop_unknown_fields_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/drop_unknown_fields_test.cc
rename to src/thirdparty/protobuf/drop_unknown_fields_test.cc
diff --git a/r5dev/thirdparty/protobuf/duration.pb.cc b/src/thirdparty/protobuf/duration.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/duration.pb.cc
rename to src/thirdparty/protobuf/duration.pb.cc
diff --git a/r5dev/thirdparty/protobuf/duration.pb.h b/src/thirdparty/protobuf/duration.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/duration.pb.h
rename to src/thirdparty/protobuf/duration.pb.h
diff --git a/r5dev/thirdparty/protobuf/duration.proto b/src/thirdparty/protobuf/duration.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/duration.proto
rename to src/thirdparty/protobuf/duration.proto
diff --git a/r5dev/thirdparty/protobuf/dynamic_message.cc b/src/thirdparty/protobuf/dynamic_message.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/dynamic_message.cc
rename to src/thirdparty/protobuf/dynamic_message.cc
diff --git a/r5dev/thirdparty/protobuf/dynamic_message.h b/src/thirdparty/protobuf/dynamic_message.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/dynamic_message.h
rename to src/thirdparty/protobuf/dynamic_message.h
diff --git a/r5dev/thirdparty/protobuf/dynamic_message_unittest.cc b/src/thirdparty/protobuf/dynamic_message_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/dynamic_message_unittest.cc
rename to src/thirdparty/protobuf/dynamic_message_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/empty.pb.cc b/src/thirdparty/protobuf/empty.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/empty.pb.cc
rename to src/thirdparty/protobuf/empty.pb.cc
diff --git a/r5dev/thirdparty/protobuf/empty.pb.h b/src/thirdparty/protobuf/empty.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/empty.pb.h
rename to src/thirdparty/protobuf/empty.pb.h
diff --git a/r5dev/thirdparty/protobuf/empty.proto b/src/thirdparty/protobuf/empty.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/empty.proto
rename to src/thirdparty/protobuf/empty.proto
diff --git a/r5dev/thirdparty/protobuf/endian.h b/src/thirdparty/protobuf/endian.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/endian.h
rename to src/thirdparty/protobuf/endian.h
diff --git a/r5dev/thirdparty/protobuf/explicitly_constructed.h b/src/thirdparty/protobuf/explicitly_constructed.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/explicitly_constructed.h
rename to src/thirdparty/protobuf/explicitly_constructed.h
diff --git a/r5dev/thirdparty/protobuf/extension_set.cc b/src/thirdparty/protobuf/extension_set.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/extension_set.cc
rename to src/thirdparty/protobuf/extension_set.cc
diff --git a/r5dev/thirdparty/protobuf/extension_set.h b/src/thirdparty/protobuf/extension_set.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/extension_set.h
rename to src/thirdparty/protobuf/extension_set.h
diff --git a/r5dev/thirdparty/protobuf/extension_set_heavy.cc b/src/thirdparty/protobuf/extension_set_heavy.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/extension_set_heavy.cc
rename to src/thirdparty/protobuf/extension_set_heavy.cc
diff --git a/r5dev/thirdparty/protobuf/extension_set_inl.h b/src/thirdparty/protobuf/extension_set_inl.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/extension_set_inl.h
rename to src/thirdparty/protobuf/extension_set_inl.h
diff --git a/r5dev/thirdparty/protobuf/extension_set_unittest.cc b/src/thirdparty/protobuf/extension_set_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/extension_set_unittest.cc
rename to src/thirdparty/protobuf/extension_set_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/field_access_listener.h b/src/thirdparty/protobuf/field_access_listener.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/field_access_listener.h
rename to src/thirdparty/protobuf/field_access_listener.h
diff --git a/r5dev/thirdparty/protobuf/field_mask.pb.cc b/src/thirdparty/protobuf/field_mask.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/field_mask.pb.cc
rename to src/thirdparty/protobuf/field_mask.pb.cc
diff --git a/r5dev/thirdparty/protobuf/field_mask.pb.h b/src/thirdparty/protobuf/field_mask.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/field_mask.pb.h
rename to src/thirdparty/protobuf/field_mask.pb.h
diff --git a/r5dev/thirdparty/protobuf/field_mask.proto b/src/thirdparty/protobuf/field_mask.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/field_mask.proto
rename to src/thirdparty/protobuf/field_mask.proto
diff --git a/r5dev/thirdparty/protobuf/generated_enum_reflection.h b/src/thirdparty/protobuf/generated_enum_reflection.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_enum_reflection.h
rename to src/thirdparty/protobuf/generated_enum_reflection.h
diff --git a/r5dev/thirdparty/protobuf/generated_enum_util.cc b/src/thirdparty/protobuf/generated_enum_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_enum_util.cc
rename to src/thirdparty/protobuf/generated_enum_util.cc
diff --git a/r5dev/thirdparty/protobuf/generated_enum_util.h b/src/thirdparty/protobuf/generated_enum_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_enum_util.h
rename to src/thirdparty/protobuf/generated_enum_util.h
diff --git a/r5dev/thirdparty/protobuf/generated_message_bases.cc b/src/thirdparty/protobuf/generated_message_bases.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_bases.cc
rename to src/thirdparty/protobuf/generated_message_bases.cc
diff --git a/r5dev/thirdparty/protobuf/generated_message_bases.h b/src/thirdparty/protobuf/generated_message_bases.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_bases.h
rename to src/thirdparty/protobuf/generated_message_bases.h
diff --git a/r5dev/thirdparty/protobuf/generated_message_reflection.cc b/src/thirdparty/protobuf/generated_message_reflection.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_reflection.cc
rename to src/thirdparty/protobuf/generated_message_reflection.cc
diff --git a/r5dev/thirdparty/protobuf/generated_message_reflection.h b/src/thirdparty/protobuf/generated_message_reflection.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_reflection.h
rename to src/thirdparty/protobuf/generated_message_reflection.h
diff --git a/r5dev/thirdparty/protobuf/generated_message_reflection_unittest.cc b/src/thirdparty/protobuf/generated_message_reflection_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_reflection_unittest.cc
rename to src/thirdparty/protobuf/generated_message_reflection_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/generated_message_tctable_decl.h b/src/thirdparty/protobuf/generated_message_tctable_decl.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_tctable_decl.h
rename to src/thirdparty/protobuf/generated_message_tctable_decl.h
diff --git a/r5dev/thirdparty/protobuf/generated_message_tctable_full.cc b/src/thirdparty/protobuf/generated_message_tctable_full.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_tctable_full.cc
rename to src/thirdparty/protobuf/generated_message_tctable_full.cc
diff --git a/r5dev/thirdparty/protobuf/generated_message_tctable_impl.h b/src/thirdparty/protobuf/generated_message_tctable_impl.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_tctable_impl.h
rename to src/thirdparty/protobuf/generated_message_tctable_impl.h
diff --git a/r5dev/thirdparty/protobuf/generated_message_tctable_lite.cc b/src/thirdparty/protobuf/generated_message_tctable_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_tctable_lite.cc
rename to src/thirdparty/protobuf/generated_message_tctable_lite.cc
diff --git a/r5dev/thirdparty/protobuf/generated_message_tctable_lite_test.cc b/src/thirdparty/protobuf/generated_message_tctable_lite_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_tctable_lite_test.cc
rename to src/thirdparty/protobuf/generated_message_tctable_lite_test.cc
diff --git a/r5dev/thirdparty/protobuf/generated_message_util.cc b/src/thirdparty/protobuf/generated_message_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_util.cc
rename to src/thirdparty/protobuf/generated_message_util.cc
diff --git a/r5dev/thirdparty/protobuf/generated_message_util.h b/src/thirdparty/protobuf/generated_message_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/generated_message_util.h
rename to src/thirdparty/protobuf/generated_message_util.h
diff --git a/r5dev/thirdparty/protobuf/has_bits.h b/src/thirdparty/protobuf/has_bits.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/has_bits.h
rename to src/thirdparty/protobuf/has_bits.h
diff --git a/r5dev/thirdparty/protobuf/implicit_weak_message.cc b/src/thirdparty/protobuf/implicit_weak_message.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/implicit_weak_message.cc
rename to src/thirdparty/protobuf/implicit_weak_message.cc
diff --git a/r5dev/thirdparty/protobuf/implicit_weak_message.h b/src/thirdparty/protobuf/implicit_weak_message.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/implicit_weak_message.h
rename to src/thirdparty/protobuf/implicit_weak_message.h
diff --git a/r5dev/thirdparty/protobuf/inlined_string_field.cc b/src/thirdparty/protobuf/inlined_string_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/inlined_string_field.cc
rename to src/thirdparty/protobuf/inlined_string_field.cc
diff --git a/r5dev/thirdparty/protobuf/inlined_string_field.h b/src/thirdparty/protobuf/inlined_string_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/inlined_string_field.h
rename to src/thirdparty/protobuf/inlined_string_field.h
diff --git a/r5dev/thirdparty/protobuf/inlined_string_field_unittest.cc b/src/thirdparty/protobuf/inlined_string_field_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/inlined_string_field_unittest.cc
rename to src/thirdparty/protobuf/inlined_string_field_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/io/coded_stream.cc b/src/thirdparty/protobuf/io/coded_stream.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/coded_stream.cc
rename to src/thirdparty/protobuf/io/coded_stream.cc
diff --git a/r5dev/thirdparty/protobuf/io/coded_stream.h b/src/thirdparty/protobuf/io/coded_stream.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/coded_stream.h
rename to src/thirdparty/protobuf/io/coded_stream.h
diff --git a/r5dev/thirdparty/protobuf/io/coded_stream_unittest.cc b/src/thirdparty/protobuf/io/coded_stream_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/coded_stream_unittest.cc
rename to src/thirdparty/protobuf/io/coded_stream_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/io/gzip_stream.cc b/src/thirdparty/protobuf/io/gzip_stream.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/gzip_stream.cc
rename to src/thirdparty/protobuf/io/gzip_stream.cc
diff --git a/r5dev/thirdparty/protobuf/io/gzip_stream.h b/src/thirdparty/protobuf/io/gzip_stream.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/gzip_stream.h
rename to src/thirdparty/protobuf/io/gzip_stream.h
diff --git a/r5dev/thirdparty/protobuf/io/gzip_stream_unittest.sh b/src/thirdparty/protobuf/io/gzip_stream_unittest.sh
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/gzip_stream_unittest.sh
rename to src/thirdparty/protobuf/io/gzip_stream_unittest.sh
diff --git a/r5dev/thirdparty/protobuf/io/io_win32.cc b/src/thirdparty/protobuf/io/io_win32.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/io_win32.cc
rename to src/thirdparty/protobuf/io/io_win32.cc
diff --git a/r5dev/thirdparty/protobuf/io/io_win32.h b/src/thirdparty/protobuf/io/io_win32.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/io_win32.h
rename to src/thirdparty/protobuf/io/io_win32.h
diff --git a/r5dev/thirdparty/protobuf/io/io_win32_unittest.cc b/src/thirdparty/protobuf/io/io_win32_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/io_win32_unittest.cc
rename to src/thirdparty/protobuf/io/io_win32_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/io/package_info.h b/src/thirdparty/protobuf/io/package_info.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/package_info.h
rename to src/thirdparty/protobuf/io/package_info.h
diff --git a/r5dev/thirdparty/protobuf/io/printer.cc b/src/thirdparty/protobuf/io/printer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/printer.cc
rename to src/thirdparty/protobuf/io/printer.cc
diff --git a/r5dev/thirdparty/protobuf/io/printer.h b/src/thirdparty/protobuf/io/printer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/printer.h
rename to src/thirdparty/protobuf/io/printer.h
diff --git a/r5dev/thirdparty/protobuf/io/printer_unittest.cc b/src/thirdparty/protobuf/io/printer_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/printer_unittest.cc
rename to src/thirdparty/protobuf/io/printer_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/io/strtod.cc b/src/thirdparty/protobuf/io/strtod.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/strtod.cc
rename to src/thirdparty/protobuf/io/strtod.cc
diff --git a/r5dev/thirdparty/protobuf/io/strtod.h b/src/thirdparty/protobuf/io/strtod.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/strtod.h
rename to src/thirdparty/protobuf/io/strtod.h
diff --git a/r5dev/thirdparty/protobuf/io/tokenizer.cc b/src/thirdparty/protobuf/io/tokenizer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/tokenizer.cc
rename to src/thirdparty/protobuf/io/tokenizer.cc
diff --git a/r5dev/thirdparty/protobuf/io/tokenizer.h b/src/thirdparty/protobuf/io/tokenizer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/tokenizer.h
rename to src/thirdparty/protobuf/io/tokenizer.h
diff --git a/r5dev/thirdparty/protobuf/io/tokenizer_unittest.cc b/src/thirdparty/protobuf/io/tokenizer_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/tokenizer_unittest.cc
rename to src/thirdparty/protobuf/io/tokenizer_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/io/zero_copy_stream.cc b/src/thirdparty/protobuf/io/zero_copy_stream.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/zero_copy_stream.cc
rename to src/thirdparty/protobuf/io/zero_copy_stream.cc
diff --git a/r5dev/thirdparty/protobuf/io/zero_copy_stream.h b/src/thirdparty/protobuf/io/zero_copy_stream.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/zero_copy_stream.h
rename to src/thirdparty/protobuf/io/zero_copy_stream.h
diff --git a/r5dev/thirdparty/protobuf/io/zero_copy_stream_impl.cc b/src/thirdparty/protobuf/io/zero_copy_stream_impl.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/zero_copy_stream_impl.cc
rename to src/thirdparty/protobuf/io/zero_copy_stream_impl.cc
diff --git a/r5dev/thirdparty/protobuf/io/zero_copy_stream_impl.h b/src/thirdparty/protobuf/io/zero_copy_stream_impl.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/zero_copy_stream_impl.h
rename to src/thirdparty/protobuf/io/zero_copy_stream_impl.h
diff --git a/r5dev/thirdparty/protobuf/io/zero_copy_stream_impl_lite.cc b/src/thirdparty/protobuf/io/zero_copy_stream_impl_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/zero_copy_stream_impl_lite.cc
rename to src/thirdparty/protobuf/io/zero_copy_stream_impl_lite.cc
diff --git a/r5dev/thirdparty/protobuf/io/zero_copy_stream_impl_lite.h b/src/thirdparty/protobuf/io/zero_copy_stream_impl_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/zero_copy_stream_impl_lite.h
rename to src/thirdparty/protobuf/io/zero_copy_stream_impl_lite.h
diff --git a/r5dev/thirdparty/protobuf/io/zero_copy_stream_unittest.cc b/src/thirdparty/protobuf/io/zero_copy_stream_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/io/zero_copy_stream_unittest.cc
rename to src/thirdparty/protobuf/io/zero_copy_stream_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/lite_arena_unittest.cc b/src/thirdparty/protobuf/lite_arena_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/lite_arena_unittest.cc
rename to src/thirdparty/protobuf/lite_arena_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/lite_unittest.cc b/src/thirdparty/protobuf/lite_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/lite_unittest.cc
rename to src/thirdparty/protobuf/lite_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/map.cc b/src/thirdparty/protobuf/map.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/map.cc
rename to src/thirdparty/protobuf/map.cc
diff --git a/r5dev/thirdparty/protobuf/map.h b/src/thirdparty/protobuf/map.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map.h
rename to src/thirdparty/protobuf/map.h
diff --git a/r5dev/thirdparty/protobuf/map_entry.h b/src/thirdparty/protobuf/map_entry.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_entry.h
rename to src/thirdparty/protobuf/map_entry.h
diff --git a/r5dev/thirdparty/protobuf/map_entry_lite.h b/src/thirdparty/protobuf/map_entry_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_entry_lite.h
rename to src/thirdparty/protobuf/map_entry_lite.h
diff --git a/r5dev/thirdparty/protobuf/map_field.cc b/src/thirdparty/protobuf/map_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_field.cc
rename to src/thirdparty/protobuf/map_field.cc
diff --git a/r5dev/thirdparty/protobuf/map_field.h b/src/thirdparty/protobuf/map_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_field.h
rename to src/thirdparty/protobuf/map_field.h
diff --git a/r5dev/thirdparty/protobuf/map_field_inl.h b/src/thirdparty/protobuf/map_field_inl.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_field_inl.h
rename to src/thirdparty/protobuf/map_field_inl.h
diff --git a/r5dev/thirdparty/protobuf/map_field_lite.h b/src/thirdparty/protobuf/map_field_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_field_lite.h
rename to src/thirdparty/protobuf/map_field_lite.h
diff --git a/r5dev/thirdparty/protobuf/map_field_test.cc b/src/thirdparty/protobuf/map_field_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_field_test.cc
rename to src/thirdparty/protobuf/map_field_test.cc
diff --git a/r5dev/thirdparty/protobuf/map_lite_test_util.cc b/src/thirdparty/protobuf/map_lite_test_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_lite_test_util.cc
rename to src/thirdparty/protobuf/map_lite_test_util.cc
diff --git a/r5dev/thirdparty/protobuf/map_lite_test_util.h b/src/thirdparty/protobuf/map_lite_test_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_lite_test_util.h
rename to src/thirdparty/protobuf/map_lite_test_util.h
diff --git a/r5dev/thirdparty/protobuf/map_lite_unittest.proto b/src/thirdparty/protobuf/map_lite_unittest.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_lite_unittest.proto
rename to src/thirdparty/protobuf/map_lite_unittest.proto
diff --git a/r5dev/thirdparty/protobuf/map_proto2_unittest.proto b/src/thirdparty/protobuf/map_proto2_unittest.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_proto2_unittest.proto
rename to src/thirdparty/protobuf/map_proto2_unittest.proto
diff --git a/r5dev/thirdparty/protobuf/map_test.cc b/src/thirdparty/protobuf/map_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_test.cc
rename to src/thirdparty/protobuf/map_test.cc
diff --git a/r5dev/thirdparty/protobuf/map_test.inc b/src/thirdparty/protobuf/map_test.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_test.inc
rename to src/thirdparty/protobuf/map_test.inc
diff --git a/r5dev/thirdparty/protobuf/map_test_util.h b/src/thirdparty/protobuf/map_test_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_test_util.h
rename to src/thirdparty/protobuf/map_test_util.h
diff --git a/r5dev/thirdparty/protobuf/map_test_util.inc b/src/thirdparty/protobuf/map_test_util.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_test_util.inc
rename to src/thirdparty/protobuf/map_test_util.inc
diff --git a/r5dev/thirdparty/protobuf/map_test_util_impl.h b/src/thirdparty/protobuf/map_test_util_impl.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_test_util_impl.h
rename to src/thirdparty/protobuf/map_test_util_impl.h
diff --git a/r5dev/thirdparty/protobuf/map_type_handler.h b/src/thirdparty/protobuf/map_type_handler.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_type_handler.h
rename to src/thirdparty/protobuf/map_type_handler.h
diff --git a/r5dev/thirdparty/protobuf/map_unittest.proto b/src/thirdparty/protobuf/map_unittest.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/map_unittest.proto
rename to src/thirdparty/protobuf/map_unittest.proto
diff --git a/r5dev/thirdparty/protobuf/message.cc b/src/thirdparty/protobuf/message.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/message.cc
rename to src/thirdparty/protobuf/message.cc
diff --git a/r5dev/thirdparty/protobuf/message.h b/src/thirdparty/protobuf/message.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/message.h
rename to src/thirdparty/protobuf/message.h
diff --git a/r5dev/thirdparty/protobuf/message_lite.cc b/src/thirdparty/protobuf/message_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/message_lite.cc
rename to src/thirdparty/protobuf/message_lite.cc
diff --git a/r5dev/thirdparty/protobuf/message_lite.h b/src/thirdparty/protobuf/message_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/message_lite.h
rename to src/thirdparty/protobuf/message_lite.h
diff --git a/r5dev/thirdparty/protobuf/message_unittest.cc b/src/thirdparty/protobuf/message_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/message_unittest.cc
rename to src/thirdparty/protobuf/message_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/message_unittest.inc b/src/thirdparty/protobuf/message_unittest.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/message_unittest.inc
rename to src/thirdparty/protobuf/message_unittest.inc
diff --git a/r5dev/thirdparty/protobuf/metadata.h b/src/thirdparty/protobuf/metadata.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/metadata.h
rename to src/thirdparty/protobuf/metadata.h
diff --git a/r5dev/thirdparty/protobuf/metadata_lite.h b/src/thirdparty/protobuf/metadata_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/metadata_lite.h
rename to src/thirdparty/protobuf/metadata_lite.h
diff --git a/r5dev/thirdparty/protobuf/no_field_presence_test.cc b/src/thirdparty/protobuf/no_field_presence_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/no_field_presence_test.cc
rename to src/thirdparty/protobuf/no_field_presence_test.cc
diff --git a/r5dev/thirdparty/protobuf/package_info.h b/src/thirdparty/protobuf/package_info.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/package_info.h
rename to src/thirdparty/protobuf/package_info.h
diff --git a/r5dev/thirdparty/protobuf/parse_context.cc b/src/thirdparty/protobuf/parse_context.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/parse_context.cc
rename to src/thirdparty/protobuf/parse_context.cc
diff --git a/r5dev/thirdparty/protobuf/parse_context.h b/src/thirdparty/protobuf/parse_context.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/parse_context.h
rename to src/thirdparty/protobuf/parse_context.h
diff --git a/r5dev/thirdparty/protobuf/port.h b/src/thirdparty/protobuf/port.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/port.h
rename to src/thirdparty/protobuf/port.h
diff --git a/r5dev/thirdparty/protobuf/port_def.inc b/src/thirdparty/protobuf/port_def.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/port_def.inc
rename to src/thirdparty/protobuf/port_def.inc
diff --git a/r5dev/thirdparty/protobuf/port_undef.inc b/src/thirdparty/protobuf/port_undef.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/port_undef.inc
rename to src/thirdparty/protobuf/port_undef.inc
diff --git a/r5dev/thirdparty/protobuf/preserve_unknown_enum_test.cc b/src/thirdparty/protobuf/preserve_unknown_enum_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/preserve_unknown_enum_test.cc
rename to src/thirdparty/protobuf/preserve_unknown_enum_test.cc
diff --git a/r5dev/thirdparty/protobuf/proto3_arena_lite_unittest.cc b/src/thirdparty/protobuf/proto3_arena_lite_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/proto3_arena_lite_unittest.cc
rename to src/thirdparty/protobuf/proto3_arena_lite_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/proto3_arena_unittest.cc b/src/thirdparty/protobuf/proto3_arena_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/proto3_arena_unittest.cc
rename to src/thirdparty/protobuf/proto3_arena_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/proto3_lite_unittest.cc b/src/thirdparty/protobuf/proto3_lite_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/proto3_lite_unittest.cc
rename to src/thirdparty/protobuf/proto3_lite_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/proto3_lite_unittest.inc b/src/thirdparty/protobuf/proto3_lite_unittest.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/proto3_lite_unittest.inc
rename to src/thirdparty/protobuf/proto3_lite_unittest.inc
diff --git a/r5dev/thirdparty/protobuf/reflection.h b/src/thirdparty/protobuf/reflection.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/reflection.h
rename to src/thirdparty/protobuf/reflection.h
diff --git a/r5dev/thirdparty/protobuf/reflection_internal.h b/src/thirdparty/protobuf/reflection_internal.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/reflection_internal.h
rename to src/thirdparty/protobuf/reflection_internal.h
diff --git a/r5dev/thirdparty/protobuf/reflection_ops.cc b/src/thirdparty/protobuf/reflection_ops.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/reflection_ops.cc
rename to src/thirdparty/protobuf/reflection_ops.cc
diff --git a/r5dev/thirdparty/protobuf/reflection_ops.h b/src/thirdparty/protobuf/reflection_ops.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/reflection_ops.h
rename to src/thirdparty/protobuf/reflection_ops.h
diff --git a/r5dev/thirdparty/protobuf/reflection_ops_unittest.cc b/src/thirdparty/protobuf/reflection_ops_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/reflection_ops_unittest.cc
rename to src/thirdparty/protobuf/reflection_ops_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/reflection_tester.cc b/src/thirdparty/protobuf/reflection_tester.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/reflection_tester.cc
rename to src/thirdparty/protobuf/reflection_tester.cc
diff --git a/r5dev/thirdparty/protobuf/reflection_tester.h b/src/thirdparty/protobuf/reflection_tester.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/reflection_tester.h
rename to src/thirdparty/protobuf/reflection_tester.h
diff --git a/r5dev/thirdparty/protobuf/repeated_field.cc b/src/thirdparty/protobuf/repeated_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/repeated_field.cc
rename to src/thirdparty/protobuf/repeated_field.cc
diff --git a/r5dev/thirdparty/protobuf/repeated_field.h b/src/thirdparty/protobuf/repeated_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/repeated_field.h
rename to src/thirdparty/protobuf/repeated_field.h
diff --git a/r5dev/thirdparty/protobuf/repeated_field_reflection_unittest.cc b/src/thirdparty/protobuf/repeated_field_reflection_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/repeated_field_reflection_unittest.cc
rename to src/thirdparty/protobuf/repeated_field_reflection_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/repeated_field_unittest.cc b/src/thirdparty/protobuf/repeated_field_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/repeated_field_unittest.cc
rename to src/thirdparty/protobuf/repeated_field_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/repeated_ptr_field.cc b/src/thirdparty/protobuf/repeated_ptr_field.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/repeated_ptr_field.cc
rename to src/thirdparty/protobuf/repeated_ptr_field.cc
diff --git a/r5dev/thirdparty/protobuf/repeated_ptr_field.h b/src/thirdparty/protobuf/repeated_ptr_field.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/repeated_ptr_field.h
rename to src/thirdparty/protobuf/repeated_ptr_field.h
diff --git a/r5dev/thirdparty/protobuf/service.cc b/src/thirdparty/protobuf/service.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/service.cc
rename to src/thirdparty/protobuf/service.cc
diff --git a/r5dev/thirdparty/protobuf/service.h b/src/thirdparty/protobuf/service.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/service.h
rename to src/thirdparty/protobuf/service.h
diff --git a/r5dev/thirdparty/protobuf/source_context.pb.cc b/src/thirdparty/protobuf/source_context.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/source_context.pb.cc
rename to src/thirdparty/protobuf/source_context.pb.cc
diff --git a/r5dev/thirdparty/protobuf/source_context.pb.h b/src/thirdparty/protobuf/source_context.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/source_context.pb.h
rename to src/thirdparty/protobuf/source_context.pb.h
diff --git a/r5dev/thirdparty/protobuf/source_context.proto b/src/thirdparty/protobuf/source_context.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/source_context.proto
rename to src/thirdparty/protobuf/source_context.proto
diff --git a/r5dev/thirdparty/protobuf/string_member_robber.h b/src/thirdparty/protobuf/string_member_robber.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/string_member_robber.h
rename to src/thirdparty/protobuf/string_member_robber.h
diff --git a/r5dev/thirdparty/protobuf/struct.pb.cc b/src/thirdparty/protobuf/struct.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/struct.pb.cc
rename to src/thirdparty/protobuf/struct.pb.cc
diff --git a/r5dev/thirdparty/protobuf/struct.pb.h b/src/thirdparty/protobuf/struct.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/struct.pb.h
rename to src/thirdparty/protobuf/struct.pb.h
diff --git a/r5dev/thirdparty/protobuf/struct.proto b/src/thirdparty/protobuf/struct.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/struct.proto
rename to src/thirdparty/protobuf/struct.proto
diff --git a/r5dev/thirdparty/protobuf/stubs/bytestream.cc b/src/thirdparty/protobuf/stubs/bytestream.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/bytestream.cc
rename to src/thirdparty/protobuf/stubs/bytestream.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/bytestream.h b/src/thirdparty/protobuf/stubs/bytestream.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/bytestream.h
rename to src/thirdparty/protobuf/stubs/bytestream.h
diff --git a/r5dev/thirdparty/protobuf/stubs/bytestream_unittest.cc b/src/thirdparty/protobuf/stubs/bytestream_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/bytestream_unittest.cc
rename to src/thirdparty/protobuf/stubs/bytestream_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/callback.h b/src/thirdparty/protobuf/stubs/callback.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/callback.h
rename to src/thirdparty/protobuf/stubs/callback.h
diff --git a/r5dev/thirdparty/protobuf/stubs/casts.h b/src/thirdparty/protobuf/stubs/casts.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/casts.h
rename to src/thirdparty/protobuf/stubs/casts.h
diff --git a/r5dev/thirdparty/protobuf/stubs/common.cc b/src/thirdparty/protobuf/stubs/common.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/common.cc
rename to src/thirdparty/protobuf/stubs/common.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/common.h b/src/thirdparty/protobuf/stubs/common.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/common.h
rename to src/thirdparty/protobuf/stubs/common.h
diff --git a/r5dev/thirdparty/protobuf/stubs/common_unittest.cc b/src/thirdparty/protobuf/stubs/common_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/common_unittest.cc
rename to src/thirdparty/protobuf/stubs/common_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/hash.h b/src/thirdparty/protobuf/stubs/hash.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/hash.h
rename to src/thirdparty/protobuf/stubs/hash.h
diff --git a/r5dev/thirdparty/protobuf/stubs/int128.cc b/src/thirdparty/protobuf/stubs/int128.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/int128.cc
rename to src/thirdparty/protobuf/stubs/int128.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/int128.h b/src/thirdparty/protobuf/stubs/int128.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/int128.h
rename to src/thirdparty/protobuf/stubs/int128.h
diff --git a/r5dev/thirdparty/protobuf/stubs/int128_unittest.cc b/src/thirdparty/protobuf/stubs/int128_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/int128_unittest.cc
rename to src/thirdparty/protobuf/stubs/int128_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/logging.h b/src/thirdparty/protobuf/stubs/logging.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/logging.h
rename to src/thirdparty/protobuf/stubs/logging.h
diff --git a/r5dev/thirdparty/protobuf/stubs/macros.h b/src/thirdparty/protobuf/stubs/macros.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/macros.h
rename to src/thirdparty/protobuf/stubs/macros.h
diff --git a/r5dev/thirdparty/protobuf/stubs/map_util.h b/src/thirdparty/protobuf/stubs/map_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/map_util.h
rename to src/thirdparty/protobuf/stubs/map_util.h
diff --git a/r5dev/thirdparty/protobuf/stubs/mathutil.h b/src/thirdparty/protobuf/stubs/mathutil.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/mathutil.h
rename to src/thirdparty/protobuf/stubs/mathutil.h
diff --git a/r5dev/thirdparty/protobuf/stubs/mutex.h b/src/thirdparty/protobuf/stubs/mutex.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/mutex.h
rename to src/thirdparty/protobuf/stubs/mutex.h
diff --git a/r5dev/thirdparty/protobuf/stubs/once.h b/src/thirdparty/protobuf/stubs/once.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/once.h
rename to src/thirdparty/protobuf/stubs/once.h
diff --git a/r5dev/thirdparty/protobuf/stubs/platform_macros.h b/src/thirdparty/protobuf/stubs/platform_macros.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/platform_macros.h
rename to src/thirdparty/protobuf/stubs/platform_macros.h
diff --git a/r5dev/thirdparty/protobuf/stubs/port.h b/src/thirdparty/protobuf/stubs/port.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/port.h
rename to src/thirdparty/protobuf/stubs/port.h
diff --git a/r5dev/thirdparty/protobuf/stubs/status.cc b/src/thirdparty/protobuf/stubs/status.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/status.cc
rename to src/thirdparty/protobuf/stubs/status.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/status.h b/src/thirdparty/protobuf/stubs/status.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/status.h
rename to src/thirdparty/protobuf/stubs/status.h
diff --git a/r5dev/thirdparty/protobuf/stubs/status_macros.h b/src/thirdparty/protobuf/stubs/status_macros.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/status_macros.h
rename to src/thirdparty/protobuf/stubs/status_macros.h
diff --git a/r5dev/thirdparty/protobuf/stubs/status_test.cc b/src/thirdparty/protobuf/stubs/status_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/status_test.cc
rename to src/thirdparty/protobuf/stubs/status_test.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/statusor.cc b/src/thirdparty/protobuf/stubs/statusor.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/statusor.cc
rename to src/thirdparty/protobuf/stubs/statusor.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/statusor.h b/src/thirdparty/protobuf/stubs/statusor.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/statusor.h
rename to src/thirdparty/protobuf/stubs/statusor.h
diff --git a/r5dev/thirdparty/protobuf/stubs/statusor_test.cc b/src/thirdparty/protobuf/stubs/statusor_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/statusor_test.cc
rename to src/thirdparty/protobuf/stubs/statusor_test.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/stl_util.h b/src/thirdparty/protobuf/stubs/stl_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/stl_util.h
rename to src/thirdparty/protobuf/stubs/stl_util.h
diff --git a/r5dev/thirdparty/protobuf/stubs/stringpiece.cc b/src/thirdparty/protobuf/stubs/stringpiece.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/stringpiece.cc
rename to src/thirdparty/protobuf/stubs/stringpiece.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/stringpiece.h b/src/thirdparty/protobuf/stubs/stringpiece.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/stringpiece.h
rename to src/thirdparty/protobuf/stubs/stringpiece.h
diff --git a/r5dev/thirdparty/protobuf/stubs/stringpiece_unittest.cc b/src/thirdparty/protobuf/stubs/stringpiece_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/stringpiece_unittest.cc
rename to src/thirdparty/protobuf/stubs/stringpiece_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/stringprintf.cc b/src/thirdparty/protobuf/stubs/stringprintf.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/stringprintf.cc
rename to src/thirdparty/protobuf/stubs/stringprintf.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/stringprintf.h b/src/thirdparty/protobuf/stubs/stringprintf.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/stringprintf.h
rename to src/thirdparty/protobuf/stubs/stringprintf.h
diff --git a/r5dev/thirdparty/protobuf/stubs/stringprintf_unittest.cc b/src/thirdparty/protobuf/stubs/stringprintf_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/stringprintf_unittest.cc
rename to src/thirdparty/protobuf/stubs/stringprintf_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/structurally_valid.cc b/src/thirdparty/protobuf/stubs/structurally_valid.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/structurally_valid.cc
rename to src/thirdparty/protobuf/stubs/structurally_valid.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/structurally_valid_unittest.cc b/src/thirdparty/protobuf/stubs/structurally_valid_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/structurally_valid_unittest.cc
rename to src/thirdparty/protobuf/stubs/structurally_valid_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/strutil.cc b/src/thirdparty/protobuf/stubs/strutil.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/strutil.cc
rename to src/thirdparty/protobuf/stubs/strutil.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/strutil.h b/src/thirdparty/protobuf/stubs/strutil.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/strutil.h
rename to src/thirdparty/protobuf/stubs/strutil.h
diff --git a/r5dev/thirdparty/protobuf/stubs/strutil_unittest.cc b/src/thirdparty/protobuf/stubs/strutil_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/strutil_unittest.cc
rename to src/thirdparty/protobuf/stubs/strutil_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/substitute.cc b/src/thirdparty/protobuf/stubs/substitute.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/substitute.cc
rename to src/thirdparty/protobuf/stubs/substitute.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/substitute.h b/src/thirdparty/protobuf/stubs/substitute.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/substitute.h
rename to src/thirdparty/protobuf/stubs/substitute.h
diff --git a/r5dev/thirdparty/protobuf/stubs/template_util.h b/src/thirdparty/protobuf/stubs/template_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/template_util.h
rename to src/thirdparty/protobuf/stubs/template_util.h
diff --git a/r5dev/thirdparty/protobuf/stubs/template_util_unittest.cc b/src/thirdparty/protobuf/stubs/template_util_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/template_util_unittest.cc
rename to src/thirdparty/protobuf/stubs/template_util_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/time.cc b/src/thirdparty/protobuf/stubs/time.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/time.cc
rename to src/thirdparty/protobuf/stubs/time.cc
diff --git a/r5dev/thirdparty/protobuf/stubs/time.h b/src/thirdparty/protobuf/stubs/time.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/time.h
rename to src/thirdparty/protobuf/stubs/time.h
diff --git a/r5dev/thirdparty/protobuf/stubs/time_test.cc b/src/thirdparty/protobuf/stubs/time_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/stubs/time_test.cc
rename to src/thirdparty/protobuf/stubs/time_test.cc
diff --git a/r5dev/thirdparty/protobuf/test_messages_proto2.proto b/src/thirdparty/protobuf/test_messages_proto2.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_messages_proto2.proto
rename to src/thirdparty/protobuf/test_messages_proto2.proto
diff --git a/r5dev/thirdparty/protobuf/test_messages_proto3.proto b/src/thirdparty/protobuf/test_messages_proto3.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_messages_proto3.proto
rename to src/thirdparty/protobuf/test_messages_proto3.proto
diff --git a/r5dev/thirdparty/protobuf/test_util.cc b/src/thirdparty/protobuf/test_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_util.cc
rename to src/thirdparty/protobuf/test_util.cc
diff --git a/r5dev/thirdparty/protobuf/test_util.h b/src/thirdparty/protobuf/test_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_util.h
rename to src/thirdparty/protobuf/test_util.h
diff --git a/r5dev/thirdparty/protobuf/test_util.inc b/src/thirdparty/protobuf/test_util.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_util.inc
rename to src/thirdparty/protobuf/test_util.inc
diff --git a/r5dev/thirdparty/protobuf/test_util2.h b/src/thirdparty/protobuf/test_util2.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_util2.h
rename to src/thirdparty/protobuf/test_util2.h
diff --git a/r5dev/thirdparty/protobuf/test_util_lite.cc b/src/thirdparty/protobuf/test_util_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_util_lite.cc
rename to src/thirdparty/protobuf/test_util_lite.cc
diff --git a/r5dev/thirdparty/protobuf/test_util_lite.h b/src/thirdparty/protobuf/test_util_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/test_util_lite.h
rename to src/thirdparty/protobuf/test_util_lite.h
diff --git a/r5dev/thirdparty/protobuf/testdata/bad_utf8_string b/src/thirdparty/protobuf/testdata/bad_utf8_string
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/bad_utf8_string
rename to src/thirdparty/protobuf/testdata/bad_utf8_string
diff --git a/r5dev/thirdparty/protobuf/testdata/golden_message b/src/thirdparty/protobuf/testdata/golden_message
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/golden_message
rename to src/thirdparty/protobuf/testdata/golden_message
diff --git a/r5dev/thirdparty/protobuf/testdata/golden_message_maps b/src/thirdparty/protobuf/testdata/golden_message_maps
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/golden_message_maps
rename to src/thirdparty/protobuf/testdata/golden_message_maps
diff --git a/r5dev/thirdparty/protobuf/testdata/golden_message_oneof_implemented b/src/thirdparty/protobuf/testdata/golden_message_oneof_implemented
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/golden_message_oneof_implemented
rename to src/thirdparty/protobuf/testdata/golden_message_oneof_implemented
diff --git a/r5dev/thirdparty/protobuf/testdata/golden_message_proto3 b/src/thirdparty/protobuf/testdata/golden_message_proto3
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/golden_message_proto3
rename to src/thirdparty/protobuf/testdata/golden_message_proto3
diff --git a/r5dev/thirdparty/protobuf/testdata/golden_packed_fields_message b/src/thirdparty/protobuf/testdata/golden_packed_fields_message
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/golden_packed_fields_message
rename to src/thirdparty/protobuf/testdata/golden_packed_fields_message
diff --git a/r5dev/thirdparty/protobuf/testdata/map_test_data.txt b/src/thirdparty/protobuf/testdata/map_test_data.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/map_test_data.txt
rename to src/thirdparty/protobuf/testdata/map_test_data.txt
diff --git a/r5dev/thirdparty/protobuf/testdata/text_format_unittest_data.txt b/src/thirdparty/protobuf/testdata/text_format_unittest_data.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/text_format_unittest_data.txt
rename to src/thirdparty/protobuf/testdata/text_format_unittest_data.txt
diff --git a/r5dev/thirdparty/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt b/src/thirdparty/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt
rename to src/thirdparty/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt
diff --git a/r5dev/thirdparty/protobuf/testdata/text_format_unittest_data_pointy.txt b/src/thirdparty/protobuf/testdata/text_format_unittest_data_pointy.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/text_format_unittest_data_pointy.txt
rename to src/thirdparty/protobuf/testdata/text_format_unittest_data_pointy.txt
diff --git a/r5dev/thirdparty/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt b/src/thirdparty/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
rename to src/thirdparty/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
diff --git a/r5dev/thirdparty/protobuf/testdata/text_format_unittest_extensions_data.txt b/src/thirdparty/protobuf/testdata/text_format_unittest_extensions_data.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/text_format_unittest_extensions_data.txt
rename to src/thirdparty/protobuf/testdata/text_format_unittest_extensions_data.txt
diff --git a/r5dev/thirdparty/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt b/src/thirdparty/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt
similarity index 100%
rename from r5dev/thirdparty/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt
rename to src/thirdparty/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt
diff --git a/r5dev/thirdparty/protobuf/testing/file.cc b/src/thirdparty/protobuf/testing/file.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/testing/file.cc
rename to src/thirdparty/protobuf/testing/file.cc
diff --git a/r5dev/thirdparty/protobuf/testing/file.h b/src/thirdparty/protobuf/testing/file.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/testing/file.h
rename to src/thirdparty/protobuf/testing/file.h
diff --git a/r5dev/thirdparty/protobuf/testing/googletest.cc b/src/thirdparty/protobuf/testing/googletest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/testing/googletest.cc
rename to src/thirdparty/protobuf/testing/googletest.cc
diff --git a/r5dev/thirdparty/protobuf/testing/googletest.h b/src/thirdparty/protobuf/testing/googletest.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/testing/googletest.h
rename to src/thirdparty/protobuf/testing/googletest.h
diff --git a/r5dev/thirdparty/protobuf/testing/zcgunzip.cc b/src/thirdparty/protobuf/testing/zcgunzip.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/testing/zcgunzip.cc
rename to src/thirdparty/protobuf/testing/zcgunzip.cc
diff --git a/r5dev/thirdparty/protobuf/testing/zcgzip.cc b/src/thirdparty/protobuf/testing/zcgzip.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/testing/zcgzip.cc
rename to src/thirdparty/protobuf/testing/zcgzip.cc
diff --git a/r5dev/thirdparty/protobuf/text_format.cc b/src/thirdparty/protobuf/text_format.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/text_format.cc
rename to src/thirdparty/protobuf/text_format.cc
diff --git a/r5dev/thirdparty/protobuf/text_format.h b/src/thirdparty/protobuf/text_format.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/text_format.h
rename to src/thirdparty/protobuf/text_format.h
diff --git a/r5dev/thirdparty/protobuf/text_format_unittest.cc b/src/thirdparty/protobuf/text_format_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/text_format_unittest.cc
rename to src/thirdparty/protobuf/text_format_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/timestamp.pb.cc b/src/thirdparty/protobuf/timestamp.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/timestamp.pb.cc
rename to src/thirdparty/protobuf/timestamp.pb.cc
diff --git a/r5dev/thirdparty/protobuf/timestamp.pb.h b/src/thirdparty/protobuf/timestamp.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/timestamp.pb.h
rename to src/thirdparty/protobuf/timestamp.pb.h
diff --git a/r5dev/thirdparty/protobuf/timestamp.proto b/src/thirdparty/protobuf/timestamp.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/timestamp.proto
rename to src/thirdparty/protobuf/timestamp.proto
diff --git a/r5dev/thirdparty/protobuf/type.pb.cc b/src/thirdparty/protobuf/type.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/type.pb.cc
rename to src/thirdparty/protobuf/type.pb.cc
diff --git a/r5dev/thirdparty/protobuf/type.pb.h b/src/thirdparty/protobuf/type.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/type.pb.h
rename to src/thirdparty/protobuf/type.pb.h
diff --git a/r5dev/thirdparty/protobuf/type.proto b/src/thirdparty/protobuf/type.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/type.proto
rename to src/thirdparty/protobuf/type.proto
diff --git a/r5dev/thirdparty/protobuf/unittest.proto b/src/thirdparty/protobuf/unittest.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest.proto
rename to src/thirdparty/protobuf/unittest.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_arena.proto b/src/thirdparty/protobuf/unittest_arena.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_arena.proto
rename to src/thirdparty/protobuf/unittest_arena.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_custom_options.proto b/src/thirdparty/protobuf/unittest_custom_options.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_custom_options.proto
rename to src/thirdparty/protobuf/unittest_custom_options.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_drop_unknown_fields.proto b/src/thirdparty/protobuf/unittest_drop_unknown_fields.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_drop_unknown_fields.proto
rename to src/thirdparty/protobuf/unittest_drop_unknown_fields.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_embed_optimize_for.proto b/src/thirdparty/protobuf/unittest_embed_optimize_for.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_embed_optimize_for.proto
rename to src/thirdparty/protobuf/unittest_embed_optimize_for.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_empty.proto b/src/thirdparty/protobuf/unittest_empty.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_empty.proto
rename to src/thirdparty/protobuf/unittest_empty.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_enormous_descriptor.proto b/src/thirdparty/protobuf/unittest_enormous_descriptor.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_enormous_descriptor.proto
rename to src/thirdparty/protobuf/unittest_enormous_descriptor.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_import.proto b/src/thirdparty/protobuf/unittest_import.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_import.proto
rename to src/thirdparty/protobuf/unittest_import.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_import_lite.proto b/src/thirdparty/protobuf/unittest_import_lite.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_import_lite.proto
rename to src/thirdparty/protobuf/unittest_import_lite.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_import_public.proto b/src/thirdparty/protobuf/unittest_import_public.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_import_public.proto
rename to src/thirdparty/protobuf/unittest_import_public.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_import_public_lite.proto b/src/thirdparty/protobuf/unittest_import_public_lite.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_import_public_lite.proto
rename to src/thirdparty/protobuf/unittest_import_public_lite.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_lazy_dependencies.proto b/src/thirdparty/protobuf/unittest_lazy_dependencies.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_lazy_dependencies.proto
rename to src/thirdparty/protobuf/unittest_lazy_dependencies.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_lazy_dependencies_custom_option.proto b/src/thirdparty/protobuf/unittest_lazy_dependencies_custom_option.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_lazy_dependencies_custom_option.proto
rename to src/thirdparty/protobuf/unittest_lazy_dependencies_custom_option.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_lazy_dependencies_enum.proto b/src/thirdparty/protobuf/unittest_lazy_dependencies_enum.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_lazy_dependencies_enum.proto
rename to src/thirdparty/protobuf/unittest_lazy_dependencies_enum.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_lite.proto b/src/thirdparty/protobuf/unittest_lite.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_lite.proto
rename to src/thirdparty/protobuf/unittest_lite.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_lite_imports_nonlite.proto b/src/thirdparty/protobuf/unittest_lite_imports_nonlite.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_lite_imports_nonlite.proto
rename to src/thirdparty/protobuf/unittest_lite_imports_nonlite.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_mset.proto b/src/thirdparty/protobuf/unittest_mset.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_mset.proto
rename to src/thirdparty/protobuf/unittest_mset.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_mset_wire_format.proto b/src/thirdparty/protobuf/unittest_mset_wire_format.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_mset_wire_format.proto
rename to src/thirdparty/protobuf/unittest_mset_wire_format.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_no_field_presence.proto b/src/thirdparty/protobuf/unittest_no_field_presence.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_no_field_presence.proto
rename to src/thirdparty/protobuf/unittest_no_field_presence.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_no_generic_services.proto b/src/thirdparty/protobuf/unittest_no_generic_services.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_no_generic_services.proto
rename to src/thirdparty/protobuf/unittest_no_generic_services.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_optimize_for.proto b/src/thirdparty/protobuf/unittest_optimize_for.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_optimize_for.proto
rename to src/thirdparty/protobuf/unittest_optimize_for.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_preserve_unknown_enum.proto b/src/thirdparty/protobuf/unittest_preserve_unknown_enum.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_preserve_unknown_enum.proto
rename to src/thirdparty/protobuf/unittest_preserve_unknown_enum.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_preserve_unknown_enum2.proto b/src/thirdparty/protobuf/unittest_preserve_unknown_enum2.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_preserve_unknown_enum2.proto
rename to src/thirdparty/protobuf/unittest_preserve_unknown_enum2.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_proto3.proto b/src/thirdparty/protobuf/unittest_proto3.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_proto3.proto
rename to src/thirdparty/protobuf/unittest_proto3.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_proto3_arena.proto b/src/thirdparty/protobuf/unittest_proto3_arena.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_proto3_arena.proto
rename to src/thirdparty/protobuf/unittest_proto3_arena.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_proto3_arena_lite.proto b/src/thirdparty/protobuf/unittest_proto3_arena_lite.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_proto3_arena_lite.proto
rename to src/thirdparty/protobuf/unittest_proto3_arena_lite.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_proto3_lite.proto b/src/thirdparty/protobuf/unittest_proto3_lite.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_proto3_lite.proto
rename to src/thirdparty/protobuf/unittest_proto3_lite.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_proto3_optional.proto b/src/thirdparty/protobuf/unittest_proto3_optional.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_proto3_optional.proto
rename to src/thirdparty/protobuf/unittest_proto3_optional.proto
diff --git a/r5dev/thirdparty/protobuf/unittest_well_known_types.proto b/src/thirdparty/protobuf/unittest_well_known_types.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/unittest_well_known_types.proto
rename to src/thirdparty/protobuf/unittest_well_known_types.proto
diff --git a/r5dev/thirdparty/protobuf/unknown_field_set.cc b/src/thirdparty/protobuf/unknown_field_set.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/unknown_field_set.cc
rename to src/thirdparty/protobuf/unknown_field_set.cc
diff --git a/r5dev/thirdparty/protobuf/unknown_field_set.h b/src/thirdparty/protobuf/unknown_field_set.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/unknown_field_set.h
rename to src/thirdparty/protobuf/unknown_field_set.h
diff --git a/r5dev/thirdparty/protobuf/unknown_field_set_unittest.cc b/src/thirdparty/protobuf/unknown_field_set_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/unknown_field_set_unittest.cc
rename to src/thirdparty/protobuf/unknown_field_set_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/util/delimited_message_util.cc b/src/thirdparty/protobuf/util/delimited_message_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/delimited_message_util.cc
rename to src/thirdparty/protobuf/util/delimited_message_util.cc
diff --git a/r5dev/thirdparty/protobuf/util/delimited_message_util.h b/src/thirdparty/protobuf/util/delimited_message_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/delimited_message_util.h
rename to src/thirdparty/protobuf/util/delimited_message_util.h
diff --git a/r5dev/thirdparty/protobuf/util/delimited_message_util_test.cc b/src/thirdparty/protobuf/util/delimited_message_util_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/delimited_message_util_test.cc
rename to src/thirdparty/protobuf/util/delimited_message_util_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/field_comparator.cc b/src/thirdparty/protobuf/util/field_comparator.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/field_comparator.cc
rename to src/thirdparty/protobuf/util/field_comparator.cc
diff --git a/r5dev/thirdparty/protobuf/util/field_comparator.h b/src/thirdparty/protobuf/util/field_comparator.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/field_comparator.h
rename to src/thirdparty/protobuf/util/field_comparator.h
diff --git a/r5dev/thirdparty/protobuf/util/field_comparator_test.cc b/src/thirdparty/protobuf/util/field_comparator_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/field_comparator_test.cc
rename to src/thirdparty/protobuf/util/field_comparator_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/field_mask_util.cc b/src/thirdparty/protobuf/util/field_mask_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/field_mask_util.cc
rename to src/thirdparty/protobuf/util/field_mask_util.cc
diff --git a/r5dev/thirdparty/protobuf/util/field_mask_util.h b/src/thirdparty/protobuf/util/field_mask_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/field_mask_util.h
rename to src/thirdparty/protobuf/util/field_mask_util.h
diff --git a/r5dev/thirdparty/protobuf/util/field_mask_util_test.cc b/src/thirdparty/protobuf/util/field_mask_util_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/field_mask_util_test.cc
rename to src/thirdparty/protobuf/util/field_mask_util_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/constants.h b/src/thirdparty/protobuf/util/internal/constants.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/constants.h
rename to src/thirdparty/protobuf/util/internal/constants.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/datapiece.cc b/src/thirdparty/protobuf/util/internal/datapiece.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/datapiece.cc
rename to src/thirdparty/protobuf/util/internal/datapiece.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/datapiece.h b/src/thirdparty/protobuf/util/internal/datapiece.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/datapiece.h
rename to src/thirdparty/protobuf/util/internal/datapiece.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/default_value_objectwriter.cc b/src/thirdparty/protobuf/util/internal/default_value_objectwriter.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/default_value_objectwriter.cc
rename to src/thirdparty/protobuf/util/internal/default_value_objectwriter.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/default_value_objectwriter.h b/src/thirdparty/protobuf/util/internal/default_value_objectwriter.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/default_value_objectwriter.h
rename to src/thirdparty/protobuf/util/internal/default_value_objectwriter.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/default_value_objectwriter_test.cc b/src/thirdparty/protobuf/util/internal/default_value_objectwriter_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/default_value_objectwriter_test.cc
rename to src/thirdparty/protobuf/util/internal/default_value_objectwriter_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/error_listener.cc b/src/thirdparty/protobuf/util/internal/error_listener.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/error_listener.cc
rename to src/thirdparty/protobuf/util/internal/error_listener.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/error_listener.h b/src/thirdparty/protobuf/util/internal/error_listener.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/error_listener.h
rename to src/thirdparty/protobuf/util/internal/error_listener.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/expecting_objectwriter.h b/src/thirdparty/protobuf/util/internal/expecting_objectwriter.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/expecting_objectwriter.h
rename to src/thirdparty/protobuf/util/internal/expecting_objectwriter.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/field_mask_utility.cc b/src/thirdparty/protobuf/util/internal/field_mask_utility.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/field_mask_utility.cc
rename to src/thirdparty/protobuf/util/internal/field_mask_utility.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/field_mask_utility.h b/src/thirdparty/protobuf/util/internal/field_mask_utility.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/field_mask_utility.h
rename to src/thirdparty/protobuf/util/internal/field_mask_utility.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_escaping.cc b/src/thirdparty/protobuf/util/internal/json_escaping.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_escaping.cc
rename to src/thirdparty/protobuf/util/internal/json_escaping.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_escaping.h b/src/thirdparty/protobuf/util/internal/json_escaping.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_escaping.h
rename to src/thirdparty/protobuf/util/internal/json_escaping.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_objectwriter.cc b/src/thirdparty/protobuf/util/internal/json_objectwriter.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_objectwriter.cc
rename to src/thirdparty/protobuf/util/internal/json_objectwriter.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_objectwriter.h b/src/thirdparty/protobuf/util/internal/json_objectwriter.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_objectwriter.h
rename to src/thirdparty/protobuf/util/internal/json_objectwriter.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_objectwriter_test.cc b/src/thirdparty/protobuf/util/internal/json_objectwriter_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_objectwriter_test.cc
rename to src/thirdparty/protobuf/util/internal/json_objectwriter_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_stream_parser.cc b/src/thirdparty/protobuf/util/internal/json_stream_parser.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_stream_parser.cc
rename to src/thirdparty/protobuf/util/internal/json_stream_parser.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_stream_parser.h b/src/thirdparty/protobuf/util/internal/json_stream_parser.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_stream_parser.h
rename to src/thirdparty/protobuf/util/internal/json_stream_parser.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/json_stream_parser_test.cc b/src/thirdparty/protobuf/util/internal/json_stream_parser_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/json_stream_parser_test.cc
rename to src/thirdparty/protobuf/util/internal/json_stream_parser_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/location_tracker.h b/src/thirdparty/protobuf/util/internal/location_tracker.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/location_tracker.h
rename to src/thirdparty/protobuf/util/internal/location_tracker.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/mock_error_listener.h b/src/thirdparty/protobuf/util/internal/mock_error_listener.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/mock_error_listener.h
rename to src/thirdparty/protobuf/util/internal/mock_error_listener.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/object_location_tracker.h b/src/thirdparty/protobuf/util/internal/object_location_tracker.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/object_location_tracker.h
rename to src/thirdparty/protobuf/util/internal/object_location_tracker.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/object_source.h b/src/thirdparty/protobuf/util/internal/object_source.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/object_source.h
rename to src/thirdparty/protobuf/util/internal/object_source.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/object_writer.cc b/src/thirdparty/protobuf/util/internal/object_writer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/object_writer.cc
rename to src/thirdparty/protobuf/util/internal/object_writer.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/object_writer.h b/src/thirdparty/protobuf/util/internal/object_writer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/object_writer.h
rename to src/thirdparty/protobuf/util/internal/object_writer.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/proto_writer.cc b/src/thirdparty/protobuf/util/internal/proto_writer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/proto_writer.cc
rename to src/thirdparty/protobuf/util/internal/proto_writer.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/proto_writer.h b/src/thirdparty/protobuf/util/internal/proto_writer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/proto_writer.h
rename to src/thirdparty/protobuf/util/internal/proto_writer.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/protostream_objectsource.cc b/src/thirdparty/protobuf/util/internal/protostream_objectsource.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/protostream_objectsource.cc
rename to src/thirdparty/protobuf/util/internal/protostream_objectsource.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/protostream_objectsource.h b/src/thirdparty/protobuf/util/internal/protostream_objectsource.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/protostream_objectsource.h
rename to src/thirdparty/protobuf/util/internal/protostream_objectsource.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/protostream_objectsource_test.cc b/src/thirdparty/protobuf/util/internal/protostream_objectsource_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/protostream_objectsource_test.cc
rename to src/thirdparty/protobuf/util/internal/protostream_objectsource_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/protostream_objectwriter.cc b/src/thirdparty/protobuf/util/internal/protostream_objectwriter.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/protostream_objectwriter.cc
rename to src/thirdparty/protobuf/util/internal/protostream_objectwriter.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/protostream_objectwriter.h b/src/thirdparty/protobuf/util/internal/protostream_objectwriter.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/protostream_objectwriter.h
rename to src/thirdparty/protobuf/util/internal/protostream_objectwriter.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/protostream_objectwriter_test.cc b/src/thirdparty/protobuf/util/internal/protostream_objectwriter_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/protostream_objectwriter_test.cc
rename to src/thirdparty/protobuf/util/internal/protostream_objectwriter_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/structured_objectwriter.h b/src/thirdparty/protobuf/util/internal/structured_objectwriter.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/structured_objectwriter.h
rename to src/thirdparty/protobuf/util/internal/structured_objectwriter.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/anys.proto b/src/thirdparty/protobuf/util/internal/testdata/anys.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/anys.proto
rename to src/thirdparty/protobuf/util/internal/testdata/anys.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/books.proto b/src/thirdparty/protobuf/util/internal/testdata/books.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/books.proto
rename to src/thirdparty/protobuf/util/internal/testdata/books.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/default_value.proto b/src/thirdparty/protobuf/util/internal/testdata/default_value.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/default_value.proto
rename to src/thirdparty/protobuf/util/internal/testdata/default_value.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/default_value_test.proto b/src/thirdparty/protobuf/util/internal/testdata/default_value_test.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/default_value_test.proto
rename to src/thirdparty/protobuf/util/internal/testdata/default_value_test.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/field_mask.proto b/src/thirdparty/protobuf/util/internal/testdata/field_mask.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/field_mask.proto
rename to src/thirdparty/protobuf/util/internal/testdata/field_mask.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/maps.proto b/src/thirdparty/protobuf/util/internal/testdata/maps.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/maps.proto
rename to src/thirdparty/protobuf/util/internal/testdata/maps.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/oneofs.proto b/src/thirdparty/protobuf/util/internal/testdata/oneofs.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/oneofs.proto
rename to src/thirdparty/protobuf/util/internal/testdata/oneofs.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/proto3.proto b/src/thirdparty/protobuf/util/internal/testdata/proto3.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/proto3.proto
rename to src/thirdparty/protobuf/util/internal/testdata/proto3.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/struct.proto b/src/thirdparty/protobuf/util/internal/testdata/struct.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/struct.proto
rename to src/thirdparty/protobuf/util/internal/testdata/struct.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/timestamp_duration.proto b/src/thirdparty/protobuf/util/internal/testdata/timestamp_duration.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/timestamp_duration.proto
rename to src/thirdparty/protobuf/util/internal/testdata/timestamp_duration.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/testdata/wrappers.proto b/src/thirdparty/protobuf/util/internal/testdata/wrappers.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/testdata/wrappers.proto
rename to src/thirdparty/protobuf/util/internal/testdata/wrappers.proto
diff --git a/r5dev/thirdparty/protobuf/util/internal/type_info.cc b/src/thirdparty/protobuf/util/internal/type_info.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/type_info.cc
rename to src/thirdparty/protobuf/util/internal/type_info.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/type_info.h b/src/thirdparty/protobuf/util/internal/type_info.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/type_info.h
rename to src/thirdparty/protobuf/util/internal/type_info.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/type_info_test_helper.cc b/src/thirdparty/protobuf/util/internal/type_info_test_helper.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/type_info_test_helper.cc
rename to src/thirdparty/protobuf/util/internal/type_info_test_helper.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/type_info_test_helper.h b/src/thirdparty/protobuf/util/internal/type_info_test_helper.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/type_info_test_helper.h
rename to src/thirdparty/protobuf/util/internal/type_info_test_helper.h
diff --git a/r5dev/thirdparty/protobuf/util/internal/utility.cc b/src/thirdparty/protobuf/util/internal/utility.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/utility.cc
rename to src/thirdparty/protobuf/util/internal/utility.cc
diff --git a/r5dev/thirdparty/protobuf/util/internal/utility.h b/src/thirdparty/protobuf/util/internal/utility.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/internal/utility.h
rename to src/thirdparty/protobuf/util/internal/utility.h
diff --git a/r5dev/thirdparty/protobuf/util/json_format.proto b/src/thirdparty/protobuf/util/json_format.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/json_format.proto
rename to src/thirdparty/protobuf/util/json_format.proto
diff --git a/r5dev/thirdparty/protobuf/util/json_format_proto3.proto b/src/thirdparty/protobuf/util/json_format_proto3.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/json_format_proto3.proto
rename to src/thirdparty/protobuf/util/json_format_proto3.proto
diff --git a/r5dev/thirdparty/protobuf/util/json_util.cc b/src/thirdparty/protobuf/util/json_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/json_util.cc
rename to src/thirdparty/protobuf/util/json_util.cc
diff --git a/r5dev/thirdparty/protobuf/util/json_util.h b/src/thirdparty/protobuf/util/json_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/json_util.h
rename to src/thirdparty/protobuf/util/json_util.h
diff --git a/r5dev/thirdparty/protobuf/util/json_util_test.cc b/src/thirdparty/protobuf/util/json_util_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/json_util_test.cc
rename to src/thirdparty/protobuf/util/json_util_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/message_differencer.cc b/src/thirdparty/protobuf/util/message_differencer.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/message_differencer.cc
rename to src/thirdparty/protobuf/util/message_differencer.cc
diff --git a/r5dev/thirdparty/protobuf/util/message_differencer.h b/src/thirdparty/protobuf/util/message_differencer.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/message_differencer.h
rename to src/thirdparty/protobuf/util/message_differencer.h
diff --git a/r5dev/thirdparty/protobuf/util/message_differencer_unittest.cc b/src/thirdparty/protobuf/util/message_differencer_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/message_differencer_unittest.cc
rename to src/thirdparty/protobuf/util/message_differencer_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/util/message_differencer_unittest.proto b/src/thirdparty/protobuf/util/message_differencer_unittest.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/message_differencer_unittest.proto
rename to src/thirdparty/protobuf/util/message_differencer_unittest.proto
diff --git a/r5dev/thirdparty/protobuf/util/package_info.h b/src/thirdparty/protobuf/util/package_info.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/package_info.h
rename to src/thirdparty/protobuf/util/package_info.h
diff --git a/r5dev/thirdparty/protobuf/util/time_util.cc b/src/thirdparty/protobuf/util/time_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/time_util.cc
rename to src/thirdparty/protobuf/util/time_util.cc
diff --git a/r5dev/thirdparty/protobuf/util/time_util.h b/src/thirdparty/protobuf/util/time_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/time_util.h
rename to src/thirdparty/protobuf/util/time_util.h
diff --git a/r5dev/thirdparty/protobuf/util/time_util_test.cc b/src/thirdparty/protobuf/util/time_util_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/time_util_test.cc
rename to src/thirdparty/protobuf/util/time_util_test.cc
diff --git a/r5dev/thirdparty/protobuf/util/type_resolver.h b/src/thirdparty/protobuf/util/type_resolver.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/type_resolver.h
rename to src/thirdparty/protobuf/util/type_resolver.h
diff --git a/r5dev/thirdparty/protobuf/util/type_resolver_util.cc b/src/thirdparty/protobuf/util/type_resolver_util.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/type_resolver_util.cc
rename to src/thirdparty/protobuf/util/type_resolver_util.cc
diff --git a/r5dev/thirdparty/protobuf/util/type_resolver_util.h b/src/thirdparty/protobuf/util/type_resolver_util.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/type_resolver_util.h
rename to src/thirdparty/protobuf/util/type_resolver_util.h
diff --git a/r5dev/thirdparty/protobuf/util/type_resolver_util_test.cc b/src/thirdparty/protobuf/util/type_resolver_util_test.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/util/type_resolver_util_test.cc
rename to src/thirdparty/protobuf/util/type_resolver_util_test.cc
diff --git a/r5dev/thirdparty/protobuf/well_known_types_unittest.cc b/src/thirdparty/protobuf/well_known_types_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/well_known_types_unittest.cc
rename to src/thirdparty/protobuf/well_known_types_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/wire_format.cc b/src/thirdparty/protobuf/wire_format.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/wire_format.cc
rename to src/thirdparty/protobuf/wire_format.cc
diff --git a/r5dev/thirdparty/protobuf/wire_format.h b/src/thirdparty/protobuf/wire_format.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/wire_format.h
rename to src/thirdparty/protobuf/wire_format.h
diff --git a/r5dev/thirdparty/protobuf/wire_format_lite.cc b/src/thirdparty/protobuf/wire_format_lite.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/wire_format_lite.cc
rename to src/thirdparty/protobuf/wire_format_lite.cc
diff --git a/r5dev/thirdparty/protobuf/wire_format_lite.h b/src/thirdparty/protobuf/wire_format_lite.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/wire_format_lite.h
rename to src/thirdparty/protobuf/wire_format_lite.h
diff --git a/r5dev/thirdparty/protobuf/wire_format_unittest.cc b/src/thirdparty/protobuf/wire_format_unittest.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/wire_format_unittest.cc
rename to src/thirdparty/protobuf/wire_format_unittest.cc
diff --git a/r5dev/thirdparty/protobuf/wire_format_unittest.inc b/src/thirdparty/protobuf/wire_format_unittest.inc
similarity index 100%
rename from r5dev/thirdparty/protobuf/wire_format_unittest.inc
rename to src/thirdparty/protobuf/wire_format_unittest.inc
diff --git a/r5dev/thirdparty/protobuf/wrappers.pb.cc b/src/thirdparty/protobuf/wrappers.pb.cc
similarity index 100%
rename from r5dev/thirdparty/protobuf/wrappers.pb.cc
rename to src/thirdparty/protobuf/wrappers.pb.cc
diff --git a/r5dev/thirdparty/protobuf/wrappers.pb.h b/src/thirdparty/protobuf/wrappers.pb.h
similarity index 100%
rename from r5dev/thirdparty/protobuf/wrappers.pb.h
rename to src/thirdparty/protobuf/wrappers.pb.h
diff --git a/r5dev/thirdparty/protobuf/wrappers.proto b/src/thirdparty/protobuf/wrappers.proto
similarity index 100%
rename from r5dev/thirdparty/protobuf/wrappers.proto
rename to src/thirdparty/protobuf/wrappers.proto
diff --git a/r5dev/thirdparty/rapidjson/allocators.h b/src/thirdparty/rapidjson/allocators.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/allocators.h
rename to src/thirdparty/rapidjson/allocators.h
diff --git a/r5dev/thirdparty/rapidjson/cursorstreamwrapper.h b/src/thirdparty/rapidjson/cursorstreamwrapper.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/cursorstreamwrapper.h
rename to src/thirdparty/rapidjson/cursorstreamwrapper.h
diff --git a/r5dev/thirdparty/rapidjson/document.h b/src/thirdparty/rapidjson/document.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/document.h
rename to src/thirdparty/rapidjson/document.h
diff --git a/r5dev/thirdparty/rapidjson/encodedstream.h b/src/thirdparty/rapidjson/encodedstream.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/encodedstream.h
rename to src/thirdparty/rapidjson/encodedstream.h
diff --git a/r5dev/thirdparty/rapidjson/encodings.h b/src/thirdparty/rapidjson/encodings.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/encodings.h
rename to src/thirdparty/rapidjson/encodings.h
diff --git a/r5dev/thirdparty/rapidjson/error/en.h b/src/thirdparty/rapidjson/error/en.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/error/en.h
rename to src/thirdparty/rapidjson/error/en.h
diff --git a/r5dev/thirdparty/rapidjson/error/error.h b/src/thirdparty/rapidjson/error/error.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/error/error.h
rename to src/thirdparty/rapidjson/error/error.h
diff --git a/r5dev/thirdparty/rapidjson/filereadstream.h b/src/thirdparty/rapidjson/filereadstream.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/filereadstream.h
rename to src/thirdparty/rapidjson/filereadstream.h
diff --git a/r5dev/thirdparty/rapidjson/filewritestream.h b/src/thirdparty/rapidjson/filewritestream.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/filewritestream.h
rename to src/thirdparty/rapidjson/filewritestream.h
diff --git a/r5dev/thirdparty/rapidjson/fwd.h b/src/thirdparty/rapidjson/fwd.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/fwd.h
rename to src/thirdparty/rapidjson/fwd.h
diff --git a/r5dev/thirdparty/rapidjson/internal/biginteger.h b/src/thirdparty/rapidjson/internal/biginteger.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/biginteger.h
rename to src/thirdparty/rapidjson/internal/biginteger.h
diff --git a/r5dev/thirdparty/rapidjson/internal/clzll.h b/src/thirdparty/rapidjson/internal/clzll.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/clzll.h
rename to src/thirdparty/rapidjson/internal/clzll.h
diff --git a/r5dev/thirdparty/rapidjson/internal/diyfp.h b/src/thirdparty/rapidjson/internal/diyfp.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/diyfp.h
rename to src/thirdparty/rapidjson/internal/diyfp.h
diff --git a/r5dev/thirdparty/rapidjson/internal/dtoa.h b/src/thirdparty/rapidjson/internal/dtoa.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/dtoa.h
rename to src/thirdparty/rapidjson/internal/dtoa.h
diff --git a/r5dev/thirdparty/rapidjson/internal/ieee754.h b/src/thirdparty/rapidjson/internal/ieee754.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/ieee754.h
rename to src/thirdparty/rapidjson/internal/ieee754.h
diff --git a/r5dev/thirdparty/rapidjson/internal/itoa.h b/src/thirdparty/rapidjson/internal/itoa.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/itoa.h
rename to src/thirdparty/rapidjson/internal/itoa.h
diff --git a/r5dev/thirdparty/rapidjson/internal/meta.h b/src/thirdparty/rapidjson/internal/meta.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/meta.h
rename to src/thirdparty/rapidjson/internal/meta.h
diff --git a/r5dev/thirdparty/rapidjson/internal/pow10.h b/src/thirdparty/rapidjson/internal/pow10.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/pow10.h
rename to src/thirdparty/rapidjson/internal/pow10.h
diff --git a/r5dev/thirdparty/rapidjson/internal/regex.h b/src/thirdparty/rapidjson/internal/regex.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/regex.h
rename to src/thirdparty/rapidjson/internal/regex.h
diff --git a/r5dev/thirdparty/rapidjson/internal/stack.h b/src/thirdparty/rapidjson/internal/stack.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/stack.h
rename to src/thirdparty/rapidjson/internal/stack.h
diff --git a/r5dev/thirdparty/rapidjson/internal/strfunc.h b/src/thirdparty/rapidjson/internal/strfunc.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/strfunc.h
rename to src/thirdparty/rapidjson/internal/strfunc.h
diff --git a/r5dev/thirdparty/rapidjson/internal/strtod.h b/src/thirdparty/rapidjson/internal/strtod.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/strtod.h
rename to src/thirdparty/rapidjson/internal/strtod.h
diff --git a/r5dev/thirdparty/rapidjson/internal/swap.h b/src/thirdparty/rapidjson/internal/swap.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/internal/swap.h
rename to src/thirdparty/rapidjson/internal/swap.h
diff --git a/r5dev/thirdparty/rapidjson/istreamwrapper.h b/src/thirdparty/rapidjson/istreamwrapper.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/istreamwrapper.h
rename to src/thirdparty/rapidjson/istreamwrapper.h
diff --git a/r5dev/thirdparty/rapidjson/memorybuffer.h b/src/thirdparty/rapidjson/memorybuffer.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/memorybuffer.h
rename to src/thirdparty/rapidjson/memorybuffer.h
diff --git a/r5dev/thirdparty/rapidjson/memorystream.h b/src/thirdparty/rapidjson/memorystream.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/memorystream.h
rename to src/thirdparty/rapidjson/memorystream.h
diff --git a/r5dev/thirdparty/rapidjson/msinttypes/inttypes.h b/src/thirdparty/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/msinttypes/inttypes.h
rename to src/thirdparty/rapidjson/msinttypes/inttypes.h
diff --git a/r5dev/thirdparty/rapidjson/msinttypes/stdint.h b/src/thirdparty/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/msinttypes/stdint.h
rename to src/thirdparty/rapidjson/msinttypes/stdint.h
diff --git a/r5dev/thirdparty/rapidjson/ostreamwrapper.h b/src/thirdparty/rapidjson/ostreamwrapper.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/ostreamwrapper.h
rename to src/thirdparty/rapidjson/ostreamwrapper.h
diff --git a/r5dev/thirdparty/rapidjson/pointer.h b/src/thirdparty/rapidjson/pointer.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/pointer.h
rename to src/thirdparty/rapidjson/pointer.h
diff --git a/r5dev/thirdparty/rapidjson/prettywriter.h b/src/thirdparty/rapidjson/prettywriter.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/prettywriter.h
rename to src/thirdparty/rapidjson/prettywriter.h
diff --git a/r5dev/thirdparty/rapidjson/rapidjson.h b/src/thirdparty/rapidjson/rapidjson.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/rapidjson.h
rename to src/thirdparty/rapidjson/rapidjson.h
diff --git a/r5dev/thirdparty/rapidjson/reader.h b/src/thirdparty/rapidjson/reader.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/reader.h
rename to src/thirdparty/rapidjson/reader.h
diff --git a/r5dev/thirdparty/rapidjson/schema.h b/src/thirdparty/rapidjson/schema.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/schema.h
rename to src/thirdparty/rapidjson/schema.h
diff --git a/r5dev/thirdparty/rapidjson/stream.h b/src/thirdparty/rapidjson/stream.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/stream.h
rename to src/thirdparty/rapidjson/stream.h
diff --git a/r5dev/thirdparty/rapidjson/stringbuffer.h b/src/thirdparty/rapidjson/stringbuffer.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/stringbuffer.h
rename to src/thirdparty/rapidjson/stringbuffer.h
diff --git a/r5dev/thirdparty/rapidjson/uri.h b/src/thirdparty/rapidjson/uri.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/uri.h
rename to src/thirdparty/rapidjson/uri.h
diff --git a/r5dev/thirdparty/rapidjson/writer.h b/src/thirdparty/rapidjson/writer.h
similarity index 100%
rename from r5dev/thirdparty/rapidjson/writer.h
rename to src/thirdparty/rapidjson/writer.h
diff --git a/r5dev/thirdparty/recast/CMakeLists.txt b/src/thirdparty/recast/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/recast/CMakeLists.txt
rename to src/thirdparty/recast/CMakeLists.txt
diff --git a/r5dev/thirdparty/recast/DebugUtils/Include/DebugDraw.h b/src/thirdparty/recast/DebugUtils/Include/DebugDraw.h
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Include/DebugDraw.h
rename to src/thirdparty/recast/DebugUtils/Include/DebugDraw.h
diff --git a/r5dev/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h b/src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h
rename to src/thirdparty/recast/DebugUtils/Include/DetourDebugDraw.h
diff --git a/r5dev/thirdparty/recast/DebugUtils/Include/RecastDebugDraw.h b/src/thirdparty/recast/DebugUtils/Include/RecastDebugDraw.h
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Include/RecastDebugDraw.h
rename to src/thirdparty/recast/DebugUtils/Include/RecastDebugDraw.h
diff --git a/r5dev/thirdparty/recast/DebugUtils/Include/RecastDump.h b/src/thirdparty/recast/DebugUtils/Include/RecastDump.h
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Include/RecastDump.h
rename to src/thirdparty/recast/DebugUtils/Include/RecastDump.h
diff --git a/r5dev/thirdparty/recast/DebugUtils/Source/DebugDraw.cpp b/src/thirdparty/recast/DebugUtils/Source/DebugDraw.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Source/DebugDraw.cpp
rename to src/thirdparty/recast/DebugUtils/Source/DebugDraw.cpp
diff --git a/r5dev/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp b/src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp
rename to src/thirdparty/recast/DebugUtils/Source/DetourDebugDraw.cpp
diff --git a/r5dev/thirdparty/recast/DebugUtils/Source/RecastDebugDraw.cpp b/src/thirdparty/recast/DebugUtils/Source/RecastDebugDraw.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Source/RecastDebugDraw.cpp
rename to src/thirdparty/recast/DebugUtils/Source/RecastDebugDraw.cpp
diff --git a/r5dev/thirdparty/recast/DebugUtils/Source/RecastDump.cpp b/src/thirdparty/recast/DebugUtils/Source/RecastDump.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DebugUtils/Source/RecastDump.cpp
rename to src/thirdparty/recast/DebugUtils/Source/RecastDump.cpp
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourAlloc.h b/src/thirdparty/recast/Detour/Include/DetourAlloc.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourAlloc.h
rename to src/thirdparty/recast/Detour/Include/DetourAlloc.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourAssert.h b/src/thirdparty/recast/Detour/Include/DetourAssert.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourAssert.h
rename to src/thirdparty/recast/Detour/Include/DetourAssert.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourCommon.h b/src/thirdparty/recast/Detour/Include/DetourCommon.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourCommon.h
rename to src/thirdparty/recast/Detour/Include/DetourCommon.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourMath.h b/src/thirdparty/recast/Detour/Include/DetourMath.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourMath.h
rename to src/thirdparty/recast/Detour/Include/DetourMath.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourNavMesh.h b/src/thirdparty/recast/Detour/Include/DetourNavMesh.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourNavMesh.h
rename to src/thirdparty/recast/Detour/Include/DetourNavMesh.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourNavMeshBuilder.h b/src/thirdparty/recast/Detour/Include/DetourNavMeshBuilder.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourNavMeshBuilder.h
rename to src/thirdparty/recast/Detour/Include/DetourNavMeshBuilder.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourNavMeshQuery.h b/src/thirdparty/recast/Detour/Include/DetourNavMeshQuery.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourNavMeshQuery.h
rename to src/thirdparty/recast/Detour/Include/DetourNavMeshQuery.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourNode.h b/src/thirdparty/recast/Detour/Include/DetourNode.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourNode.h
rename to src/thirdparty/recast/Detour/Include/DetourNode.h
diff --git a/r5dev/thirdparty/recast/Detour/Include/DetourStatus.h b/src/thirdparty/recast/Detour/Include/DetourStatus.h
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Include/DetourStatus.h
rename to src/thirdparty/recast/Detour/Include/DetourStatus.h
diff --git a/r5dev/thirdparty/recast/Detour/Source/DetourAlloc.cpp b/src/thirdparty/recast/Detour/Source/DetourAlloc.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Source/DetourAlloc.cpp
rename to src/thirdparty/recast/Detour/Source/DetourAlloc.cpp
diff --git a/r5dev/thirdparty/recast/Detour/Source/DetourAssert.cpp b/src/thirdparty/recast/Detour/Source/DetourAssert.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Source/DetourAssert.cpp
rename to src/thirdparty/recast/Detour/Source/DetourAssert.cpp
diff --git a/r5dev/thirdparty/recast/Detour/Source/DetourCommon.cpp b/src/thirdparty/recast/Detour/Source/DetourCommon.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Source/DetourCommon.cpp
rename to src/thirdparty/recast/Detour/Source/DetourCommon.cpp
diff --git a/r5dev/thirdparty/recast/Detour/Source/DetourNavMesh.cpp b/src/thirdparty/recast/Detour/Source/DetourNavMesh.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Source/DetourNavMesh.cpp
rename to src/thirdparty/recast/Detour/Source/DetourNavMesh.cpp
diff --git a/r5dev/thirdparty/recast/Detour/Source/DetourNavMeshBuilder.cpp b/src/thirdparty/recast/Detour/Source/DetourNavMeshBuilder.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Source/DetourNavMeshBuilder.cpp
rename to src/thirdparty/recast/Detour/Source/DetourNavMeshBuilder.cpp
diff --git a/r5dev/thirdparty/recast/Detour/Source/DetourNavMeshQuery.cpp b/src/thirdparty/recast/Detour/Source/DetourNavMeshQuery.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Source/DetourNavMeshQuery.cpp
rename to src/thirdparty/recast/Detour/Source/DetourNavMeshQuery.cpp
diff --git a/r5dev/thirdparty/recast/Detour/Source/DetourNode.cpp b/src/thirdparty/recast/Detour/Source/DetourNode.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Detour/Source/DetourNode.cpp
rename to src/thirdparty/recast/Detour/Source/DetourNode.cpp
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Include/DetourCrowd.h b/src/thirdparty/recast/DetourCrowd/Include/DetourCrowd.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Include/DetourCrowd.h
rename to src/thirdparty/recast/DetourCrowd/Include/DetourCrowd.h
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Include/DetourCrowdInternal.h b/src/thirdparty/recast/DetourCrowd/Include/DetourCrowdInternal.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Include/DetourCrowdInternal.h
rename to src/thirdparty/recast/DetourCrowd/Include/DetourCrowdInternal.h
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Include/DetourLocalBoundary.h b/src/thirdparty/recast/DetourCrowd/Include/DetourLocalBoundary.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Include/DetourLocalBoundary.h
rename to src/thirdparty/recast/DetourCrowd/Include/DetourLocalBoundary.h
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Include/DetourObstacleAvoidance.h b/src/thirdparty/recast/DetourCrowd/Include/DetourObstacleAvoidance.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Include/DetourObstacleAvoidance.h
rename to src/thirdparty/recast/DetourCrowd/Include/DetourObstacleAvoidance.h
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Include/DetourPathCorridor.h b/src/thirdparty/recast/DetourCrowd/Include/DetourPathCorridor.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Include/DetourPathCorridor.h
rename to src/thirdparty/recast/DetourCrowd/Include/DetourPathCorridor.h
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Include/DetourPathQueue.h b/src/thirdparty/recast/DetourCrowd/Include/DetourPathQueue.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Include/DetourPathQueue.h
rename to src/thirdparty/recast/DetourCrowd/Include/DetourPathQueue.h
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Include/DetourProximityGrid.h b/src/thirdparty/recast/DetourCrowd/Include/DetourProximityGrid.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Include/DetourProximityGrid.h
rename to src/thirdparty/recast/DetourCrowd/Include/DetourProximityGrid.h
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Source/DetourCrowd.cpp b/src/thirdparty/recast/DetourCrowd/Source/DetourCrowd.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Source/DetourCrowd.cpp
rename to src/thirdparty/recast/DetourCrowd/Source/DetourCrowd.cpp
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Source/DetourCrowdInternal.cpp b/src/thirdparty/recast/DetourCrowd/Source/DetourCrowdInternal.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Source/DetourCrowdInternal.cpp
rename to src/thirdparty/recast/DetourCrowd/Source/DetourCrowdInternal.cpp
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Source/DetourLocalBoundary.cpp b/src/thirdparty/recast/DetourCrowd/Source/DetourLocalBoundary.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Source/DetourLocalBoundary.cpp
rename to src/thirdparty/recast/DetourCrowd/Source/DetourLocalBoundary.cpp
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Source/DetourObstacleAvoidance.cpp b/src/thirdparty/recast/DetourCrowd/Source/DetourObstacleAvoidance.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Source/DetourObstacleAvoidance.cpp
rename to src/thirdparty/recast/DetourCrowd/Source/DetourObstacleAvoidance.cpp
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Source/DetourPathCorridor.cpp b/src/thirdparty/recast/DetourCrowd/Source/DetourPathCorridor.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Source/DetourPathCorridor.cpp
rename to src/thirdparty/recast/DetourCrowd/Source/DetourPathCorridor.cpp
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Source/DetourPathQueue.cpp b/src/thirdparty/recast/DetourCrowd/Source/DetourPathQueue.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Source/DetourPathQueue.cpp
rename to src/thirdparty/recast/DetourCrowd/Source/DetourPathQueue.cpp
diff --git a/r5dev/thirdparty/recast/DetourCrowd/Source/DetourProximityGrid.cpp b/src/thirdparty/recast/DetourCrowd/Source/DetourProximityGrid.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourCrowd/Source/DetourProximityGrid.cpp
rename to src/thirdparty/recast/DetourCrowd/Source/DetourProximityGrid.cpp
diff --git a/r5dev/thirdparty/recast/DetourTileCache/Include/DetourTileCache.h b/src/thirdparty/recast/DetourTileCache/Include/DetourTileCache.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourTileCache/Include/DetourTileCache.h
rename to src/thirdparty/recast/DetourTileCache/Include/DetourTileCache.h
diff --git a/r5dev/thirdparty/recast/DetourTileCache/Include/DetourTileCacheBuilder.h b/src/thirdparty/recast/DetourTileCache/Include/DetourTileCacheBuilder.h
similarity index 100%
rename from r5dev/thirdparty/recast/DetourTileCache/Include/DetourTileCacheBuilder.h
rename to src/thirdparty/recast/DetourTileCache/Include/DetourTileCacheBuilder.h
diff --git a/r5dev/thirdparty/recast/DetourTileCache/Source/DetourTileCache.cpp b/src/thirdparty/recast/DetourTileCache/Source/DetourTileCache.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourTileCache/Source/DetourTileCache.cpp
rename to src/thirdparty/recast/DetourTileCache/Source/DetourTileCache.cpp
diff --git a/r5dev/thirdparty/recast/DetourTileCache/Source/DetourTileCacheBuilder.cpp b/src/thirdparty/recast/DetourTileCache/Source/DetourTileCacheBuilder.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/DetourTileCache/Source/DetourTileCacheBuilder.cpp
rename to src/thirdparty/recast/DetourTileCache/Source/DetourTileCacheBuilder.cpp
diff --git a/r5dev/thirdparty/recast/Pch.cpp b/src/thirdparty/recast/Pch.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Pch.cpp
rename to src/thirdparty/recast/Pch.cpp
diff --git a/r5dev/thirdparty/recast/Pch.h b/src/thirdparty/recast/Pch.h
similarity index 100%
rename from r5dev/thirdparty/recast/Pch.h
rename to src/thirdparty/recast/Pch.h
diff --git a/r5dev/thirdparty/recast/Recast/Include/Recast.h b/src/thirdparty/recast/Recast/Include/Recast.h
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Include/Recast.h
rename to src/thirdparty/recast/Recast/Include/Recast.h
diff --git a/r5dev/thirdparty/recast/Recast/Include/RecastAlloc.h b/src/thirdparty/recast/Recast/Include/RecastAlloc.h
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Include/RecastAlloc.h
rename to src/thirdparty/recast/Recast/Include/RecastAlloc.h
diff --git a/r5dev/thirdparty/recast/Recast/Include/RecastAssert.h b/src/thirdparty/recast/Recast/Include/RecastAssert.h
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Include/RecastAssert.h
rename to src/thirdparty/recast/Recast/Include/RecastAssert.h
diff --git a/r5dev/thirdparty/recast/Recast/Source/Recast.cpp b/src/thirdparty/recast/Recast/Source/Recast.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/Recast.cpp
rename to src/thirdparty/recast/Recast/Source/Recast.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastAlloc.cpp b/src/thirdparty/recast/Recast/Source/RecastAlloc.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastAlloc.cpp
rename to src/thirdparty/recast/Recast/Source/RecastAlloc.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastArea.cpp b/src/thirdparty/recast/Recast/Source/RecastArea.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastArea.cpp
rename to src/thirdparty/recast/Recast/Source/RecastArea.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastAssert.cpp b/src/thirdparty/recast/Recast/Source/RecastAssert.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastAssert.cpp
rename to src/thirdparty/recast/Recast/Source/RecastAssert.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastContour.cpp b/src/thirdparty/recast/Recast/Source/RecastContour.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastContour.cpp
rename to src/thirdparty/recast/Recast/Source/RecastContour.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastFilter.cpp b/src/thirdparty/recast/Recast/Source/RecastFilter.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastFilter.cpp
rename to src/thirdparty/recast/Recast/Source/RecastFilter.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastLayers.cpp b/src/thirdparty/recast/Recast/Source/RecastLayers.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastLayers.cpp
rename to src/thirdparty/recast/Recast/Source/RecastLayers.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastMesh.cpp b/src/thirdparty/recast/Recast/Source/RecastMesh.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastMesh.cpp
rename to src/thirdparty/recast/Recast/Source/RecastMesh.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastMeshDetail.cpp b/src/thirdparty/recast/Recast/Source/RecastMeshDetail.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastMeshDetail.cpp
rename to src/thirdparty/recast/Recast/Source/RecastMeshDetail.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastRasterization.cpp b/src/thirdparty/recast/Recast/Source/RecastRasterization.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastRasterization.cpp
rename to src/thirdparty/recast/Recast/Source/RecastRasterization.cpp
diff --git a/r5dev/thirdparty/recast/Recast/Source/RecastRegion.cpp b/src/thirdparty/recast/Recast/Source/RecastRegion.cpp
similarity index 100%
rename from r5dev/thirdparty/recast/Recast/Source/RecastRegion.cpp
rename to src/thirdparty/recast/Recast/Source/RecastRegion.cpp
diff --git a/r5dev/thirdparty/sdl/CMakeLists.txt b/src/thirdparty/sdl/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/CMakeLists.txt
rename to src/thirdparty/sdl/CMakeLists.txt
diff --git a/r5dev/thirdparty/sdl/include/SDL.h b/src/thirdparty/sdl/include/SDL.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL.h
rename to src/thirdparty/sdl/include/SDL.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_assert.h b/src/thirdparty/sdl/include/SDL_assert.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_assert.h
rename to src/thirdparty/sdl/include/SDL_assert.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_atomic.h b/src/thirdparty/sdl/include/SDL_atomic.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_atomic.h
rename to src/thirdparty/sdl/include/SDL_atomic.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_audio.h b/src/thirdparty/sdl/include/SDL_audio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_audio.h
rename to src/thirdparty/sdl/include/SDL_audio.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_bits.h b/src/thirdparty/sdl/include/SDL_bits.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_bits.h
rename to src/thirdparty/sdl/include/SDL_bits.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_blendmode.h b/src/thirdparty/sdl/include/SDL_blendmode.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_blendmode.h
rename to src/thirdparty/sdl/include/SDL_blendmode.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_clipboard.h b/src/thirdparty/sdl/include/SDL_clipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_clipboard.h
rename to src/thirdparty/sdl/include/SDL_clipboard.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config.h b/src/thirdparty/sdl/include/SDL_config.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config.h
rename to src/thirdparty/sdl/include/SDL_config.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config.h.cmake b/src/thirdparty/sdl/include/SDL_config.h.cmake
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config.h.cmake
rename to src/thirdparty/sdl/include/SDL_config.h.cmake
diff --git a/r5dev/thirdparty/sdl/include/SDL_config.h.in b/src/thirdparty/sdl/include/SDL_config.h.in
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config.h.in
rename to src/thirdparty/sdl/include/SDL_config.h.in
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_android.h b/src/thirdparty/sdl/include/SDL_config_android.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_android.h
rename to src/thirdparty/sdl/include/SDL_config_android.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_emscripten.h b/src/thirdparty/sdl/include/SDL_config_emscripten.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_emscripten.h
rename to src/thirdparty/sdl/include/SDL_config_emscripten.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_iphoneos.h b/src/thirdparty/sdl/include/SDL_config_iphoneos.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_iphoneos.h
rename to src/thirdparty/sdl/include/SDL_config_iphoneos.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_macosx.h b/src/thirdparty/sdl/include/SDL_config_macosx.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_macosx.h
rename to src/thirdparty/sdl/include/SDL_config_macosx.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_minimal.h b/src/thirdparty/sdl/include/SDL_config_minimal.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_minimal.h
rename to src/thirdparty/sdl/include/SDL_config_minimal.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_os2.h b/src/thirdparty/sdl/include/SDL_config_os2.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_os2.h
rename to src/thirdparty/sdl/include/SDL_config_os2.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_pandora.h b/src/thirdparty/sdl/include/SDL_config_pandora.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_pandora.h
rename to src/thirdparty/sdl/include/SDL_config_pandora.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_psp.h b/src/thirdparty/sdl/include/SDL_config_psp.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_psp.h
rename to src/thirdparty/sdl/include/SDL_config_psp.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_windows.h b/src/thirdparty/sdl/include/SDL_config_windows.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_windows.h
rename to src/thirdparty/sdl/include/SDL_config_windows.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_winrt.h b/src/thirdparty/sdl/include/SDL_config_winrt.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_winrt.h
rename to src/thirdparty/sdl/include/SDL_config_winrt.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_config_wiz.h b/src/thirdparty/sdl/include/SDL_config_wiz.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_config_wiz.h
rename to src/thirdparty/sdl/include/SDL_config_wiz.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_copying.h b/src/thirdparty/sdl/include/SDL_copying.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_copying.h
rename to src/thirdparty/sdl/include/SDL_copying.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_cpuinfo.h b/src/thirdparty/sdl/include/SDL_cpuinfo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_cpuinfo.h
rename to src/thirdparty/sdl/include/SDL_cpuinfo.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_egl.h b/src/thirdparty/sdl/include/SDL_egl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_egl.h
rename to src/thirdparty/sdl/include/SDL_egl.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_endian.h b/src/thirdparty/sdl/include/SDL_endian.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_endian.h
rename to src/thirdparty/sdl/include/SDL_endian.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_error.h b/src/thirdparty/sdl/include/SDL_error.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_error.h
rename to src/thirdparty/sdl/include/SDL_error.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_events.h b/src/thirdparty/sdl/include/SDL_events.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_events.h
rename to src/thirdparty/sdl/include/SDL_events.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_filesystem.h b/src/thirdparty/sdl/include/SDL_filesystem.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_filesystem.h
rename to src/thirdparty/sdl/include/SDL_filesystem.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_gamecontroller.h b/src/thirdparty/sdl/include/SDL_gamecontroller.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_gamecontroller.h
rename to src/thirdparty/sdl/include/SDL_gamecontroller.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_gesture.h b/src/thirdparty/sdl/include/SDL_gesture.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_gesture.h
rename to src/thirdparty/sdl/include/SDL_gesture.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_haptic.h b/src/thirdparty/sdl/include/SDL_haptic.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_haptic.h
rename to src/thirdparty/sdl/include/SDL_haptic.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_hidapi.h b/src/thirdparty/sdl/include/SDL_hidapi.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_hidapi.h
rename to src/thirdparty/sdl/include/SDL_hidapi.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_hints.h b/src/thirdparty/sdl/include/SDL_hints.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_hints.h
rename to src/thirdparty/sdl/include/SDL_hints.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_joystick.h b/src/thirdparty/sdl/include/SDL_joystick.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_joystick.h
rename to src/thirdparty/sdl/include/SDL_joystick.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_keyboard.h b/src/thirdparty/sdl/include/SDL_keyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_keyboard.h
rename to src/thirdparty/sdl/include/SDL_keyboard.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_keycode.h b/src/thirdparty/sdl/include/SDL_keycode.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_keycode.h
rename to src/thirdparty/sdl/include/SDL_keycode.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_loadso.h b/src/thirdparty/sdl/include/SDL_loadso.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_loadso.h
rename to src/thirdparty/sdl/include/SDL_loadso.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_locale.h b/src/thirdparty/sdl/include/SDL_locale.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_locale.h
rename to src/thirdparty/sdl/include/SDL_locale.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_log.h b/src/thirdparty/sdl/include/SDL_log.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_log.h
rename to src/thirdparty/sdl/include/SDL_log.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_main.h b/src/thirdparty/sdl/include/SDL_main.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_main.h
rename to src/thirdparty/sdl/include/SDL_main.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_messagebox.h b/src/thirdparty/sdl/include/SDL_messagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_messagebox.h
rename to src/thirdparty/sdl/include/SDL_messagebox.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_metal.h b/src/thirdparty/sdl/include/SDL_metal.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_metal.h
rename to src/thirdparty/sdl/include/SDL_metal.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_misc.h b/src/thirdparty/sdl/include/SDL_misc.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_misc.h
rename to src/thirdparty/sdl/include/SDL_misc.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_mouse.h b/src/thirdparty/sdl/include/SDL_mouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_mouse.h
rename to src/thirdparty/sdl/include/SDL_mouse.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_mutex.h b/src/thirdparty/sdl/include/SDL_mutex.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_mutex.h
rename to src/thirdparty/sdl/include/SDL_mutex.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_name.h b/src/thirdparty/sdl/include/SDL_name.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_name.h
rename to src/thirdparty/sdl/include/SDL_name.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengl.h b/src/thirdparty/sdl/include/SDL_opengl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengl.h
rename to src/thirdparty/sdl/include/SDL_opengl.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengl_glext.h b/src/thirdparty/sdl/include/SDL_opengl_glext.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengl_glext.h
rename to src/thirdparty/sdl/include/SDL_opengl_glext.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengles.h b/src/thirdparty/sdl/include/SDL_opengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengles.h
rename to src/thirdparty/sdl/include/SDL_opengles.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengles2.h b/src/thirdparty/sdl/include/SDL_opengles2.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengles2.h
rename to src/thirdparty/sdl/include/SDL_opengles2.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengles2_gl2.h b/src/thirdparty/sdl/include/SDL_opengles2_gl2.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengles2_gl2.h
rename to src/thirdparty/sdl/include/SDL_opengles2_gl2.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengles2_gl2ext.h b/src/thirdparty/sdl/include/SDL_opengles2_gl2ext.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengles2_gl2ext.h
rename to src/thirdparty/sdl/include/SDL_opengles2_gl2ext.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengles2_gl2platform.h b/src/thirdparty/sdl/include/SDL_opengles2_gl2platform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengles2_gl2platform.h
rename to src/thirdparty/sdl/include/SDL_opengles2_gl2platform.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_opengles2_khrplatform.h b/src/thirdparty/sdl/include/SDL_opengles2_khrplatform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_opengles2_khrplatform.h
rename to src/thirdparty/sdl/include/SDL_opengles2_khrplatform.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_pixels.h b/src/thirdparty/sdl/include/SDL_pixels.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_pixels.h
rename to src/thirdparty/sdl/include/SDL_pixels.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_platform.h b/src/thirdparty/sdl/include/SDL_platform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_platform.h
rename to src/thirdparty/sdl/include/SDL_platform.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_power.h b/src/thirdparty/sdl/include/SDL_power.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_power.h
rename to src/thirdparty/sdl/include/SDL_power.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_quit.h b/src/thirdparty/sdl/include/SDL_quit.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_quit.h
rename to src/thirdparty/sdl/include/SDL_quit.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_rect.h b/src/thirdparty/sdl/include/SDL_rect.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_rect.h
rename to src/thirdparty/sdl/include/SDL_rect.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_render.h b/src/thirdparty/sdl/include/SDL_render.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_render.h
rename to src/thirdparty/sdl/include/SDL_render.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_revision.h b/src/thirdparty/sdl/include/SDL_revision.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_revision.h
rename to src/thirdparty/sdl/include/SDL_revision.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_revision.h.cmake b/src/thirdparty/sdl/include/SDL_revision.h.cmake
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_revision.h.cmake
rename to src/thirdparty/sdl/include/SDL_revision.h.cmake
diff --git a/r5dev/thirdparty/sdl/include/SDL_rwops.h b/src/thirdparty/sdl/include/SDL_rwops.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_rwops.h
rename to src/thirdparty/sdl/include/SDL_rwops.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_scancode.h b/src/thirdparty/sdl/include/SDL_scancode.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_scancode.h
rename to src/thirdparty/sdl/include/SDL_scancode.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_sensor.h b/src/thirdparty/sdl/include/SDL_sensor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_sensor.h
rename to src/thirdparty/sdl/include/SDL_sensor.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_shape.h b/src/thirdparty/sdl/include/SDL_shape.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_shape.h
rename to src/thirdparty/sdl/include/SDL_shape.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_stdinc.h b/src/thirdparty/sdl/include/SDL_stdinc.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_stdinc.h
rename to src/thirdparty/sdl/include/SDL_stdinc.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_surface.h b/src/thirdparty/sdl/include/SDL_surface.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_surface.h
rename to src/thirdparty/sdl/include/SDL_surface.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_system.h b/src/thirdparty/sdl/include/SDL_system.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_system.h
rename to src/thirdparty/sdl/include/SDL_system.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_syswm.h b/src/thirdparty/sdl/include/SDL_syswm.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_syswm.h
rename to src/thirdparty/sdl/include/SDL_syswm.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test.h b/src/thirdparty/sdl/include/SDL_test.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test.h
rename to src/thirdparty/sdl/include/SDL_test.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_assert.h b/src/thirdparty/sdl/include/SDL_test_assert.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_assert.h
rename to src/thirdparty/sdl/include/SDL_test_assert.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_common.h b/src/thirdparty/sdl/include/SDL_test_common.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_common.h
rename to src/thirdparty/sdl/include/SDL_test_common.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_compare.h b/src/thirdparty/sdl/include/SDL_test_compare.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_compare.h
rename to src/thirdparty/sdl/include/SDL_test_compare.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_crc32.h b/src/thirdparty/sdl/include/SDL_test_crc32.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_crc32.h
rename to src/thirdparty/sdl/include/SDL_test_crc32.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_font.h b/src/thirdparty/sdl/include/SDL_test_font.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_font.h
rename to src/thirdparty/sdl/include/SDL_test_font.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_fuzzer.h b/src/thirdparty/sdl/include/SDL_test_fuzzer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_fuzzer.h
rename to src/thirdparty/sdl/include/SDL_test_fuzzer.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_harness.h b/src/thirdparty/sdl/include/SDL_test_harness.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_harness.h
rename to src/thirdparty/sdl/include/SDL_test_harness.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_images.h b/src/thirdparty/sdl/include/SDL_test_images.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_images.h
rename to src/thirdparty/sdl/include/SDL_test_images.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_log.h b/src/thirdparty/sdl/include/SDL_test_log.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_log.h
rename to src/thirdparty/sdl/include/SDL_test_log.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_md5.h b/src/thirdparty/sdl/include/SDL_test_md5.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_md5.h
rename to src/thirdparty/sdl/include/SDL_test_md5.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_memory.h b/src/thirdparty/sdl/include/SDL_test_memory.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_memory.h
rename to src/thirdparty/sdl/include/SDL_test_memory.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_test_random.h b/src/thirdparty/sdl/include/SDL_test_random.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_test_random.h
rename to src/thirdparty/sdl/include/SDL_test_random.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_thread.h b/src/thirdparty/sdl/include/SDL_thread.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_thread.h
rename to src/thirdparty/sdl/include/SDL_thread.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_timer.h b/src/thirdparty/sdl/include/SDL_timer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_timer.h
rename to src/thirdparty/sdl/include/SDL_timer.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_touch.h b/src/thirdparty/sdl/include/SDL_touch.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_touch.h
rename to src/thirdparty/sdl/include/SDL_touch.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_types.h b/src/thirdparty/sdl/include/SDL_types.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_types.h
rename to src/thirdparty/sdl/include/SDL_types.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_version.h b/src/thirdparty/sdl/include/SDL_version.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_version.h
rename to src/thirdparty/sdl/include/SDL_version.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_video.h b/src/thirdparty/sdl/include/SDL_video.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_video.h
rename to src/thirdparty/sdl/include/SDL_video.h
diff --git a/r5dev/thirdparty/sdl/include/SDL_vulkan.h b/src/thirdparty/sdl/include/SDL_vulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/SDL_vulkan.h
rename to src/thirdparty/sdl/include/SDL_vulkan.h
diff --git a/r5dev/thirdparty/sdl/include/begin_code.h b/src/thirdparty/sdl/include/begin_code.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/begin_code.h
rename to src/thirdparty/sdl/include/begin_code.h
diff --git a/r5dev/thirdparty/sdl/include/close_code.h b/src/thirdparty/sdl/include/close_code.h
similarity index 100%
rename from r5dev/thirdparty/sdl/include/close_code.h
rename to src/thirdparty/sdl/include/close_code.h
diff --git a/r5dev/thirdparty/sdl/src/SDL.c b/src/thirdparty/sdl/src/SDL.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL.c
rename to src/thirdparty/sdl/src/SDL.c
diff --git a/r5dev/thirdparty/sdl/src/SDL_assert.c b/src/thirdparty/sdl/src/SDL_assert.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_assert.c
rename to src/thirdparty/sdl/src/SDL_assert.c
diff --git a/r5dev/thirdparty/sdl/src/SDL_assert_c.h b/src/thirdparty/sdl/src/SDL_assert_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_assert_c.h
rename to src/thirdparty/sdl/src/SDL_assert_c.h
diff --git a/r5dev/thirdparty/sdl/src/SDL_dataqueue.c b/src/thirdparty/sdl/src/SDL_dataqueue.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_dataqueue.c
rename to src/thirdparty/sdl/src/SDL_dataqueue.c
diff --git a/r5dev/thirdparty/sdl/src/SDL_dataqueue.h b/src/thirdparty/sdl/src/SDL_dataqueue.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_dataqueue.h
rename to src/thirdparty/sdl/src/SDL_dataqueue.h
diff --git a/r5dev/thirdparty/sdl/src/SDL_error.c b/src/thirdparty/sdl/src/SDL_error.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_error.c
rename to src/thirdparty/sdl/src/SDL_error.c
diff --git a/r5dev/thirdparty/sdl/src/SDL_error_c.h b/src/thirdparty/sdl/src/SDL_error_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_error_c.h
rename to src/thirdparty/sdl/src/SDL_error_c.h
diff --git a/r5dev/thirdparty/sdl/src/SDL_hints.c b/src/thirdparty/sdl/src/SDL_hints.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_hints.c
rename to src/thirdparty/sdl/src/SDL_hints.c
diff --git a/r5dev/thirdparty/sdl/src/SDL_hints_c.h b/src/thirdparty/sdl/src/SDL_hints_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_hints_c.h
rename to src/thirdparty/sdl/src/SDL_hints_c.h
diff --git a/r5dev/thirdparty/sdl/src/SDL_internal.h b/src/thirdparty/sdl/src/SDL_internal.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_internal.h
rename to src/thirdparty/sdl/src/SDL_internal.h
diff --git a/r5dev/thirdparty/sdl/src/SDL_log.c b/src/thirdparty/sdl/src/SDL_log.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/SDL_log.c
rename to src/thirdparty/sdl/src/SDL_log.c
diff --git a/r5dev/thirdparty/sdl/src/atomic/SDL_atomic.c b/src/thirdparty/sdl/src/atomic/SDL_atomic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/atomic/SDL_atomic.c
rename to src/thirdparty/sdl/src/atomic/SDL_atomic.c
diff --git a/r5dev/thirdparty/sdl/src/atomic/SDL_spinlock.c b/src/thirdparty/sdl/src/atomic/SDL_spinlock.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/atomic/SDL_spinlock.c
rename to src/thirdparty/sdl/src/atomic/SDL_spinlock.c
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_audio.c b/src/thirdparty/sdl/src/audio/SDL_audio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_audio.c
rename to src/thirdparty/sdl/src/audio/SDL_audio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_audio_c.h b/src/thirdparty/sdl/src/audio/SDL_audio_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_audio_c.h
rename to src/thirdparty/sdl/src/audio/SDL_audio_c.h
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_audiocvt.c b/src/thirdparty/sdl/src/audio/SDL_audiocvt.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_audiocvt.c
rename to src/thirdparty/sdl/src/audio/SDL_audiocvt.c
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_audiodev.c b/src/thirdparty/sdl/src/audio/SDL_audiodev.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_audiodev.c
rename to src/thirdparty/sdl/src/audio/SDL_audiodev.c
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_audiodev_c.h b/src/thirdparty/sdl/src/audio/SDL_audiodev_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_audiodev_c.h
rename to src/thirdparty/sdl/src/audio/SDL_audiodev_c.h
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_audiotypecvt.c b/src/thirdparty/sdl/src/audio/SDL_audiotypecvt.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_audiotypecvt.c
rename to src/thirdparty/sdl/src/audio/SDL_audiotypecvt.c
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_mixer.c b/src/thirdparty/sdl/src/audio/SDL_mixer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_mixer.c
rename to src/thirdparty/sdl/src/audio/SDL_mixer.c
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_sysaudio.h b/src/thirdparty/sdl/src/audio/SDL_sysaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_sysaudio.h
rename to src/thirdparty/sdl/src/audio/SDL_sysaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_wave.c b/src/thirdparty/sdl/src/audio/SDL_wave.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_wave.c
rename to src/thirdparty/sdl/src/audio/SDL_wave.c
diff --git a/r5dev/thirdparty/sdl/src/audio/SDL_wave.h b/src/thirdparty/sdl/src/audio/SDL_wave.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/SDL_wave.h
rename to src/thirdparty/sdl/src/audio/SDL_wave.h
diff --git a/r5dev/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.c b/src/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.c
rename to src/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.h b/src/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.h
rename to src/thirdparty/sdl/src/audio/aaudio/SDL_aaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/aaudio/SDL_aaudiofuncs.h b/src/thirdparty/sdl/src/audio/aaudio/SDL_aaudiofuncs.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/aaudio/SDL_aaudiofuncs.h
rename to src/thirdparty/sdl/src/audio/aaudio/SDL_aaudiofuncs.h
diff --git a/r5dev/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.c b/src/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.c
rename to src/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.h b/src/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.h
rename to src/thirdparty/sdl/src/audio/alsa/SDL_alsa_audio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/android/SDL_androidaudio.c b/src/thirdparty/sdl/src/audio/android/SDL_androidaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/android/SDL_androidaudio.c
rename to src/thirdparty/sdl/src/audio/android/SDL_androidaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/android/SDL_androidaudio.h b/src/thirdparty/sdl/src/audio/android/SDL_androidaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/android/SDL_androidaudio.h
rename to src/thirdparty/sdl/src/audio/android/SDL_androidaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/arts/SDL_artsaudio.c b/src/thirdparty/sdl/src/audio/arts/SDL_artsaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/arts/SDL_artsaudio.c
rename to src/thirdparty/sdl/src/audio/arts/SDL_artsaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/arts/SDL_artsaudio.h b/src/thirdparty/sdl/src/audio/arts/SDL_artsaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/arts/SDL_artsaudio.h
rename to src/thirdparty/sdl/src/audio/arts/SDL_artsaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.h b/src/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.h
rename to src/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.m b/src/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.m
rename to src/thirdparty/sdl/src/audio/coreaudio/SDL_coreaudio.m
diff --git a/r5dev/thirdparty/sdl/src/audio/directsound/SDL_directsound.c b/src/thirdparty/sdl/src/audio/directsound/SDL_directsound.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/directsound/SDL_directsound.c
rename to src/thirdparty/sdl/src/audio/directsound/SDL_directsound.c
diff --git a/r5dev/thirdparty/sdl/src/audio/directsound/SDL_directsound.h b/src/thirdparty/sdl/src/audio/directsound/SDL_directsound.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/directsound/SDL_directsound.h
rename to src/thirdparty/sdl/src/audio/directsound/SDL_directsound.h
diff --git a/r5dev/thirdparty/sdl/src/audio/disk/SDL_diskaudio.c b/src/thirdparty/sdl/src/audio/disk/SDL_diskaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/disk/SDL_diskaudio.c
rename to src/thirdparty/sdl/src/audio/disk/SDL_diskaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/disk/SDL_diskaudio.h b/src/thirdparty/sdl/src/audio/disk/SDL_diskaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/disk/SDL_diskaudio.h
rename to src/thirdparty/sdl/src/audio/disk/SDL_diskaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.c b/src/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.c
rename to src/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.h b/src/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.h
rename to src/thirdparty/sdl/src/audio/dsp/SDL_dspaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.c b/src/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.c
rename to src/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.h b/src/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.h
rename to src/thirdparty/sdl/src/audio/dummy/SDL_dummyaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.c b/src/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.c
rename to src/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.h b/src/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.h
rename to src/thirdparty/sdl/src/audio/emscripten/SDL_emscriptenaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/esd/SDL_esdaudio.c b/src/thirdparty/sdl/src/audio/esd/SDL_esdaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/esd/SDL_esdaudio.c
rename to src/thirdparty/sdl/src/audio/esd/SDL_esdaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/esd/SDL_esdaudio.h b/src/thirdparty/sdl/src/audio/esd/SDL_esdaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/esd/SDL_esdaudio.h
rename to src/thirdparty/sdl/src/audio/esd/SDL_esdaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.c b/src/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.c
rename to src/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.h b/src/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.h
rename to src/thirdparty/sdl/src/audio/fusionsound/SDL_fsaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.cc b/src/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.cc
rename to src/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.cc
diff --git a/r5dev/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.h b/src/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.h
rename to src/thirdparty/sdl/src/audio/haiku/SDL_haikuaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/jack/SDL_jackaudio.c b/src/thirdparty/sdl/src/audio/jack/SDL_jackaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/jack/SDL_jackaudio.c
rename to src/thirdparty/sdl/src/audio/jack/SDL_jackaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/jack/SDL_jackaudio.h b/src/thirdparty/sdl/src/audio/jack/SDL_jackaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/jack/SDL_jackaudio.h
rename to src/thirdparty/sdl/src/audio/jack/SDL_jackaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.c b/src/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.c
rename to src/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.h b/src/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.h
rename to src/thirdparty/sdl/src/audio/nacl/SDL_naclaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/nas/SDL_nasaudio.c b/src/thirdparty/sdl/src/audio/nas/SDL_nasaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/nas/SDL_nasaudio.c
rename to src/thirdparty/sdl/src/audio/nas/SDL_nasaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/nas/SDL_nasaudio.h b/src/thirdparty/sdl/src/audio/nas/SDL_nasaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/nas/SDL_nasaudio.h
rename to src/thirdparty/sdl/src/audio/nas/SDL_nasaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.c b/src/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.c
rename to src/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.h b/src/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.h
rename to src/thirdparty/sdl/src/audio/netbsd/SDL_netbsdaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/openslES/SDL_openslES.c b/src/thirdparty/sdl/src/audio/openslES/SDL_openslES.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/openslES/SDL_openslES.c
rename to src/thirdparty/sdl/src/audio/openslES/SDL_openslES.c
diff --git a/r5dev/thirdparty/sdl/src/audio/openslES/SDL_openslES.h b/src/thirdparty/sdl/src/audio/openslES/SDL_openslES.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/openslES/SDL_openslES.h
rename to src/thirdparty/sdl/src/audio/openslES/SDL_openslES.h
diff --git a/r5dev/thirdparty/sdl/src/audio/os2/SDL_os2audio.c b/src/thirdparty/sdl/src/audio/os2/SDL_os2audio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/os2/SDL_os2audio.c
rename to src/thirdparty/sdl/src/audio/os2/SDL_os2audio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/os2/SDL_os2audio.h b/src/thirdparty/sdl/src/audio/os2/SDL_os2audio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/os2/SDL_os2audio.h
rename to src/thirdparty/sdl/src/audio/os2/SDL_os2audio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/paudio/SDL_paudio.c b/src/thirdparty/sdl/src/audio/paudio/SDL_paudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/paudio/SDL_paudio.c
rename to src/thirdparty/sdl/src/audio/paudio/SDL_paudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/paudio/SDL_paudio.h b/src/thirdparty/sdl/src/audio/paudio/SDL_paudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/paudio/SDL_paudio.h
rename to src/thirdparty/sdl/src/audio/paudio/SDL_paudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.c b/src/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.c
rename to src/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.c
diff --git a/r5dev/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.h b/src/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.h
rename to src/thirdparty/sdl/src/audio/pipewire/SDL_pipewire.h
diff --git a/r5dev/thirdparty/sdl/src/audio/psp/SDL_pspaudio.c b/src/thirdparty/sdl/src/audio/psp/SDL_pspaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/psp/SDL_pspaudio.c
rename to src/thirdparty/sdl/src/audio/psp/SDL_pspaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/psp/SDL_pspaudio.h b/src/thirdparty/sdl/src/audio/psp/SDL_pspaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/psp/SDL_pspaudio.h
rename to src/thirdparty/sdl/src/audio/psp/SDL_pspaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.c b/src/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.c
rename to src/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.h b/src/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.h
rename to src/thirdparty/sdl/src/audio/pulseaudio/SDL_pulseaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.c b/src/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.c
rename to src/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.h b/src/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.h
rename to src/thirdparty/sdl/src/audio/qsa/SDL_qsa_audio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.c b/src/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.c
rename to src/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.h b/src/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.h
rename to src/thirdparty/sdl/src/audio/sndio/SDL_sndioaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/sun/SDL_sunaudio.c b/src/thirdparty/sdl/src/audio/sun/SDL_sunaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/sun/SDL_sunaudio.c
rename to src/thirdparty/sdl/src/audio/sun/SDL_sunaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/sun/SDL_sunaudio.h b/src/thirdparty/sdl/src/audio/sun/SDL_sunaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/sun/SDL_sunaudio.h
rename to src/thirdparty/sdl/src/audio/sun/SDL_sunaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.c b/src/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.c
rename to src/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.c
diff --git a/r5dev/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.h b/src/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.h
rename to src/thirdparty/sdl/src/audio/vita/SDL_vitaaudio.h
diff --git a/r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.c b/src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.c
rename to src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.c
diff --git a/r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.h b/src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.h
rename to src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi.h
diff --git a/r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_win32.c b/src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_win32.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_win32.c
rename to src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_win32.c
diff --git a/r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp b/src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp
rename to src/thirdparty/sdl/src/audio/wasapi/SDL_wasapi_winrt.cpp
diff --git a/r5dev/thirdparty/sdl/src/audio/winmm/SDL_winmm.c b/src/thirdparty/sdl/src/audio/winmm/SDL_winmm.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/winmm/SDL_winmm.c
rename to src/thirdparty/sdl/src/audio/winmm/SDL_winmm.c
diff --git a/r5dev/thirdparty/sdl/src/audio/winmm/SDL_winmm.h b/src/thirdparty/sdl/src/audio/winmm/SDL_winmm.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/audio/winmm/SDL_winmm.h
rename to src/thirdparty/sdl/src/audio/winmm/SDL_winmm.h
diff --git a/r5dev/thirdparty/sdl/src/core/android/SDL_android.c b/src/thirdparty/sdl/src/core/android/SDL_android.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/android/SDL_android.c
rename to src/thirdparty/sdl/src/core/android/SDL_android.c
diff --git a/r5dev/thirdparty/sdl/src/core/android/SDL_android.h b/src/thirdparty/sdl/src/core/android/SDL_android.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/android/SDL_android.h
rename to src/thirdparty/sdl/src/core/android/SDL_android.h
diff --git a/r5dev/thirdparty/sdl/src/core/android/keyinfotable.h b/src/thirdparty/sdl/src/core/android/keyinfotable.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/android/keyinfotable.h
rename to src/thirdparty/sdl/src/core/android/keyinfotable.h
diff --git a/r5dev/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_default_keyaccmap.h b/src/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_default_keyaccmap.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_default_keyaccmap.h
rename to src/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_default_keyaccmap.h
diff --git a/r5dev/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_freebsd.c b/src/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_freebsd.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_freebsd.c
rename to src/thirdparty/sdl/src/core/freebsd/SDL_evdev_kbd_freebsd.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_dbus.c b/src/thirdparty/sdl/src/core/linux/SDL_dbus.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_dbus.c
rename to src/thirdparty/sdl/src/core/linux/SDL_dbus.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_dbus.h b/src/thirdparty/sdl/src/core/linux/SDL_dbus.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_dbus.h
rename to src/thirdparty/sdl/src/core/linux/SDL_dbus.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev.c b/src/thirdparty/sdl/src/core/linux/SDL_evdev.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev.c
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev.h b/src/thirdparty/sdl/src/core/linux/SDL_evdev.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev.h
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.c b/src/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.c
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.h b/src/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.h
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev_capabilities.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.c b/src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.c
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.h b/src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.h
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h b/src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_accents.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h b/src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h
rename to src/thirdparty/sdl/src/core/linux/SDL_evdev_kbd_default_keymap.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_fcitx.c b/src/thirdparty/sdl/src/core/linux/SDL_fcitx.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_fcitx.c
rename to src/thirdparty/sdl/src/core/linux/SDL_fcitx.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_fcitx.h b/src/thirdparty/sdl/src/core/linux/SDL_fcitx.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_fcitx.h
rename to src/thirdparty/sdl/src/core/linux/SDL_fcitx.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_ibus.c b/src/thirdparty/sdl/src/core/linux/SDL_ibus.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_ibus.c
rename to src/thirdparty/sdl/src/core/linux/SDL_ibus.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_ibus.h b/src/thirdparty/sdl/src/core/linux/SDL_ibus.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_ibus.h
rename to src/thirdparty/sdl/src/core/linux/SDL_ibus.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_ime.c b/src/thirdparty/sdl/src/core/linux/SDL_ime.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_ime.c
rename to src/thirdparty/sdl/src/core/linux/SDL_ime.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_ime.h b/src/thirdparty/sdl/src/core/linux/SDL_ime.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_ime.h
rename to src/thirdparty/sdl/src/core/linux/SDL_ime.h
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_threadprio.c b/src/thirdparty/sdl/src/core/linux/SDL_threadprio.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_threadprio.c
rename to src/thirdparty/sdl/src/core/linux/SDL_threadprio.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_udev.c b/src/thirdparty/sdl/src/core/linux/SDL_udev.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_udev.c
rename to src/thirdparty/sdl/src/core/linux/SDL_udev.c
diff --git a/r5dev/thirdparty/sdl/src/core/linux/SDL_udev.h b/src/thirdparty/sdl/src/core/linux/SDL_udev.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/linux/SDL_udev.h
rename to src/thirdparty/sdl/src/core/linux/SDL_udev.h
diff --git a/r5dev/thirdparty/sdl/src/core/openbsd/SDL_wscons.h b/src/thirdparty/sdl/src/core/openbsd/SDL_wscons.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/openbsd/SDL_wscons.h
rename to src/thirdparty/sdl/src/core/openbsd/SDL_wscons.h
diff --git a/r5dev/thirdparty/sdl/src/core/openbsd/SDL_wscons_kbd.c b/src/thirdparty/sdl/src/core/openbsd/SDL_wscons_kbd.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/openbsd/SDL_wscons_kbd.c
rename to src/thirdparty/sdl/src/core/openbsd/SDL_wscons_kbd.c
diff --git a/r5dev/thirdparty/sdl/src/core/openbsd/SDL_wscons_mouse.c b/src/thirdparty/sdl/src/core/openbsd/SDL_wscons_mouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/openbsd/SDL_wscons_mouse.c
rename to src/thirdparty/sdl/src/core/openbsd/SDL_wscons_mouse.c
diff --git a/r5dev/thirdparty/sdl/src/core/os2/SDL_os2.c b/src/thirdparty/sdl/src/core/os2/SDL_os2.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/SDL_os2.c
rename to src/thirdparty/sdl/src/core/os2/SDL_os2.c
diff --git a/r5dev/thirdparty/sdl/src/core/os2/SDL_os2.h b/src/thirdparty/sdl/src/core/os2/SDL_os2.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/SDL_os2.h
rename to src/thirdparty/sdl/src/core/os2/SDL_os2.h
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/geniconv.c b/src/thirdparty/sdl/src/core/os2/geniconv/geniconv.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/geniconv.c
rename to src/thirdparty/sdl/src/core/os2/geniconv/geniconv.c
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/geniconv.h b/src/thirdparty/sdl/src/core/os2/geniconv/geniconv.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/geniconv.h
rename to src/thirdparty/sdl/src/core/os2/geniconv/geniconv.h
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/iconv.h b/src/thirdparty/sdl/src/core/os2/geniconv/iconv.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/iconv.h
rename to src/thirdparty/sdl/src/core/os2/geniconv/iconv.h
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/makefile b/src/thirdparty/sdl/src/core/os2/geniconv/makefile
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/makefile
rename to src/thirdparty/sdl/src/core/os2/geniconv/makefile
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/os2cp.c b/src/thirdparty/sdl/src/core/os2/geniconv/os2cp.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/os2cp.c
rename to src/thirdparty/sdl/src/core/os2/geniconv/os2cp.c
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/os2cp.h b/src/thirdparty/sdl/src/core/os2/geniconv/os2cp.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/os2cp.h
rename to src/thirdparty/sdl/src/core/os2/geniconv/os2cp.h
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/os2iconv.c b/src/thirdparty/sdl/src/core/os2/geniconv/os2iconv.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/os2iconv.c
rename to src/thirdparty/sdl/src/core/os2/geniconv/os2iconv.c
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/sys2utf8.c b/src/thirdparty/sdl/src/core/os2/geniconv/sys2utf8.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/sys2utf8.c
rename to src/thirdparty/sdl/src/core/os2/geniconv/sys2utf8.c
diff --git a/r5dev/thirdparty/sdl/src/core/os2/geniconv/test.c b/src/thirdparty/sdl/src/core/os2/geniconv/test.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/geniconv/test.c
rename to src/thirdparty/sdl/src/core/os2/geniconv/test.c
diff --git a/r5dev/thirdparty/sdl/src/core/os2/iconv2.lbc b/src/thirdparty/sdl/src/core/os2/iconv2.lbc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/os2/iconv2.lbc
rename to src/thirdparty/sdl/src/core/os2/iconv2.lbc
diff --git a/r5dev/thirdparty/sdl/src/core/unix/SDL_poll.c b/src/thirdparty/sdl/src/core/unix/SDL_poll.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/unix/SDL_poll.c
rename to src/thirdparty/sdl/src/core/unix/SDL_poll.c
diff --git a/r5dev/thirdparty/sdl/src/core/unix/SDL_poll.h b/src/thirdparty/sdl/src/core/unix/SDL_poll.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/unix/SDL_poll.h
rename to src/thirdparty/sdl/src/core/unix/SDL_poll.h
diff --git a/r5dev/thirdparty/sdl/src/core/windows/SDL_directx.h b/src/thirdparty/sdl/src/core/windows/SDL_directx.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/windows/SDL_directx.h
rename to src/thirdparty/sdl/src/core/windows/SDL_directx.h
diff --git a/r5dev/thirdparty/sdl/src/core/windows/SDL_hid.c b/src/thirdparty/sdl/src/core/windows/SDL_hid.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/windows/SDL_hid.c
rename to src/thirdparty/sdl/src/core/windows/SDL_hid.c
diff --git a/r5dev/thirdparty/sdl/src/core/windows/SDL_hid.h b/src/thirdparty/sdl/src/core/windows/SDL_hid.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/windows/SDL_hid.h
rename to src/thirdparty/sdl/src/core/windows/SDL_hid.h
diff --git a/r5dev/thirdparty/sdl/src/core/windows/SDL_windows.c b/src/thirdparty/sdl/src/core/windows/SDL_windows.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/windows/SDL_windows.c
rename to src/thirdparty/sdl/src/core/windows/SDL_windows.c
diff --git a/r5dev/thirdparty/sdl/src/core/windows/SDL_windows.h b/src/thirdparty/sdl/src/core/windows/SDL_windows.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/windows/SDL_windows.h
rename to src/thirdparty/sdl/src/core/windows/SDL_windows.h
diff --git a/r5dev/thirdparty/sdl/src/core/windows/SDL_xinput.c b/src/thirdparty/sdl/src/core/windows/SDL_xinput.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/windows/SDL_xinput.c
rename to src/thirdparty/sdl/src/core/windows/SDL_xinput.c
diff --git a/r5dev/thirdparty/sdl/src/core/windows/SDL_xinput.h b/src/thirdparty/sdl/src/core/windows/SDL_xinput.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/windows/SDL_xinput.h
rename to src/thirdparty/sdl/src/core/windows/SDL_xinput.h
diff --git a/r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.cpp b/src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.cpp
rename to src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.cpp
diff --git a/r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.h b/src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.h
rename to src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_common.h
diff --git a/r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp b/src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp
rename to src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp
diff --git a/r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.h b/src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.h
rename to src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_direct3d.h
diff --git a/r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp b/src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp
rename to src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp
diff --git a/r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.h b/src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.h
rename to src/thirdparty/sdl/src/core/winrt/SDL_winrtapp_xaml.h
diff --git a/r5dev/thirdparty/sdl/src/cpuinfo/SDL_cpuinfo.c b/src/thirdparty/sdl/src/cpuinfo/SDL_cpuinfo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/cpuinfo/SDL_cpuinfo.c
rename to src/thirdparty/sdl/src/cpuinfo/SDL_cpuinfo.c
diff --git a/r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi.c b/src/thirdparty/sdl/src/dynapi/SDL_dynapi.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi.c
rename to src/thirdparty/sdl/src/dynapi/SDL_dynapi.c
diff --git a/r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi.h b/src/thirdparty/sdl/src/dynapi/SDL_dynapi.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi.h
rename to src/thirdparty/sdl/src/dynapi/SDL_dynapi.h
diff --git a/r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi_overrides.h b/src/thirdparty/sdl/src/dynapi/SDL_dynapi_overrides.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi_overrides.h
rename to src/thirdparty/sdl/src/dynapi/SDL_dynapi_overrides.h
diff --git a/r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi_procs.h b/src/thirdparty/sdl/src/dynapi/SDL_dynapi_procs.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/dynapi/SDL_dynapi_procs.h
rename to src/thirdparty/sdl/src/dynapi/SDL_dynapi_procs.h
diff --git a/r5dev/thirdparty/sdl/src/dynapi/gendynapi.pl b/src/thirdparty/sdl/src/dynapi/gendynapi.pl
similarity index 100%
rename from r5dev/thirdparty/sdl/src/dynapi/gendynapi.pl
rename to src/thirdparty/sdl/src/dynapi/gendynapi.pl
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_clipboardevents.c b/src/thirdparty/sdl/src/events/SDL_clipboardevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_clipboardevents.c
rename to src/thirdparty/sdl/src/events/SDL_clipboardevents.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_clipboardevents_c.h b/src/thirdparty/sdl/src/events/SDL_clipboardevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_clipboardevents_c.h
rename to src/thirdparty/sdl/src/events/SDL_clipboardevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_displayevents.c b/src/thirdparty/sdl/src/events/SDL_displayevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_displayevents.c
rename to src/thirdparty/sdl/src/events/SDL_displayevents.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_displayevents_c.h b/src/thirdparty/sdl/src/events/SDL_displayevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_displayevents_c.h
rename to src/thirdparty/sdl/src/events/SDL_displayevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_dropevents.c b/src/thirdparty/sdl/src/events/SDL_dropevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_dropevents.c
rename to src/thirdparty/sdl/src/events/SDL_dropevents.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_dropevents_c.h b/src/thirdparty/sdl/src/events/SDL_dropevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_dropevents_c.h
rename to src/thirdparty/sdl/src/events/SDL_dropevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_events.c b/src/thirdparty/sdl/src/events/SDL_events.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_events.c
rename to src/thirdparty/sdl/src/events/SDL_events.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_events_c.h b/src/thirdparty/sdl/src/events/SDL_events_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_events_c.h
rename to src/thirdparty/sdl/src/events/SDL_events_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_gesture.c b/src/thirdparty/sdl/src/events/SDL_gesture.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_gesture.c
rename to src/thirdparty/sdl/src/events/SDL_gesture.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_gesture_c.h b/src/thirdparty/sdl/src/events/SDL_gesture_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_gesture_c.h
rename to src/thirdparty/sdl/src/events/SDL_gesture_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_keyboard.c b/src/thirdparty/sdl/src/events/SDL_keyboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_keyboard.c
rename to src/thirdparty/sdl/src/events/SDL_keyboard.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_keyboard_c.h b/src/thirdparty/sdl/src/events/SDL_keyboard_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_keyboard_c.h
rename to src/thirdparty/sdl/src/events/SDL_keyboard_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_mouse.c b/src/thirdparty/sdl/src/events/SDL_mouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_mouse.c
rename to src/thirdparty/sdl/src/events/SDL_mouse.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_mouse_c.h b/src/thirdparty/sdl/src/events/SDL_mouse_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_mouse_c.h
rename to src/thirdparty/sdl/src/events/SDL_mouse_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_quit.c b/src/thirdparty/sdl/src/events/SDL_quit.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_quit.c
rename to src/thirdparty/sdl/src/events/SDL_quit.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_sysevents.h b/src/thirdparty/sdl/src/events/SDL_sysevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_sysevents.h
rename to src/thirdparty/sdl/src/events/SDL_sysevents.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_touch.c b/src/thirdparty/sdl/src/events/SDL_touch.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_touch.c
rename to src/thirdparty/sdl/src/events/SDL_touch.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_touch_c.h b/src/thirdparty/sdl/src/events/SDL_touch_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_touch_c.h
rename to src/thirdparty/sdl/src/events/SDL_touch_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_windowevents.c b/src/thirdparty/sdl/src/events/SDL_windowevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_windowevents.c
rename to src/thirdparty/sdl/src/events/SDL_windowevents.c
diff --git a/r5dev/thirdparty/sdl/src/events/SDL_windowevents_c.h b/src/thirdparty/sdl/src/events/SDL_windowevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/SDL_windowevents_c.h
rename to src/thirdparty/sdl/src/events/SDL_windowevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/events/blank_cursor.h b/src/thirdparty/sdl/src/events/blank_cursor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/blank_cursor.h
rename to src/thirdparty/sdl/src/events/blank_cursor.h
diff --git a/r5dev/thirdparty/sdl/src/events/default_cursor.h b/src/thirdparty/sdl/src/events/default_cursor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/default_cursor.h
rename to src/thirdparty/sdl/src/events/default_cursor.h
diff --git a/r5dev/thirdparty/sdl/src/events/imKStoUCS.c b/src/thirdparty/sdl/src/events/imKStoUCS.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/imKStoUCS.c
rename to src/thirdparty/sdl/src/events/imKStoUCS.c
diff --git a/r5dev/thirdparty/sdl/src/events/imKStoUCS.h b/src/thirdparty/sdl/src/events/imKStoUCS.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/imKStoUCS.h
rename to src/thirdparty/sdl/src/events/imKStoUCS.h
diff --git a/r5dev/thirdparty/sdl/src/events/scancodes_darwin.h b/src/thirdparty/sdl/src/events/scancodes_darwin.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/scancodes_darwin.h
rename to src/thirdparty/sdl/src/events/scancodes_darwin.h
diff --git a/r5dev/thirdparty/sdl/src/events/scancodes_linux.h b/src/thirdparty/sdl/src/events/scancodes_linux.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/scancodes_linux.h
rename to src/thirdparty/sdl/src/events/scancodes_linux.h
diff --git a/r5dev/thirdparty/sdl/src/events/scancodes_windows.h b/src/thirdparty/sdl/src/events/scancodes_windows.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/scancodes_windows.h
rename to src/thirdparty/sdl/src/events/scancodes_windows.h
diff --git a/r5dev/thirdparty/sdl/src/events/scancodes_xfree86.h b/src/thirdparty/sdl/src/events/scancodes_xfree86.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/events/scancodes_xfree86.h
rename to src/thirdparty/sdl/src/events/scancodes_xfree86.h
diff --git a/r5dev/thirdparty/sdl/src/file/SDL_rwops.c b/src/thirdparty/sdl/src/file/SDL_rwops.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/file/SDL_rwops.c
rename to src/thirdparty/sdl/src/file/SDL_rwops.c
diff --git a/r5dev/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h b/src/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h
rename to src/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h
diff --git a/r5dev/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m b/src/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m
rename to src/thirdparty/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m
diff --git a/r5dev/thirdparty/sdl/src/filesystem/android/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/android/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/android/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/android/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m b/src/thirdparty/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m
rename to src/thirdparty/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m
diff --git a/r5dev/thirdparty/sdl/src/filesystem/dummy/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/dummy/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/dummy/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/dummy/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/emscripten/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc b/src/thirdparty/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc
rename to src/thirdparty/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc
diff --git a/r5dev/thirdparty/sdl/src/filesystem/nacl/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/nacl/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/nacl/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/nacl/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/os2/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/os2/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/os2/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/os2/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/psp/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/psp/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/psp/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/psp/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/riscos/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/riscos/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/riscos/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/riscos/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/unix/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/unix/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/unix/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/unix/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/vita/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/vita/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/vita/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/vita/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/windows/SDL_sysfilesystem.c b/src/thirdparty/sdl/src/filesystem/windows/SDL_sysfilesystem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/windows/SDL_sysfilesystem.c
rename to src/thirdparty/sdl/src/filesystem/windows/SDL_sysfilesystem.c
diff --git a/r5dev/thirdparty/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp b/src/thirdparty/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp
rename to src/thirdparty/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp
diff --git a/r5dev/thirdparty/sdl/src/haptic/SDL_haptic.c b/src/thirdparty/sdl/src/haptic/SDL_haptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/SDL_haptic.c
rename to src/thirdparty/sdl/src/haptic/SDL_haptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/SDL_haptic_c.h b/src/thirdparty/sdl/src/haptic/SDL_haptic_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/SDL_haptic_c.h
rename to src/thirdparty/sdl/src/haptic/SDL_haptic_c.h
diff --git a/r5dev/thirdparty/sdl/src/haptic/SDL_syshaptic.h b/src/thirdparty/sdl/src/haptic/SDL_syshaptic.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/SDL_syshaptic.h
rename to src/thirdparty/sdl/src/haptic/SDL_syshaptic.h
diff --git a/r5dev/thirdparty/sdl/src/haptic/android/SDL_syshaptic.c b/src/thirdparty/sdl/src/haptic/android/SDL_syshaptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/android/SDL_syshaptic.c
rename to src/thirdparty/sdl/src/haptic/android/SDL_syshaptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/android/SDL_syshaptic_c.h b/src/thirdparty/sdl/src/haptic/android/SDL_syshaptic_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/android/SDL_syshaptic_c.h
rename to src/thirdparty/sdl/src/haptic/android/SDL_syshaptic_c.h
diff --git a/r5dev/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic.c b/src/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic.c
rename to src/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic_c.h b/src/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic_c.h
rename to src/thirdparty/sdl/src/haptic/darwin/SDL_syshaptic_c.h
diff --git a/r5dev/thirdparty/sdl/src/haptic/dummy/SDL_syshaptic.c b/src/thirdparty/sdl/src/haptic/dummy/SDL_syshaptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/dummy/SDL_syshaptic.c
rename to src/thirdparty/sdl/src/haptic/dummy/SDL_syshaptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/linux/SDL_syshaptic.c b/src/thirdparty/sdl/src/haptic/linux/SDL_syshaptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/linux/SDL_syshaptic.c
rename to src/thirdparty/sdl/src/haptic/linux/SDL_syshaptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic.c b/src/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic.c
rename to src/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic_c.h b/src/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic_c.h
rename to src/thirdparty/sdl/src/haptic/windows/SDL_dinputhaptic_c.h
diff --git a/r5dev/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic.c b/src/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic.c
rename to src/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic_c.h b/src/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic_c.h
rename to src/thirdparty/sdl/src/haptic/windows/SDL_windowshaptic_c.h
diff --git a/r5dev/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic.c b/src/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic.c
rename to src/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic.c
diff --git a/r5dev/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic_c.h b/src/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic_c.h
rename to src/thirdparty/sdl/src/haptic/windows/SDL_xinputhaptic_c.h
diff --git a/r5dev/thirdparty/sdl/src/hidapi/AUTHORS.txt b/src/thirdparty/sdl/src/hidapi/AUTHORS.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/AUTHORS.txt
rename to src/thirdparty/sdl/src/hidapi/AUTHORS.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/HACKING.txt b/src/thirdparty/sdl/src/hidapi/HACKING.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/HACKING.txt
rename to src/thirdparty/sdl/src/hidapi/HACKING.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/LICENSE-bsd.txt b/src/thirdparty/sdl/src/hidapi/LICENSE-bsd.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/LICENSE-bsd.txt
rename to src/thirdparty/sdl/src/hidapi/LICENSE-bsd.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/LICENSE-gpl3.txt b/src/thirdparty/sdl/src/hidapi/LICENSE-gpl3.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/LICENSE-gpl3.txt
rename to src/thirdparty/sdl/src/hidapi/LICENSE-gpl3.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/LICENSE-orig.txt b/src/thirdparty/sdl/src/hidapi/LICENSE-orig.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/LICENSE-orig.txt
rename to src/thirdparty/sdl/src/hidapi/LICENSE-orig.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/LICENSE.txt b/src/thirdparty/sdl/src/hidapi/LICENSE.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/LICENSE.txt
rename to src/thirdparty/sdl/src/hidapi/LICENSE.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/Makefile.am b/src/thirdparty/sdl/src/hidapi/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/README.txt b/src/thirdparty/sdl/src/hidapi/README.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/README.txt
rename to src/thirdparty/sdl/src/hidapi/README.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/SDL_hidapi.c b/src/thirdparty/sdl/src/hidapi/SDL_hidapi.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/SDL_hidapi.c
rename to src/thirdparty/sdl/src/hidapi/SDL_hidapi.c
diff --git a/r5dev/thirdparty/sdl/src/hidapi/SDL_hidapi_c.h b/src/thirdparty/sdl/src/hidapi/SDL_hidapi_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/SDL_hidapi_c.h
rename to src/thirdparty/sdl/src/hidapi/SDL_hidapi_c.h
diff --git a/r5dev/thirdparty/sdl/src/hidapi/android/hid.cpp b/src/thirdparty/sdl/src/hidapi/android/hid.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/android/hid.cpp
rename to src/thirdparty/sdl/src/hidapi/android/hid.cpp
diff --git a/r5dev/thirdparty/sdl/src/hidapi/android/jni/Android.mk b/src/thirdparty/sdl/src/hidapi/android/jni/Android.mk
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/android/jni/Android.mk
rename to src/thirdparty/sdl/src/hidapi/android/jni/Android.mk
diff --git a/r5dev/thirdparty/sdl/src/hidapi/android/jni/Application.mk b/src/thirdparty/sdl/src/hidapi/android/jni/Application.mk
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/android/jni/Application.mk
rename to src/thirdparty/sdl/src/hidapi/android/jni/Application.mk
diff --git a/r5dev/thirdparty/sdl/src/hidapi/android/project.properties b/src/thirdparty/sdl/src/hidapi/android/project.properties
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/android/project.properties
rename to src/thirdparty/sdl/src/hidapi/android/project.properties
diff --git a/r5dev/thirdparty/sdl/src/hidapi/bootstrap b/src/thirdparty/sdl/src/hidapi/bootstrap
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/bootstrap
rename to src/thirdparty/sdl/src/hidapi/bootstrap
diff --git a/r5dev/thirdparty/sdl/src/hidapi/configure.ac b/src/thirdparty/sdl/src/hidapi/configure.ac
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/configure.ac
rename to src/thirdparty/sdl/src/hidapi/configure.ac
diff --git a/r5dev/thirdparty/sdl/src/hidapi/doxygen/Doxyfile b/src/thirdparty/sdl/src/hidapi/doxygen/Doxyfile
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/doxygen/Doxyfile
rename to src/thirdparty/sdl/src/hidapi/doxygen/Doxyfile
diff --git a/r5dev/thirdparty/sdl/src/hidapi/hidapi/hidapi.h b/src/thirdparty/sdl/src/hidapi/hidapi/hidapi.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/hidapi/hidapi.h
rename to src/thirdparty/sdl/src/hidapi/hidapi/hidapi.h
diff --git a/r5dev/thirdparty/sdl/src/hidapi/hidtest/Makefile.am b/src/thirdparty/sdl/src/hidapi/hidtest/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/hidtest/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/hidtest/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/hidtest/hidtest.cpp b/src/thirdparty/sdl/src/hidapi/hidtest/hidtest.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/hidtest/hidtest.cpp
rename to src/thirdparty/sdl/src/hidapi/hidtest/hidtest.cpp
diff --git a/r5dev/thirdparty/sdl/src/hidapi/ios/Makefile-manual b/src/thirdparty/sdl/src/hidapi/ios/Makefile-manual
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/ios/Makefile-manual
rename to src/thirdparty/sdl/src/hidapi/ios/Makefile-manual
diff --git a/r5dev/thirdparty/sdl/src/hidapi/ios/Makefile.am b/src/thirdparty/sdl/src/hidapi/ios/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/ios/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/ios/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/ios/hid.m b/src/thirdparty/sdl/src/hidapi/ios/hid.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/ios/hid.m
rename to src/thirdparty/sdl/src/hidapi/ios/hid.m
diff --git a/r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile-manual b/src/thirdparty/sdl/src/hidapi/libusb/Makefile-manual
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile-manual
rename to src/thirdparty/sdl/src/hidapi/libusb/Makefile-manual
diff --git a/r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile.am b/src/thirdparty/sdl/src/hidapi/libusb/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/libusb/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile.freebsd b/src/thirdparty/sdl/src/hidapi/libusb/Makefile.freebsd
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile.freebsd
rename to src/thirdparty/sdl/src/hidapi/libusb/Makefile.freebsd
diff --git a/r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile.linux b/src/thirdparty/sdl/src/hidapi/libusb/Makefile.linux
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/libusb/Makefile.linux
rename to src/thirdparty/sdl/src/hidapi/libusb/Makefile.linux
diff --git a/r5dev/thirdparty/sdl/src/hidapi/libusb/hid.c b/src/thirdparty/sdl/src/hidapi/libusb/hid.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/libusb/hid.c
rename to src/thirdparty/sdl/src/hidapi/libusb/hid.c
diff --git a/r5dev/thirdparty/sdl/src/hidapi/libusb/hidusb.cpp b/src/thirdparty/sdl/src/hidapi/libusb/hidusb.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/libusb/hidusb.cpp
rename to src/thirdparty/sdl/src/hidapi/libusb/hidusb.cpp
diff --git a/r5dev/thirdparty/sdl/src/hidapi/linux/Makefile-manual b/src/thirdparty/sdl/src/hidapi/linux/Makefile-manual
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/linux/Makefile-manual
rename to src/thirdparty/sdl/src/hidapi/linux/Makefile-manual
diff --git a/r5dev/thirdparty/sdl/src/hidapi/linux/Makefile.am b/src/thirdparty/sdl/src/hidapi/linux/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/linux/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/linux/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/linux/README.txt b/src/thirdparty/sdl/src/hidapi/linux/README.txt
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/linux/README.txt
rename to src/thirdparty/sdl/src/hidapi/linux/README.txt
diff --git a/r5dev/thirdparty/sdl/src/hidapi/linux/hid.c b/src/thirdparty/sdl/src/hidapi/linux/hid.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/linux/hid.c
rename to src/thirdparty/sdl/src/hidapi/linux/hid.c
diff --git a/r5dev/thirdparty/sdl/src/hidapi/linux/hidraw.cpp b/src/thirdparty/sdl/src/hidapi/linux/hidraw.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/linux/hidraw.cpp
rename to src/thirdparty/sdl/src/hidapi/linux/hidraw.cpp
diff --git a/r5dev/thirdparty/sdl/src/hidapi/m4/ax_pthread.m4 b/src/thirdparty/sdl/src/hidapi/m4/ax_pthread.m4
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/m4/ax_pthread.m4
rename to src/thirdparty/sdl/src/hidapi/m4/ax_pthread.m4
diff --git a/r5dev/thirdparty/sdl/src/hidapi/m4/pkg.m4 b/src/thirdparty/sdl/src/hidapi/m4/pkg.m4
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/m4/pkg.m4
rename to src/thirdparty/sdl/src/hidapi/m4/pkg.m4
diff --git a/r5dev/thirdparty/sdl/src/hidapi/mac/Makefile-manual b/src/thirdparty/sdl/src/hidapi/mac/Makefile-manual
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/mac/Makefile-manual
rename to src/thirdparty/sdl/src/hidapi/mac/Makefile-manual
diff --git a/r5dev/thirdparty/sdl/src/hidapi/mac/Makefile.am b/src/thirdparty/sdl/src/hidapi/mac/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/mac/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/mac/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/mac/hid.c b/src/thirdparty/sdl/src/hidapi/mac/hid.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/mac/hid.c
rename to src/thirdparty/sdl/src/hidapi/mac/hid.c
diff --git a/r5dev/thirdparty/sdl/src/hidapi/pc/hidapi-hidraw.pc.in b/src/thirdparty/sdl/src/hidapi/pc/hidapi-hidraw.pc.in
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/pc/hidapi-hidraw.pc.in
rename to src/thirdparty/sdl/src/hidapi/pc/hidapi-hidraw.pc.in
diff --git a/r5dev/thirdparty/sdl/src/hidapi/pc/hidapi-libusb.pc.in b/src/thirdparty/sdl/src/hidapi/pc/hidapi-libusb.pc.in
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/pc/hidapi-libusb.pc.in
rename to src/thirdparty/sdl/src/hidapi/pc/hidapi-libusb.pc.in
diff --git a/r5dev/thirdparty/sdl/src/hidapi/pc/hidapi.pc.in b/src/thirdparty/sdl/src/hidapi/pc/hidapi.pc.in
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/pc/hidapi.pc.in
rename to src/thirdparty/sdl/src/hidapi/pc/hidapi.pc.in
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile-manual b/src/thirdparty/sdl/src/hidapi/testgui/Makefile-manual
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile-manual
rename to src/thirdparty/sdl/src/hidapi/testgui/Makefile-manual
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.am b/src/thirdparty/sdl/src/hidapi/testgui/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/testgui/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.freebsd b/src/thirdparty/sdl/src/hidapi/testgui/Makefile.freebsd
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.freebsd
rename to src/thirdparty/sdl/src/hidapi/testgui/Makefile.freebsd
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.linux b/src/thirdparty/sdl/src/hidapi/testgui/Makefile.linux
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.linux
rename to src/thirdparty/sdl/src/hidapi/testgui/Makefile.linux
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.mac b/src/thirdparty/sdl/src/hidapi/testgui/Makefile.mac
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.mac
rename to src/thirdparty/sdl/src/hidapi/testgui/Makefile.mac
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.mingw b/src/thirdparty/sdl/src/hidapi/testgui/Makefile.mingw
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/Makefile.mingw
rename to src/thirdparty/sdl/src/hidapi/testgui/Makefile.mingw
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Info.plist b/src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Info.plist
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Info.plist
rename to src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Info.plist
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/PkgInfo b/src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/PkgInfo
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/PkgInfo
rename to src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/PkgInfo
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/English.lproj/InfoPlist.strings b/src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/English.lproj/InfoPlist.strings
rename to src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/English.lproj/InfoPlist.strings
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/Signal11.icns b/src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/Signal11.icns
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/Signal11.icns
rename to src/thirdparty/sdl/src/hidapi/testgui/TestGUI.app.in/Contents/Resources/Signal11.icns
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/copy_to_bundle.sh b/src/thirdparty/sdl/src/hidapi/testgui/copy_to_bundle.sh
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/copy_to_bundle.sh
rename to src/thirdparty/sdl/src/hidapi/testgui/copy_to_bundle.sh
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/mac_support.cpp b/src/thirdparty/sdl/src/hidapi/testgui/mac_support.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/mac_support.cpp
rename to src/thirdparty/sdl/src/hidapi/testgui/mac_support.cpp
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/mac_support.h b/src/thirdparty/sdl/src/hidapi/testgui/mac_support.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/mac_support.h
rename to src/thirdparty/sdl/src/hidapi/testgui/mac_support.h
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/mac_support_cocoa.m b/src/thirdparty/sdl/src/hidapi/testgui/mac_support_cocoa.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/mac_support_cocoa.m
rename to src/thirdparty/sdl/src/hidapi/testgui/mac_support_cocoa.m
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/start.sh b/src/thirdparty/sdl/src/hidapi/testgui/start.sh
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/start.sh
rename to src/thirdparty/sdl/src/hidapi/testgui/start.sh
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/test.cpp b/src/thirdparty/sdl/src/hidapi/testgui/test.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/test.cpp
rename to src/thirdparty/sdl/src/hidapi/testgui/test.cpp
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/testgui.sln b/src/thirdparty/sdl/src/hidapi/testgui/testgui.sln
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/testgui.sln
rename to src/thirdparty/sdl/src/hidapi/testgui/testgui.sln
diff --git a/r5dev/thirdparty/sdl/src/hidapi/testgui/testgui.vcproj b/src/thirdparty/sdl/src/hidapi/testgui/testgui.vcproj
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/testgui/testgui.vcproj
rename to src/thirdparty/sdl/src/hidapi/testgui/testgui.vcproj
diff --git a/r5dev/thirdparty/sdl/src/hidapi/udev/99-hid.rules b/src/thirdparty/sdl/src/hidapi/udev/99-hid.rules
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/udev/99-hid.rules
rename to src/thirdparty/sdl/src/hidapi/udev/99-hid.rules
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/Makefile-manual b/src/thirdparty/sdl/src/hidapi/windows/Makefile-manual
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/Makefile-manual
rename to src/thirdparty/sdl/src/hidapi/windows/Makefile-manual
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/Makefile.am b/src/thirdparty/sdl/src/hidapi/windows/Makefile.am
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/Makefile.am
rename to src/thirdparty/sdl/src/hidapi/windows/Makefile.am
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/Makefile.mingw b/src/thirdparty/sdl/src/hidapi/windows/Makefile.mingw
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/Makefile.mingw
rename to src/thirdparty/sdl/src/hidapi/windows/Makefile.mingw
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/ddk_build/hidapi.def b/src/thirdparty/sdl/src/hidapi/windows/ddk_build/hidapi.def
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/ddk_build/hidapi.def
rename to src/thirdparty/sdl/src/hidapi/windows/ddk_build/hidapi.def
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/ddk_build/makefile b/src/thirdparty/sdl/src/hidapi/windows/ddk_build/makefile
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/ddk_build/makefile
rename to src/thirdparty/sdl/src/hidapi/windows/ddk_build/makefile
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/ddk_build/sources b/src/thirdparty/sdl/src/hidapi/windows/ddk_build/sources
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/ddk_build/sources
rename to src/thirdparty/sdl/src/hidapi/windows/ddk_build/sources
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/hid.c b/src/thirdparty/sdl/src/hidapi/windows/hid.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/hid.c
rename to src/thirdparty/sdl/src/hidapi/windows/hid.c
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/hidapi.sln b/src/thirdparty/sdl/src/hidapi/windows/hidapi.sln
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/hidapi.sln
rename to src/thirdparty/sdl/src/hidapi/windows/hidapi.sln
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/hidapi.vcproj b/src/thirdparty/sdl/src/hidapi/windows/hidapi.vcproj
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/hidapi.vcproj
rename to src/thirdparty/sdl/src/hidapi/windows/hidapi.vcproj
diff --git a/r5dev/thirdparty/sdl/src/hidapi/windows/hidtest.vcproj b/src/thirdparty/sdl/src/hidapi/windows/hidtest.vcproj
similarity index 100%
rename from r5dev/thirdparty/sdl/src/hidapi/windows/hidtest.vcproj
rename to src/thirdparty/sdl/src/hidapi/windows/hidtest.vcproj
diff --git a/r5dev/thirdparty/sdl/src/joystick/SDL_gamecontroller.c b/src/thirdparty/sdl/src/joystick/SDL_gamecontroller.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/SDL_gamecontroller.c
rename to src/thirdparty/sdl/src/joystick/SDL_gamecontroller.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/SDL_gamecontrollerdb.h b/src/thirdparty/sdl/src/joystick/SDL_gamecontrollerdb.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/SDL_gamecontrollerdb.h
rename to src/thirdparty/sdl/src/joystick/SDL_gamecontrollerdb.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/SDL_joystick.c b/src/thirdparty/sdl/src/joystick/SDL_joystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/SDL_joystick.c
rename to src/thirdparty/sdl/src/joystick/SDL_joystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/SDL_joystick_c.h b/src/thirdparty/sdl/src/joystick/SDL_joystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/SDL_joystick_c.h
rename to src/thirdparty/sdl/src/joystick/SDL_joystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/SDL_sysjoystick.h b/src/thirdparty/sdl/src/joystick/SDL_sysjoystick.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/SDL_sysjoystick.h
rename to src/thirdparty/sdl/src/joystick/SDL_sysjoystick.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/android/SDL_sysjoystick.c b/src/thirdparty/sdl/src/joystick/android/SDL_sysjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/android/SDL_sysjoystick.c
rename to src/thirdparty/sdl/src/joystick/android/SDL_sysjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/android/SDL_sysjoystick_c.h b/src/thirdparty/sdl/src/joystick/android/SDL_sysjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/android/SDL_sysjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/android/SDL_sysjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/bsd/SDL_bsdjoystick.c b/src/thirdparty/sdl/src/joystick/bsd/SDL_bsdjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/bsd/SDL_bsdjoystick.c
rename to src/thirdparty/sdl/src/joystick/bsd/SDL_bsdjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/check_8bitdo.sh b/src/thirdparty/sdl/src/joystick/check_8bitdo.sh
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/check_8bitdo.sh
rename to src/thirdparty/sdl/src/joystick/check_8bitdo.sh
diff --git a/r5dev/thirdparty/sdl/src/joystick/controller_type.h b/src/thirdparty/sdl/src/joystick/controller_type.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/controller_type.h
rename to src/thirdparty/sdl/src/joystick/controller_type.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick.c b/src/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick.c
rename to src/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick_c.h b/src/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/darwin/SDL_iokitjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/dummy/SDL_sysjoystick.c b/src/thirdparty/sdl/src/joystick/dummy/SDL_sysjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/dummy/SDL_sysjoystick.c
rename to src/thirdparty/sdl/src/joystick/dummy/SDL_sysjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick.c b/src/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick.c
rename to src/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h b/src/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/emscripten/SDL_sysjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/haiku/SDL_haikujoystick.cc b/src/thirdparty/sdl/src/joystick/haiku/SDL_haikujoystick.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/haiku/SDL_haikujoystick.cc
rename to src/thirdparty/sdl/src/joystick/haiku/SDL_haikujoystick.cc
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_luna.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_luna.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_luna.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_luna.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.h b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.h
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_rumble.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_stadia.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_stadia.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_stadia.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_stadia.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_steam.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_steam.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_steam.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_steam.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_switch.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_switch.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_switch.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_switch.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360w.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360w.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360w.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xbox360w.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick.c b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick.c
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h b/src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h
rename to src/thirdparty/sdl/src/joystick/hidapi/SDL_hidapijoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/steam/controller_constants.h b/src/thirdparty/sdl/src/joystick/hidapi/steam/controller_constants.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/steam/controller_constants.h
rename to src/thirdparty/sdl/src/joystick/hidapi/steam/controller_constants.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/hidapi/steam/controller_structs.h b/src/thirdparty/sdl/src/joystick/hidapi/steam/controller_structs.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/hidapi/steam/controller_structs.h
rename to src/thirdparty/sdl/src/joystick/hidapi/steam/controller_structs.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick.m b/src/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick.m
rename to src/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick.m
diff --git a/r5dev/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick_c.h b/src/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick_c.h
rename to src/thirdparty/sdl/src/joystick/iphoneos/SDL_mfijoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick.c b/src/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick.c
rename to src/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick_c.h b/src/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/linux/SDL_sysjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/os2/SDL_os2joystick.c b/src/thirdparty/sdl/src/joystick/os2/SDL_os2joystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/os2/SDL_os2joystick.c
rename to src/thirdparty/sdl/src/joystick/os2/SDL_os2joystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/psp/SDL_sysjoystick.c b/src/thirdparty/sdl/src/joystick/psp/SDL_sysjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/psp/SDL_sysjoystick.c
rename to src/thirdparty/sdl/src/joystick/psp/SDL_sysjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/sort_controllers.py b/src/thirdparty/sdl/src/joystick/sort_controllers.py
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/sort_controllers.py
rename to src/thirdparty/sdl/src/joystick/sort_controllers.py
diff --git a/r5dev/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.c b/src/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.c
rename to src/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.h b/src/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.h
rename to src/thirdparty/sdl/src/joystick/steam/SDL_steamcontroller.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/usb_ids.h b/src/thirdparty/sdl/src/joystick/usb_ids.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/usb_ids.h
rename to src/thirdparty/sdl/src/joystick/usb_ids.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick.c b/src/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick.c
rename to src/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick_c.h b/src/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/virtual/SDL_virtualjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/vita/SDL_sysjoystick.c b/src/thirdparty/sdl/src/joystick/vita/SDL_sysjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/vita/SDL_sysjoystick.c
rename to src/thirdparty/sdl/src/joystick/vita/SDL_sysjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick.c b/src/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick.c
rename to src/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick_c.h b/src/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/windows/SDL_dinputjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick.c b/src/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick.c
rename to src/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick_c.h b/src/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/windows/SDL_rawinputjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_windows_gaming_input.c b/src/thirdparty/sdl/src/joystick/windows/SDL_windows_gaming_input.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_windows_gaming_input.c
rename to src/thirdparty/sdl/src/joystick/windows/SDL_windows_gaming_input.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick.c b/src/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick.c
rename to src/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick_c.h b/src/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/windows/SDL_windowsjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick.c b/src/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick.c
rename to src/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick.c
diff --git a/r5dev/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick_c.h b/src/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick_c.h
rename to src/thirdparty/sdl/src/joystick/windows/SDL_xinputjoystick_c.h
diff --git a/r5dev/thirdparty/sdl/src/libm/e_atan2.c b/src/thirdparty/sdl/src/libm/e_atan2.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_atan2.c
rename to src/thirdparty/sdl/src/libm/e_atan2.c
diff --git a/r5dev/thirdparty/sdl/src/libm/e_exp.c b/src/thirdparty/sdl/src/libm/e_exp.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_exp.c
rename to src/thirdparty/sdl/src/libm/e_exp.c
diff --git a/r5dev/thirdparty/sdl/src/libm/e_fmod.c b/src/thirdparty/sdl/src/libm/e_fmod.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_fmod.c
rename to src/thirdparty/sdl/src/libm/e_fmod.c
diff --git a/r5dev/thirdparty/sdl/src/libm/e_log.c b/src/thirdparty/sdl/src/libm/e_log.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_log.c
rename to src/thirdparty/sdl/src/libm/e_log.c
diff --git a/r5dev/thirdparty/sdl/src/libm/e_log10.c b/src/thirdparty/sdl/src/libm/e_log10.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_log10.c
rename to src/thirdparty/sdl/src/libm/e_log10.c
diff --git a/r5dev/thirdparty/sdl/src/libm/e_pow.c b/src/thirdparty/sdl/src/libm/e_pow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_pow.c
rename to src/thirdparty/sdl/src/libm/e_pow.c
diff --git a/r5dev/thirdparty/sdl/src/libm/e_rem_pio2.c b/src/thirdparty/sdl/src/libm/e_rem_pio2.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_rem_pio2.c
rename to src/thirdparty/sdl/src/libm/e_rem_pio2.c
diff --git a/r5dev/thirdparty/sdl/src/libm/e_sqrt.c b/src/thirdparty/sdl/src/libm/e_sqrt.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/e_sqrt.c
rename to src/thirdparty/sdl/src/libm/e_sqrt.c
diff --git a/r5dev/thirdparty/sdl/src/libm/k_cos.c b/src/thirdparty/sdl/src/libm/k_cos.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/k_cos.c
rename to src/thirdparty/sdl/src/libm/k_cos.c
diff --git a/r5dev/thirdparty/sdl/src/libm/k_rem_pio2.c b/src/thirdparty/sdl/src/libm/k_rem_pio2.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/k_rem_pio2.c
rename to src/thirdparty/sdl/src/libm/k_rem_pio2.c
diff --git a/r5dev/thirdparty/sdl/src/libm/k_sin.c b/src/thirdparty/sdl/src/libm/k_sin.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/k_sin.c
rename to src/thirdparty/sdl/src/libm/k_sin.c
diff --git a/r5dev/thirdparty/sdl/src/libm/k_tan.c b/src/thirdparty/sdl/src/libm/k_tan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/k_tan.c
rename to src/thirdparty/sdl/src/libm/k_tan.c
diff --git a/r5dev/thirdparty/sdl/src/libm/math_libm.h b/src/thirdparty/sdl/src/libm/math_libm.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/math_libm.h
rename to src/thirdparty/sdl/src/libm/math_libm.h
diff --git a/r5dev/thirdparty/sdl/src/libm/math_private.h b/src/thirdparty/sdl/src/libm/math_private.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/math_private.h
rename to src/thirdparty/sdl/src/libm/math_private.h
diff --git a/r5dev/thirdparty/sdl/src/libm/s_atan.c b/src/thirdparty/sdl/src/libm/s_atan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_atan.c
rename to src/thirdparty/sdl/src/libm/s_atan.c
diff --git a/r5dev/thirdparty/sdl/src/libm/s_copysign.c b/src/thirdparty/sdl/src/libm/s_copysign.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_copysign.c
rename to src/thirdparty/sdl/src/libm/s_copysign.c
diff --git a/r5dev/thirdparty/sdl/src/libm/s_cos.c b/src/thirdparty/sdl/src/libm/s_cos.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_cos.c
rename to src/thirdparty/sdl/src/libm/s_cos.c
diff --git a/r5dev/thirdparty/sdl/src/libm/s_fabs.c b/src/thirdparty/sdl/src/libm/s_fabs.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_fabs.c
rename to src/thirdparty/sdl/src/libm/s_fabs.c
diff --git a/r5dev/thirdparty/sdl/src/libm/s_floor.c b/src/thirdparty/sdl/src/libm/s_floor.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_floor.c
rename to src/thirdparty/sdl/src/libm/s_floor.c
diff --git a/r5dev/thirdparty/sdl/src/libm/s_scalbn.c b/src/thirdparty/sdl/src/libm/s_scalbn.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_scalbn.c
rename to src/thirdparty/sdl/src/libm/s_scalbn.c
diff --git a/r5dev/thirdparty/sdl/src/libm/s_sin.c b/src/thirdparty/sdl/src/libm/s_sin.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_sin.c
rename to src/thirdparty/sdl/src/libm/s_sin.c
diff --git a/r5dev/thirdparty/sdl/src/libm/s_tan.c b/src/thirdparty/sdl/src/libm/s_tan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/libm/s_tan.c
rename to src/thirdparty/sdl/src/libm/s_tan.c
diff --git a/r5dev/thirdparty/sdl/src/loadso/dlopen/SDL_sysloadso.c b/src/thirdparty/sdl/src/loadso/dlopen/SDL_sysloadso.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/loadso/dlopen/SDL_sysloadso.c
rename to src/thirdparty/sdl/src/loadso/dlopen/SDL_sysloadso.c
diff --git a/r5dev/thirdparty/sdl/src/loadso/dummy/SDL_sysloadso.c b/src/thirdparty/sdl/src/loadso/dummy/SDL_sysloadso.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/loadso/dummy/SDL_sysloadso.c
rename to src/thirdparty/sdl/src/loadso/dummy/SDL_sysloadso.c
diff --git a/r5dev/thirdparty/sdl/src/loadso/os2/SDL_sysloadso.c b/src/thirdparty/sdl/src/loadso/os2/SDL_sysloadso.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/loadso/os2/SDL_sysloadso.c
rename to src/thirdparty/sdl/src/loadso/os2/SDL_sysloadso.c
diff --git a/r5dev/thirdparty/sdl/src/loadso/windows/SDL_sysloadso.c b/src/thirdparty/sdl/src/loadso/windows/SDL_sysloadso.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/loadso/windows/SDL_sysloadso.c
rename to src/thirdparty/sdl/src/loadso/windows/SDL_sysloadso.c
diff --git a/r5dev/thirdparty/sdl/src/locale/SDL_locale.c b/src/thirdparty/sdl/src/locale/SDL_locale.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/SDL_locale.c
rename to src/thirdparty/sdl/src/locale/SDL_locale.c
diff --git a/r5dev/thirdparty/sdl/src/locale/SDL_syslocale.h b/src/thirdparty/sdl/src/locale/SDL_syslocale.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/SDL_syslocale.h
rename to src/thirdparty/sdl/src/locale/SDL_syslocale.h
diff --git a/r5dev/thirdparty/sdl/src/locale/android/SDL_syslocale.c b/src/thirdparty/sdl/src/locale/android/SDL_syslocale.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/android/SDL_syslocale.c
rename to src/thirdparty/sdl/src/locale/android/SDL_syslocale.c
diff --git a/r5dev/thirdparty/sdl/src/locale/dummy/SDL_syslocale.c b/src/thirdparty/sdl/src/locale/dummy/SDL_syslocale.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/dummy/SDL_syslocale.c
rename to src/thirdparty/sdl/src/locale/dummy/SDL_syslocale.c
diff --git a/r5dev/thirdparty/sdl/src/locale/emscripten/SDL_syslocale.c b/src/thirdparty/sdl/src/locale/emscripten/SDL_syslocale.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/emscripten/SDL_syslocale.c
rename to src/thirdparty/sdl/src/locale/emscripten/SDL_syslocale.c
diff --git a/r5dev/thirdparty/sdl/src/locale/haiku/SDL_syslocale.cc b/src/thirdparty/sdl/src/locale/haiku/SDL_syslocale.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/haiku/SDL_syslocale.cc
rename to src/thirdparty/sdl/src/locale/haiku/SDL_syslocale.cc
diff --git a/r5dev/thirdparty/sdl/src/locale/macosx/SDL_syslocale.m b/src/thirdparty/sdl/src/locale/macosx/SDL_syslocale.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/macosx/SDL_syslocale.m
rename to src/thirdparty/sdl/src/locale/macosx/SDL_syslocale.m
diff --git a/r5dev/thirdparty/sdl/src/locale/unix/SDL_syslocale.c b/src/thirdparty/sdl/src/locale/unix/SDL_syslocale.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/unix/SDL_syslocale.c
rename to src/thirdparty/sdl/src/locale/unix/SDL_syslocale.c
diff --git a/r5dev/thirdparty/sdl/src/locale/windows/SDL_syslocale.c b/src/thirdparty/sdl/src/locale/windows/SDL_syslocale.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/windows/SDL_syslocale.c
rename to src/thirdparty/sdl/src/locale/windows/SDL_syslocale.c
diff --git a/r5dev/thirdparty/sdl/src/locale/winrt/SDL_syslocale.c b/src/thirdparty/sdl/src/locale/winrt/SDL_syslocale.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/locale/winrt/SDL_syslocale.c
rename to src/thirdparty/sdl/src/locale/winrt/SDL_syslocale.c
diff --git a/r5dev/thirdparty/sdl/src/main/android/SDL_android_main.c b/src/thirdparty/sdl/src/main/android/SDL_android_main.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/android/SDL_android_main.c
rename to src/thirdparty/sdl/src/main/android/SDL_android_main.c
diff --git a/r5dev/thirdparty/sdl/src/main/dummy/SDL_dummy_main.c b/src/thirdparty/sdl/src/main/dummy/SDL_dummy_main.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/dummy/SDL_dummy_main.c
rename to src/thirdparty/sdl/src/main/dummy/SDL_dummy_main.c
diff --git a/r5dev/thirdparty/sdl/src/main/haiku/SDL_BApp.h b/src/thirdparty/sdl/src/main/haiku/SDL_BApp.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/haiku/SDL_BApp.h
rename to src/thirdparty/sdl/src/main/haiku/SDL_BApp.h
diff --git a/r5dev/thirdparty/sdl/src/main/haiku/SDL_BeApp.cc b/src/thirdparty/sdl/src/main/haiku/SDL_BeApp.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/haiku/SDL_BeApp.cc
rename to src/thirdparty/sdl/src/main/haiku/SDL_BeApp.cc
diff --git a/r5dev/thirdparty/sdl/src/main/haiku/SDL_BeApp.h b/src/thirdparty/sdl/src/main/haiku/SDL_BeApp.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/haiku/SDL_BeApp.h
rename to src/thirdparty/sdl/src/main/haiku/SDL_BeApp.h
diff --git a/r5dev/thirdparty/sdl/src/main/nacl/SDL_nacl_main.c b/src/thirdparty/sdl/src/main/nacl/SDL_nacl_main.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/nacl/SDL_nacl_main.c
rename to src/thirdparty/sdl/src/main/nacl/SDL_nacl_main.c
diff --git a/r5dev/thirdparty/sdl/src/main/psp/SDL_psp_main.c b/src/thirdparty/sdl/src/main/psp/SDL_psp_main.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/psp/SDL_psp_main.c
rename to src/thirdparty/sdl/src/main/psp/SDL_psp_main.c
diff --git a/r5dev/thirdparty/sdl/src/main/uikit/SDL_uikit_main.c b/src/thirdparty/sdl/src/main/uikit/SDL_uikit_main.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/uikit/SDL_uikit_main.c
rename to src/thirdparty/sdl/src/main/uikit/SDL_uikit_main.c
diff --git a/r5dev/thirdparty/sdl/src/main/windows/SDL_windows_main.c b/src/thirdparty/sdl/src/main/windows/SDL_windows_main.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/windows/SDL_windows_main.c
rename to src/thirdparty/sdl/src/main/windows/SDL_windows_main.c
diff --git a/r5dev/thirdparty/sdl/src/main/windows/version.rc b/src/thirdparty/sdl/src/main/windows/version.rc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/windows/version.rc
rename to src/thirdparty/sdl/src/main/windows/version.rc
diff --git a/r5dev/thirdparty/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur b/src/thirdparty/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur
rename to src/thirdparty/sdl/src/main/winrt/SDL2-WinRTResource_BlankCursor.cur
diff --git a/r5dev/thirdparty/sdl/src/main/winrt/SDL2-WinRTResources.rc b/src/thirdparty/sdl/src/main/winrt/SDL2-WinRTResources.rc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/winrt/SDL2-WinRTResources.rc
rename to src/thirdparty/sdl/src/main/winrt/SDL2-WinRTResources.rc
diff --git a/r5dev/thirdparty/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp b/src/thirdparty/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp
rename to src/thirdparty/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp
diff --git a/r5dev/thirdparty/sdl/src/misc/SDL_sysurl.h b/src/thirdparty/sdl/src/misc/SDL_sysurl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/SDL_sysurl.h
rename to src/thirdparty/sdl/src/misc/SDL_sysurl.h
diff --git a/r5dev/thirdparty/sdl/src/misc/SDL_url.c b/src/thirdparty/sdl/src/misc/SDL_url.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/SDL_url.c
rename to src/thirdparty/sdl/src/misc/SDL_url.c
diff --git a/r5dev/thirdparty/sdl/src/misc/android/SDL_sysurl.c b/src/thirdparty/sdl/src/misc/android/SDL_sysurl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/android/SDL_sysurl.c
rename to src/thirdparty/sdl/src/misc/android/SDL_sysurl.c
diff --git a/r5dev/thirdparty/sdl/src/misc/dummy/SDL_sysurl.c b/src/thirdparty/sdl/src/misc/dummy/SDL_sysurl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/dummy/SDL_sysurl.c
rename to src/thirdparty/sdl/src/misc/dummy/SDL_sysurl.c
diff --git a/r5dev/thirdparty/sdl/src/misc/haiku/SDL_sysurl.cc b/src/thirdparty/sdl/src/misc/haiku/SDL_sysurl.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/haiku/SDL_sysurl.cc
rename to src/thirdparty/sdl/src/misc/haiku/SDL_sysurl.cc
diff --git a/r5dev/thirdparty/sdl/src/misc/ios/SDL_sysurl.m b/src/thirdparty/sdl/src/misc/ios/SDL_sysurl.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/ios/SDL_sysurl.m
rename to src/thirdparty/sdl/src/misc/ios/SDL_sysurl.m
diff --git a/r5dev/thirdparty/sdl/src/misc/macosx/SDL_sysurl.m b/src/thirdparty/sdl/src/misc/macosx/SDL_sysurl.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/macosx/SDL_sysurl.m
rename to src/thirdparty/sdl/src/misc/macosx/SDL_sysurl.m
diff --git a/r5dev/thirdparty/sdl/src/misc/riscos/SDL_sysurl.c b/src/thirdparty/sdl/src/misc/riscos/SDL_sysurl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/riscos/SDL_sysurl.c
rename to src/thirdparty/sdl/src/misc/riscos/SDL_sysurl.c
diff --git a/r5dev/thirdparty/sdl/src/misc/unix/SDL_sysurl.c b/src/thirdparty/sdl/src/misc/unix/SDL_sysurl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/unix/SDL_sysurl.c
rename to src/thirdparty/sdl/src/misc/unix/SDL_sysurl.c
diff --git a/r5dev/thirdparty/sdl/src/misc/vita/SDL_sysurl.c b/src/thirdparty/sdl/src/misc/vita/SDL_sysurl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/vita/SDL_sysurl.c
rename to src/thirdparty/sdl/src/misc/vita/SDL_sysurl.c
diff --git a/r5dev/thirdparty/sdl/src/misc/windows/SDL_sysurl.c b/src/thirdparty/sdl/src/misc/windows/SDL_sysurl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/windows/SDL_sysurl.c
rename to src/thirdparty/sdl/src/misc/windows/SDL_sysurl.c
diff --git a/r5dev/thirdparty/sdl/src/misc/winrt/SDL_sysurl.cpp b/src/thirdparty/sdl/src/misc/winrt/SDL_sysurl.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/misc/winrt/SDL_sysurl.cpp
rename to src/thirdparty/sdl/src/misc/winrt/SDL_sysurl.cpp
diff --git a/r5dev/thirdparty/sdl/src/power/SDL_power.c b/src/thirdparty/sdl/src/power/SDL_power.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/SDL_power.c
rename to src/thirdparty/sdl/src/power/SDL_power.c
diff --git a/r5dev/thirdparty/sdl/src/power/SDL_syspower.h b/src/thirdparty/sdl/src/power/SDL_syspower.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/SDL_syspower.h
rename to src/thirdparty/sdl/src/power/SDL_syspower.h
diff --git a/r5dev/thirdparty/sdl/src/power/android/SDL_syspower.c b/src/thirdparty/sdl/src/power/android/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/android/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/android/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/emscripten/SDL_syspower.c b/src/thirdparty/sdl/src/power/emscripten/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/emscripten/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/emscripten/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/haiku/SDL_syspower.c b/src/thirdparty/sdl/src/power/haiku/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/haiku/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/haiku/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/linux/SDL_syspower.c b/src/thirdparty/sdl/src/power/linux/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/linux/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/linux/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/macosx/SDL_syspower.c b/src/thirdparty/sdl/src/power/macosx/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/macosx/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/macosx/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/psp/SDL_syspower.c b/src/thirdparty/sdl/src/power/psp/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/psp/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/psp/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/uikit/SDL_syspower.h b/src/thirdparty/sdl/src/power/uikit/SDL_syspower.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/uikit/SDL_syspower.h
rename to src/thirdparty/sdl/src/power/uikit/SDL_syspower.h
diff --git a/r5dev/thirdparty/sdl/src/power/uikit/SDL_syspower.m b/src/thirdparty/sdl/src/power/uikit/SDL_syspower.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/uikit/SDL_syspower.m
rename to src/thirdparty/sdl/src/power/uikit/SDL_syspower.m
diff --git a/r5dev/thirdparty/sdl/src/power/vita/SDL_syspower.c b/src/thirdparty/sdl/src/power/vita/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/vita/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/vita/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/windows/SDL_syspower.c b/src/thirdparty/sdl/src/power/windows/SDL_syspower.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/windows/SDL_syspower.c
rename to src/thirdparty/sdl/src/power/windows/SDL_syspower.c
diff --git a/r5dev/thirdparty/sdl/src/power/winrt/SDL_syspower.cpp b/src/thirdparty/sdl/src/power/winrt/SDL_syspower.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/power/winrt/SDL_syspower.cpp
rename to src/thirdparty/sdl/src/power/winrt/SDL_syspower.cpp
diff --git a/r5dev/thirdparty/sdl/src/render/SDL_d3dmath.c b/src/thirdparty/sdl/src/render/SDL_d3dmath.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/SDL_d3dmath.c
rename to src/thirdparty/sdl/src/render/SDL_d3dmath.c
diff --git a/r5dev/thirdparty/sdl/src/render/SDL_d3dmath.h b/src/thirdparty/sdl/src/render/SDL_d3dmath.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/SDL_d3dmath.h
rename to src/thirdparty/sdl/src/render/SDL_d3dmath.h
diff --git a/r5dev/thirdparty/sdl/src/render/SDL_render.c b/src/thirdparty/sdl/src/render/SDL_render.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/SDL_render.c
rename to src/thirdparty/sdl/src/render/SDL_render.c
diff --git a/r5dev/thirdparty/sdl/src/render/SDL_sysrender.h b/src/thirdparty/sdl/src/render/SDL_sysrender.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/SDL_sysrender.h
rename to src/thirdparty/sdl/src/render/SDL_sysrender.h
diff --git a/r5dev/thirdparty/sdl/src/render/SDL_yuv_sw.c b/src/thirdparty/sdl/src/render/SDL_yuv_sw.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/SDL_yuv_sw.c
rename to src/thirdparty/sdl/src/render/SDL_yuv_sw.c
diff --git a/r5dev/thirdparty/sdl/src/render/SDL_yuv_sw_c.h b/src/thirdparty/sdl/src/render/SDL_yuv_sw_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/SDL_yuv_sw_c.h
rename to src/thirdparty/sdl/src/render/SDL_yuv_sw_c.h
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d/SDL_render_d3d.c b/src/thirdparty/sdl/src/render/direct3d/SDL_render_d3d.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d/SDL_render_d3d.c
rename to src/thirdparty/sdl/src/render/direct3d/SDL_render_d3d.c
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.c b/src/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.c
rename to src/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.c
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.h b/src/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.h
rename to src/thirdparty/sdl/src/render/direct3d/SDL_shaders_d3d.h
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d11/SDL_render_d3d11.c b/src/thirdparty/sdl/src/render/direct3d11/SDL_render_d3d11.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d11/SDL_render_d3d11.c
rename to src/thirdparty/sdl/src/render/direct3d11/SDL_render_d3d11.c
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.cpp b/src/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.cpp
rename to src/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.cpp
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.h b/src/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.h
rename to src/thirdparty/sdl/src/render/direct3d11/SDL_render_winrt.h
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.c b/src/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.c
rename to src/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.c
diff --git a/r5dev/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.h b/src/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.h
rename to src/thirdparty/sdl/src/render/direct3d11/SDL_shaders_d3d11.h
diff --git a/r5dev/thirdparty/sdl/src/render/metal/SDL_render_metal.m b/src/thirdparty/sdl/src/render/metal/SDL_render_metal.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/SDL_render_metal.m
rename to src/thirdparty/sdl/src/render/metal/SDL_render_metal.m
diff --git a/r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal.metal b/src/thirdparty/sdl/src/render/metal/SDL_shaders_metal.metal
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal.metal
rename to src/thirdparty/sdl/src/render/metal/SDL_shaders_metal.metal
diff --git a/r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_ios.h b/src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_ios.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_ios.h
rename to src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_ios.h
diff --git a/r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_iphonesimulator.h b/src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_iphonesimulator.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_iphonesimulator.h
rename to src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_iphonesimulator.h
diff --git a/r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_osx.h b/src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_osx.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_osx.h
rename to src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_osx.h
diff --git a/r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvos.h b/src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvos.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvos.h
rename to src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvos.h
diff --git a/r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvsimulator.h b/src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvsimulator.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvsimulator.h
rename to src/thirdparty/sdl/src/render/metal/SDL_shaders_metal_tvsimulator.h
diff --git a/r5dev/thirdparty/sdl/src/render/metal/build-metal-shaders.sh b/src/thirdparty/sdl/src/render/metal/build-metal-shaders.sh
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/metal/build-metal-shaders.sh
rename to src/thirdparty/sdl/src/render/metal/build-metal-shaders.sh
diff --git a/r5dev/thirdparty/sdl/src/render/opengl/SDL_glfuncs.h b/src/thirdparty/sdl/src/render/opengl/SDL_glfuncs.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengl/SDL_glfuncs.h
rename to src/thirdparty/sdl/src/render/opengl/SDL_glfuncs.h
diff --git a/r5dev/thirdparty/sdl/src/render/opengl/SDL_render_gl.c b/src/thirdparty/sdl/src/render/opengl/SDL_render_gl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengl/SDL_render_gl.c
rename to src/thirdparty/sdl/src/render/opengl/SDL_render_gl.c
diff --git a/r5dev/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.c b/src/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.c
rename to src/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.c
diff --git a/r5dev/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.h b/src/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.h
rename to src/thirdparty/sdl/src/render/opengl/SDL_shaders_gl.h
diff --git a/r5dev/thirdparty/sdl/src/render/opengles/SDL_glesfuncs.h b/src/thirdparty/sdl/src/render/opengles/SDL_glesfuncs.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengles/SDL_glesfuncs.h
rename to src/thirdparty/sdl/src/render/opengles/SDL_glesfuncs.h
diff --git a/r5dev/thirdparty/sdl/src/render/opengles/SDL_render_gles.c b/src/thirdparty/sdl/src/render/opengles/SDL_render_gles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengles/SDL_render_gles.c
rename to src/thirdparty/sdl/src/render/opengles/SDL_render_gles.c
diff --git a/r5dev/thirdparty/sdl/src/render/opengles2/SDL_gles2funcs.h b/src/thirdparty/sdl/src/render/opengles2/SDL_gles2funcs.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengles2/SDL_gles2funcs.h
rename to src/thirdparty/sdl/src/render/opengles2/SDL_gles2funcs.h
diff --git a/r5dev/thirdparty/sdl/src/render/opengles2/SDL_render_gles2.c b/src/thirdparty/sdl/src/render/opengles2/SDL_render_gles2.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengles2/SDL_render_gles2.c
rename to src/thirdparty/sdl/src/render/opengles2/SDL_render_gles2.c
diff --git a/r5dev/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.c b/src/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.c
rename to src/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.c
diff --git a/r5dev/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.h b/src/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.h
rename to src/thirdparty/sdl/src/render/opengles2/SDL_shaders_gles2.h
diff --git a/r5dev/thirdparty/sdl/src/render/psp/SDL_render_psp.c b/src/thirdparty/sdl/src/render/psp/SDL_render_psp.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/psp/SDL_render_psp.c
rename to src/thirdparty/sdl/src/render/psp/SDL_render_psp.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_blendfillrect.c b/src/thirdparty/sdl/src/render/software/SDL_blendfillrect.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_blendfillrect.c
rename to src/thirdparty/sdl/src/render/software/SDL_blendfillrect.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_blendfillrect.h b/src/thirdparty/sdl/src/render/software/SDL_blendfillrect.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_blendfillrect.h
rename to src/thirdparty/sdl/src/render/software/SDL_blendfillrect.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_blendline.c b/src/thirdparty/sdl/src/render/software/SDL_blendline.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_blendline.c
rename to src/thirdparty/sdl/src/render/software/SDL_blendline.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_blendline.h b/src/thirdparty/sdl/src/render/software/SDL_blendline.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_blendline.h
rename to src/thirdparty/sdl/src/render/software/SDL_blendline.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_blendpoint.c b/src/thirdparty/sdl/src/render/software/SDL_blendpoint.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_blendpoint.c
rename to src/thirdparty/sdl/src/render/software/SDL_blendpoint.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_blendpoint.h b/src/thirdparty/sdl/src/render/software/SDL_blendpoint.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_blendpoint.h
rename to src/thirdparty/sdl/src/render/software/SDL_blendpoint.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_draw.h b/src/thirdparty/sdl/src/render/software/SDL_draw.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_draw.h
rename to src/thirdparty/sdl/src/render/software/SDL_draw.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_drawline.c b/src/thirdparty/sdl/src/render/software/SDL_drawline.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_drawline.c
rename to src/thirdparty/sdl/src/render/software/SDL_drawline.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_drawline.h b/src/thirdparty/sdl/src/render/software/SDL_drawline.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_drawline.h
rename to src/thirdparty/sdl/src/render/software/SDL_drawline.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_drawpoint.c b/src/thirdparty/sdl/src/render/software/SDL_drawpoint.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_drawpoint.c
rename to src/thirdparty/sdl/src/render/software/SDL_drawpoint.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_drawpoint.h b/src/thirdparty/sdl/src/render/software/SDL_drawpoint.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_drawpoint.h
rename to src/thirdparty/sdl/src/render/software/SDL_drawpoint.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_render_sw.c b/src/thirdparty/sdl/src/render/software/SDL_render_sw.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_render_sw.c
rename to src/thirdparty/sdl/src/render/software/SDL_render_sw.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_render_sw_c.h b/src/thirdparty/sdl/src/render/software/SDL_render_sw_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_render_sw_c.h
rename to src/thirdparty/sdl/src/render/software/SDL_render_sw_c.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_rotate.c b/src/thirdparty/sdl/src/render/software/SDL_rotate.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_rotate.c
rename to src/thirdparty/sdl/src/render/software/SDL_rotate.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_rotate.h b/src/thirdparty/sdl/src/render/software/SDL_rotate.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_rotate.h
rename to src/thirdparty/sdl/src/render/software/SDL_rotate.h
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_triangle.c b/src/thirdparty/sdl/src/render/software/SDL_triangle.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_triangle.c
rename to src/thirdparty/sdl/src/render/software/SDL_triangle.c
diff --git a/r5dev/thirdparty/sdl/src/render/software/SDL_triangle.h b/src/thirdparty/sdl/src/render/software/SDL_triangle.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/software/SDL_triangle.h
rename to src/thirdparty/sdl/src/render/software/SDL_triangle.h
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm.c b/src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm.c
rename to src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm.c
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.c b/src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.c
rename to src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.c
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.h b/src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.h
rename to src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_memory.h
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_shaders.h b/src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_shaders.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_shaders.h
rename to src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_shaders.h
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.c b/src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.c
rename to src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.c
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.h b/src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.h
rename to src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_tools.h
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_types.h b/src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_types.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_types.h
rename to src/thirdparty/sdl/src/render/vitagxm/SDL_render_vita_gxm_types.h
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/clear_f.cg b/src/thirdparty/sdl/src/render/vitagxm/shader_src/clear_f.cg
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/clear_f.cg
rename to src/thirdparty/sdl/src/render/vitagxm/shader_src/clear_f.cg
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/clear_v.cg b/src/thirdparty/sdl/src/render/vitagxm/shader_src/clear_v.cg
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/clear_v.cg
rename to src/thirdparty/sdl/src/render/vitagxm/shader_src/clear_v.cg
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/color_f.cg b/src/thirdparty/sdl/src/render/vitagxm/shader_src/color_f.cg
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/color_f.cg
rename to src/thirdparty/sdl/src/render/vitagxm/shader_src/color_f.cg
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/color_v.cg b/src/thirdparty/sdl/src/render/vitagxm/shader_src/color_v.cg
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/color_v.cg
rename to src/thirdparty/sdl/src/render/vitagxm/shader_src/color_v.cg
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/texture_f.cg b/src/thirdparty/sdl/src/render/vitagxm/shader_src/texture_f.cg
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/texture_f.cg
rename to src/thirdparty/sdl/src/render/vitagxm/shader_src/texture_f.cg
diff --git a/r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/texture_v.cg b/src/thirdparty/sdl/src/render/vitagxm/shader_src/texture_v.cg
similarity index 100%
rename from r5dev/thirdparty/sdl/src/render/vitagxm/shader_src/texture_v.cg
rename to src/thirdparty/sdl/src/render/vitagxm/shader_src/texture_v.cg
diff --git a/r5dev/thirdparty/sdl/src/sensor/SDL_sensor.c b/src/thirdparty/sdl/src/sensor/SDL_sensor.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/SDL_sensor.c
rename to src/thirdparty/sdl/src/sensor/SDL_sensor.c
diff --git a/r5dev/thirdparty/sdl/src/sensor/SDL_sensor_c.h b/src/thirdparty/sdl/src/sensor/SDL_sensor_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/SDL_sensor_c.h
rename to src/thirdparty/sdl/src/sensor/SDL_sensor_c.h
diff --git a/r5dev/thirdparty/sdl/src/sensor/SDL_syssensor.h b/src/thirdparty/sdl/src/sensor/SDL_syssensor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/SDL_syssensor.h
rename to src/thirdparty/sdl/src/sensor/SDL_syssensor.h
diff --git a/r5dev/thirdparty/sdl/src/sensor/android/SDL_androidsensor.c b/src/thirdparty/sdl/src/sensor/android/SDL_androidsensor.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/android/SDL_androidsensor.c
rename to src/thirdparty/sdl/src/sensor/android/SDL_androidsensor.c
diff --git a/r5dev/thirdparty/sdl/src/sensor/android/SDL_androidsensor.h b/src/thirdparty/sdl/src/sensor/android/SDL_androidsensor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/android/SDL_androidsensor.h
rename to src/thirdparty/sdl/src/sensor/android/SDL_androidsensor.h
diff --git a/r5dev/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.h b/src/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.h
rename to src/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.h
diff --git a/r5dev/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.m b/src/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.m
rename to src/thirdparty/sdl/src/sensor/coremotion/SDL_coremotionsensor.m
diff --git a/r5dev/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.c b/src/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.c
rename to src/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.c
diff --git a/r5dev/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.h b/src/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.h
rename to src/thirdparty/sdl/src/sensor/dummy/SDL_dummysensor.h
diff --git a/r5dev/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.c b/src/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.c
rename to src/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.c
diff --git a/r5dev/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.h b/src/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.h
rename to src/thirdparty/sdl/src/sensor/vita/SDL_vitasensor.h
diff --git a/r5dev/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.c b/src/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.c
rename to src/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.c
diff --git a/r5dev/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.h b/src/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.h
rename to src/thirdparty/sdl/src/sensor/windows/SDL_windowssensor.h
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_crc32.c b/src/thirdparty/sdl/src/stdlib/SDL_crc32.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_crc32.c
rename to src/thirdparty/sdl/src/stdlib/SDL_crc32.c
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_getenv.c b/src/thirdparty/sdl/src/stdlib/SDL_getenv.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_getenv.c
rename to src/thirdparty/sdl/src/stdlib/SDL_getenv.c
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_iconv.c b/src/thirdparty/sdl/src/stdlib/SDL_iconv.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_iconv.c
rename to src/thirdparty/sdl/src/stdlib/SDL_iconv.c
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_malloc.c b/src/thirdparty/sdl/src/stdlib/SDL_malloc.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_malloc.c
rename to src/thirdparty/sdl/src/stdlib/SDL_malloc.c
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_qsort.c b/src/thirdparty/sdl/src/stdlib/SDL_qsort.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_qsort.c
rename to src/thirdparty/sdl/src/stdlib/SDL_qsort.c
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_stdlib.c b/src/thirdparty/sdl/src/stdlib/SDL_stdlib.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_stdlib.c
rename to src/thirdparty/sdl/src/stdlib/SDL_stdlib.c
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_string.c b/src/thirdparty/sdl/src/stdlib/SDL_string.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_string.c
rename to src/thirdparty/sdl/src/stdlib/SDL_string.c
diff --git a/r5dev/thirdparty/sdl/src/stdlib/SDL_strtokr.c b/src/thirdparty/sdl/src/stdlib/SDL_strtokr.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/stdlib/SDL_strtokr.c
rename to src/thirdparty/sdl/src/stdlib/SDL_strtokr.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_assert.c b/src/thirdparty/sdl/src/test/SDL_test_assert.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_assert.c
rename to src/thirdparty/sdl/src/test/SDL_test_assert.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_common.c b/src/thirdparty/sdl/src/test/SDL_test_common.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_common.c
rename to src/thirdparty/sdl/src/test/SDL_test_common.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_compare.c b/src/thirdparty/sdl/src/test/SDL_test_compare.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_compare.c
rename to src/thirdparty/sdl/src/test/SDL_test_compare.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_crc32.c b/src/thirdparty/sdl/src/test/SDL_test_crc32.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_crc32.c
rename to src/thirdparty/sdl/src/test/SDL_test_crc32.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_font.c b/src/thirdparty/sdl/src/test/SDL_test_font.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_font.c
rename to src/thirdparty/sdl/src/test/SDL_test_font.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_fuzzer.c b/src/thirdparty/sdl/src/test/SDL_test_fuzzer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_fuzzer.c
rename to src/thirdparty/sdl/src/test/SDL_test_fuzzer.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_harness.c b/src/thirdparty/sdl/src/test/SDL_test_harness.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_harness.c
rename to src/thirdparty/sdl/src/test/SDL_test_harness.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_imageBlit.c b/src/thirdparty/sdl/src/test/SDL_test_imageBlit.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_imageBlit.c
rename to src/thirdparty/sdl/src/test/SDL_test_imageBlit.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_imageBlitBlend.c b/src/thirdparty/sdl/src/test/SDL_test_imageBlitBlend.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_imageBlitBlend.c
rename to src/thirdparty/sdl/src/test/SDL_test_imageBlitBlend.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_imageFace.c b/src/thirdparty/sdl/src/test/SDL_test_imageFace.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_imageFace.c
rename to src/thirdparty/sdl/src/test/SDL_test_imageFace.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_imagePrimitives.c b/src/thirdparty/sdl/src/test/SDL_test_imagePrimitives.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_imagePrimitives.c
rename to src/thirdparty/sdl/src/test/SDL_test_imagePrimitives.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_imagePrimitivesBlend.c b/src/thirdparty/sdl/src/test/SDL_test_imagePrimitivesBlend.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_imagePrimitivesBlend.c
rename to src/thirdparty/sdl/src/test/SDL_test_imagePrimitivesBlend.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_log.c b/src/thirdparty/sdl/src/test/SDL_test_log.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_log.c
rename to src/thirdparty/sdl/src/test/SDL_test_log.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_md5.c b/src/thirdparty/sdl/src/test/SDL_test_md5.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_md5.c
rename to src/thirdparty/sdl/src/test/SDL_test_md5.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_memory.c b/src/thirdparty/sdl/src/test/SDL_test_memory.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_memory.c
rename to src/thirdparty/sdl/src/test/SDL_test_memory.c
diff --git a/r5dev/thirdparty/sdl/src/test/SDL_test_random.c b/src/thirdparty/sdl/src/test/SDL_test_random.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/test/SDL_test_random.c
rename to src/thirdparty/sdl/src/test/SDL_test_random.c
diff --git a/r5dev/thirdparty/sdl/src/thread/SDL_systhread.h b/src/thirdparty/sdl/src/thread/SDL_systhread.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/SDL_systhread.h
rename to src/thirdparty/sdl/src/thread/SDL_systhread.h
diff --git a/r5dev/thirdparty/sdl/src/thread/SDL_thread.c b/src/thirdparty/sdl/src/thread/SDL_thread.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/SDL_thread.c
rename to src/thirdparty/sdl/src/thread/SDL_thread.c
diff --git a/r5dev/thirdparty/sdl/src/thread/SDL_thread_c.h b/src/thirdparty/sdl/src/thread/SDL_thread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/SDL_thread_c.h
rename to src/thirdparty/sdl/src/thread/SDL_thread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_syscond.c b/src/thirdparty/sdl/src/thread/generic/SDL_syscond.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_syscond.c
rename to src/thirdparty/sdl/src/thread/generic/SDL_syscond.c
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_syscond_c.h b/src/thirdparty/sdl/src/thread/generic/SDL_syscond_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_syscond_c.h
rename to src/thirdparty/sdl/src/thread/generic/SDL_syscond_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_sysmutex.c b/src/thirdparty/sdl/src/thread/generic/SDL_sysmutex.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_sysmutex.c
rename to src/thirdparty/sdl/src/thread/generic/SDL_sysmutex.c
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_sysmutex_c.h b/src/thirdparty/sdl/src/thread/generic/SDL_sysmutex_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_sysmutex_c.h
rename to src/thirdparty/sdl/src/thread/generic/SDL_sysmutex_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_syssem.c b/src/thirdparty/sdl/src/thread/generic/SDL_syssem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_syssem.c
rename to src/thirdparty/sdl/src/thread/generic/SDL_syssem.c
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_systhread.c b/src/thirdparty/sdl/src/thread/generic/SDL_systhread.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_systhread.c
rename to src/thirdparty/sdl/src/thread/generic/SDL_systhread.c
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_systhread_c.h b/src/thirdparty/sdl/src/thread/generic/SDL_systhread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_systhread_c.h
rename to src/thirdparty/sdl/src/thread/generic/SDL_systhread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/generic/SDL_systls.c b/src/thirdparty/sdl/src/thread/generic/SDL_systls.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/generic/SDL_systls.c
rename to src/thirdparty/sdl/src/thread/generic/SDL_systls.c
diff --git a/r5dev/thirdparty/sdl/src/thread/os2/SDL_sysmutex.c b/src/thirdparty/sdl/src/thread/os2/SDL_sysmutex.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/os2/SDL_sysmutex.c
rename to src/thirdparty/sdl/src/thread/os2/SDL_sysmutex.c
diff --git a/r5dev/thirdparty/sdl/src/thread/os2/SDL_syssem.c b/src/thirdparty/sdl/src/thread/os2/SDL_syssem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/os2/SDL_syssem.c
rename to src/thirdparty/sdl/src/thread/os2/SDL_syssem.c
diff --git a/r5dev/thirdparty/sdl/src/thread/os2/SDL_systhread.c b/src/thirdparty/sdl/src/thread/os2/SDL_systhread.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/os2/SDL_systhread.c
rename to src/thirdparty/sdl/src/thread/os2/SDL_systhread.c
diff --git a/r5dev/thirdparty/sdl/src/thread/os2/SDL_systhread_c.h b/src/thirdparty/sdl/src/thread/os2/SDL_systhread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/os2/SDL_systhread_c.h
rename to src/thirdparty/sdl/src/thread/os2/SDL_systhread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/os2/SDL_systls.c b/src/thirdparty/sdl/src/thread/os2/SDL_systls.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/os2/SDL_systls.c
rename to src/thirdparty/sdl/src/thread/os2/SDL_systls.c
diff --git a/r5dev/thirdparty/sdl/src/thread/os2/SDL_systls_c.h b/src/thirdparty/sdl/src/thread/os2/SDL_systls_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/os2/SDL_systls_c.h
rename to src/thirdparty/sdl/src/thread/os2/SDL_systls_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/psp/SDL_syscond.c b/src/thirdparty/sdl/src/thread/psp/SDL_syscond.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/psp/SDL_syscond.c
rename to src/thirdparty/sdl/src/thread/psp/SDL_syscond.c
diff --git a/r5dev/thirdparty/sdl/src/thread/psp/SDL_sysmutex.c b/src/thirdparty/sdl/src/thread/psp/SDL_sysmutex.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/psp/SDL_sysmutex.c
rename to src/thirdparty/sdl/src/thread/psp/SDL_sysmutex.c
diff --git a/r5dev/thirdparty/sdl/src/thread/psp/SDL_sysmutex_c.h b/src/thirdparty/sdl/src/thread/psp/SDL_sysmutex_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/psp/SDL_sysmutex_c.h
rename to src/thirdparty/sdl/src/thread/psp/SDL_sysmutex_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/psp/SDL_syssem.c b/src/thirdparty/sdl/src/thread/psp/SDL_syssem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/psp/SDL_syssem.c
rename to src/thirdparty/sdl/src/thread/psp/SDL_syssem.c
diff --git a/r5dev/thirdparty/sdl/src/thread/psp/SDL_systhread.c b/src/thirdparty/sdl/src/thread/psp/SDL_systhread.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/psp/SDL_systhread.c
rename to src/thirdparty/sdl/src/thread/psp/SDL_systhread.c
diff --git a/r5dev/thirdparty/sdl/src/thread/psp/SDL_systhread_c.h b/src/thirdparty/sdl/src/thread/psp/SDL_systhread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/psp/SDL_systhread_c.h
rename to src/thirdparty/sdl/src/thread/psp/SDL_systhread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/pthread/SDL_syscond.c b/src/thirdparty/sdl/src/thread/pthread/SDL_syscond.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/pthread/SDL_syscond.c
rename to src/thirdparty/sdl/src/thread/pthread/SDL_syscond.c
diff --git a/r5dev/thirdparty/sdl/src/thread/pthread/SDL_sysmutex.c b/src/thirdparty/sdl/src/thread/pthread/SDL_sysmutex.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/pthread/SDL_sysmutex.c
rename to src/thirdparty/sdl/src/thread/pthread/SDL_sysmutex.c
diff --git a/r5dev/thirdparty/sdl/src/thread/pthread/SDL_sysmutex_c.h b/src/thirdparty/sdl/src/thread/pthread/SDL_sysmutex_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/pthread/SDL_sysmutex_c.h
rename to src/thirdparty/sdl/src/thread/pthread/SDL_sysmutex_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/pthread/SDL_syssem.c b/src/thirdparty/sdl/src/thread/pthread/SDL_syssem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/pthread/SDL_syssem.c
rename to src/thirdparty/sdl/src/thread/pthread/SDL_syssem.c
diff --git a/r5dev/thirdparty/sdl/src/thread/pthread/SDL_systhread.c b/src/thirdparty/sdl/src/thread/pthread/SDL_systhread.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/pthread/SDL_systhread.c
rename to src/thirdparty/sdl/src/thread/pthread/SDL_systhread.c
diff --git a/r5dev/thirdparty/sdl/src/thread/pthread/SDL_systhread_c.h b/src/thirdparty/sdl/src/thread/pthread/SDL_systhread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/pthread/SDL_systhread_c.h
rename to src/thirdparty/sdl/src/thread/pthread/SDL_systhread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/pthread/SDL_systls.c b/src/thirdparty/sdl/src/thread/pthread/SDL_systls.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/pthread/SDL_systls.c
rename to src/thirdparty/sdl/src/thread/pthread/SDL_systls.c
diff --git a/r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_syscond.cpp b/src/thirdparty/sdl/src/thread/stdcpp/SDL_syscond.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_syscond.cpp
rename to src/thirdparty/sdl/src/thread/stdcpp/SDL_syscond.cpp
diff --git a/r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex.cpp b/src/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
rename to src/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
diff --git a/r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex_c.h b/src/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
rename to src/thirdparty/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_systhread.cpp b/src/thirdparty/sdl/src/thread/stdcpp/SDL_systhread.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_systhread.cpp
rename to src/thirdparty/sdl/src/thread/stdcpp/SDL_systhread.cpp
diff --git a/r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_systhread_c.h b/src/thirdparty/sdl/src/thread/stdcpp/SDL_systhread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/stdcpp/SDL_systhread_c.h
rename to src/thirdparty/sdl/src/thread/stdcpp/SDL_systhread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/vita/SDL_syscond.c b/src/thirdparty/sdl/src/thread/vita/SDL_syscond.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/vita/SDL_syscond.c
rename to src/thirdparty/sdl/src/thread/vita/SDL_syscond.c
diff --git a/r5dev/thirdparty/sdl/src/thread/vita/SDL_sysmutex.c b/src/thirdparty/sdl/src/thread/vita/SDL_sysmutex.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/vita/SDL_sysmutex.c
rename to src/thirdparty/sdl/src/thread/vita/SDL_sysmutex.c
diff --git a/r5dev/thirdparty/sdl/src/thread/vita/SDL_sysmutex_c.h b/src/thirdparty/sdl/src/thread/vita/SDL_sysmutex_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/vita/SDL_sysmutex_c.h
rename to src/thirdparty/sdl/src/thread/vita/SDL_sysmutex_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/vita/SDL_syssem.c b/src/thirdparty/sdl/src/thread/vita/SDL_syssem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/vita/SDL_syssem.c
rename to src/thirdparty/sdl/src/thread/vita/SDL_syssem.c
diff --git a/r5dev/thirdparty/sdl/src/thread/vita/SDL_systhread.c b/src/thirdparty/sdl/src/thread/vita/SDL_systhread.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/vita/SDL_systhread.c
rename to src/thirdparty/sdl/src/thread/vita/SDL_systhread.c
diff --git a/r5dev/thirdparty/sdl/src/thread/vita/SDL_systhread_c.h b/src/thirdparty/sdl/src/thread/vita/SDL_systhread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/vita/SDL_systhread_c.h
rename to src/thirdparty/sdl/src/thread/vita/SDL_systhread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/windows/SDL_syscond_cv.c b/src/thirdparty/sdl/src/thread/windows/SDL_syscond_cv.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/windows/SDL_syscond_cv.c
rename to src/thirdparty/sdl/src/thread/windows/SDL_syscond_cv.c
diff --git a/r5dev/thirdparty/sdl/src/thread/windows/SDL_sysmutex.c b/src/thirdparty/sdl/src/thread/windows/SDL_sysmutex.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/windows/SDL_sysmutex.c
rename to src/thirdparty/sdl/src/thread/windows/SDL_sysmutex.c
diff --git a/r5dev/thirdparty/sdl/src/thread/windows/SDL_sysmutex_c.h b/src/thirdparty/sdl/src/thread/windows/SDL_sysmutex_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/windows/SDL_sysmutex_c.h
rename to src/thirdparty/sdl/src/thread/windows/SDL_sysmutex_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/windows/SDL_syssem.c b/src/thirdparty/sdl/src/thread/windows/SDL_syssem.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/windows/SDL_syssem.c
rename to src/thirdparty/sdl/src/thread/windows/SDL_syssem.c
diff --git a/r5dev/thirdparty/sdl/src/thread/windows/SDL_systhread.c b/src/thirdparty/sdl/src/thread/windows/SDL_systhread.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/windows/SDL_systhread.c
rename to src/thirdparty/sdl/src/thread/windows/SDL_systhread.c
diff --git a/r5dev/thirdparty/sdl/src/thread/windows/SDL_systhread_c.h b/src/thirdparty/sdl/src/thread/windows/SDL_systhread_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/windows/SDL_systhread_c.h
rename to src/thirdparty/sdl/src/thread/windows/SDL_systhread_c.h
diff --git a/r5dev/thirdparty/sdl/src/thread/windows/SDL_systls.c b/src/thirdparty/sdl/src/thread/windows/SDL_systls.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/thread/windows/SDL_systls.c
rename to src/thirdparty/sdl/src/thread/windows/SDL_systls.c
diff --git a/r5dev/thirdparty/sdl/src/timer/SDL_timer.c b/src/thirdparty/sdl/src/timer/SDL_timer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/SDL_timer.c
rename to src/thirdparty/sdl/src/timer/SDL_timer.c
diff --git a/r5dev/thirdparty/sdl/src/timer/SDL_timer_c.h b/src/thirdparty/sdl/src/timer/SDL_timer_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/SDL_timer_c.h
rename to src/thirdparty/sdl/src/timer/SDL_timer_c.h
diff --git a/r5dev/thirdparty/sdl/src/timer/dummy/SDL_systimer.c b/src/thirdparty/sdl/src/timer/dummy/SDL_systimer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/dummy/SDL_systimer.c
rename to src/thirdparty/sdl/src/timer/dummy/SDL_systimer.c
diff --git a/r5dev/thirdparty/sdl/src/timer/haiku/SDL_systimer.c b/src/thirdparty/sdl/src/timer/haiku/SDL_systimer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/haiku/SDL_systimer.c
rename to src/thirdparty/sdl/src/timer/haiku/SDL_systimer.c
diff --git a/r5dev/thirdparty/sdl/src/timer/os2/SDL_systimer.c b/src/thirdparty/sdl/src/timer/os2/SDL_systimer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/os2/SDL_systimer.c
rename to src/thirdparty/sdl/src/timer/os2/SDL_systimer.c
diff --git a/r5dev/thirdparty/sdl/src/timer/psp/SDL_systimer.c b/src/thirdparty/sdl/src/timer/psp/SDL_systimer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/psp/SDL_systimer.c
rename to src/thirdparty/sdl/src/timer/psp/SDL_systimer.c
diff --git a/r5dev/thirdparty/sdl/src/timer/unix/SDL_systimer.c b/src/thirdparty/sdl/src/timer/unix/SDL_systimer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/unix/SDL_systimer.c
rename to src/thirdparty/sdl/src/timer/unix/SDL_systimer.c
diff --git a/r5dev/thirdparty/sdl/src/timer/vita/SDL_systimer.c b/src/thirdparty/sdl/src/timer/vita/SDL_systimer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/vita/SDL_systimer.c
rename to src/thirdparty/sdl/src/timer/vita/SDL_systimer.c
diff --git a/r5dev/thirdparty/sdl/src/timer/windows/SDL_systimer.c b/src/thirdparty/sdl/src/timer/windows/SDL_systimer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/timer/windows/SDL_systimer.c
rename to src/thirdparty/sdl/src/timer/windows/SDL_systimer.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_RLEaccel.c b/src/thirdparty/sdl/src/video/SDL_RLEaccel.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_RLEaccel.c
rename to src/thirdparty/sdl/src/video/SDL_RLEaccel.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_RLEaccel_c.h b/src/thirdparty/sdl/src/video/SDL_RLEaccel_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_RLEaccel_c.h
rename to src/thirdparty/sdl/src/video/SDL_RLEaccel_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit.c b/src/thirdparty/sdl/src/video/SDL_blit.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit.c
rename to src/thirdparty/sdl/src/video/SDL_blit.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit.h b/src/thirdparty/sdl/src/video/SDL_blit.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit.h
rename to src/thirdparty/sdl/src/video/SDL_blit.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_0.c b/src/thirdparty/sdl/src/video/SDL_blit_0.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_0.c
rename to src/thirdparty/sdl/src/video/SDL_blit_0.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_1.c b/src/thirdparty/sdl/src/video/SDL_blit_1.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_1.c
rename to src/thirdparty/sdl/src/video/SDL_blit_1.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_A.c b/src/thirdparty/sdl/src/video/SDL_blit_A.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_A.c
rename to src/thirdparty/sdl/src/video/SDL_blit_A.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_N.c b/src/thirdparty/sdl/src/video/SDL_blit_N.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_N.c
rename to src/thirdparty/sdl/src/video/SDL_blit_N.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_auto.c b/src/thirdparty/sdl/src/video/SDL_blit_auto.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_auto.c
rename to src/thirdparty/sdl/src/video/SDL_blit_auto.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_auto.h b/src/thirdparty/sdl/src/video/SDL_blit_auto.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_auto.h
rename to src/thirdparty/sdl/src/video/SDL_blit_auto.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_copy.c b/src/thirdparty/sdl/src/video/SDL_blit_copy.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_copy.c
rename to src/thirdparty/sdl/src/video/SDL_blit_copy.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_copy.h b/src/thirdparty/sdl/src/video/SDL_blit_copy.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_copy.h
rename to src/thirdparty/sdl/src/video/SDL_blit_copy.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_slow.c b/src/thirdparty/sdl/src/video/SDL_blit_slow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_slow.c
rename to src/thirdparty/sdl/src/video/SDL_blit_slow.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_blit_slow.h b/src/thirdparty/sdl/src/video/SDL_blit_slow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_blit_slow.h
rename to src/thirdparty/sdl/src/video/SDL_blit_slow.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_bmp.c b/src/thirdparty/sdl/src/video/SDL_bmp.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_bmp.c
rename to src/thirdparty/sdl/src/video/SDL_bmp.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_clipboard.c b/src/thirdparty/sdl/src/video/SDL_clipboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_clipboard.c
rename to src/thirdparty/sdl/src/video/SDL_clipboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_egl.c b/src/thirdparty/sdl/src/video/SDL_egl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_egl.c
rename to src/thirdparty/sdl/src/video/SDL_egl.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_egl_c.h b/src/thirdparty/sdl/src/video/SDL_egl_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_egl_c.h
rename to src/thirdparty/sdl/src/video/SDL_egl_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_fillrect.c b/src/thirdparty/sdl/src/video/SDL_fillrect.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_fillrect.c
rename to src/thirdparty/sdl/src/video/SDL_fillrect.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_pixels.c b/src/thirdparty/sdl/src/video/SDL_pixels.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_pixels.c
rename to src/thirdparty/sdl/src/video/SDL_pixels.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_pixels_c.h b/src/thirdparty/sdl/src/video/SDL_pixels_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_pixels_c.h
rename to src/thirdparty/sdl/src/video/SDL_pixels_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_rect.c b/src/thirdparty/sdl/src/video/SDL_rect.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_rect.c
rename to src/thirdparty/sdl/src/video/SDL_rect.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_rect_c.h b/src/thirdparty/sdl/src/video/SDL_rect_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_rect_c.h
rename to src/thirdparty/sdl/src/video/SDL_rect_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_shape.c b/src/thirdparty/sdl/src/video/SDL_shape.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_shape.c
rename to src/thirdparty/sdl/src/video/SDL_shape.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_shape_internals.h b/src/thirdparty/sdl/src/video/SDL_shape_internals.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_shape_internals.h
rename to src/thirdparty/sdl/src/video/SDL_shape_internals.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_stretch.c b/src/thirdparty/sdl/src/video/SDL_stretch.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_stretch.c
rename to src/thirdparty/sdl/src/video/SDL_stretch.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_surface.c b/src/thirdparty/sdl/src/video/SDL_surface.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_surface.c
rename to src/thirdparty/sdl/src/video/SDL_surface.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_sysvideo.h b/src/thirdparty/sdl/src/video/SDL_sysvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_sysvideo.h
rename to src/thirdparty/sdl/src/video/SDL_sysvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_video.c b/src/thirdparty/sdl/src/video/SDL_video.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_video.c
rename to src/thirdparty/sdl/src/video/SDL_video.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_vulkan_internal.h b/src/thirdparty/sdl/src/video/SDL_vulkan_internal.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_vulkan_internal.h
rename to src/thirdparty/sdl/src/video/SDL_vulkan_internal.h
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_vulkan_utils.c b/src/thirdparty/sdl/src/video/SDL_vulkan_utils.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_vulkan_utils.c
rename to src/thirdparty/sdl/src/video/SDL_vulkan_utils.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_yuv.c b/src/thirdparty/sdl/src/video/SDL_yuv.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_yuv.c
rename to src/thirdparty/sdl/src/video/SDL_yuv.c
diff --git a/r5dev/thirdparty/sdl/src/video/SDL_yuv_c.h b/src/thirdparty/sdl/src/video/SDL_yuv_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/SDL_yuv_c.h
rename to src/thirdparty/sdl/src/video/SDL_yuv_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidclipboard.c b/src/thirdparty/sdl/src/video/android/SDL_androidclipboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidclipboard.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidclipboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidclipboard.h b/src/thirdparty/sdl/src/video/android/SDL_androidclipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidclipboard.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidclipboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidevents.c b/src/thirdparty/sdl/src/video/android/SDL_androidevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidevents.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidevents.h b/src/thirdparty/sdl/src/video/android/SDL_androidevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidevents.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidevents.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidgl.c b/src/thirdparty/sdl/src/video/android/SDL_androidgl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidgl.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidgl.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidgl.h b/src/thirdparty/sdl/src/video/android/SDL_androidgl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidgl.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidgl.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidkeyboard.c b/src/thirdparty/sdl/src/video/android/SDL_androidkeyboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidkeyboard.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidkeyboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidkeyboard.h b/src/thirdparty/sdl/src/video/android/SDL_androidkeyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidkeyboard.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidkeyboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidmessagebox.c b/src/thirdparty/sdl/src/video/android/SDL_androidmessagebox.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidmessagebox.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidmessagebox.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidmessagebox.h b/src/thirdparty/sdl/src/video/android/SDL_androidmessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidmessagebox.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidmessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidmouse.c b/src/thirdparty/sdl/src/video/android/SDL_androidmouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidmouse.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidmouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidmouse.h b/src/thirdparty/sdl/src/video/android/SDL_androidmouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidmouse.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidmouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidtouch.c b/src/thirdparty/sdl/src/video/android/SDL_androidtouch.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidtouch.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidtouch.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidtouch.h b/src/thirdparty/sdl/src/video/android/SDL_androidtouch.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidtouch.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidtouch.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidvideo.c b/src/thirdparty/sdl/src/video/android/SDL_androidvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidvideo.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidvideo.h b/src/thirdparty/sdl/src/video/android/SDL_androidvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidvideo.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidvulkan.c b/src/thirdparty/sdl/src/video/android/SDL_androidvulkan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidvulkan.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidvulkan.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidvulkan.h b/src/thirdparty/sdl/src/video/android/SDL_androidvulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidvulkan.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidvulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidwindow.c b/src/thirdparty/sdl/src/video/android/SDL_androidwindow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidwindow.c
rename to src/thirdparty/sdl/src/video/android/SDL_androidwindow.c
diff --git a/r5dev/thirdparty/sdl/src/video/android/SDL_androidwindow.h b/src/thirdparty/sdl/src/video/android/SDL_androidwindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/android/SDL_androidwindow.h
rename to src/thirdparty/sdl/src/video/android/SDL_androidwindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaclipboard.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaevents.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoakeyboard.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoamessagebox.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoametalview.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoamodes.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoamouse.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengl.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoaopengles.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoashape.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoavideo.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoavulkan.m
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.h b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.h
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.m b/src/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.m
rename to src/thirdparty/sdl/src/video/cocoa/SDL_cocoawindow.m
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_WM.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_dyn.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_events.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_modes.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_mouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_opengl.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_render.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_shape.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_video.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_vulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.c b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.c
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.c
diff --git a/r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.h b/src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.h
rename to src/thirdparty/sdl/src/video/directfb/SDL_DirectFB_window.h
diff --git a/r5dev/thirdparty/sdl/src/video/dummy/SDL_nullevents.c b/src/thirdparty/sdl/src/video/dummy/SDL_nullevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/dummy/SDL_nullevents.c
rename to src/thirdparty/sdl/src/video/dummy/SDL_nullevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/dummy/SDL_nullevents_c.h b/src/thirdparty/sdl/src/video/dummy/SDL_nullevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/dummy/SDL_nullevents_c.h
rename to src/thirdparty/sdl/src/video/dummy/SDL_nullevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer.c b/src/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer.c
rename to src/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer.c
diff --git a/r5dev/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer_c.h b/src/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer_c.h
rename to src/thirdparty/sdl/src/video/dummy/SDL_nullframebuffer_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/dummy/SDL_nullvideo.c b/src/thirdparty/sdl/src/video/dummy/SDL_nullvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/dummy/SDL_nullvideo.c
rename to src/thirdparty/sdl/src/video/dummy/SDL_nullvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/dummy/SDL_nullvideo.h b/src/thirdparty/sdl/src/video/dummy/SDL_nullvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/dummy/SDL_nullvideo.h
rename to src/thirdparty/sdl/src/video/dummy/SDL_nullvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.c b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.c
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.h b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.h
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenevents.h
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.c
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenframebuffer.h
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.c b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.c
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.h b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.h
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenmouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.c b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.c
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.h b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.h
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.c b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.c
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.h b/src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.h
rename to src/thirdparty/sdl/src/video/emscripten/SDL_emscriptenvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_BWin.h b/src/thirdparty/sdl/src/video/haiku/SDL_BWin.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_BWin.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_BWin.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bclipboard.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bclipboard.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bclipboard.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bclipboard.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bclipboard.h b/src/thirdparty/sdl/src/video/haiku/SDL_bclipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bclipboard.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bclipboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bevents.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bevents.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bevents.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bevents.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bevents.h b/src/thirdparty/sdl/src/video/haiku/SDL_bevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bevents.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bevents.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.h b/src/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bframebuffer.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.h b/src/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bkeyboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.h b/src/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bmessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bmodes.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bmodes.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bmodes.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bmodes.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bmodes.h b/src/thirdparty/sdl/src/video/haiku/SDL_bmodes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bmodes.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bmodes.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bopengl.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bopengl.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bopengl.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bopengl.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bopengl.h b/src/thirdparty/sdl/src/video/haiku/SDL_bopengl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bopengl.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bopengl.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bvideo.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bvideo.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bvideo.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bvideo.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bvideo.h b/src/thirdparty/sdl/src/video/haiku/SDL_bvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bvideo.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bwindow.cc b/src/thirdparty/sdl/src/video/haiku/SDL_bwindow.cc
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bwindow.cc
rename to src/thirdparty/sdl/src/video/haiku/SDL_bwindow.cc
diff --git a/r5dev/thirdparty/sdl/src/video/haiku/SDL_bwindow.h b/src/thirdparty/sdl/src/video/haiku/SDL_bwindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/haiku/SDL_bwindow.h
rename to src/thirdparty/sdl/src/video/haiku/SDL_bwindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/EGL/egl.h b/src/thirdparty/sdl/src/video/khronos/EGL/egl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/EGL/egl.h
rename to src/thirdparty/sdl/src/video/khronos/EGL/egl.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/EGL/eglext.h b/src/thirdparty/sdl/src/video/khronos/EGL/eglext.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/EGL/eglext.h
rename to src/thirdparty/sdl/src/video/khronos/EGL/eglext.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/EGL/eglplatform.h b/src/thirdparty/sdl/src/video/khronos/EGL/eglplatform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/EGL/eglplatform.h
rename to src/thirdparty/sdl/src/video/khronos/EGL/eglplatform.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/GLES2/gl2.h b/src/thirdparty/sdl/src/video/khronos/GLES2/gl2.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/GLES2/gl2.h
rename to src/thirdparty/sdl/src/video/khronos/GLES2/gl2.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/GLES2/gl2ext.h b/src/thirdparty/sdl/src/video/khronos/GLES2/gl2ext.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/GLES2/gl2ext.h
rename to src/thirdparty/sdl/src/video/khronos/GLES2/gl2ext.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/GLES2/gl2platform.h b/src/thirdparty/sdl/src/video/khronos/GLES2/gl2platform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/GLES2/gl2platform.h
rename to src/thirdparty/sdl/src/video/khronos/GLES2/gl2platform.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/KHR/khrplatform.h b/src/thirdparty/sdl/src/video/khronos/KHR/khrplatform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/KHR/khrplatform.h
rename to src/thirdparty/sdl/src/video/khronos/KHR/khrplatform.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_icd.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vk_icd.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_icd.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vk_icd.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_layer.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vk_layer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_layer.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vk_layer.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_platform.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vk_platform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_platform.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vk_platform.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_sdk_platform.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vk_sdk_platform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vk_sdk_platform.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vk_sdk_platform.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan.hpp b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan.hpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan.hpp
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan.hpp
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_android.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_android.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_android.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_android.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_beta.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_beta.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_beta.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_beta.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_core.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_core.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_core.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_core.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_directfb.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_directfb.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_directfb.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_directfb.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_fuchsia.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ggp.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ggp.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ggp.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ggp.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ios.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ios.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ios.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_ios.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_macos.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_macos.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_macos.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_macos.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_metal.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_metal.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_metal.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_metal.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_vi.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_vi.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_vi.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_vi.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_wayland.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_wayland.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_wayland.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_wayland.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_win32.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_win32.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_win32.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_win32.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xcb.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xcb.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xcb.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xcb.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib.h
diff --git a/r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h b/src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h
rename to src/thirdparty/sdl/src/video/khronos/vulkan/vulkan_xlib_xrandr.h
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.c
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmdyn.h
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmevents.h
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmmouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmsym.h
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.c b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.c
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.c
diff --git a/r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.h b/src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.h
rename to src/thirdparty/sdl/src/video/kmsdrm/SDL_kmsdrmvulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclevents.c b/src/thirdparty/sdl/src/video/nacl/SDL_naclevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclevents.c
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclevents_c.h b/src/thirdparty/sdl/src/video/nacl/SDL_naclevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclevents_c.h
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclglue.c b/src/thirdparty/sdl/src/video/nacl/SDL_naclglue.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclglue.c
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclglue.c
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclopengles.c b/src/thirdparty/sdl/src/video/nacl/SDL_naclopengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclopengles.c
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclopengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclopengles.h b/src/thirdparty/sdl/src/video/nacl/SDL_naclopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclopengles.h
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclvideo.c b/src/thirdparty/sdl/src/video/nacl/SDL_naclvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclvideo.c
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclvideo.h b/src/thirdparty/sdl/src/video/nacl/SDL_naclvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclvideo.h
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclwindow.c b/src/thirdparty/sdl/src/video/nacl/SDL_naclwindow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclwindow.c
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclwindow.c
diff --git a/r5dev/thirdparty/sdl/src/video/nacl/SDL_naclwindow.h b/src/thirdparty/sdl/src/video/nacl/SDL_naclwindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/nacl/SDL_naclwindow.h
rename to src/thirdparty/sdl/src/video/nacl/SDL_naclwindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents.c b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents.c
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents_c.h b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents_c.h
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer.c b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer.c
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer.c
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer_c.h b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer_c.h
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenframebuffer_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.c b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.c
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.c
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.h b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.h
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenopengl.h
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.c b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.c
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.h b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.h
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.c b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.c
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.c
diff --git a/r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.h b/src/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.h
rename to src/thirdparty/sdl/src/video/offscreen/SDL_offscreenwindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_gradd.h b/src/thirdparty/sdl/src/video/os2/SDL_gradd.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_gradd.h
rename to src/thirdparty/sdl/src/video/os2/SDL_gradd.h
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2dive.c b/src/thirdparty/sdl/src/video/os2/SDL_os2dive.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2dive.c
rename to src/thirdparty/sdl/src/video/os2/SDL_os2dive.c
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2messagebox.c b/src/thirdparty/sdl/src/video/os2/SDL_os2messagebox.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2messagebox.c
rename to src/thirdparty/sdl/src/video/os2/SDL_os2messagebox.c
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2messagebox.h b/src/thirdparty/sdl/src/video/os2/SDL_os2messagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2messagebox.h
rename to src/thirdparty/sdl/src/video/os2/SDL_os2messagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2mouse.c b/src/thirdparty/sdl/src/video/os2/SDL_os2mouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2mouse.c
rename to src/thirdparty/sdl/src/video/os2/SDL_os2mouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2mouse.h b/src/thirdparty/sdl/src/video/os2/SDL_os2mouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2mouse.h
rename to src/thirdparty/sdl/src/video/os2/SDL_os2mouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2output.h b/src/thirdparty/sdl/src/video/os2/SDL_os2output.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2output.h
rename to src/thirdparty/sdl/src/video/os2/SDL_os2output.h
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2util.c b/src/thirdparty/sdl/src/video/os2/SDL_os2util.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2util.c
rename to src/thirdparty/sdl/src/video/os2/SDL_os2util.c
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2util.h b/src/thirdparty/sdl/src/video/os2/SDL_os2util.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2util.h
rename to src/thirdparty/sdl/src/video/os2/SDL_os2util.h
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2video.c b/src/thirdparty/sdl/src/video/os2/SDL_os2video.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2video.c
rename to src/thirdparty/sdl/src/video/os2/SDL_os2video.c
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2video.h b/src/thirdparty/sdl/src/video/os2/SDL_os2video.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2video.h
rename to src/thirdparty/sdl/src/video/os2/SDL_os2video.h
diff --git a/r5dev/thirdparty/sdl/src/video/os2/SDL_os2vman.c b/src/thirdparty/sdl/src/video/os2/SDL_os2vman.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/os2/SDL_os2vman.c
rename to src/thirdparty/sdl/src/video/os2/SDL_os2vman.c
diff --git a/r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora.c b/src/thirdparty/sdl/src/video/pandora/SDL_pandora.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora.c
rename to src/thirdparty/sdl/src/video/pandora/SDL_pandora.c
diff --git a/r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora.h b/src/thirdparty/sdl/src/video/pandora/SDL_pandora.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora.h
rename to src/thirdparty/sdl/src/video/pandora/SDL_pandora.h
diff --git a/r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora_events.c b/src/thirdparty/sdl/src/video/pandora/SDL_pandora_events.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora_events.c
rename to src/thirdparty/sdl/src/video/pandora/SDL_pandora_events.c
diff --git a/r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora_events.h b/src/thirdparty/sdl/src/video/pandora/SDL_pandora_events.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/pandora/SDL_pandora_events.h
rename to src/thirdparty/sdl/src/video/pandora/SDL_pandora_events.h
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspevents.c b/src/thirdparty/sdl/src/video/psp/SDL_pspevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspevents.c
rename to src/thirdparty/sdl/src/video/psp/SDL_pspevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspevents_c.h b/src/thirdparty/sdl/src/video/psp/SDL_pspevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspevents_c.h
rename to src/thirdparty/sdl/src/video/psp/SDL_pspevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspgl.c b/src/thirdparty/sdl/src/video/psp/SDL_pspgl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspgl.c
rename to src/thirdparty/sdl/src/video/psp/SDL_pspgl.c
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspgl_c.h b/src/thirdparty/sdl/src/video/psp/SDL_pspgl_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspgl_c.h
rename to src/thirdparty/sdl/src/video/psp/SDL_pspgl_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspmouse.c b/src/thirdparty/sdl/src/video/psp/SDL_pspmouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspmouse.c
rename to src/thirdparty/sdl/src/video/psp/SDL_pspmouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspmouse_c.h b/src/thirdparty/sdl/src/video/psp/SDL_pspmouse_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspmouse_c.h
rename to src/thirdparty/sdl/src/video/psp/SDL_pspmouse_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspvideo.c b/src/thirdparty/sdl/src/video/psp/SDL_pspvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspvideo.c
rename to src/thirdparty/sdl/src/video/psp/SDL_pspvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/psp/SDL_pspvideo.h b/src/thirdparty/sdl/src/video/psp/SDL_pspvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/psp/SDL_pspvideo.h
rename to src/thirdparty/sdl/src/video/psp/SDL_pspvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/qnx/gl.c b/src/thirdparty/sdl/src/video/qnx/gl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/qnx/gl.c
rename to src/thirdparty/sdl/src/video/qnx/gl.c
diff --git a/r5dev/thirdparty/sdl/src/video/qnx/keyboard.c b/src/thirdparty/sdl/src/video/qnx/keyboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/qnx/keyboard.c
rename to src/thirdparty/sdl/src/video/qnx/keyboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/qnx/sdl_qnx.h b/src/thirdparty/sdl/src/video/qnx/sdl_qnx.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/qnx/sdl_qnx.h
rename to src/thirdparty/sdl/src/video/qnx/sdl_qnx.h
diff --git a/r5dev/thirdparty/sdl/src/video/qnx/video.c b/src/thirdparty/sdl/src/video/qnx/video.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/qnx/video.c
rename to src/thirdparty/sdl/src/video/qnx/video.c
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpievents.c b/src/thirdparty/sdl/src/video/raspberry/SDL_rpievents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpievents.c
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpievents.c
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpievents_c.h b/src/thirdparty/sdl/src/video/raspberry/SDL_rpievents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpievents_c.h
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpievents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.c b/src/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.c
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.h b/src/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.h
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpimouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.c b/src/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.c
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.h b/src/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.h
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpiopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.c b/src/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.c
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.h b/src/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.h
rename to src/thirdparty/sdl/src/video/raspberry/SDL_rpivideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosdefs.h b/src/thirdparty/sdl/src/video/riscos/SDL_riscosdefs.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosdefs.h
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosdefs.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosevents.c b/src/thirdparty/sdl/src/video/riscos/SDL_riscosevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosevents.c
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosevents_c.h b/src/thirdparty/sdl/src/video/riscos/SDL_riscosevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosevents_c.h
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer.c b/src/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer.c
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer.c
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer_c.h b/src/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer_c.h
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosframebuffer_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.c b/src/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.c
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.c
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.h b/src/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.h
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosmessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.c b/src/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.c
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.c
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.h b/src/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.h
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosmodes.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.c b/src/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.c
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.h b/src/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.h
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscosvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.c b/src/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.c
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.c
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.h b/src/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.h
rename to src/thirdparty/sdl/src/video/riscos/SDL_riscoswindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/riscos/scancodes_riscos.h b/src/thirdparty/sdl/src/video/riscos/scancodes_riscos.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/riscos/scancodes_riscos.h
rename to src/thirdparty/sdl/src/video/riscos/scancodes_riscos.h
diff --git a/r5dev/thirdparty/sdl/src/video/sdlgenblit.pl b/src/thirdparty/sdl/src/video/sdlgenblit.pl
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/sdlgenblit.pl
rename to src/thirdparty/sdl/src/video/sdlgenblit.pl
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitappdelegate.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitclipboard.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitevents.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitevents.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitevents.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitevents.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitevents.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitevents.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitevents.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitmessagebox.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitmetalview.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitmodes.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitopengles.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitopenglview.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitvideo.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitview.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitview.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitview.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitview.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitview.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitview.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitview.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitview.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitviewcontroller.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitvulkan.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.h b/src/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.h
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.m b/src/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.m
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.m
rename to src/thirdparty/sdl/src/video/uikit/SDL_uikitwindow.m
diff --git a/r5dev/thirdparty/sdl/src/video/uikit/keyinfotable.h b/src/thirdparty/sdl/src/video/uikit/keyinfotable.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/uikit/keyinfotable.h
rename to src/thirdparty/sdl/src/video/uikit/keyinfotable.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.c b/src/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.h b/src/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitaframebuffer.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl.c b/src/thirdparty/sdl/src/video/vita/SDL_vitagl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitagl.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl_c.h b/src/thirdparty/sdl/src/video/vita/SDL_vitagl_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl_c.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitagl_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr.c b/src/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr_c.h b/src/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr_c.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitagl_pvr_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.c b/src/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.h b/src/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitakeyboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.c b/src/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.h b/src/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitamessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitamouse.c b/src/thirdparty/sdl/src/video/vita/SDL_vitamouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitamouse.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitamouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitamouse_c.h b/src/thirdparty/sdl/src/video/vita/SDL_vitamouse_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitamouse_c.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitamouse_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitatouch.c b/src/thirdparty/sdl/src/video/vita/SDL_vitatouch.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitatouch.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitatouch.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitatouch.h b/src/thirdparty/sdl/src/video/vita/SDL_vitatouch.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitatouch.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitatouch.h
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitavideo.c b/src/thirdparty/sdl/src/video/vita/SDL_vitavideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitavideo.c
rename to src/thirdparty/sdl/src/video/vita/SDL_vitavideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/vita/SDL_vitavideo.h b/src/thirdparty/sdl/src/video/vita/SDL_vitavideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vita/SDL_vitavideo.h
rename to src/thirdparty/sdl/src/video/vita/SDL_vitavideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.c b/src/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.c
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.h b/src/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.h
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivanteopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.c b/src/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.c
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.c
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.h b/src/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.h
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivanteplatform.h
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.c b/src/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.c
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.h b/src/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.h
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivantevideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.c b/src/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.c
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.c
diff --git a/r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.h b/src/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.h
rename to src/thirdparty/sdl/src/video/vivante/SDL_vivantevulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandclipboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylanddatamanager.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylanddyn.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandevents.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandevents.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandevents_c.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandevents_c.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandkeyboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandmessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandmouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandsym.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandsym.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandsym.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandsym.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandtouch.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandvulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.c b/src/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.c
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.c
diff --git a/r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.h b/src/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.h
rename to src/thirdparty/sdl/src/video/wayland/SDL_waylandwindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_msctf.h b/src/thirdparty/sdl/src/video/windows/SDL_msctf.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_msctf.h
rename to src/thirdparty/sdl/src/video/windows/SDL_msctf.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_vkeys.h b/src/thirdparty/sdl/src/video/windows/SDL_vkeys.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_vkeys.h
rename to src/thirdparty/sdl/src/video/windows/SDL_vkeys.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsclipboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsevents.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsevents.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsevents.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsevents.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsevents.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsevents.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsevents.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsevents.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsframebuffer.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.c b/src/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.h b/src/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowskeyboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsmessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmodes.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsmodes.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmodes.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsmodes.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmodes.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsmodes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmodes.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsmodes.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmouse.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsmouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmouse.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsmouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmouse.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsmouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsmouse.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsmouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengl.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsopengl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengl.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsopengl.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengl.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsopengl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengl.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsopengl.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengles.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsopengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengles.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsopengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengles.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsopengles.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsshape.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsshape.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsshape.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsshape.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsshape.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsshape.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsshape.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsshape.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowstaskdialog.h b/src/thirdparty/sdl/src/video/windows/SDL_windowstaskdialog.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowstaskdialog.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowstaskdialog.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvideo.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsvideo.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvideo.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsvideo.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvideo.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsvideo.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvideo.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsvideo.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.c b/src/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.h b/src/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowsvulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowswindow.c b/src/thirdparty/sdl/src/video/windows/SDL_windowswindow.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowswindow.c
rename to src/thirdparty/sdl/src/video/windows/SDL_windowswindow.c
diff --git a/r5dev/thirdparty/sdl/src/video/windows/SDL_windowswindow.h b/src/thirdparty/sdl/src/video/windows/SDL_windowswindow.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/SDL_windowswindow.h
rename to src/thirdparty/sdl/src/video/windows/SDL_windowswindow.h
diff --git a/r5dev/thirdparty/sdl/src/video/windows/wmmsg.h b/src/thirdparty/sdl/src/video/windows/wmmsg.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/windows/wmmsg.h
rename to src/thirdparty/sdl/src/video/windows/wmmsg.h
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtevents.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtevents.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtevents.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtevents.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtevents_c.h b/src/thirdparty/sdl/src/video/winrt/SDL_winrtevents_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtevents_c.h
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtevents_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h b/src/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtgamebar_cpp.h
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtkeyboard.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtkeyboard.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtkeyboard.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtkeyboard.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.h b/src/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.h
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtmessagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmouse.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtmouse.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmouse.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtmouse.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmouse_c.h b/src/thirdparty/sdl/src/video/winrt/SDL_winrtmouse_c.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtmouse_c.h
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtmouse_c.h
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.h b/src/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.h
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtopengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtpointerinput.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtpointerinput.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtpointerinput.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtpointerinput.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtvideo.cpp b/src/thirdparty/sdl/src/video/winrt/SDL_winrtvideo.cpp
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtvideo.cpp
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtvideo.cpp
diff --git a/r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtvideo_cpp.h b/src/thirdparty/sdl/src/video/winrt/SDL_winrtvideo_cpp.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/winrt/SDL_winrtvideo_cpp.h
rename to src/thirdparty/sdl/src/video/winrt/SDL_winrtvideo_cpp.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11clipboard.c b/src/thirdparty/sdl/src/video/x11/SDL_x11clipboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11clipboard.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11clipboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11clipboard.h b/src/thirdparty/sdl/src/video/x11/SDL_x11clipboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11clipboard.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11clipboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11dyn.c b/src/thirdparty/sdl/src/video/x11/SDL_x11dyn.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11dyn.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11dyn.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11dyn.h b/src/thirdparty/sdl/src/video/x11/SDL_x11dyn.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11dyn.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11dyn.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11events.c b/src/thirdparty/sdl/src/video/x11/SDL_x11events.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11events.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11events.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11events.h b/src/thirdparty/sdl/src/video/x11/SDL_x11events.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11events.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11events.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.c b/src/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.h b/src/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11framebuffer.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11keyboard.c b/src/thirdparty/sdl/src/video/x11/SDL_x11keyboard.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11keyboard.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11keyboard.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11keyboard.h b/src/thirdparty/sdl/src/video/x11/SDL_x11keyboard.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11keyboard.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11keyboard.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11messagebox.c b/src/thirdparty/sdl/src/video/x11/SDL_x11messagebox.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11messagebox.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11messagebox.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11messagebox.h b/src/thirdparty/sdl/src/video/x11/SDL_x11messagebox.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11messagebox.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11messagebox.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11modes.c b/src/thirdparty/sdl/src/video/x11/SDL_x11modes.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11modes.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11modes.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11modes.h b/src/thirdparty/sdl/src/video/x11/SDL_x11modes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11modes.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11modes.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11mouse.c b/src/thirdparty/sdl/src/video/x11/SDL_x11mouse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11mouse.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11mouse.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11mouse.h b/src/thirdparty/sdl/src/video/x11/SDL_x11mouse.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11mouse.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11mouse.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengl.c b/src/thirdparty/sdl/src/video/x11/SDL_x11opengl.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengl.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11opengl.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengl.h b/src/thirdparty/sdl/src/video/x11/SDL_x11opengl.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengl.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11opengl.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengles.c b/src/thirdparty/sdl/src/video/x11/SDL_x11opengles.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengles.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11opengles.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengles.h b/src/thirdparty/sdl/src/video/x11/SDL_x11opengles.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11opengles.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11opengles.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11shape.c b/src/thirdparty/sdl/src/video/x11/SDL_x11shape.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11shape.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11shape.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11shape.h b/src/thirdparty/sdl/src/video/x11/SDL_x11shape.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11shape.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11shape.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11sym.h b/src/thirdparty/sdl/src/video/x11/SDL_x11sym.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11sym.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11sym.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11touch.c b/src/thirdparty/sdl/src/video/x11/SDL_x11touch.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11touch.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11touch.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11touch.h b/src/thirdparty/sdl/src/video/x11/SDL_x11touch.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11touch.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11touch.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11video.c b/src/thirdparty/sdl/src/video/x11/SDL_x11video.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11video.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11video.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11video.h b/src/thirdparty/sdl/src/video/x11/SDL_x11video.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11video.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11video.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11vulkan.c b/src/thirdparty/sdl/src/video/x11/SDL_x11vulkan.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11vulkan.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11vulkan.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11vulkan.h b/src/thirdparty/sdl/src/video/x11/SDL_x11vulkan.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11vulkan.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11vulkan.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11window.c b/src/thirdparty/sdl/src/video/x11/SDL_x11window.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11window.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11window.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11window.h b/src/thirdparty/sdl/src/video/x11/SDL_x11window.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11window.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11window.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11xfixes.c b/src/thirdparty/sdl/src/video/x11/SDL_x11xfixes.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11xfixes.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11xfixes.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11xfixes.h b/src/thirdparty/sdl/src/video/x11/SDL_x11xfixes.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11xfixes.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11xfixes.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11xinput2.c b/src/thirdparty/sdl/src/video/x11/SDL_x11xinput2.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11xinput2.c
rename to src/thirdparty/sdl/src/video/x11/SDL_x11xinput2.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/SDL_x11xinput2.h b/src/thirdparty/sdl/src/video/x11/SDL_x11xinput2.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/SDL_x11xinput2.h
rename to src/thirdparty/sdl/src/video/x11/SDL_x11xinput2.h
diff --git a/r5dev/thirdparty/sdl/src/video/x11/edid-parse.c b/src/thirdparty/sdl/src/video/x11/edid-parse.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/edid-parse.c
rename to src/thirdparty/sdl/src/video/x11/edid-parse.c
diff --git a/r5dev/thirdparty/sdl/src/video/x11/edid.h b/src/thirdparty/sdl/src/video/x11/edid.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/x11/edid.h
rename to src/thirdparty/sdl/src/video/x11/edid.h
diff --git a/r5dev/thirdparty/sdl/src/video/yuv2rgb/LICENSE b/src/thirdparty/sdl/src/video/yuv2rgb/LICENSE
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/yuv2rgb/LICENSE
rename to src/thirdparty/sdl/src/video/yuv2rgb/LICENSE
diff --git a/r5dev/thirdparty/sdl/src/video/yuv2rgb/README.md b/src/thirdparty/sdl/src/video/yuv2rgb/README.md
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/yuv2rgb/README.md
rename to src/thirdparty/sdl/src/video/yuv2rgb/README.md
diff --git a/r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.c b/src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.c
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.c
rename to src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.c
diff --git a/r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.h b/src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.h
rename to src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb.h
diff --git a/r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h b/src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h
rename to src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_sse_func.h
diff --git a/r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h b/src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h
similarity index 100%
rename from r5dev/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h
rename to src/thirdparty/sdl/src/video/yuv2rgb/yuv_rgb_std_func.h
diff --git a/r5dev/thirdparty/spdlog/CMakeLists.txt b/src/thirdparty/spdlog/CMakeLists.txt
similarity index 100%
rename from r5dev/thirdparty/spdlog/CMakeLists.txt
rename to src/thirdparty/spdlog/CMakeLists.txt
diff --git a/r5dev/thirdparty/spdlog/async.h b/src/thirdparty/spdlog/async.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/async.h
rename to src/thirdparty/spdlog/async.h
diff --git a/r5dev/thirdparty/spdlog/async_logger-inl.h b/src/thirdparty/spdlog/async_logger-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/async_logger-inl.h
rename to src/thirdparty/spdlog/async_logger-inl.h
diff --git a/r5dev/thirdparty/spdlog/async_logger.h b/src/thirdparty/spdlog/async_logger.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/async_logger.h
rename to src/thirdparty/spdlog/async_logger.h
diff --git a/r5dev/thirdparty/spdlog/cfg/argv.h b/src/thirdparty/spdlog/cfg/argv.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/cfg/argv.h
rename to src/thirdparty/spdlog/cfg/argv.h
diff --git a/r5dev/thirdparty/spdlog/cfg/env.h b/src/thirdparty/spdlog/cfg/env.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/cfg/env.h
rename to src/thirdparty/spdlog/cfg/env.h
diff --git a/r5dev/thirdparty/spdlog/cfg/helpers-inl.h b/src/thirdparty/spdlog/cfg/helpers-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/cfg/helpers-inl.h
rename to src/thirdparty/spdlog/cfg/helpers-inl.h
diff --git a/r5dev/thirdparty/spdlog/cfg/helpers.h b/src/thirdparty/spdlog/cfg/helpers.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/cfg/helpers.h
rename to src/thirdparty/spdlog/cfg/helpers.h
diff --git a/r5dev/thirdparty/spdlog/common-inl.h b/src/thirdparty/spdlog/common-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/common-inl.h
rename to src/thirdparty/spdlog/common-inl.h
diff --git a/r5dev/thirdparty/spdlog/common.h b/src/thirdparty/spdlog/common.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/common.h
rename to src/thirdparty/spdlog/common.h
diff --git a/r5dev/thirdparty/spdlog/details/backtracer-inl.h b/src/thirdparty/spdlog/details/backtracer-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/backtracer-inl.h
rename to src/thirdparty/spdlog/details/backtracer-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/backtracer.h b/src/thirdparty/spdlog/details/backtracer.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/backtracer.h
rename to src/thirdparty/spdlog/details/backtracer.h
diff --git a/r5dev/thirdparty/spdlog/details/circular_q.h b/src/thirdparty/spdlog/details/circular_q.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/circular_q.h
rename to src/thirdparty/spdlog/details/circular_q.h
diff --git a/r5dev/thirdparty/spdlog/details/console_globals.h b/src/thirdparty/spdlog/details/console_globals.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/console_globals.h
rename to src/thirdparty/spdlog/details/console_globals.h
diff --git a/r5dev/thirdparty/spdlog/details/file_helper-inl.h b/src/thirdparty/spdlog/details/file_helper-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/file_helper-inl.h
rename to src/thirdparty/spdlog/details/file_helper-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/file_helper.h b/src/thirdparty/spdlog/details/file_helper.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/file_helper.h
rename to src/thirdparty/spdlog/details/file_helper.h
diff --git a/r5dev/thirdparty/spdlog/details/fmt_helper.h b/src/thirdparty/spdlog/details/fmt_helper.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/fmt_helper.h
rename to src/thirdparty/spdlog/details/fmt_helper.h
diff --git a/r5dev/thirdparty/spdlog/details/log_msg-inl.h b/src/thirdparty/spdlog/details/log_msg-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/log_msg-inl.h
rename to src/thirdparty/spdlog/details/log_msg-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/log_msg.h b/src/thirdparty/spdlog/details/log_msg.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/log_msg.h
rename to src/thirdparty/spdlog/details/log_msg.h
diff --git a/r5dev/thirdparty/spdlog/details/log_msg_buffer-inl.h b/src/thirdparty/spdlog/details/log_msg_buffer-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/log_msg_buffer-inl.h
rename to src/thirdparty/spdlog/details/log_msg_buffer-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/log_msg_buffer.h b/src/thirdparty/spdlog/details/log_msg_buffer.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/log_msg_buffer.h
rename to src/thirdparty/spdlog/details/log_msg_buffer.h
diff --git a/r5dev/thirdparty/spdlog/details/mpmc_blocking_q.h b/src/thirdparty/spdlog/details/mpmc_blocking_q.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/mpmc_blocking_q.h
rename to src/thirdparty/spdlog/details/mpmc_blocking_q.h
diff --git a/r5dev/thirdparty/spdlog/details/null_mutex.h b/src/thirdparty/spdlog/details/null_mutex.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/null_mutex.h
rename to src/thirdparty/spdlog/details/null_mutex.h
diff --git a/r5dev/thirdparty/spdlog/details/os-inl.h b/src/thirdparty/spdlog/details/os-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/os-inl.h
rename to src/thirdparty/spdlog/details/os-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/os.h b/src/thirdparty/spdlog/details/os.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/os.h
rename to src/thirdparty/spdlog/details/os.h
diff --git a/r5dev/thirdparty/spdlog/details/periodic_worker-inl.h b/src/thirdparty/spdlog/details/periodic_worker-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/periodic_worker-inl.h
rename to src/thirdparty/spdlog/details/periodic_worker-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/periodic_worker.h b/src/thirdparty/spdlog/details/periodic_worker.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/periodic_worker.h
rename to src/thirdparty/spdlog/details/periodic_worker.h
diff --git a/r5dev/thirdparty/spdlog/details/registry-inl.h b/src/thirdparty/spdlog/details/registry-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/registry-inl.h
rename to src/thirdparty/spdlog/details/registry-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/registry.h b/src/thirdparty/spdlog/details/registry.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/registry.h
rename to src/thirdparty/spdlog/details/registry.h
diff --git a/r5dev/thirdparty/spdlog/details/synchronous_factory.h b/src/thirdparty/spdlog/details/synchronous_factory.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/synchronous_factory.h
rename to src/thirdparty/spdlog/details/synchronous_factory.h
diff --git a/r5dev/thirdparty/spdlog/details/tcp_client-windows.h b/src/thirdparty/spdlog/details/tcp_client-windows.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/tcp_client-windows.h
rename to src/thirdparty/spdlog/details/tcp_client-windows.h
diff --git a/r5dev/thirdparty/spdlog/details/tcp_client.h b/src/thirdparty/spdlog/details/tcp_client.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/tcp_client.h
rename to src/thirdparty/spdlog/details/tcp_client.h
diff --git a/r5dev/thirdparty/spdlog/details/thread_pool-inl.h b/src/thirdparty/spdlog/details/thread_pool-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/thread_pool-inl.h
rename to src/thirdparty/spdlog/details/thread_pool-inl.h
diff --git a/r5dev/thirdparty/spdlog/details/thread_pool.h b/src/thirdparty/spdlog/details/thread_pool.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/thread_pool.h
rename to src/thirdparty/spdlog/details/thread_pool.h
diff --git a/r5dev/thirdparty/spdlog/details/udp_client-windows.h b/src/thirdparty/spdlog/details/udp_client-windows.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/udp_client-windows.h
rename to src/thirdparty/spdlog/details/udp_client-windows.h
diff --git a/r5dev/thirdparty/spdlog/details/udp_client.h b/src/thirdparty/spdlog/details/udp_client.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/udp_client.h
rename to src/thirdparty/spdlog/details/udp_client.h
diff --git a/r5dev/thirdparty/spdlog/details/windows_include.h b/src/thirdparty/spdlog/details/windows_include.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/details/windows_include.h
rename to src/thirdparty/spdlog/details/windows_include.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bin_to_hex.h b/src/thirdparty/spdlog/fmt/bin_to_hex.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bin_to_hex.h
rename to src/thirdparty/spdlog/fmt/bin_to_hex.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/args.h b/src/thirdparty/spdlog/fmt/bundled/args.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/args.h
rename to src/thirdparty/spdlog/fmt/bundled/args.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/chrono.h b/src/thirdparty/spdlog/fmt/bundled/chrono.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/chrono.h
rename to src/thirdparty/spdlog/fmt/bundled/chrono.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/color.h b/src/thirdparty/spdlog/fmt/bundled/color.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/color.h
rename to src/thirdparty/spdlog/fmt/bundled/color.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/compile.h b/src/thirdparty/spdlog/fmt/bundled/compile.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/compile.h
rename to src/thirdparty/spdlog/fmt/bundled/compile.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/core.h b/src/thirdparty/spdlog/fmt/bundled/core.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/core.h
rename to src/thirdparty/spdlog/fmt/bundled/core.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/fmt.license.rst b/src/thirdparty/spdlog/fmt/bundled/fmt.license.rst
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/fmt.license.rst
rename to src/thirdparty/spdlog/fmt/bundled/fmt.license.rst
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/format-inl.h b/src/thirdparty/spdlog/fmt/bundled/format-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/format-inl.h
rename to src/thirdparty/spdlog/fmt/bundled/format-inl.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/format.h b/src/thirdparty/spdlog/fmt/bundled/format.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/format.h
rename to src/thirdparty/spdlog/fmt/bundled/format.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/locale.h b/src/thirdparty/spdlog/fmt/bundled/locale.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/locale.h
rename to src/thirdparty/spdlog/fmt/bundled/locale.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/os.h b/src/thirdparty/spdlog/fmt/bundled/os.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/os.h
rename to src/thirdparty/spdlog/fmt/bundled/os.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/ostream.h b/src/thirdparty/spdlog/fmt/bundled/ostream.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/ostream.h
rename to src/thirdparty/spdlog/fmt/bundled/ostream.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/printf.h b/src/thirdparty/spdlog/fmt/bundled/printf.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/printf.h
rename to src/thirdparty/spdlog/fmt/bundled/printf.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/ranges.h b/src/thirdparty/spdlog/fmt/bundled/ranges.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/ranges.h
rename to src/thirdparty/spdlog/fmt/bundled/ranges.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/std.h b/src/thirdparty/spdlog/fmt/bundled/std.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/std.h
rename to src/thirdparty/spdlog/fmt/bundled/std.h
diff --git a/r5dev/thirdparty/spdlog/fmt/bundled/xchar.h b/src/thirdparty/spdlog/fmt/bundled/xchar.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/bundled/xchar.h
rename to src/thirdparty/spdlog/fmt/bundled/xchar.h
diff --git a/r5dev/thirdparty/spdlog/fmt/chrono.h b/src/thirdparty/spdlog/fmt/chrono.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/chrono.h
rename to src/thirdparty/spdlog/fmt/chrono.h
diff --git a/r5dev/thirdparty/spdlog/fmt/compile.h b/src/thirdparty/spdlog/fmt/compile.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/compile.h
rename to src/thirdparty/spdlog/fmt/compile.h
diff --git a/r5dev/thirdparty/spdlog/fmt/fmt.h b/src/thirdparty/spdlog/fmt/fmt.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/fmt.h
rename to src/thirdparty/spdlog/fmt/fmt.h
diff --git a/r5dev/thirdparty/spdlog/fmt/ostr.h b/src/thirdparty/spdlog/fmt/ostr.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/ostr.h
rename to src/thirdparty/spdlog/fmt/ostr.h
diff --git a/r5dev/thirdparty/spdlog/fmt/ranges.h b/src/thirdparty/spdlog/fmt/ranges.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/ranges.h
rename to src/thirdparty/spdlog/fmt/ranges.h
diff --git a/r5dev/thirdparty/spdlog/fmt/std.h b/src/thirdparty/spdlog/fmt/std.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/std.h
rename to src/thirdparty/spdlog/fmt/std.h
diff --git a/r5dev/thirdparty/spdlog/fmt/xchar.h b/src/thirdparty/spdlog/fmt/xchar.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fmt/xchar.h
rename to src/thirdparty/spdlog/fmt/xchar.h
diff --git a/r5dev/thirdparty/spdlog/formatter.h b/src/thirdparty/spdlog/formatter.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/formatter.h
rename to src/thirdparty/spdlog/formatter.h
diff --git a/r5dev/thirdparty/spdlog/fwd.h b/src/thirdparty/spdlog/fwd.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/fwd.h
rename to src/thirdparty/spdlog/fwd.h
diff --git a/r5dev/thirdparty/spdlog/logger-inl.h b/src/thirdparty/spdlog/logger-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/logger-inl.h
rename to src/thirdparty/spdlog/logger-inl.h
diff --git a/r5dev/thirdparty/spdlog/logger.h b/src/thirdparty/spdlog/logger.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/logger.h
rename to src/thirdparty/spdlog/logger.h
diff --git a/r5dev/thirdparty/spdlog/pattern_formatter-inl.h b/src/thirdparty/spdlog/pattern_formatter-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/pattern_formatter-inl.h
rename to src/thirdparty/spdlog/pattern_formatter-inl.h
diff --git a/r5dev/thirdparty/spdlog/pattern_formatter.h b/src/thirdparty/spdlog/pattern_formatter.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/pattern_formatter.h
rename to src/thirdparty/spdlog/pattern_formatter.h
diff --git a/r5dev/thirdparty/spdlog/sinks/android_sink.h b/src/thirdparty/spdlog/sinks/android_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/android_sink.h
rename to src/thirdparty/spdlog/sinks/android_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/ansicolor_sink-inl.h b/src/thirdparty/spdlog/sinks/ansicolor_sink-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/ansicolor_sink-inl.h
rename to src/thirdparty/spdlog/sinks/ansicolor_sink-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/ansicolor_sink.h b/src/thirdparty/spdlog/sinks/ansicolor_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/ansicolor_sink.h
rename to src/thirdparty/spdlog/sinks/ansicolor_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/base_sink-inl.h b/src/thirdparty/spdlog/sinks/base_sink-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/base_sink-inl.h
rename to src/thirdparty/spdlog/sinks/base_sink-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/base_sink.h b/src/thirdparty/spdlog/sinks/base_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/base_sink.h
rename to src/thirdparty/spdlog/sinks/base_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/basic_file_sink-inl.h b/src/thirdparty/spdlog/sinks/basic_file_sink-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/basic_file_sink-inl.h
rename to src/thirdparty/spdlog/sinks/basic_file_sink-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/basic_file_sink.h b/src/thirdparty/spdlog/sinks/basic_file_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/basic_file_sink.h
rename to src/thirdparty/spdlog/sinks/basic_file_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/callback_sink.h b/src/thirdparty/spdlog/sinks/callback_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/callback_sink.h
rename to src/thirdparty/spdlog/sinks/callback_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/daily_file_sink.h b/src/thirdparty/spdlog/sinks/daily_file_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/daily_file_sink.h
rename to src/thirdparty/spdlog/sinks/daily_file_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/dist_sink.h b/src/thirdparty/spdlog/sinks/dist_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/dist_sink.h
rename to src/thirdparty/spdlog/sinks/dist_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/dup_filter_sink.h b/src/thirdparty/spdlog/sinks/dup_filter_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/dup_filter_sink.h
rename to src/thirdparty/spdlog/sinks/dup_filter_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/hourly_file_sink.h b/src/thirdparty/spdlog/sinks/hourly_file_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/hourly_file_sink.h
rename to src/thirdparty/spdlog/sinks/hourly_file_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/kafka_sink.h b/src/thirdparty/spdlog/sinks/kafka_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/kafka_sink.h
rename to src/thirdparty/spdlog/sinks/kafka_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/mongo_sink.h b/src/thirdparty/spdlog/sinks/mongo_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/mongo_sink.h
rename to src/thirdparty/spdlog/sinks/mongo_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/msvc_sink.h b/src/thirdparty/spdlog/sinks/msvc_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/msvc_sink.h
rename to src/thirdparty/spdlog/sinks/msvc_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/null_sink.h b/src/thirdparty/spdlog/sinks/null_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/null_sink.h
rename to src/thirdparty/spdlog/sinks/null_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/ostream_sink.h b/src/thirdparty/spdlog/sinks/ostream_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/ostream_sink.h
rename to src/thirdparty/spdlog/sinks/ostream_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/qt_sinks.h b/src/thirdparty/spdlog/sinks/qt_sinks.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/qt_sinks.h
rename to src/thirdparty/spdlog/sinks/qt_sinks.h
diff --git a/r5dev/thirdparty/spdlog/sinks/ringbuffer_sink.h b/src/thirdparty/spdlog/sinks/ringbuffer_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/ringbuffer_sink.h
rename to src/thirdparty/spdlog/sinks/ringbuffer_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/rotating_file_sink-inl.h b/src/thirdparty/spdlog/sinks/rotating_file_sink-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/rotating_file_sink-inl.h
rename to src/thirdparty/spdlog/sinks/rotating_file_sink-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/rotating_file_sink.h b/src/thirdparty/spdlog/sinks/rotating_file_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/rotating_file_sink.h
rename to src/thirdparty/spdlog/sinks/rotating_file_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/sink-inl.h b/src/thirdparty/spdlog/sinks/sink-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/sink-inl.h
rename to src/thirdparty/spdlog/sinks/sink-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/sink.h b/src/thirdparty/spdlog/sinks/sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/sink.h
rename to src/thirdparty/spdlog/sinks/sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h b/src/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h
rename to src/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/stdout_color_sinks.h b/src/thirdparty/spdlog/sinks/stdout_color_sinks.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/stdout_color_sinks.h
rename to src/thirdparty/spdlog/sinks/stdout_color_sinks.h
diff --git a/r5dev/thirdparty/spdlog/sinks/stdout_sinks-inl.h b/src/thirdparty/spdlog/sinks/stdout_sinks-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/stdout_sinks-inl.h
rename to src/thirdparty/spdlog/sinks/stdout_sinks-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/stdout_sinks.h b/src/thirdparty/spdlog/sinks/stdout_sinks.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/stdout_sinks.h
rename to src/thirdparty/spdlog/sinks/stdout_sinks.h
diff --git a/r5dev/thirdparty/spdlog/sinks/syslog_sink.h b/src/thirdparty/spdlog/sinks/syslog_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/syslog_sink.h
rename to src/thirdparty/spdlog/sinks/syslog_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/systemd_sink.h b/src/thirdparty/spdlog/sinks/systemd_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/systemd_sink.h
rename to src/thirdparty/spdlog/sinks/systemd_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/tcp_sink.h b/src/thirdparty/spdlog/sinks/tcp_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/tcp_sink.h
rename to src/thirdparty/spdlog/sinks/tcp_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/udp_sink.h b/src/thirdparty/spdlog/sinks/udp_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/udp_sink.h
rename to src/thirdparty/spdlog/sinks/udp_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/win_eventlog_sink.h b/src/thirdparty/spdlog/sinks/win_eventlog_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/win_eventlog_sink.h
rename to src/thirdparty/spdlog/sinks/win_eventlog_sink.h
diff --git a/r5dev/thirdparty/spdlog/sinks/wincolor_sink-inl.h b/src/thirdparty/spdlog/sinks/wincolor_sink-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/wincolor_sink-inl.h
rename to src/thirdparty/spdlog/sinks/wincolor_sink-inl.h
diff --git a/r5dev/thirdparty/spdlog/sinks/wincolor_sink.h b/src/thirdparty/spdlog/sinks/wincolor_sink.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/sinks/wincolor_sink.h
rename to src/thirdparty/spdlog/sinks/wincolor_sink.h
diff --git a/r5dev/thirdparty/spdlog/spdlog-inl.h b/src/thirdparty/spdlog/spdlog-inl.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/spdlog-inl.h
rename to src/thirdparty/spdlog/spdlog-inl.h
diff --git a/r5dev/thirdparty/spdlog/spdlog.h b/src/thirdparty/spdlog/spdlog.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/spdlog.h
rename to src/thirdparty/spdlog/spdlog.h
diff --git a/r5dev/thirdparty/spdlog/src/async.cpp b/src/thirdparty/spdlog/src/async.cpp
similarity index 100%
rename from r5dev/thirdparty/spdlog/src/async.cpp
rename to src/thirdparty/spdlog/src/async.cpp
diff --git a/r5dev/thirdparty/spdlog/src/bundled_fmtlib_format.cpp b/src/thirdparty/spdlog/src/bundled_fmtlib_format.cpp
similarity index 100%
rename from r5dev/thirdparty/spdlog/src/bundled_fmtlib_format.cpp
rename to src/thirdparty/spdlog/src/bundled_fmtlib_format.cpp
diff --git a/r5dev/thirdparty/spdlog/src/cfg.cpp b/src/thirdparty/spdlog/src/cfg.cpp
similarity index 100%
rename from r5dev/thirdparty/spdlog/src/cfg.cpp
rename to src/thirdparty/spdlog/src/cfg.cpp
diff --git a/r5dev/thirdparty/spdlog/src/color_sinks.cpp b/src/thirdparty/spdlog/src/color_sinks.cpp
similarity index 100%
rename from r5dev/thirdparty/spdlog/src/color_sinks.cpp
rename to src/thirdparty/spdlog/src/color_sinks.cpp
diff --git a/r5dev/thirdparty/spdlog/src/file_sinks.cpp b/src/thirdparty/spdlog/src/file_sinks.cpp
similarity index 100%
rename from r5dev/thirdparty/spdlog/src/file_sinks.cpp
rename to src/thirdparty/spdlog/src/file_sinks.cpp
diff --git a/r5dev/thirdparty/spdlog/src/spdlog.cpp b/src/thirdparty/spdlog/src/spdlog.cpp
similarity index 100%
rename from r5dev/thirdparty/spdlog/src/spdlog.cpp
rename to src/thirdparty/spdlog/src/spdlog.cpp
diff --git a/r5dev/thirdparty/spdlog/src/stdout_sinks.cpp b/src/thirdparty/spdlog/src/stdout_sinks.cpp
similarity index 100%
rename from r5dev/thirdparty/spdlog/src/stdout_sinks.cpp
rename to src/thirdparty/spdlog/src/stdout_sinks.cpp
diff --git a/r5dev/thirdparty/spdlog/stopwatch.h b/src/thirdparty/spdlog/stopwatch.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/stopwatch.h
rename to src/thirdparty/spdlog/stopwatch.h
diff --git a/r5dev/thirdparty/spdlog/tweakme.h b/src/thirdparty/spdlog/tweakme.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/tweakme.h
rename to src/thirdparty/spdlog/tweakme.h
diff --git a/r5dev/thirdparty/spdlog/version.h b/src/thirdparty/spdlog/version.h
similarity index 100%
rename from r5dev/thirdparty/spdlog/version.h
rename to src/thirdparty/spdlog/version.h
diff --git a/r5dev/tier0/CMakeLists.txt b/src/tier0/CMakeLists.txt
similarity index 100%
rename from r5dev/tier0/CMakeLists.txt
rename to src/tier0/CMakeLists.txt
diff --git a/r5dev/tier0/binstream.cpp b/src/tier0/binstream.cpp
similarity index 100%
rename from r5dev/tier0/binstream.cpp
rename to src/tier0/binstream.cpp
diff --git a/r5dev/tier0/commandline.cpp b/src/tier0/commandline.cpp
similarity index 100%
rename from r5dev/tier0/commandline.cpp
rename to src/tier0/commandline.cpp
diff --git a/r5dev/tier0/commandline.h b/src/tier0/commandline.h
similarity index 100%
rename from r5dev/tier0/commandline.h
rename to src/tier0/commandline.h
diff --git a/r5dev/tier0/cpu.cpp b/src/tier0/cpu.cpp
similarity index 100%
rename from r5dev/tier0/cpu.cpp
rename to src/tier0/cpu.cpp
diff --git a/r5dev/tier0/cpu.h b/src/tier0/cpu.h
similarity index 100%
rename from r5dev/tier0/cpu.h
rename to src/tier0/cpu.h
diff --git a/r5dev/tier0/cputopology.cpp b/src/tier0/cputopology.cpp
similarity index 100%
rename from r5dev/tier0/cputopology.cpp
rename to src/tier0/cputopology.cpp
diff --git a/r5dev/tier0/cputopology.h b/src/tier0/cputopology.h
similarity index 100%
rename from r5dev/tier0/cputopology.h
rename to src/tier0/cputopology.h
diff --git a/r5dev/tier0/crashhandler.cpp b/src/tier0/crashhandler.cpp
similarity index 100%
rename from r5dev/tier0/crashhandler.cpp
rename to src/tier0/crashhandler.cpp
diff --git a/r5dev/tier0/dbg.cpp b/src/tier0/dbg.cpp
similarity index 100%
rename from r5dev/tier0/dbg.cpp
rename to src/tier0/dbg.cpp
diff --git a/r5dev/tier0/fasttimer.cpp b/src/tier0/fasttimer.cpp
similarity index 100%
rename from r5dev/tier0/fasttimer.cpp
rename to src/tier0/fasttimer.cpp
diff --git a/r5dev/tier0/frametask.cpp b/src/tier0/frametask.cpp
similarity index 100%
rename from r5dev/tier0/frametask.cpp
rename to src/tier0/frametask.cpp
diff --git a/r5dev/tier0/jobthread.cpp b/src/tier0/jobthread.cpp
similarity index 100%
rename from r5dev/tier0/jobthread.cpp
rename to src/tier0/jobthread.cpp
diff --git a/r5dev/tier0/memaddr.cpp b/src/tier0/memaddr.cpp
similarity index 100%
rename from r5dev/tier0/memaddr.cpp
rename to src/tier0/memaddr.cpp
diff --git a/r5dev/tier0/memstd.cpp b/src/tier0/memstd.cpp
similarity index 100%
rename from r5dev/tier0/memstd.cpp
rename to src/tier0/memstd.cpp
diff --git a/r5dev/tier0/memstd.h b/src/tier0/memstd.h
similarity index 100%
rename from r5dev/tier0/memstd.h
rename to src/tier0/memstd.h
diff --git a/r5dev/tier0/module.cpp b/src/tier0/module.cpp
similarity index 100%
rename from r5dev/tier0/module.cpp
rename to src/tier0/module.cpp
diff --git a/r5dev/tier0/module_statics.cpp b/src/tier0/module_statics.cpp
similarity index 100%
rename from r5dev/tier0/module_statics.cpp
rename to src/tier0/module_statics.cpp
diff --git a/r5dev/tier0/platform.cpp b/src/tier0/platform.cpp
similarity index 100%
rename from r5dev/tier0/platform.cpp
rename to src/tier0/platform.cpp
diff --git a/r5dev/tier0/sigcache.cpp b/src/tier0/sigcache.cpp
similarity index 100%
rename from r5dev/tier0/sigcache.cpp
rename to src/tier0/sigcache.cpp
diff --git a/r5dev/tier0/threadtools.cpp b/src/tier0/threadtools.cpp
similarity index 100%
rename from r5dev/tier0/threadtools.cpp
rename to src/tier0/threadtools.cpp
diff --git a/r5dev/tier0/tier0_iface.cpp b/src/tier0/tier0_iface.cpp
similarity index 100%
rename from r5dev/tier0/tier0_iface.cpp
rename to src/tier0/tier0_iface.cpp
diff --git a/r5dev/tier0/tslist.cpp b/src/tier0/tslist.cpp
similarity index 100%
rename from r5dev/tier0/tslist.cpp
rename to src/tier0/tslist.cpp
diff --git a/r5dev/tier0/utility.cpp b/src/tier0/utility.cpp
similarity index 100%
rename from r5dev/tier0/utility.cpp
rename to src/tier0/utility.cpp
diff --git a/r5dev/tier0/vtable.cpp b/src/tier0/vtable.cpp
similarity index 100%
rename from r5dev/tier0/vtable.cpp
rename to src/tier0/vtable.cpp
diff --git a/r5dev/tier1/CMakeLists.txt b/src/tier1/CMakeLists.txt
similarity index 100%
rename from r5dev/tier1/CMakeLists.txt
rename to src/tier1/CMakeLists.txt
diff --git a/r5dev/tier1/NetAdr.cpp b/src/tier1/NetAdr.cpp
similarity index 100%
rename from r5dev/tier1/NetAdr.cpp
rename to src/tier1/NetAdr.cpp
diff --git a/r5dev/tier1/NetKey.cpp b/src/tier1/NetKey.cpp
similarity index 100%
rename from r5dev/tier1/NetKey.cpp
rename to src/tier1/NetKey.cpp
diff --git a/r5dev/tier1/bitbuf.cpp b/src/tier1/bitbuf.cpp
similarity index 100%
rename from r5dev/tier1/bitbuf.cpp
rename to src/tier1/bitbuf.cpp
diff --git a/r5dev/tier1/characterset.cpp b/src/tier1/characterset.cpp
similarity index 100%
rename from r5dev/tier1/characterset.cpp
rename to src/tier1/characterset.cpp
diff --git a/r5dev/tier1/cmd.cpp b/src/tier1/cmd.cpp
similarity index 100%
rename from r5dev/tier1/cmd.cpp
rename to src/tier1/cmd.cpp
diff --git a/r5dev/tier1/convar.cpp b/src/tier1/convar.cpp
similarity index 100%
rename from r5dev/tier1/convar.cpp
rename to src/tier1/convar.cpp
diff --git a/r5dev/tier1/cvar.cpp b/src/tier1/cvar.cpp
similarity index 100%
rename from r5dev/tier1/cvar.cpp
rename to src/tier1/cvar.cpp
diff --git a/r5dev/tier1/generichash.cpp b/src/tier1/generichash.cpp
similarity index 100%
rename from r5dev/tier1/generichash.cpp
rename to src/tier1/generichash.cpp
diff --git a/r5dev/tier1/interface.cpp b/src/tier1/interface.cpp
similarity index 100%
rename from r5dev/tier1/interface.cpp
rename to src/tier1/interface.cpp
diff --git a/r5dev/tier1/lzss.cpp b/src/tier1/lzss.cpp
similarity index 100%
rename from r5dev/tier1/lzss.cpp
rename to src/tier1/lzss.cpp
diff --git a/r5dev/tier1/memstack.cpp b/src/tier1/memstack.cpp
similarity index 100%
rename from r5dev/tier1/memstack.cpp
rename to src/tier1/memstack.cpp
diff --git a/r5dev/tier1/splitstring.cpp b/src/tier1/splitstring.cpp
similarity index 100%
rename from r5dev/tier1/splitstring.cpp
rename to src/tier1/splitstring.cpp
diff --git a/r5dev/tier1/stringpool.cpp b/src/tier1/stringpool.cpp
similarity index 100%
rename from r5dev/tier1/stringpool.cpp
rename to src/tier1/stringpool.cpp
diff --git a/r5dev/tier1/strtools.cpp b/src/tier1/strtools.cpp
similarity index 100%
rename from r5dev/tier1/strtools.cpp
rename to src/tier1/strtools.cpp
diff --git a/r5dev/tier1/utlbuffer.cpp b/src/tier1/utlbuffer.cpp
similarity index 100%
rename from r5dev/tier1/utlbuffer.cpp
rename to src/tier1/utlbuffer.cpp
diff --git a/r5dev/tier1/utlstring.cpp b/src/tier1/utlstring.cpp
similarity index 100%
rename from r5dev/tier1/utlstring.cpp
rename to src/tier1/utlstring.cpp
diff --git a/r5dev/tier2/CMakeLists.txt b/src/tier2/CMakeLists.txt
similarity index 100%
rename from r5dev/tier2/CMakeLists.txt
rename to src/tier2/CMakeLists.txt
diff --git a/r5dev/tier2/curlutils.cpp b/src/tier2/curlutils.cpp
similarity index 100%
rename from r5dev/tier2/curlutils.cpp
rename to src/tier2/curlutils.cpp
diff --git a/r5dev/tier2/fileutils.cpp b/src/tier2/fileutils.cpp
similarity index 100%
rename from r5dev/tier2/fileutils.cpp
rename to src/tier2/fileutils.cpp
diff --git a/r5dev/tier2/meshutils.cpp b/src/tier2/meshutils.cpp
similarity index 100%
rename from r5dev/tier2/meshutils.cpp
rename to src/tier2/meshutils.cpp
diff --git a/r5dev/tier2/renderutils.cpp b/src/tier2/renderutils.cpp
similarity index 100%
rename from r5dev/tier2/renderutils.cpp
rename to src/tier2/renderutils.cpp
diff --git a/r5dev/tier2/socketcreator.cpp b/src/tier2/socketcreator.cpp
similarity index 100%
rename from r5dev/tier2/socketcreator.cpp
rename to src/tier2/socketcreator.cpp
diff --git a/r5dev/vgui/CMakeLists.txt b/src/vgui/CMakeLists.txt
similarity index 100%
rename from r5dev/vgui/CMakeLists.txt
rename to src/vgui/CMakeLists.txt
diff --git a/r5dev/vgui/vgui.h b/src/vgui/vgui.h
similarity index 100%
rename from r5dev/vgui/vgui.h
rename to src/vgui/vgui.h
diff --git a/r5dev/vgui/vgui_baseui_interface.cpp b/src/vgui/vgui_baseui_interface.cpp
similarity index 100%
rename from r5dev/vgui/vgui_baseui_interface.cpp
rename to src/vgui/vgui_baseui_interface.cpp
diff --git a/r5dev/vgui/vgui_baseui_interface.h b/src/vgui/vgui_baseui_interface.h
similarity index 100%
rename from r5dev/vgui/vgui_baseui_interface.h
rename to src/vgui/vgui_baseui_interface.h
diff --git a/r5dev/vgui/vgui_debugpanel.cpp b/src/vgui/vgui_debugpanel.cpp
similarity index 100%
rename from r5dev/vgui/vgui_debugpanel.cpp
rename to src/vgui/vgui_debugpanel.cpp
diff --git a/r5dev/vgui/vgui_debugpanel.h b/src/vgui/vgui_debugpanel.h
similarity index 100%
rename from r5dev/vgui/vgui_debugpanel.h
rename to src/vgui/vgui_debugpanel.h
diff --git a/r5dev/vgui/vgui_fpspanel.cpp b/src/vgui/vgui_fpspanel.cpp
similarity index 100%
rename from r5dev/vgui/vgui_fpspanel.cpp
rename to src/vgui/vgui_fpspanel.cpp
diff --git a/r5dev/vgui/vgui_fpspanel.h b/src/vgui/vgui_fpspanel.h
similarity index 100%
rename from r5dev/vgui/vgui_fpspanel.h
rename to src/vgui/vgui_fpspanel.h
diff --git a/r5dev/vguimatsurface/CMakeLists.txt b/src/vguimatsurface/CMakeLists.txt
similarity index 100%
rename from r5dev/vguimatsurface/CMakeLists.txt
rename to src/vguimatsurface/CMakeLists.txt
diff --git a/r5dev/vguimatsurface/MatSystemSurface.cpp b/src/vguimatsurface/MatSystemSurface.cpp
similarity index 100%
rename from r5dev/vguimatsurface/MatSystemSurface.cpp
rename to src/vguimatsurface/MatSystemSurface.cpp
diff --git a/r5dev/vguimatsurface/MatSystemSurface.h b/src/vguimatsurface/MatSystemSurface.h
similarity index 100%
rename from r5dev/vguimatsurface/MatSystemSurface.h
rename to src/vguimatsurface/MatSystemSurface.h
diff --git a/r5dev/vpc/CMakeLists.txt b/src/vpc/CMakeLists.txt
similarity index 100%
rename from r5dev/vpc/CMakeLists.txt
rename to src/vpc/CMakeLists.txt
diff --git a/r5dev/vpc/IAppSystem.cpp b/src/vpc/IAppSystem.cpp
similarity index 100%
rename from r5dev/vpc/IAppSystem.cpp
rename to src/vpc/IAppSystem.cpp
diff --git a/r5dev/vpc/IAppSystem.h b/src/vpc/IAppSystem.h
similarity index 100%
rename from r5dev/vpc/IAppSystem.h
rename to src/vpc/IAppSystem.h
diff --git a/r5dev/vpc/interfaces.cpp b/src/vpc/interfaces.cpp
similarity index 100%
rename from r5dev/vpc/interfaces.cpp
rename to src/vpc/interfaces.cpp
diff --git a/r5dev/vpc/interfaces.h b/src/vpc/interfaces.h
similarity index 100%
rename from r5dev/vpc/interfaces.h
rename to src/vpc/interfaces.h
diff --git a/r5dev/vpc/keyvalues.cpp b/src/vpc/keyvalues.cpp
similarity index 100%
rename from r5dev/vpc/keyvalues.cpp
rename to src/vpc/keyvalues.cpp
diff --git a/r5dev/vpc/keyvalues.h b/src/vpc/keyvalues.h
similarity index 100%
rename from r5dev/vpc/keyvalues.h
rename to src/vpc/keyvalues.h
diff --git a/r5dev/vpc/kvleaktrace.h b/src/vpc/kvleaktrace.h
similarity index 100%
rename from r5dev/vpc/kvleaktrace.h
rename to src/vpc/kvleaktrace.h
diff --git a/r5dev/vpc/rson.cpp b/src/vpc/rson.cpp
similarity index 100%
rename from r5dev/vpc/rson.cpp
rename to src/vpc/rson.cpp
diff --git a/r5dev/vpc/rson.h b/src/vpc/rson.h
similarity index 100%
rename from r5dev/vpc/rson.h
rename to src/vpc/rson.h
diff --git a/r5dev/vphysics/CMakeLists.txt b/src/vphysics/CMakeLists.txt
similarity index 100%
rename from r5dev/vphysics/CMakeLists.txt
rename to src/vphysics/CMakeLists.txt
diff --git a/r5dev/vphysics/QHull.cpp b/src/vphysics/QHull.cpp
similarity index 100%
rename from r5dev/vphysics/QHull.cpp
rename to src/vphysics/QHull.cpp
diff --git a/r5dev/vphysics/QHull.h b/src/vphysics/QHull.h
similarity index 100%
rename from r5dev/vphysics/QHull.h
rename to src/vphysics/QHull.h
diff --git a/r5dev/vphysics/physics_collide.cpp b/src/vphysics/physics_collide.cpp
similarity index 100%
rename from r5dev/vphysics/physics_collide.cpp
rename to src/vphysics/physics_collide.cpp
diff --git a/r5dev/vpklib/CMakeLists.txt b/src/vpklib/CMakeLists.txt
similarity index 100%
rename from r5dev/vpklib/CMakeLists.txt
rename to src/vpklib/CMakeLists.txt
diff --git a/r5dev/vpklib/packedstore.cpp b/src/vpklib/packedstore.cpp
similarity index 100%
rename from r5dev/vpklib/packedstore.cpp
rename to src/vpklib/packedstore.cpp
diff --git a/r5dev/vpklib/packedstore.h b/src/vpklib/packedstore.h
similarity index 100%
rename from r5dev/vpklib/packedstore.h
rename to src/vpklib/packedstore.h
diff --git a/r5dev/vscript/CMakeLists.txt b/src/vscript/CMakeLists.txt
similarity index 100%
rename from r5dev/vscript/CMakeLists.txt
rename to src/vscript/CMakeLists.txt
diff --git a/r5dev/vscript/languages/squirrel_re/include/sqstate.h b/src/vscript/languages/squirrel_re/include/sqstate.h
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/include/sqstate.h
rename to src/vscript/languages/squirrel_re/include/sqstate.h
diff --git a/r5dev/vscript/languages/squirrel_re/include/sqstdaux.h b/src/vscript/languages/squirrel_re/include/sqstdaux.h
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/include/sqstdaux.h
rename to src/vscript/languages/squirrel_re/include/sqstdaux.h
diff --git a/r5dev/vscript/languages/squirrel_re/include/squirrel.h b/src/vscript/languages/squirrel_re/include/squirrel.h
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/include/squirrel.h
rename to src/vscript/languages/squirrel_re/include/squirrel.h
diff --git a/r5dev/vscript/languages/squirrel_re/include/sqvm.h b/src/vscript/languages/squirrel_re/include/sqvm.h
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/include/sqvm.h
rename to src/vscript/languages/squirrel_re/include/sqvm.h
diff --git a/r5dev/vscript/languages/squirrel_re/sqstdlib/sqstdaux.cpp b/src/vscript/languages/squirrel_re/sqstdlib/sqstdaux.cpp
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/sqstdlib/sqstdaux.cpp
rename to src/vscript/languages/squirrel_re/sqstdlib/sqstdaux.cpp
diff --git a/r5dev/vscript/languages/squirrel_re/squirrel/sqapi.cpp b/src/vscript/languages/squirrel_re/squirrel/sqapi.cpp
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/squirrel/sqapi.cpp
rename to src/vscript/languages/squirrel_re/squirrel/sqapi.cpp
diff --git a/r5dev/vscript/languages/squirrel_re/squirrel/sqvm.cpp b/src/vscript/languages/squirrel_re/squirrel/sqvm.cpp
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/squirrel/sqvm.cpp
rename to src/vscript/languages/squirrel_re/squirrel/sqvm.cpp
diff --git a/r5dev/vscript/languages/squirrel_re/vsquirrel.cpp b/src/vscript/languages/squirrel_re/vsquirrel.cpp
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/vsquirrel.cpp
rename to src/vscript/languages/squirrel_re/vsquirrel.cpp
diff --git a/r5dev/vscript/languages/squirrel_re/vsquirrel.h b/src/vscript/languages/squirrel_re/vsquirrel.h
similarity index 100%
rename from r5dev/vscript/languages/squirrel_re/vsquirrel.h
rename to src/vscript/languages/squirrel_re/vsquirrel.h
diff --git a/r5dev/vscript/vscript.cpp b/src/vscript/vscript.cpp
similarity index 100%
rename from r5dev/vscript/vscript.cpp
rename to src/vscript/vscript.cpp
diff --git a/r5dev/vscript/vscript.h b/src/vscript/vscript.h
similarity index 100%
rename from r5dev/vscript/vscript.h
rename to src/vscript/vscript.h
diff --git a/r5dev/vstdlib/CMakeLists.txt b/src/vstdlib/CMakeLists.txt
similarity index 100%
rename from r5dev/vstdlib/CMakeLists.txt
rename to src/vstdlib/CMakeLists.txt
diff --git a/r5dev/vstdlib/autocompletefilelist.cpp b/src/vstdlib/autocompletefilelist.cpp
similarity index 100%
rename from r5dev/vstdlib/autocompletefilelist.cpp
rename to src/vstdlib/autocompletefilelist.cpp
diff --git a/r5dev/vstdlib/autocompletefilelist.h b/src/vstdlib/autocompletefilelist.h
similarity index 100%
rename from r5dev/vstdlib/autocompletefilelist.h
rename to src/vstdlib/autocompletefilelist.h
diff --git a/r5dev/vstdlib/concommandhash.cpp b/src/vstdlib/concommandhash.cpp
similarity index 100%
rename from r5dev/vstdlib/concommandhash.cpp
rename to src/vstdlib/concommandhash.cpp
diff --git a/r5dev/vstdlib/concommandhash.h b/src/vstdlib/concommandhash.h
similarity index 100%
rename from r5dev/vstdlib/concommandhash.h
rename to src/vstdlib/concommandhash.h
diff --git a/r5dev/vstdlib/keyvaluessystem.cpp b/src/vstdlib/keyvaluessystem.cpp
similarity index 100%
rename from r5dev/vstdlib/keyvaluessystem.cpp
rename to src/vstdlib/keyvaluessystem.cpp
diff --git a/r5dev/vstdlib/keyvaluessystem.h b/src/vstdlib/keyvaluessystem.h
similarity index 100%
rename from r5dev/vstdlib/keyvaluessystem.h
rename to src/vstdlib/keyvaluessystem.h
diff --git a/r5dev/vstdlib/random.cpp b/src/vstdlib/random.cpp
similarity index 100%
rename from r5dev/vstdlib/random.cpp
rename to src/vstdlib/random.cpp
diff --git a/r5dev/vstdlib/random.h b/src/vstdlib/random.h
similarity index 100%
rename from r5dev/vstdlib/random.h
rename to src/vstdlib/random.h
diff --git a/r5dev/windows/console.cpp b/src/windows/console.cpp
similarity index 100%
rename from r5dev/windows/console.cpp
rename to src/windows/console.cpp
diff --git a/r5dev/windows/console.h b/src/windows/console.h
similarity index 100%
rename from r5dev/windows/console.h
rename to src/windows/console.h
diff --git a/r5dev/windows/id3dx.cpp b/src/windows/id3dx.cpp
similarity index 100%
rename from r5dev/windows/id3dx.cpp
rename to src/windows/id3dx.cpp
diff --git a/r5dev/windows/id3dx.h b/src/windows/id3dx.h
similarity index 100%
rename from r5dev/windows/id3dx.h
rename to src/windows/id3dx.h
diff --git a/r5dev/windows/input.cpp b/src/windows/input.cpp
similarity index 100%
rename from r5dev/windows/input.cpp
rename to src/windows/input.cpp
diff --git a/r5dev/windows/input.h b/src/windows/input.h
similarity index 100%
rename from r5dev/windows/input.h
rename to src/windows/input.h
diff --git a/r5dev/windows/resource.cpp b/src/windows/resource.cpp
similarity index 100%
rename from r5dev/windows/resource.cpp
rename to src/windows/resource.cpp
diff --git a/r5dev/windows/resource.h b/src/windows/resource.h
similarity index 100%
rename from r5dev/windows/resource.h
rename to src/windows/resource.h
diff --git a/r5dev/windows/system.cpp b/src/windows/system.cpp
similarity index 100%
rename from r5dev/windows/system.cpp
rename to src/windows/system.cpp
diff --git a/r5dev/windows/system.h b/src/windows/system.h
similarity index 100%
rename from r5dev/windows/system.h
rename to src/windows/system.h
diff --git a/r5dev/windows/tebpeb64.h b/src/windows/tebpeb64.h
similarity index 100%
rename from r5dev/windows/tebpeb64.h
rename to src/windows/tebpeb64.h
diff --git a/r5dev/windows/window.cpp b/src/windows/window.cpp
similarity index 100%
rename from r5dev/windows/window.cpp
rename to src/windows/window.cpp
diff --git a/r5dev/windows/window.h b/src/windows/window.h
similarity index 100%
rename from r5dev/windows/window.h
rename to src/windows/window.h