diff --git a/.gitmodules b/.gitmodules index c4cfc0a13..41f118e3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "thirdparty/libcurl"] - path = thirdparty/libcurl + path = primedev/thirdparty/libcurl url = https://github.com/curl/curl ignore = untracked [submodule "thirdparty/minhook"] - path = thirdparty/minhook + path = primedev/thirdparty/minhook url = https://github.com/TsudaKageyu/minhook ignore = untracked [submodule "thirdparty/minizip"] - path = thirdparty/minizip + path = primedev/thirdparty/minizip url = https://github.com/zlib-ng/minizip-ng.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 83c38a564..9bea0ce89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,10 +24,11 @@ set(NS_BINARY_DIR ${CMAKE_BINARY_DIR}/game) message(STATUS "NS: Building to ${NS_BINARY_DIR}") -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/primedev/cmake") include(utils) +include_directories(primedev) +include_directories(primedev/thirdparty) + # Targets -add_subdirectory(loader_wsock32_proxy) -add_subdirectory(NorthstarDLL) -add_subdirectory(NorthstarLauncher) +add_subdirectory(primedev) diff --git a/cmake/Findminhook.cmake b/cmake/Findminhook.cmake deleted file mode 100644 index 8ec2e99ab..000000000 --- a/cmake/Findminhook.cmake +++ /dev/null @@ -1,8 +0,0 @@ - -if(NOT minhook_FOUND) - check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/minhook) - - add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/minhook minhook) - set(minhook_FOUND 1 PARENT_SCOPE) -endif() - diff --git a/cmake/Findspdlog.cmake b/cmake/Findspdlog.cmake deleted file mode 100644 index 38b52a531..000000000 --- a/cmake/Findspdlog.cmake +++ /dev/null @@ -1,8 +0,0 @@ - -if(NOT spdlog_FOUND) - check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/spdlog) - - add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/spdlog spdlog) - set(spdlog_FOUND 1 PARENT_SCOPE) -endif() - diff --git a/primedev/CMakeLists.txt b/primedev/CMakeLists.txt new file mode 100644 index 000000000..03f2628ef --- /dev/null +++ b/primedev/CMakeLists.txt @@ -0,0 +1,3 @@ +include(Northstar.cmake) +include(Launcher.cmake) +include(WSockProxy.cmake) diff --git a/NorthstarLauncher/CMakeLists.txt b/primedev/Launcher.cmake similarity index 91% rename from NorthstarLauncher/CMakeLists.txt rename to primedev/Launcher.cmake index f4d7bcb96..9edcf0e57 100644 --- a/NorthstarLauncher/CMakeLists.txt +++ b/primedev/Launcher.cmake @@ -1,8 +1,8 @@ # NorthstarLauncher add_executable(NorthstarLauncher - "main.cpp" - "resources.rc" + "primelauncher/main.cpp" + "primelauncher/resources.rc" ) target_compile_definitions(NorthstarLauncher PRIVATE diff --git a/NorthstarDLL/CMakeLists.txt b/primedev/Northstar.cmake similarity index 97% rename from NorthstarDLL/CMakeLists.txt rename to primedev/Northstar.cmake index d238f61fe..69db3d4e0 100644 --- a/NorthstarDLL/CMakeLists.txt +++ b/primedev/Northstar.cmake @@ -167,11 +167,6 @@ target_link_libraries(NorthstarDLL PRIVATE version.lib ) -target_include_directories(NorthstarDLL PRIVATE - ${CMAKE_SOURCE_DIR}/NorthstarDLL - ${CMAKE_SOURCE_DIR}/thirdparty -) - target_precompile_headers(NorthstarDLL PRIVATE pch.h) target_compile_definitions(NorthstarDLL PRIVATE diff --git a/loader_wsock32_proxy/CMakeLists.txt b/primedev/WSockProxy.cmake similarity index 81% rename from loader_wsock32_proxy/CMakeLists.txt rename to primedev/WSockProxy.cmake index 3157f6c55..84338bc79 100644 --- a/loader_wsock32_proxy/CMakeLists.txt +++ b/primedev/WSockProxy.cmake @@ -3,11 +3,11 @@ find_package(minhook REQUIRED) add_library(loader_wsock32_proxy SHARED - "dllmain.cpp" - "loader.cpp" - "loader.h" - "wsock32.asm" - "wsock32.def" + "wsockproxy/dllmain.cpp" + "wsockproxy/loader.cpp" + "wsockproxy/loader.h" + "wsockproxy/wsock32.asm" + "wsockproxy/wsock32.def" ) target_link_libraries(loader_wsock32_proxy PRIVATE @@ -31,7 +31,7 @@ target_link_libraries(loader_wsock32_proxy PRIVATE odbccp32.lib ) -target_precompile_headers(loader_wsock32_proxy PRIVATE pch.h) +target_precompile_headers(loader_wsock32_proxy PRIVATE wsockproxy/pch.h) target_compile_definitions(loader_wsock32_proxy PRIVATE UNICODE diff --git a/NorthstarDLL/client/audio.cpp b/primedev/client/audio.cpp similarity index 100% rename from NorthstarDLL/client/audio.cpp rename to primedev/client/audio.cpp diff --git a/NorthstarDLL/client/audio.h b/primedev/client/audio.h similarity index 100% rename from NorthstarDLL/client/audio.h rename to primedev/client/audio.h diff --git a/NorthstarDLL/client/chatcommand.cpp b/primedev/client/chatcommand.cpp similarity index 100% rename from NorthstarDLL/client/chatcommand.cpp rename to primedev/client/chatcommand.cpp diff --git a/NorthstarDLL/client/clientauthhooks.cpp b/primedev/client/clientauthhooks.cpp similarity index 100% rename from NorthstarDLL/client/clientauthhooks.cpp rename to primedev/client/clientauthhooks.cpp diff --git a/NorthstarDLL/client/clientruihooks.cpp b/primedev/client/clientruihooks.cpp similarity index 100% rename from NorthstarDLL/client/clientruihooks.cpp rename to primedev/client/clientruihooks.cpp diff --git a/NorthstarDLL/client/clientvideooverrides.cpp b/primedev/client/clientvideooverrides.cpp similarity index 100% rename from NorthstarDLL/client/clientvideooverrides.cpp rename to primedev/client/clientvideooverrides.cpp diff --git a/NorthstarDLL/client/debugoverlay.cpp b/primedev/client/debugoverlay.cpp similarity index 100% rename from NorthstarDLL/client/debugoverlay.cpp rename to primedev/client/debugoverlay.cpp diff --git a/NorthstarDLL/client/demofixes.cpp b/primedev/client/demofixes.cpp similarity index 100% rename from NorthstarDLL/client/demofixes.cpp rename to primedev/client/demofixes.cpp diff --git a/NorthstarDLL/client/diskvmtfixes.cpp b/primedev/client/diskvmtfixes.cpp similarity index 100% rename from NorthstarDLL/client/diskvmtfixes.cpp rename to primedev/client/diskvmtfixes.cpp diff --git a/NorthstarDLL/client/languagehooks.cpp b/primedev/client/languagehooks.cpp similarity index 100% rename from NorthstarDLL/client/languagehooks.cpp rename to primedev/client/languagehooks.cpp diff --git a/NorthstarDLL/client/latencyflex.cpp b/primedev/client/latencyflex.cpp similarity index 100% rename from NorthstarDLL/client/latencyflex.cpp rename to primedev/client/latencyflex.cpp diff --git a/NorthstarDLL/client/localchatwriter.cpp b/primedev/client/localchatwriter.cpp similarity index 100% rename from NorthstarDLL/client/localchatwriter.cpp rename to primedev/client/localchatwriter.cpp diff --git a/NorthstarDLL/client/localchatwriter.h b/primedev/client/localchatwriter.h similarity index 100% rename from NorthstarDLL/client/localchatwriter.h rename to primedev/client/localchatwriter.h diff --git a/NorthstarDLL/client/modlocalisation.cpp b/primedev/client/modlocalisation.cpp similarity index 100% rename from NorthstarDLL/client/modlocalisation.cpp rename to primedev/client/modlocalisation.cpp diff --git a/NorthstarDLL/client/r2client.cpp b/primedev/client/r2client.cpp similarity index 100% rename from NorthstarDLL/client/r2client.cpp rename to primedev/client/r2client.cpp diff --git a/NorthstarDLL/client/r2client.h b/primedev/client/r2client.h similarity index 100% rename from NorthstarDLL/client/r2client.h rename to primedev/client/r2client.h diff --git a/NorthstarDLL/client/rejectconnectionfixes.cpp b/primedev/client/rejectconnectionfixes.cpp similarity index 100% rename from NorthstarDLL/client/rejectconnectionfixes.cpp rename to primedev/client/rejectconnectionfixes.cpp diff --git a/primedev/cmake/Findlibcurl.cmake b/primedev/cmake/Findlibcurl.cmake new file mode 100644 index 000000000..a6f0b47c6 --- /dev/null +++ b/primedev/cmake/Findlibcurl.cmake @@ -0,0 +1,18 @@ + + +if (NOT libcurl_FOUND) + check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/libcurl) + + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries") + set(BUILD_CURL_EXE OFF CACHE BOOL "Build curl EXE") + set(HTTP_ONLY ON CACHE BOOL "Only build HTTP and HTTPS") + set(CURL_ENABLE_SSL ON CACHE BOOL "Enable SSL support") + set(CURL_USE_OPENSSL OFF CACHE BOOL "Disable OpenSSL") + set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Disable libSSH2") + set(CURL_USE_SCHANNEL ON CACHE BOOL "Enable Secure Channel") + set(CURL_CA_BUNDLE "none" CACHE STRING "Disable CA Bundle") + set(CURL_CA_PATH "none" CACHE STRING "Disable CA Path") + + add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/libcurl libcurl) + set(libcurl_FOUND 1 PARENT_SCOPE) +endif() diff --git a/primedev/cmake/Findminizip.cmake b/primedev/cmake/Findminizip.cmake new file mode 100644 index 000000000..15cfa3732 --- /dev/null +++ b/primedev/cmake/Findminizip.cmake @@ -0,0 +1,16 @@ + +if(NOT minizip_FOUND) + check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/minizip) + + set(MZ_ZLIB ON CACHE BOOL "Enable ZLIB compression, needed for DEFLATE") + set(MZ_BZIP2 OFF CACHE BOOL "Disable BZIP2 compression") + set(MZ_LZMA OFF CACHE BOOL "Disable LZMA & XZ compression") + set(MZ_PKCRYPT OFF CACHE BOOL "Disable PKWARE traditional encryption") + set(MZ_WZAES OFF CACHE BOOL "Disable WinZIP AES encryption") + set(MZ_ZSTD OFF CACHE BOOL "Disable ZSTD compression") + set(MZ_SIGNING OFF CACHE BOOL "Disable zip signing support") + + add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/minizip minizip) + set(minizip_FOUND 1 PARENT_SCOPE) +endif() + diff --git a/cmake/utils.cmake b/primedev/cmake/utils.cmake similarity index 100% rename from cmake/utils.cmake rename to primedev/cmake/utils.cmake diff --git a/NorthstarDLL/config/profile.cpp b/primedev/config/profile.cpp similarity index 100% rename from NorthstarDLL/config/profile.cpp rename to primedev/config/profile.cpp diff --git a/NorthstarDLL/config/profile.h b/primedev/config/profile.h similarity index 100% rename from NorthstarDLL/config/profile.h rename to primedev/config/profile.h diff --git a/NorthstarDLL/core/convar/concommand.cpp b/primedev/core/convar/concommand.cpp similarity index 100% rename from NorthstarDLL/core/convar/concommand.cpp rename to primedev/core/convar/concommand.cpp diff --git a/NorthstarDLL/core/convar/concommand.h b/primedev/core/convar/concommand.h similarity index 100% rename from NorthstarDLL/core/convar/concommand.h rename to primedev/core/convar/concommand.h diff --git a/NorthstarDLL/core/convar/convar.cpp b/primedev/core/convar/convar.cpp similarity index 100% rename from NorthstarDLL/core/convar/convar.cpp rename to primedev/core/convar/convar.cpp diff --git a/NorthstarDLL/core/convar/convar.h b/primedev/core/convar/convar.h similarity index 100% rename from NorthstarDLL/core/convar/convar.h rename to primedev/core/convar/convar.h diff --git a/NorthstarDLL/core/convar/cvar.cpp b/primedev/core/convar/cvar.cpp similarity index 100% rename from NorthstarDLL/core/convar/cvar.cpp rename to primedev/core/convar/cvar.cpp diff --git a/NorthstarDLL/core/convar/cvar.h b/primedev/core/convar/cvar.h similarity index 100% rename from NorthstarDLL/core/convar/cvar.h rename to primedev/core/convar/cvar.h diff --git a/NorthstarDLL/core/filesystem/filesystem.cpp b/primedev/core/filesystem/filesystem.cpp similarity index 100% rename from NorthstarDLL/core/filesystem/filesystem.cpp rename to primedev/core/filesystem/filesystem.cpp diff --git a/NorthstarDLL/core/filesystem/filesystem.h b/primedev/core/filesystem/filesystem.h similarity index 100% rename from NorthstarDLL/core/filesystem/filesystem.h rename to primedev/core/filesystem/filesystem.h diff --git a/NorthstarDLL/core/filesystem/rpakfilesystem.cpp b/primedev/core/filesystem/rpakfilesystem.cpp similarity index 100% rename from NorthstarDLL/core/filesystem/rpakfilesystem.cpp rename to primedev/core/filesystem/rpakfilesystem.cpp diff --git a/NorthstarDLL/core/filesystem/rpakfilesystem.h b/primedev/core/filesystem/rpakfilesystem.h similarity index 100% rename from NorthstarDLL/core/filesystem/rpakfilesystem.h rename to primedev/core/filesystem/rpakfilesystem.h diff --git a/NorthstarDLL/core/hooks.cpp b/primedev/core/hooks.cpp similarity index 100% rename from NorthstarDLL/core/hooks.cpp rename to primedev/core/hooks.cpp diff --git a/NorthstarDLL/core/hooks.h b/primedev/core/hooks.h similarity index 100% rename from NorthstarDLL/core/hooks.h rename to primedev/core/hooks.h diff --git a/NorthstarDLL/core/macros.h b/primedev/core/macros.h similarity index 100% rename from NorthstarDLL/core/macros.h rename to primedev/core/macros.h diff --git a/NorthstarDLL/core/math/bitbuf.h b/primedev/core/math/bitbuf.h similarity index 100% rename from NorthstarDLL/core/math/bitbuf.h rename to primedev/core/math/bitbuf.h diff --git a/NorthstarDLL/core/math/bits.cpp b/primedev/core/math/bits.cpp similarity index 100% rename from NorthstarDLL/core/math/bits.cpp rename to primedev/core/math/bits.cpp diff --git a/NorthstarDLL/core/math/bits.h b/primedev/core/math/bits.h similarity index 100% rename from NorthstarDLL/core/math/bits.h rename to primedev/core/math/bits.h diff --git a/NorthstarDLL/core/math/color.cpp b/primedev/core/math/color.cpp similarity index 100% rename from NorthstarDLL/core/math/color.cpp rename to primedev/core/math/color.cpp diff --git a/NorthstarDLL/core/math/color.h b/primedev/core/math/color.h similarity index 100% rename from NorthstarDLL/core/math/color.h rename to primedev/core/math/color.h diff --git a/NorthstarDLL/core/math/vector.h b/primedev/core/math/vector.h similarity index 100% rename from NorthstarDLL/core/math/vector.h rename to primedev/core/math/vector.h diff --git a/NorthstarDLL/core/memalloc.cpp b/primedev/core/memalloc.cpp similarity index 100% rename from NorthstarDLL/core/memalloc.cpp rename to primedev/core/memalloc.cpp diff --git a/NorthstarDLL/core/memalloc.h b/primedev/core/memalloc.h similarity index 100% rename from NorthstarDLL/core/memalloc.h rename to primedev/core/memalloc.h diff --git a/NorthstarDLL/core/memory.cpp b/primedev/core/memory.cpp similarity index 100% rename from NorthstarDLL/core/memory.cpp rename to primedev/core/memory.cpp diff --git a/NorthstarDLL/core/memory.h b/primedev/core/memory.h similarity index 100% rename from NorthstarDLL/core/memory.h rename to primedev/core/memory.h diff --git a/NorthstarDLL/core/sourceinterface.cpp b/primedev/core/sourceinterface.cpp similarity index 100% rename from NorthstarDLL/core/sourceinterface.cpp rename to primedev/core/sourceinterface.cpp diff --git a/NorthstarDLL/core/sourceinterface.h b/primedev/core/sourceinterface.h similarity index 100% rename from NorthstarDLL/core/sourceinterface.h rename to primedev/core/sourceinterface.h diff --git a/NorthstarDLL/core/structs.h b/primedev/core/structs.h similarity index 100% rename from NorthstarDLL/core/structs.h rename to primedev/core/structs.h diff --git a/NorthstarDLL/core/tier0.cpp b/primedev/core/tier0.cpp similarity index 100% rename from NorthstarDLL/core/tier0.cpp rename to primedev/core/tier0.cpp diff --git a/NorthstarDLL/core/tier0.h b/primedev/core/tier0.h similarity index 100% rename from NorthstarDLL/core/tier0.h rename to primedev/core/tier0.h diff --git a/NorthstarDLL/core/vanilla.h b/primedev/core/vanilla.h similarity index 100% rename from NorthstarDLL/core/vanilla.h rename to primedev/core/vanilla.h diff --git a/NorthstarDLL/dedicated/dedicated.cpp b/primedev/dedicated/dedicated.cpp similarity index 100% rename from NorthstarDLL/dedicated/dedicated.cpp rename to primedev/dedicated/dedicated.cpp diff --git a/NorthstarDLL/dedicated/dedicated.h b/primedev/dedicated/dedicated.h similarity index 100% rename from NorthstarDLL/dedicated/dedicated.h rename to primedev/dedicated/dedicated.h diff --git a/NorthstarDLL/dedicated/dedicatedlogtoclient.cpp b/primedev/dedicated/dedicatedlogtoclient.cpp similarity index 100% rename from NorthstarDLL/dedicated/dedicatedlogtoclient.cpp rename to primedev/dedicated/dedicatedlogtoclient.cpp diff --git a/NorthstarDLL/dedicated/dedicatedlogtoclient.h b/primedev/dedicated/dedicatedlogtoclient.h similarity index 100% rename from NorthstarDLL/dedicated/dedicatedlogtoclient.h rename to primedev/dedicated/dedicatedlogtoclient.h diff --git a/NorthstarDLL/dedicated/dedicatedmaterialsystem.cpp b/primedev/dedicated/dedicatedmaterialsystem.cpp similarity index 100% rename from NorthstarDLL/dedicated/dedicatedmaterialsystem.cpp rename to primedev/dedicated/dedicatedmaterialsystem.cpp diff --git a/NorthstarDLL/dllmain.cpp b/primedev/dllmain.cpp similarity index 100% rename from NorthstarDLL/dllmain.cpp rename to primedev/dllmain.cpp diff --git a/NorthstarDLL/dllmain.h b/primedev/dllmain.h similarity index 100% rename from NorthstarDLL/dllmain.h rename to primedev/dllmain.h diff --git a/NorthstarDLL/engine/host.cpp b/primedev/engine/host.cpp similarity index 100% rename from NorthstarDLL/engine/host.cpp rename to primedev/engine/host.cpp diff --git a/NorthstarDLL/engine/hoststate.cpp b/primedev/engine/hoststate.cpp similarity index 100% rename from NorthstarDLL/engine/hoststate.cpp rename to primedev/engine/hoststate.cpp diff --git a/NorthstarDLL/engine/hoststate.h b/primedev/engine/hoststate.h similarity index 100% rename from NorthstarDLL/engine/hoststate.h rename to primedev/engine/hoststate.h diff --git a/NorthstarDLL/engine/r2engine.cpp b/primedev/engine/r2engine.cpp similarity index 100% rename from NorthstarDLL/engine/r2engine.cpp rename to primedev/engine/r2engine.cpp diff --git a/NorthstarDLL/engine/r2engine.h b/primedev/engine/r2engine.h similarity index 100% rename from NorthstarDLL/engine/r2engine.h rename to primedev/engine/r2engine.h diff --git a/NorthstarDLL/engine/runframe.cpp b/primedev/engine/runframe.cpp similarity index 100% rename from NorthstarDLL/engine/runframe.cpp rename to primedev/engine/runframe.cpp diff --git a/NorthstarDLL/logging/crashhandler.cpp b/primedev/logging/crashhandler.cpp similarity index 100% rename from NorthstarDLL/logging/crashhandler.cpp rename to primedev/logging/crashhandler.cpp diff --git a/NorthstarDLL/logging/crashhandler.h b/primedev/logging/crashhandler.h similarity index 100% rename from NorthstarDLL/logging/crashhandler.h rename to primedev/logging/crashhandler.h diff --git a/NorthstarDLL/logging/logging.cpp b/primedev/logging/logging.cpp similarity index 100% rename from NorthstarDLL/logging/logging.cpp rename to primedev/logging/logging.cpp diff --git a/NorthstarDLL/logging/logging.h b/primedev/logging/logging.h similarity index 100% rename from NorthstarDLL/logging/logging.h rename to primedev/logging/logging.h diff --git a/NorthstarDLL/logging/loghooks.cpp b/primedev/logging/loghooks.cpp similarity index 100% rename from NorthstarDLL/logging/loghooks.cpp rename to primedev/logging/loghooks.cpp diff --git a/NorthstarDLL/logging/loghooks.h b/primedev/logging/loghooks.h similarity index 100% rename from NorthstarDLL/logging/loghooks.h rename to primedev/logging/loghooks.h diff --git a/NorthstarDLL/logging/sourceconsole.cpp b/primedev/logging/sourceconsole.cpp similarity index 100% rename from NorthstarDLL/logging/sourceconsole.cpp rename to primedev/logging/sourceconsole.cpp diff --git a/NorthstarDLL/logging/sourceconsole.h b/primedev/logging/sourceconsole.h similarity index 100% rename from NorthstarDLL/logging/sourceconsole.h rename to primedev/logging/sourceconsole.h diff --git a/NorthstarDLL/masterserver/masterserver.cpp b/primedev/masterserver/masterserver.cpp similarity index 100% rename from NorthstarDLL/masterserver/masterserver.cpp rename to primedev/masterserver/masterserver.cpp diff --git a/NorthstarDLL/masterserver/masterserver.h b/primedev/masterserver/masterserver.h similarity index 100% rename from NorthstarDLL/masterserver/masterserver.h rename to primedev/masterserver/masterserver.h diff --git a/NorthstarDLL/mods/autodownload/moddownloader.cpp b/primedev/mods/autodownload/moddownloader.cpp similarity index 100% rename from NorthstarDLL/mods/autodownload/moddownloader.cpp rename to primedev/mods/autodownload/moddownloader.cpp diff --git a/NorthstarDLL/mods/autodownload/moddownloader.h b/primedev/mods/autodownload/moddownloader.h similarity index 100% rename from NorthstarDLL/mods/autodownload/moddownloader.h rename to primedev/mods/autodownload/moddownloader.h diff --git a/NorthstarDLL/mods/compiled/kb_act.cpp b/primedev/mods/compiled/kb_act.cpp similarity index 100% rename from NorthstarDLL/mods/compiled/kb_act.cpp rename to primedev/mods/compiled/kb_act.cpp diff --git a/NorthstarDLL/mods/compiled/modkeyvalues.cpp b/primedev/mods/compiled/modkeyvalues.cpp similarity index 100% rename from NorthstarDLL/mods/compiled/modkeyvalues.cpp rename to primedev/mods/compiled/modkeyvalues.cpp diff --git a/NorthstarDLL/mods/compiled/modpdef.cpp b/primedev/mods/compiled/modpdef.cpp similarity index 100% rename from NorthstarDLL/mods/compiled/modpdef.cpp rename to primedev/mods/compiled/modpdef.cpp diff --git a/NorthstarDLL/mods/compiled/modscriptsrson.cpp b/primedev/mods/compiled/modscriptsrson.cpp similarity index 100% rename from NorthstarDLL/mods/compiled/modscriptsrson.cpp rename to primedev/mods/compiled/modscriptsrson.cpp diff --git a/NorthstarDLL/mods/modmanager.cpp b/primedev/mods/modmanager.cpp similarity index 100% rename from NorthstarDLL/mods/modmanager.cpp rename to primedev/mods/modmanager.cpp diff --git a/NorthstarDLL/mods/modmanager.h b/primedev/mods/modmanager.h similarity index 100% rename from NorthstarDLL/mods/modmanager.h rename to primedev/mods/modmanager.h diff --git a/NorthstarDLL/mods/modsavefiles.cpp b/primedev/mods/modsavefiles.cpp similarity index 100% rename from NorthstarDLL/mods/modsavefiles.cpp rename to primedev/mods/modsavefiles.cpp diff --git a/NorthstarDLL/mods/modsavefiles.h b/primedev/mods/modsavefiles.h similarity index 100% rename from NorthstarDLL/mods/modsavefiles.h rename to primedev/mods/modsavefiles.h diff --git a/NorthstarDLL/ns_version.h b/primedev/ns_version.h similarity index 100% rename from NorthstarDLL/ns_version.h rename to primedev/ns_version.h diff --git a/NorthstarDLL/pch.h b/primedev/pch.h similarity index 100% rename from NorthstarDLL/pch.h rename to primedev/pch.h diff --git a/NorthstarDLL/plugins/plugin_abi.h b/primedev/plugins/plugin_abi.h similarity index 100% rename from NorthstarDLL/plugins/plugin_abi.h rename to primedev/plugins/plugin_abi.h diff --git a/NorthstarDLL/plugins/pluginbackend.cpp b/primedev/plugins/pluginbackend.cpp similarity index 100% rename from NorthstarDLL/plugins/pluginbackend.cpp rename to primedev/plugins/pluginbackend.cpp diff --git a/NorthstarDLL/plugins/pluginbackend.h b/primedev/plugins/pluginbackend.h similarity index 100% rename from NorthstarDLL/plugins/pluginbackend.h rename to primedev/plugins/pluginbackend.h diff --git a/NorthstarDLL/plugins/plugins.cpp b/primedev/plugins/plugins.cpp similarity index 100% rename from NorthstarDLL/plugins/plugins.cpp rename to primedev/plugins/plugins.cpp diff --git a/NorthstarDLL/plugins/plugins.h b/primedev/plugins/plugins.h similarity index 100% rename from NorthstarDLL/plugins/plugins.h rename to primedev/plugins/plugins.h diff --git a/NorthstarLauncher/main.cpp b/primedev/primelauncher/main.cpp similarity index 100% rename from NorthstarLauncher/main.cpp rename to primedev/primelauncher/main.cpp diff --git a/NorthstarLauncher/ns_icon.ico b/primedev/primelauncher/ns_icon.ico similarity index 100% rename from NorthstarLauncher/ns_icon.ico rename to primedev/primelauncher/ns_icon.ico diff --git a/NorthstarDLL/resource1.h b/primedev/primelauncher/resource1.h similarity index 100% rename from NorthstarDLL/resource1.h rename to primedev/primelauncher/resource1.h diff --git a/NorthstarLauncher/resources.rc b/primedev/primelauncher/resources.rc similarity index 100% rename from NorthstarLauncher/resources.rc rename to primedev/primelauncher/resources.rc diff --git a/NorthstarLauncher/resource1.h b/primedev/resource1.h similarity index 100% rename from NorthstarLauncher/resource1.h rename to primedev/resource1.h diff --git a/NorthstarDLL/resources.rc b/primedev/resources.rc similarity index 100% rename from NorthstarDLL/resources.rc rename to primedev/resources.rc diff --git a/NorthstarDLL/scripts/client/clientchathooks.cpp b/primedev/scripts/client/clientchathooks.cpp similarity index 100% rename from NorthstarDLL/scripts/client/clientchathooks.cpp rename to primedev/scripts/client/clientchathooks.cpp diff --git a/NorthstarDLL/scripts/client/cursorposition.cpp b/primedev/scripts/client/cursorposition.cpp similarity index 100% rename from NorthstarDLL/scripts/client/cursorposition.cpp rename to primedev/scripts/client/cursorposition.cpp diff --git a/NorthstarDLL/scripts/client/scriptbrowserhooks.cpp b/primedev/scripts/client/scriptbrowserhooks.cpp similarity index 100% rename from NorthstarDLL/scripts/client/scriptbrowserhooks.cpp rename to primedev/scripts/client/scriptbrowserhooks.cpp diff --git a/NorthstarDLL/scripts/client/scriptmainmenupromos.cpp b/primedev/scripts/client/scriptmainmenupromos.cpp similarity index 100% rename from NorthstarDLL/scripts/client/scriptmainmenupromos.cpp rename to primedev/scripts/client/scriptmainmenupromos.cpp diff --git a/NorthstarDLL/scripts/client/scriptmodmenu.cpp b/primedev/scripts/client/scriptmodmenu.cpp similarity index 100% rename from NorthstarDLL/scripts/client/scriptmodmenu.cpp rename to primedev/scripts/client/scriptmodmenu.cpp diff --git a/NorthstarDLL/scripts/client/scriptoriginauth.cpp b/primedev/scripts/client/scriptoriginauth.cpp similarity index 100% rename from NorthstarDLL/scripts/client/scriptoriginauth.cpp rename to primedev/scripts/client/scriptoriginauth.cpp diff --git a/NorthstarDLL/scripts/client/scriptserverbrowser.cpp b/primedev/scripts/client/scriptserverbrowser.cpp similarity index 100% rename from NorthstarDLL/scripts/client/scriptserverbrowser.cpp rename to primedev/scripts/client/scriptserverbrowser.cpp diff --git a/NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp b/primedev/scripts/client/scriptservertoclientstringcommand.cpp similarity index 100% rename from NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp rename to primedev/scripts/client/scriptservertoclientstringcommand.cpp diff --git a/NorthstarDLL/scripts/scriptdatatables.cpp b/primedev/scripts/scriptdatatables.cpp similarity index 100% rename from NorthstarDLL/scripts/scriptdatatables.cpp rename to primedev/scripts/scriptdatatables.cpp diff --git a/NorthstarDLL/scripts/scripthttprequesthandler.cpp b/primedev/scripts/scripthttprequesthandler.cpp similarity index 100% rename from NorthstarDLL/scripts/scripthttprequesthandler.cpp rename to primedev/scripts/scripthttprequesthandler.cpp diff --git a/NorthstarDLL/scripts/scripthttprequesthandler.h b/primedev/scripts/scripthttprequesthandler.h similarity index 100% rename from NorthstarDLL/scripts/scripthttprequesthandler.h rename to primedev/scripts/scripthttprequesthandler.h diff --git a/NorthstarDLL/scripts/scriptjson.cpp b/primedev/scripts/scriptjson.cpp similarity index 100% rename from NorthstarDLL/scripts/scriptjson.cpp rename to primedev/scripts/scriptjson.cpp diff --git a/NorthstarDLL/scripts/scriptjson.h b/primedev/scripts/scriptjson.h similarity index 100% rename from NorthstarDLL/scripts/scriptjson.h rename to primedev/scripts/scriptjson.h diff --git a/NorthstarDLL/scripts/scriptutility.cpp b/primedev/scripts/scriptutility.cpp similarity index 100% rename from NorthstarDLL/scripts/scriptutility.cpp rename to primedev/scripts/scriptutility.cpp diff --git a/NorthstarDLL/scripts/server/miscserverfixes.cpp b/primedev/scripts/server/miscserverfixes.cpp similarity index 100% rename from NorthstarDLL/scripts/server/miscserverfixes.cpp rename to primedev/scripts/server/miscserverfixes.cpp diff --git a/NorthstarDLL/scripts/server/miscserverscript.cpp b/primedev/scripts/server/miscserverscript.cpp similarity index 100% rename from NorthstarDLL/scripts/server/miscserverscript.cpp rename to primedev/scripts/server/miscserverscript.cpp diff --git a/NorthstarDLL/scripts/server/scriptuserinfo.cpp b/primedev/scripts/server/scriptuserinfo.cpp similarity index 100% rename from NorthstarDLL/scripts/server/scriptuserinfo.cpp rename to primedev/scripts/server/scriptuserinfo.cpp diff --git a/NorthstarDLL/server/alltalk.cpp b/primedev/server/alltalk.cpp similarity index 100% rename from NorthstarDLL/server/alltalk.cpp rename to primedev/server/alltalk.cpp diff --git a/NorthstarDLL/server/auth/bansystem.cpp b/primedev/server/auth/bansystem.cpp similarity index 100% rename from NorthstarDLL/server/auth/bansystem.cpp rename to primedev/server/auth/bansystem.cpp diff --git a/NorthstarDLL/server/auth/bansystem.h b/primedev/server/auth/bansystem.h similarity index 100% rename from NorthstarDLL/server/auth/bansystem.h rename to primedev/server/auth/bansystem.h diff --git a/NorthstarDLL/server/auth/serverauthentication.cpp b/primedev/server/auth/serverauthentication.cpp similarity index 100% rename from NorthstarDLL/server/auth/serverauthentication.cpp rename to primedev/server/auth/serverauthentication.cpp diff --git a/NorthstarDLL/server/auth/serverauthentication.h b/primedev/server/auth/serverauthentication.h similarity index 100% rename from NorthstarDLL/server/auth/serverauthentication.h rename to primedev/server/auth/serverauthentication.h diff --git a/NorthstarDLL/server/buildainfile.cpp b/primedev/server/buildainfile.cpp similarity index 100% rename from NorthstarDLL/server/buildainfile.cpp rename to primedev/server/buildainfile.cpp diff --git a/NorthstarDLL/server/r2server.cpp b/primedev/server/r2server.cpp similarity index 100% rename from NorthstarDLL/server/r2server.cpp rename to primedev/server/r2server.cpp diff --git a/NorthstarDLL/server/r2server.h b/primedev/server/r2server.h similarity index 100% rename from NorthstarDLL/server/r2server.h rename to primedev/server/r2server.h diff --git a/NorthstarDLL/server/serverchathooks.cpp b/primedev/server/serverchathooks.cpp similarity index 100% rename from NorthstarDLL/server/serverchathooks.cpp rename to primedev/server/serverchathooks.cpp diff --git a/NorthstarDLL/server/serverchathooks.h b/primedev/server/serverchathooks.h similarity index 100% rename from NorthstarDLL/server/serverchathooks.h rename to primedev/server/serverchathooks.h diff --git a/NorthstarDLL/server/servernethooks.cpp b/primedev/server/servernethooks.cpp similarity index 100% rename from NorthstarDLL/server/servernethooks.cpp rename to primedev/server/servernethooks.cpp diff --git a/NorthstarDLL/server/serverpresence.cpp b/primedev/server/serverpresence.cpp similarity index 100% rename from NorthstarDLL/server/serverpresence.cpp rename to primedev/server/serverpresence.cpp diff --git a/NorthstarDLL/server/serverpresence.h b/primedev/server/serverpresence.h similarity index 100% rename from NorthstarDLL/server/serverpresence.h rename to primedev/server/serverpresence.h diff --git a/NorthstarDLL/shared/exploit_fixes/exploitfixes.cpp b/primedev/shared/exploit_fixes/exploitfixes.cpp similarity index 100% rename from NorthstarDLL/shared/exploit_fixes/exploitfixes.cpp rename to primedev/shared/exploit_fixes/exploitfixes.cpp diff --git a/NorthstarDLL/shared/exploit_fixes/exploitfixes_lzss.cpp b/primedev/shared/exploit_fixes/exploitfixes_lzss.cpp similarity index 100% rename from NorthstarDLL/shared/exploit_fixes/exploitfixes_lzss.cpp rename to primedev/shared/exploit_fixes/exploitfixes_lzss.cpp diff --git a/NorthstarDLL/shared/exploit_fixes/exploitfixes_utf8parser.cpp b/primedev/shared/exploit_fixes/exploitfixes_utf8parser.cpp similarity index 100% rename from NorthstarDLL/shared/exploit_fixes/exploitfixes_utf8parser.cpp rename to primedev/shared/exploit_fixes/exploitfixes_utf8parser.cpp diff --git a/NorthstarDLL/shared/exploit_fixes/ns_limits.cpp b/primedev/shared/exploit_fixes/ns_limits.cpp similarity index 100% rename from NorthstarDLL/shared/exploit_fixes/ns_limits.cpp rename to primedev/shared/exploit_fixes/ns_limits.cpp diff --git a/NorthstarDLL/shared/exploit_fixes/ns_limits.h b/primedev/shared/exploit_fixes/ns_limits.h similarity index 100% rename from NorthstarDLL/shared/exploit_fixes/ns_limits.h rename to primedev/shared/exploit_fixes/ns_limits.h diff --git a/NorthstarDLL/shared/keyvalues.cpp b/primedev/shared/keyvalues.cpp similarity index 100% rename from NorthstarDLL/shared/keyvalues.cpp rename to primedev/shared/keyvalues.cpp diff --git a/NorthstarDLL/shared/keyvalues.h b/primedev/shared/keyvalues.h similarity index 100% rename from NorthstarDLL/shared/keyvalues.h rename to primedev/shared/keyvalues.h diff --git a/NorthstarDLL/shared/maxplayers.cpp b/primedev/shared/maxplayers.cpp similarity index 100% rename from NorthstarDLL/shared/maxplayers.cpp rename to primedev/shared/maxplayers.cpp diff --git a/NorthstarDLL/shared/maxplayers.h b/primedev/shared/maxplayers.h similarity index 100% rename from NorthstarDLL/shared/maxplayers.h rename to primedev/shared/maxplayers.h diff --git a/NorthstarDLL/shared/misccommands.cpp b/primedev/shared/misccommands.cpp similarity index 100% rename from NorthstarDLL/shared/misccommands.cpp rename to primedev/shared/misccommands.cpp diff --git a/NorthstarDLL/shared/misccommands.h b/primedev/shared/misccommands.h similarity index 100% rename from NorthstarDLL/shared/misccommands.h rename to primedev/shared/misccommands.h diff --git a/NorthstarDLL/shared/playlist.cpp b/primedev/shared/playlist.cpp similarity index 100% rename from NorthstarDLL/shared/playlist.cpp rename to primedev/shared/playlist.cpp diff --git a/NorthstarDLL/shared/playlist.h b/primedev/shared/playlist.h similarity index 100% rename from NorthstarDLL/shared/playlist.h rename to primedev/shared/playlist.h diff --git a/NorthstarDLL/squirrel/squirrel.cpp b/primedev/squirrel/squirrel.cpp similarity index 100% rename from NorthstarDLL/squirrel/squirrel.cpp rename to primedev/squirrel/squirrel.cpp diff --git a/NorthstarDLL/squirrel/squirrel.h b/primedev/squirrel/squirrel.h similarity index 100% rename from NorthstarDLL/squirrel/squirrel.h rename to primedev/squirrel/squirrel.h diff --git a/NorthstarDLL/squirrel/squirrelautobind.cpp b/primedev/squirrel/squirrelautobind.cpp similarity index 100% rename from NorthstarDLL/squirrel/squirrelautobind.cpp rename to primedev/squirrel/squirrelautobind.cpp diff --git a/NorthstarDLL/squirrel/squirrelautobind.h b/primedev/squirrel/squirrelautobind.h similarity index 100% rename from NorthstarDLL/squirrel/squirrelautobind.h rename to primedev/squirrel/squirrelautobind.h diff --git a/NorthstarDLL/squirrel/squirrelclasstypes.h b/primedev/squirrel/squirrelclasstypes.h similarity index 100% rename from NorthstarDLL/squirrel/squirrelclasstypes.h rename to primedev/squirrel/squirrelclasstypes.h diff --git a/NorthstarDLL/squirrel/squirreldatatypes.h b/primedev/squirrel/squirreldatatypes.h similarity index 100% rename from NorthstarDLL/squirrel/squirreldatatypes.h rename to primedev/squirrel/squirreldatatypes.h diff --git a/thirdparty/libcurl b/primedev/thirdparty/libcurl similarity index 100% rename from thirdparty/libcurl rename to primedev/thirdparty/libcurl diff --git a/thirdparty/minhook b/primedev/thirdparty/minhook similarity index 100% rename from thirdparty/minhook rename to primedev/thirdparty/minhook diff --git a/thirdparty/minizip b/primedev/thirdparty/minizip similarity index 100% rename from thirdparty/minizip rename to primedev/thirdparty/minizip diff --git a/thirdparty/rapidjson/allocators.h b/primedev/thirdparty/rapidjson/allocators.h similarity index 100% rename from thirdparty/rapidjson/allocators.h rename to primedev/thirdparty/rapidjson/allocators.h diff --git a/thirdparty/rapidjson/document.h b/primedev/thirdparty/rapidjson/document.h similarity index 100% rename from thirdparty/rapidjson/document.h rename to primedev/thirdparty/rapidjson/document.h diff --git a/thirdparty/rapidjson/encodedstream.h b/primedev/thirdparty/rapidjson/encodedstream.h similarity index 100% rename from thirdparty/rapidjson/encodedstream.h rename to primedev/thirdparty/rapidjson/encodedstream.h diff --git a/thirdparty/rapidjson/encodings.h b/primedev/thirdparty/rapidjson/encodings.h similarity index 100% rename from thirdparty/rapidjson/encodings.h rename to primedev/thirdparty/rapidjson/encodings.h diff --git a/thirdparty/rapidjson/error/en.h b/primedev/thirdparty/rapidjson/error/en.h similarity index 100% rename from thirdparty/rapidjson/error/en.h rename to primedev/thirdparty/rapidjson/error/en.h diff --git a/thirdparty/rapidjson/error/error.h b/primedev/thirdparty/rapidjson/error/error.h similarity index 100% rename from thirdparty/rapidjson/error/error.h rename to primedev/thirdparty/rapidjson/error/error.h diff --git a/thirdparty/rapidjson/filereadstream.h b/primedev/thirdparty/rapidjson/filereadstream.h similarity index 100% rename from thirdparty/rapidjson/filereadstream.h rename to primedev/thirdparty/rapidjson/filereadstream.h diff --git a/thirdparty/rapidjson/filewritestream.h b/primedev/thirdparty/rapidjson/filewritestream.h similarity index 100% rename from thirdparty/rapidjson/filewritestream.h rename to primedev/thirdparty/rapidjson/filewritestream.h diff --git a/thirdparty/rapidjson/fwd.h b/primedev/thirdparty/rapidjson/fwd.h similarity index 100% rename from thirdparty/rapidjson/fwd.h rename to primedev/thirdparty/rapidjson/fwd.h diff --git a/thirdparty/rapidjson/internal/biginteger.h b/primedev/thirdparty/rapidjson/internal/biginteger.h similarity index 100% rename from thirdparty/rapidjson/internal/biginteger.h rename to primedev/thirdparty/rapidjson/internal/biginteger.h diff --git a/thirdparty/rapidjson/internal/diyfp.h b/primedev/thirdparty/rapidjson/internal/diyfp.h similarity index 100% rename from thirdparty/rapidjson/internal/diyfp.h rename to primedev/thirdparty/rapidjson/internal/diyfp.h diff --git a/thirdparty/rapidjson/internal/dtoa.h b/primedev/thirdparty/rapidjson/internal/dtoa.h similarity index 100% rename from thirdparty/rapidjson/internal/dtoa.h rename to primedev/thirdparty/rapidjson/internal/dtoa.h diff --git a/thirdparty/rapidjson/internal/ieee754.h b/primedev/thirdparty/rapidjson/internal/ieee754.h similarity index 100% rename from thirdparty/rapidjson/internal/ieee754.h rename to primedev/thirdparty/rapidjson/internal/ieee754.h diff --git a/thirdparty/rapidjson/internal/itoa.h b/primedev/thirdparty/rapidjson/internal/itoa.h similarity index 100% rename from thirdparty/rapidjson/internal/itoa.h rename to primedev/thirdparty/rapidjson/internal/itoa.h diff --git a/thirdparty/rapidjson/internal/meta.h b/primedev/thirdparty/rapidjson/internal/meta.h similarity index 100% rename from thirdparty/rapidjson/internal/meta.h rename to primedev/thirdparty/rapidjson/internal/meta.h diff --git a/thirdparty/rapidjson/internal/pow10.h b/primedev/thirdparty/rapidjson/internal/pow10.h similarity index 100% rename from thirdparty/rapidjson/internal/pow10.h rename to primedev/thirdparty/rapidjson/internal/pow10.h diff --git a/thirdparty/rapidjson/internal/regex.h b/primedev/thirdparty/rapidjson/internal/regex.h similarity index 100% rename from thirdparty/rapidjson/internal/regex.h rename to primedev/thirdparty/rapidjson/internal/regex.h diff --git a/thirdparty/rapidjson/internal/stack.h b/primedev/thirdparty/rapidjson/internal/stack.h similarity index 100% rename from thirdparty/rapidjson/internal/stack.h rename to primedev/thirdparty/rapidjson/internal/stack.h diff --git a/thirdparty/rapidjson/internal/strfunc.h b/primedev/thirdparty/rapidjson/internal/strfunc.h similarity index 100% rename from thirdparty/rapidjson/internal/strfunc.h rename to primedev/thirdparty/rapidjson/internal/strfunc.h diff --git a/thirdparty/rapidjson/internal/strtod.h b/primedev/thirdparty/rapidjson/internal/strtod.h similarity index 100% rename from thirdparty/rapidjson/internal/strtod.h rename to primedev/thirdparty/rapidjson/internal/strtod.h diff --git a/thirdparty/rapidjson/internal/swap.h b/primedev/thirdparty/rapidjson/internal/swap.h similarity index 100% rename from thirdparty/rapidjson/internal/swap.h rename to primedev/thirdparty/rapidjson/internal/swap.h diff --git a/thirdparty/rapidjson/istreamwrapper.h b/primedev/thirdparty/rapidjson/istreamwrapper.h similarity index 100% rename from thirdparty/rapidjson/istreamwrapper.h rename to primedev/thirdparty/rapidjson/istreamwrapper.h diff --git a/thirdparty/rapidjson/memorybuffer.h b/primedev/thirdparty/rapidjson/memorybuffer.h similarity index 100% rename from thirdparty/rapidjson/memorybuffer.h rename to primedev/thirdparty/rapidjson/memorybuffer.h diff --git a/thirdparty/rapidjson/memorystream.h b/primedev/thirdparty/rapidjson/memorystream.h similarity index 100% rename from thirdparty/rapidjson/memorystream.h rename to primedev/thirdparty/rapidjson/memorystream.h diff --git a/thirdparty/rapidjson/msinttypes/inttypes.h b/primedev/thirdparty/rapidjson/msinttypes/inttypes.h similarity index 100% rename from thirdparty/rapidjson/msinttypes/inttypes.h rename to primedev/thirdparty/rapidjson/msinttypes/inttypes.h diff --git a/thirdparty/rapidjson/msinttypes/stdint.h b/primedev/thirdparty/rapidjson/msinttypes/stdint.h similarity index 100% rename from thirdparty/rapidjson/msinttypes/stdint.h rename to primedev/thirdparty/rapidjson/msinttypes/stdint.h diff --git a/thirdparty/rapidjson/ostreamwrapper.h b/primedev/thirdparty/rapidjson/ostreamwrapper.h similarity index 100% rename from thirdparty/rapidjson/ostreamwrapper.h rename to primedev/thirdparty/rapidjson/ostreamwrapper.h diff --git a/thirdparty/rapidjson/pointer.h b/primedev/thirdparty/rapidjson/pointer.h similarity index 100% rename from thirdparty/rapidjson/pointer.h rename to primedev/thirdparty/rapidjson/pointer.h diff --git a/thirdparty/rapidjson/prettywriter.h b/primedev/thirdparty/rapidjson/prettywriter.h similarity index 100% rename from thirdparty/rapidjson/prettywriter.h rename to primedev/thirdparty/rapidjson/prettywriter.h diff --git a/thirdparty/rapidjson/rapidjson.h b/primedev/thirdparty/rapidjson/rapidjson.h similarity index 100% rename from thirdparty/rapidjson/rapidjson.h rename to primedev/thirdparty/rapidjson/rapidjson.h diff --git a/thirdparty/rapidjson/reader.h b/primedev/thirdparty/rapidjson/reader.h similarity index 100% rename from thirdparty/rapidjson/reader.h rename to primedev/thirdparty/rapidjson/reader.h diff --git a/thirdparty/rapidjson/schema.h b/primedev/thirdparty/rapidjson/schema.h similarity index 100% rename from thirdparty/rapidjson/schema.h rename to primedev/thirdparty/rapidjson/schema.h diff --git a/thirdparty/rapidjson/stream.h b/primedev/thirdparty/rapidjson/stream.h similarity index 100% rename from thirdparty/rapidjson/stream.h rename to primedev/thirdparty/rapidjson/stream.h diff --git a/thirdparty/rapidjson/stringbuffer.h b/primedev/thirdparty/rapidjson/stringbuffer.h similarity index 100% rename from thirdparty/rapidjson/stringbuffer.h rename to primedev/thirdparty/rapidjson/stringbuffer.h diff --git a/thirdparty/rapidjson/writer.h b/primedev/thirdparty/rapidjson/writer.h similarity index 100% rename from thirdparty/rapidjson/writer.h rename to primedev/thirdparty/rapidjson/writer.h diff --git a/thirdparty/spdlog/async.h b/primedev/thirdparty/spdlog/async.h similarity index 100% rename from thirdparty/spdlog/async.h rename to primedev/thirdparty/spdlog/async.h diff --git a/thirdparty/spdlog/async_logger-inl.h b/primedev/thirdparty/spdlog/async_logger-inl.h similarity index 100% rename from thirdparty/spdlog/async_logger-inl.h rename to primedev/thirdparty/spdlog/async_logger-inl.h diff --git a/thirdparty/spdlog/async_logger.h b/primedev/thirdparty/spdlog/async_logger.h similarity index 100% rename from thirdparty/spdlog/async_logger.h rename to primedev/thirdparty/spdlog/async_logger.h diff --git a/thirdparty/spdlog/cfg/argv.h b/primedev/thirdparty/spdlog/cfg/argv.h similarity index 100% rename from thirdparty/spdlog/cfg/argv.h rename to primedev/thirdparty/spdlog/cfg/argv.h diff --git a/thirdparty/spdlog/cfg/env.h b/primedev/thirdparty/spdlog/cfg/env.h similarity index 100% rename from thirdparty/spdlog/cfg/env.h rename to primedev/thirdparty/spdlog/cfg/env.h diff --git a/thirdparty/spdlog/cfg/helpers-inl.h b/primedev/thirdparty/spdlog/cfg/helpers-inl.h similarity index 100% rename from thirdparty/spdlog/cfg/helpers-inl.h rename to primedev/thirdparty/spdlog/cfg/helpers-inl.h diff --git a/thirdparty/spdlog/cfg/helpers.h b/primedev/thirdparty/spdlog/cfg/helpers.h similarity index 100% rename from thirdparty/spdlog/cfg/helpers.h rename to primedev/thirdparty/spdlog/cfg/helpers.h diff --git a/thirdparty/spdlog/common-inl.h b/primedev/thirdparty/spdlog/common-inl.h similarity index 100% rename from thirdparty/spdlog/common-inl.h rename to primedev/thirdparty/spdlog/common-inl.h diff --git a/thirdparty/spdlog/common.h b/primedev/thirdparty/spdlog/common.h similarity index 100% rename from thirdparty/spdlog/common.h rename to primedev/thirdparty/spdlog/common.h diff --git a/thirdparty/spdlog/details/backtracer-inl.h b/primedev/thirdparty/spdlog/details/backtracer-inl.h similarity index 100% rename from thirdparty/spdlog/details/backtracer-inl.h rename to primedev/thirdparty/spdlog/details/backtracer-inl.h diff --git a/thirdparty/spdlog/details/backtracer.h b/primedev/thirdparty/spdlog/details/backtracer.h similarity index 100% rename from thirdparty/spdlog/details/backtracer.h rename to primedev/thirdparty/spdlog/details/backtracer.h diff --git a/thirdparty/spdlog/details/circular_q.h b/primedev/thirdparty/spdlog/details/circular_q.h similarity index 100% rename from thirdparty/spdlog/details/circular_q.h rename to primedev/thirdparty/spdlog/details/circular_q.h diff --git a/thirdparty/spdlog/details/console_globals.h b/primedev/thirdparty/spdlog/details/console_globals.h similarity index 100% rename from thirdparty/spdlog/details/console_globals.h rename to primedev/thirdparty/spdlog/details/console_globals.h diff --git a/thirdparty/spdlog/details/file_helper-inl.h b/primedev/thirdparty/spdlog/details/file_helper-inl.h similarity index 100% rename from thirdparty/spdlog/details/file_helper-inl.h rename to primedev/thirdparty/spdlog/details/file_helper-inl.h diff --git a/thirdparty/spdlog/details/file_helper.h b/primedev/thirdparty/spdlog/details/file_helper.h similarity index 100% rename from thirdparty/spdlog/details/file_helper.h rename to primedev/thirdparty/spdlog/details/file_helper.h diff --git a/thirdparty/spdlog/details/fmt_helper.h b/primedev/thirdparty/spdlog/details/fmt_helper.h similarity index 100% rename from thirdparty/spdlog/details/fmt_helper.h rename to primedev/thirdparty/spdlog/details/fmt_helper.h diff --git a/thirdparty/spdlog/details/log_msg-inl.h b/primedev/thirdparty/spdlog/details/log_msg-inl.h similarity index 100% rename from thirdparty/spdlog/details/log_msg-inl.h rename to primedev/thirdparty/spdlog/details/log_msg-inl.h diff --git a/thirdparty/spdlog/details/log_msg.h b/primedev/thirdparty/spdlog/details/log_msg.h similarity index 100% rename from thirdparty/spdlog/details/log_msg.h rename to primedev/thirdparty/spdlog/details/log_msg.h diff --git a/thirdparty/spdlog/details/log_msg_buffer-inl.h b/primedev/thirdparty/spdlog/details/log_msg_buffer-inl.h similarity index 100% rename from thirdparty/spdlog/details/log_msg_buffer-inl.h rename to primedev/thirdparty/spdlog/details/log_msg_buffer-inl.h diff --git a/thirdparty/spdlog/details/log_msg_buffer.h b/primedev/thirdparty/spdlog/details/log_msg_buffer.h similarity index 100% rename from thirdparty/spdlog/details/log_msg_buffer.h rename to primedev/thirdparty/spdlog/details/log_msg_buffer.h diff --git a/thirdparty/spdlog/details/mpmc_blocking_q.h b/primedev/thirdparty/spdlog/details/mpmc_blocking_q.h similarity index 100% rename from thirdparty/spdlog/details/mpmc_blocking_q.h rename to primedev/thirdparty/spdlog/details/mpmc_blocking_q.h diff --git a/thirdparty/spdlog/details/null_mutex.h b/primedev/thirdparty/spdlog/details/null_mutex.h similarity index 100% rename from thirdparty/spdlog/details/null_mutex.h rename to primedev/thirdparty/spdlog/details/null_mutex.h diff --git a/thirdparty/spdlog/details/os-inl.h b/primedev/thirdparty/spdlog/details/os-inl.h similarity index 100% rename from thirdparty/spdlog/details/os-inl.h rename to primedev/thirdparty/spdlog/details/os-inl.h diff --git a/thirdparty/spdlog/details/os.h b/primedev/thirdparty/spdlog/details/os.h similarity index 100% rename from thirdparty/spdlog/details/os.h rename to primedev/thirdparty/spdlog/details/os.h diff --git a/thirdparty/spdlog/details/periodic_worker-inl.h b/primedev/thirdparty/spdlog/details/periodic_worker-inl.h similarity index 100% rename from thirdparty/spdlog/details/periodic_worker-inl.h rename to primedev/thirdparty/spdlog/details/periodic_worker-inl.h diff --git a/thirdparty/spdlog/details/periodic_worker.h b/primedev/thirdparty/spdlog/details/periodic_worker.h similarity index 100% rename from thirdparty/spdlog/details/periodic_worker.h rename to primedev/thirdparty/spdlog/details/periodic_worker.h diff --git a/thirdparty/spdlog/details/registry-inl.h b/primedev/thirdparty/spdlog/details/registry-inl.h similarity index 100% rename from thirdparty/spdlog/details/registry-inl.h rename to primedev/thirdparty/spdlog/details/registry-inl.h diff --git a/thirdparty/spdlog/details/registry.h b/primedev/thirdparty/spdlog/details/registry.h similarity index 100% rename from thirdparty/spdlog/details/registry.h rename to primedev/thirdparty/spdlog/details/registry.h diff --git a/thirdparty/spdlog/details/synchronous_factory.h b/primedev/thirdparty/spdlog/details/synchronous_factory.h similarity index 100% rename from thirdparty/spdlog/details/synchronous_factory.h rename to primedev/thirdparty/spdlog/details/synchronous_factory.h diff --git a/thirdparty/spdlog/details/tcp_client-windows.h b/primedev/thirdparty/spdlog/details/tcp_client-windows.h similarity index 100% rename from thirdparty/spdlog/details/tcp_client-windows.h rename to primedev/thirdparty/spdlog/details/tcp_client-windows.h diff --git a/thirdparty/spdlog/details/tcp_client.h b/primedev/thirdparty/spdlog/details/tcp_client.h similarity index 100% rename from thirdparty/spdlog/details/tcp_client.h rename to primedev/thirdparty/spdlog/details/tcp_client.h diff --git a/thirdparty/spdlog/details/thread_pool-inl.h b/primedev/thirdparty/spdlog/details/thread_pool-inl.h similarity index 100% rename from thirdparty/spdlog/details/thread_pool-inl.h rename to primedev/thirdparty/spdlog/details/thread_pool-inl.h diff --git a/thirdparty/spdlog/details/thread_pool.h b/primedev/thirdparty/spdlog/details/thread_pool.h similarity index 100% rename from thirdparty/spdlog/details/thread_pool.h rename to primedev/thirdparty/spdlog/details/thread_pool.h diff --git a/thirdparty/spdlog/details/windows_include.h b/primedev/thirdparty/spdlog/details/windows_include.h similarity index 100% rename from thirdparty/spdlog/details/windows_include.h rename to primedev/thirdparty/spdlog/details/windows_include.h diff --git a/thirdparty/spdlog/fmt/bin_to_hex.h b/primedev/thirdparty/spdlog/fmt/bin_to_hex.h similarity index 100% rename from thirdparty/spdlog/fmt/bin_to_hex.h rename to primedev/thirdparty/spdlog/fmt/bin_to_hex.h diff --git a/thirdparty/spdlog/fmt/bundled/LICENSE.rst b/primedev/thirdparty/spdlog/fmt/bundled/LICENSE.rst similarity index 100% rename from thirdparty/spdlog/fmt/bundled/LICENSE.rst rename to primedev/thirdparty/spdlog/fmt/bundled/LICENSE.rst diff --git a/thirdparty/spdlog/fmt/bundled/chrono.h b/primedev/thirdparty/spdlog/fmt/bundled/chrono.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/chrono.h rename to primedev/thirdparty/spdlog/fmt/bundled/chrono.h diff --git a/thirdparty/spdlog/fmt/bundled/color.h b/primedev/thirdparty/spdlog/fmt/bundled/color.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/color.h rename to primedev/thirdparty/spdlog/fmt/bundled/color.h diff --git a/thirdparty/spdlog/fmt/bundled/compile.h b/primedev/thirdparty/spdlog/fmt/bundled/compile.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/compile.h rename to primedev/thirdparty/spdlog/fmt/bundled/compile.h diff --git a/thirdparty/spdlog/fmt/bundled/core.h b/primedev/thirdparty/spdlog/fmt/bundled/core.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/core.h rename to primedev/thirdparty/spdlog/fmt/bundled/core.h diff --git a/thirdparty/spdlog/fmt/bundled/format-inl.h b/primedev/thirdparty/spdlog/fmt/bundled/format-inl.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/format-inl.h rename to primedev/thirdparty/spdlog/fmt/bundled/format-inl.h diff --git a/thirdparty/spdlog/fmt/bundled/format.h b/primedev/thirdparty/spdlog/fmt/bundled/format.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/format.h rename to primedev/thirdparty/spdlog/fmt/bundled/format.h diff --git a/thirdparty/spdlog/fmt/bundled/locale.h b/primedev/thirdparty/spdlog/fmt/bundled/locale.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/locale.h rename to primedev/thirdparty/spdlog/fmt/bundled/locale.h diff --git a/thirdparty/spdlog/fmt/bundled/os.h b/primedev/thirdparty/spdlog/fmt/bundled/os.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/os.h rename to primedev/thirdparty/spdlog/fmt/bundled/os.h diff --git a/thirdparty/spdlog/fmt/bundled/ostream.h b/primedev/thirdparty/spdlog/fmt/bundled/ostream.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/ostream.h rename to primedev/thirdparty/spdlog/fmt/bundled/ostream.h diff --git a/thirdparty/spdlog/fmt/bundled/posix.h b/primedev/thirdparty/spdlog/fmt/bundled/posix.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/posix.h rename to primedev/thirdparty/spdlog/fmt/bundled/posix.h diff --git a/thirdparty/spdlog/fmt/bundled/printf.h b/primedev/thirdparty/spdlog/fmt/bundled/printf.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/printf.h rename to primedev/thirdparty/spdlog/fmt/bundled/printf.h diff --git a/thirdparty/spdlog/fmt/bundled/ranges.h b/primedev/thirdparty/spdlog/fmt/bundled/ranges.h similarity index 100% rename from thirdparty/spdlog/fmt/bundled/ranges.h rename to primedev/thirdparty/spdlog/fmt/bundled/ranges.h diff --git a/thirdparty/spdlog/fmt/chrono.h b/primedev/thirdparty/spdlog/fmt/chrono.h similarity index 100% rename from thirdparty/spdlog/fmt/chrono.h rename to primedev/thirdparty/spdlog/fmt/chrono.h diff --git a/thirdparty/spdlog/fmt/fmt.h b/primedev/thirdparty/spdlog/fmt/fmt.h similarity index 100% rename from thirdparty/spdlog/fmt/fmt.h rename to primedev/thirdparty/spdlog/fmt/fmt.h diff --git a/thirdparty/spdlog/fmt/ostr.h b/primedev/thirdparty/spdlog/fmt/ostr.h similarity index 100% rename from thirdparty/spdlog/fmt/ostr.h rename to primedev/thirdparty/spdlog/fmt/ostr.h diff --git a/thirdparty/spdlog/formatter.h b/primedev/thirdparty/spdlog/formatter.h similarity index 100% rename from thirdparty/spdlog/formatter.h rename to primedev/thirdparty/spdlog/formatter.h diff --git a/thirdparty/spdlog/fwd.h b/primedev/thirdparty/spdlog/fwd.h similarity index 100% rename from thirdparty/spdlog/fwd.h rename to primedev/thirdparty/spdlog/fwd.h diff --git a/thirdparty/spdlog/logger-inl.h b/primedev/thirdparty/spdlog/logger-inl.h similarity index 100% rename from thirdparty/spdlog/logger-inl.h rename to primedev/thirdparty/spdlog/logger-inl.h diff --git a/thirdparty/spdlog/logger.h b/primedev/thirdparty/spdlog/logger.h similarity index 100% rename from thirdparty/spdlog/logger.h rename to primedev/thirdparty/spdlog/logger.h diff --git a/thirdparty/spdlog/pattern_formatter-inl.h b/primedev/thirdparty/spdlog/pattern_formatter-inl.h similarity index 100% rename from thirdparty/spdlog/pattern_formatter-inl.h rename to primedev/thirdparty/spdlog/pattern_formatter-inl.h diff --git a/thirdparty/spdlog/pattern_formatter.h b/primedev/thirdparty/spdlog/pattern_formatter.h similarity index 100% rename from thirdparty/spdlog/pattern_formatter.h rename to primedev/thirdparty/spdlog/pattern_formatter.h diff --git a/thirdparty/spdlog/sinks/android_sink.h b/primedev/thirdparty/spdlog/sinks/android_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/android_sink.h rename to primedev/thirdparty/spdlog/sinks/android_sink.h diff --git a/thirdparty/spdlog/sinks/ansicolor_sink-inl.h b/primedev/thirdparty/spdlog/sinks/ansicolor_sink-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/ansicolor_sink-inl.h rename to primedev/thirdparty/spdlog/sinks/ansicolor_sink-inl.h diff --git a/thirdparty/spdlog/sinks/ansicolor_sink.h b/primedev/thirdparty/spdlog/sinks/ansicolor_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/ansicolor_sink.h rename to primedev/thirdparty/spdlog/sinks/ansicolor_sink.h diff --git a/thirdparty/spdlog/sinks/base_sink-inl.h b/primedev/thirdparty/spdlog/sinks/base_sink-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/base_sink-inl.h rename to primedev/thirdparty/spdlog/sinks/base_sink-inl.h diff --git a/thirdparty/spdlog/sinks/base_sink.h b/primedev/thirdparty/spdlog/sinks/base_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/base_sink.h rename to primedev/thirdparty/spdlog/sinks/base_sink.h diff --git a/thirdparty/spdlog/sinks/basic_file_sink-inl.h b/primedev/thirdparty/spdlog/sinks/basic_file_sink-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/basic_file_sink-inl.h rename to primedev/thirdparty/spdlog/sinks/basic_file_sink-inl.h diff --git a/thirdparty/spdlog/sinks/basic_file_sink.h b/primedev/thirdparty/spdlog/sinks/basic_file_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/basic_file_sink.h rename to primedev/thirdparty/spdlog/sinks/basic_file_sink.h diff --git a/thirdparty/spdlog/sinks/daily_file_sink.h b/primedev/thirdparty/spdlog/sinks/daily_file_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/daily_file_sink.h rename to primedev/thirdparty/spdlog/sinks/daily_file_sink.h diff --git a/thirdparty/spdlog/sinks/dist_sink.h b/primedev/thirdparty/spdlog/sinks/dist_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/dist_sink.h rename to primedev/thirdparty/spdlog/sinks/dist_sink.h diff --git a/thirdparty/spdlog/sinks/dup_filter_sink.h b/primedev/thirdparty/spdlog/sinks/dup_filter_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/dup_filter_sink.h rename to primedev/thirdparty/spdlog/sinks/dup_filter_sink.h diff --git a/thirdparty/spdlog/sinks/hourly_file_sink.h b/primedev/thirdparty/spdlog/sinks/hourly_file_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/hourly_file_sink.h rename to primedev/thirdparty/spdlog/sinks/hourly_file_sink.h diff --git a/thirdparty/spdlog/sinks/msvc_sink.h b/primedev/thirdparty/spdlog/sinks/msvc_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/msvc_sink.h rename to primedev/thirdparty/spdlog/sinks/msvc_sink.h diff --git a/thirdparty/spdlog/sinks/null_sink.h b/primedev/thirdparty/spdlog/sinks/null_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/null_sink.h rename to primedev/thirdparty/spdlog/sinks/null_sink.h diff --git a/thirdparty/spdlog/sinks/ostream_sink.h b/primedev/thirdparty/spdlog/sinks/ostream_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/ostream_sink.h rename to primedev/thirdparty/spdlog/sinks/ostream_sink.h diff --git a/thirdparty/spdlog/sinks/ringbuffer_sink.h b/primedev/thirdparty/spdlog/sinks/ringbuffer_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/ringbuffer_sink.h rename to primedev/thirdparty/spdlog/sinks/ringbuffer_sink.h diff --git a/thirdparty/spdlog/sinks/rotating_file_sink-inl.h b/primedev/thirdparty/spdlog/sinks/rotating_file_sink-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/rotating_file_sink-inl.h rename to primedev/thirdparty/spdlog/sinks/rotating_file_sink-inl.h diff --git a/thirdparty/spdlog/sinks/rotating_file_sink.h b/primedev/thirdparty/spdlog/sinks/rotating_file_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/rotating_file_sink.h rename to primedev/thirdparty/spdlog/sinks/rotating_file_sink.h diff --git a/thirdparty/spdlog/sinks/sink-inl.h b/primedev/thirdparty/spdlog/sinks/sink-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/sink-inl.h rename to primedev/thirdparty/spdlog/sinks/sink-inl.h diff --git a/thirdparty/spdlog/sinks/sink.h b/primedev/thirdparty/spdlog/sinks/sink.h similarity index 100% rename from thirdparty/spdlog/sinks/sink.h rename to primedev/thirdparty/spdlog/sinks/sink.h diff --git a/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h b/primedev/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/stdout_color_sinks-inl.h rename to primedev/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h diff --git a/thirdparty/spdlog/sinks/stdout_color_sinks.h b/primedev/thirdparty/spdlog/sinks/stdout_color_sinks.h similarity index 100% rename from thirdparty/spdlog/sinks/stdout_color_sinks.h rename to primedev/thirdparty/spdlog/sinks/stdout_color_sinks.h diff --git a/thirdparty/spdlog/sinks/stdout_sinks-inl.h b/primedev/thirdparty/spdlog/sinks/stdout_sinks-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/stdout_sinks-inl.h rename to primedev/thirdparty/spdlog/sinks/stdout_sinks-inl.h diff --git a/thirdparty/spdlog/sinks/stdout_sinks.h b/primedev/thirdparty/spdlog/sinks/stdout_sinks.h similarity index 100% rename from thirdparty/spdlog/sinks/stdout_sinks.h rename to primedev/thirdparty/spdlog/sinks/stdout_sinks.h diff --git a/thirdparty/spdlog/sinks/syslog_sink.h b/primedev/thirdparty/spdlog/sinks/syslog_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/syslog_sink.h rename to primedev/thirdparty/spdlog/sinks/syslog_sink.h diff --git a/thirdparty/spdlog/sinks/systemd_sink.h b/primedev/thirdparty/spdlog/sinks/systemd_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/systemd_sink.h rename to primedev/thirdparty/spdlog/sinks/systemd_sink.h diff --git a/thirdparty/spdlog/sinks/tcp_sink.h b/primedev/thirdparty/spdlog/sinks/tcp_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/tcp_sink.h rename to primedev/thirdparty/spdlog/sinks/tcp_sink.h diff --git a/thirdparty/spdlog/sinks/win_eventlog_sink.h b/primedev/thirdparty/spdlog/sinks/win_eventlog_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/win_eventlog_sink.h rename to primedev/thirdparty/spdlog/sinks/win_eventlog_sink.h diff --git a/thirdparty/spdlog/sinks/wincolor_sink-inl.h b/primedev/thirdparty/spdlog/sinks/wincolor_sink-inl.h similarity index 100% rename from thirdparty/spdlog/sinks/wincolor_sink-inl.h rename to primedev/thirdparty/spdlog/sinks/wincolor_sink-inl.h diff --git a/thirdparty/spdlog/sinks/wincolor_sink.h b/primedev/thirdparty/spdlog/sinks/wincolor_sink.h similarity index 100% rename from thirdparty/spdlog/sinks/wincolor_sink.h rename to primedev/thirdparty/spdlog/sinks/wincolor_sink.h diff --git a/thirdparty/spdlog/spdlog-inl.h b/primedev/thirdparty/spdlog/spdlog-inl.h similarity index 100% rename from thirdparty/spdlog/spdlog-inl.h rename to primedev/thirdparty/spdlog/spdlog-inl.h diff --git a/thirdparty/spdlog/spdlog.h b/primedev/thirdparty/spdlog/spdlog.h similarity index 100% rename from thirdparty/spdlog/spdlog.h rename to primedev/thirdparty/spdlog/spdlog.h diff --git a/thirdparty/spdlog/stopwatch.h b/primedev/thirdparty/spdlog/stopwatch.h similarity index 100% rename from thirdparty/spdlog/stopwatch.h rename to primedev/thirdparty/spdlog/stopwatch.h diff --git a/thirdparty/spdlog/tweakme.h b/primedev/thirdparty/spdlog/tweakme.h similarity index 100% rename from thirdparty/spdlog/tweakme.h rename to primedev/thirdparty/spdlog/tweakme.h diff --git a/thirdparty/spdlog/version.h b/primedev/thirdparty/spdlog/version.h similarity index 100% rename from thirdparty/spdlog/version.h rename to primedev/thirdparty/spdlog/version.h diff --git a/NorthstarDLL/util/printcommands.cpp b/primedev/util/printcommands.cpp similarity index 100% rename from NorthstarDLL/util/printcommands.cpp rename to primedev/util/printcommands.cpp diff --git a/NorthstarDLL/util/printcommands.h b/primedev/util/printcommands.h similarity index 100% rename from NorthstarDLL/util/printcommands.h rename to primedev/util/printcommands.h diff --git a/NorthstarDLL/util/printmaps.cpp b/primedev/util/printmaps.cpp similarity index 100% rename from NorthstarDLL/util/printmaps.cpp rename to primedev/util/printmaps.cpp diff --git a/NorthstarDLL/util/printmaps.h b/primedev/util/printmaps.h similarity index 100% rename from NorthstarDLL/util/printmaps.h rename to primedev/util/printmaps.h diff --git a/NorthstarDLL/util/utils.cpp b/primedev/util/utils.cpp similarity index 100% rename from NorthstarDLL/util/utils.cpp rename to primedev/util/utils.cpp diff --git a/NorthstarDLL/util/utils.h b/primedev/util/utils.h similarity index 100% rename from NorthstarDLL/util/utils.h rename to primedev/util/utils.h diff --git a/NorthstarDLL/util/version.cpp b/primedev/util/version.cpp similarity index 100% rename from NorthstarDLL/util/version.cpp rename to primedev/util/version.cpp diff --git a/NorthstarDLL/util/version.h b/primedev/util/version.h similarity index 100% rename from NorthstarDLL/util/version.h rename to primedev/util/version.h diff --git a/NorthstarDLL/util/wininfo.cpp b/primedev/util/wininfo.cpp similarity index 100% rename from NorthstarDLL/util/wininfo.cpp rename to primedev/util/wininfo.cpp diff --git a/NorthstarDLL/util/wininfo.h b/primedev/util/wininfo.h similarity index 100% rename from NorthstarDLL/util/wininfo.h rename to primedev/util/wininfo.h diff --git a/loader_wsock32_proxy/dllmain.cpp b/primedev/wsockproxy/dllmain.cpp similarity index 100% rename from loader_wsock32_proxy/dllmain.cpp rename to primedev/wsockproxy/dllmain.cpp diff --git a/loader_wsock32_proxy/loader.cpp b/primedev/wsockproxy/loader.cpp similarity index 100% rename from loader_wsock32_proxy/loader.cpp rename to primedev/wsockproxy/loader.cpp diff --git a/loader_wsock32_proxy/loader.h b/primedev/wsockproxy/loader.h similarity index 100% rename from loader_wsock32_proxy/loader.h rename to primedev/wsockproxy/loader.h diff --git a/loader_wsock32_proxy/pch.h b/primedev/wsockproxy/pch.h similarity index 100% rename from loader_wsock32_proxy/pch.h rename to primedev/wsockproxy/pch.h diff --git a/loader_wsock32_proxy/wsock32.asm b/primedev/wsockproxy/wsock32.asm similarity index 100% rename from loader_wsock32_proxy/wsock32.asm rename to primedev/wsockproxy/wsock32.asm diff --git a/loader_wsock32_proxy/wsock32.def b/primedev/wsockproxy/wsock32.def similarity index 100% rename from loader_wsock32_proxy/wsock32.def rename to primedev/wsockproxy/wsock32.def