diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 40f48a6d5..000000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,149 +0,0 @@ -cmake_minimum_required(VERSION 3.28) - -project(rpcs3 LANGUAGES C CXX) - -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - -if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11) - message(FATAL_ERROR "RPCS3 requires at least gcc-11.") - endif() -elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0) - message(FATAL_ERROR "RPCS3 requires at least clang-12.0.") - endif() -endif() - -option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON) -option(WITH_LLVM "Enable usage of LLVM library" ON) -option(BUILD_LLVM "Build LLVM from git submodule" OFF) -option(STATIC_LINK_LLVM "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." OFF) -option(USE_FAUDIO "FAudio audio backend" ON) -option(USE_LIBEVDEV "libevdev-based joystick support" ON) -option(USE_DISCORD_RPC "Discord rich presence integration" OFF) -option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON) -option(USE_VULKAN "Vulkan render backend" ON) -option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF) -option(USE_SDL "Enables SDL input handler" OFF) -option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON) -option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF) -option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON) -option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON) -option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON) -option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF) -option(USE_LTO "Use LTO for building" ON) - -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake") - -include(CheckCXXCompilerFlag) - -get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -if(IS_MULTI_CONFIG) - # TODO(cjj19970505@live.cn) - # Currently DicordRPC is included as a binary compiled with /MT flag. - # We need all 4 binaries(/MT /MTd /MD /MDd) or including the source instead of binary. - set(USE_DISCORD_RPC OFF CACHE BOOL "Discord RPC is only avaliable with single-config generator" FORCE) -else() - if(NOT CMAKE_BUILD_TYPE) - message(STATUS "No build type selected, default to Release") - set(CMAKE_BUILD_TYPE "Release") - endif() -endif() - -if(CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT MSVC) - add_compile_definitions(_DEBUG) -endif() - -if(MSVC) - option(USE_MSVC_STATIC_CRT "Use static MSVC C runtime" OFF) - - # TODO(cjj19970505@live.cn) - # DiscordRPC binary in 3rdparty is compiled /MT - # So theoretically we should enable DiscordRPC in Release and static CRT build - # since we might encounter some rumtime issues when more than one CRT version are presented. - # https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-160#what-problems-exist-if-an-application-uses-more-than-one-crt-version - # Add other DiscordRPC binaries(compiled with /MTd, /MD, /MDd) or compile it from source may address this issue. - if(NOT IS_MULTI_CONFIG) - if(NOT(CMAKE_BUILD_TYPE MATCHES "Release" AND USE_MSVC_STATIC_CRT)) - set(USE_DISCORD_RPC OFF CACHE BOOL "Discord RPC is only available in Release and static CRT build." FORCE) - endif() - endif() - - if(USE_MSVC_STATIC_CRT) - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - else() - # though doc ( https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html ) - # says if that property is not set then CMake uses the default value MultiThreaded$<$:Debug>DLL - # to select a MSVC runtime library. - # But yaml-cpp set /MT(d) if CMAKE_MSVC_RUNTIME_LIBRARY is undefined - # So we have to define it explicitly - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") - endif() - - # TODO(cjj19970505@live.cn) - # offical QT uses dynamic CRT. - # When building our lib with static CRT and debug build type - # and linking with Qt with dynamic CRT and debug build, - # error is encountered in runtime (which is expected). - # But building our lib with static CRT and release build type, - # and linking with Qt with dynamic CRT and release build seems to be working, - # which is the same config with VS solution. - # (though technically it might still have some hidden errors). - # So we allow static CRT in both relase and debug build, but prompt warning in debug build. - # For more info: - # https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-160#what-problems-exist-if-an-application-uses-more-than-one-crt-version - # https://wiki.qt.io/Technical_FAQ#Why_does_a_statically_built_Qt_use_the_dynamic_Visual_Studio_runtime_libraries_.3F_Do_I_need_to_deploy_those_with_my_application_.3F - if(USE_MSVC_STATIC_CRT) - if(IS_MULTI_CONFIG OR CMAKE_BUILD_TYPE MATCHES "Debug") - message(AUTHOR_WARNING "Debug build currently can not work with static CRT.") - endif() - endif() - add_compile_options(/MP) -endif() - -if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8) - message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." ) -endif() - -find_program(CCACHE_FOUND ccache) -if(CCACHE_FOUND) - set(CMAKE_CXX_COMPILER_LAUNCHER ccache) -endif() - -if(APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") - include_directories(/opt/homebrew/include) - link_directories(/opt/homebrew/lib) -endif() - -if(MSVC) - add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled -endif() - -add_subdirectory(3rdparty) - -if (DISABLE_LTO) - if (CMAKE_C_FLAGS) - string(REGEX REPLACE "-flto[^ ]*" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) - endif() - if (CMAKE_CXX_FLAGS) - string(REGEX REPLACE "-flto[^ ]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - endif() -endif() - -string(FIND "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}" "-flto" FOUND_LTO) -if (NOT FOUND_LTO EQUAL -1) - message(FATAL_ERROR "RPCS3 doesn't support building with LTO, use -DDISABLE_LTO=TRUE to force-disable it") -endif() - -if(NOT WIN32) - add_compile_options(-pthread) -endif() - -# TODO: do real installation, including copying directory structure -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin") - -add_subdirectory(rpcs3) - -set_directory_properties(PROPERTIES VS_STARTUP_PROJECT rpcs3) diff --git a/.ci/build-freebsd.sh b/rpcs3/.ci/build-freebsd.sh similarity index 100% rename from .ci/build-freebsd.sh rename to rpcs3/.ci/build-freebsd.sh diff --git a/.ci/build-linux-aarch64.sh b/rpcs3/.ci/build-linux-aarch64.sh similarity index 100% rename from .ci/build-linux-aarch64.sh rename to rpcs3/.ci/build-linux-aarch64.sh diff --git a/.ci/build-linux.sh b/rpcs3/.ci/build-linux.sh similarity index 100% rename from .ci/build-linux.sh rename to rpcs3/.ci/build-linux.sh diff --git a/.ci/build-mac-arm64.sh b/rpcs3/.ci/build-mac-arm64.sh similarity index 100% rename from .ci/build-mac-arm64.sh rename to rpcs3/.ci/build-mac-arm64.sh diff --git a/.ci/build-mac.sh b/rpcs3/.ci/build-mac.sh similarity index 100% rename from .ci/build-mac.sh rename to rpcs3/.ci/build-mac.sh diff --git a/.ci/deploy-linux.sh b/rpcs3/.ci/deploy-linux.sh similarity index 100% rename from .ci/deploy-linux.sh rename to rpcs3/.ci/deploy-linux.sh diff --git a/.ci/deploy-mac-arm64.sh b/rpcs3/.ci/deploy-mac-arm64.sh similarity index 100% rename from .ci/deploy-mac-arm64.sh rename to rpcs3/.ci/deploy-mac-arm64.sh diff --git a/.ci/deploy-mac.sh b/rpcs3/.ci/deploy-mac.sh similarity index 100% rename from .ci/deploy-mac.sh rename to rpcs3/.ci/deploy-mac.sh diff --git a/.ci/deploy-windows.sh b/rpcs3/.ci/deploy-windows.sh similarity index 100% rename from .ci/deploy-windows.sh rename to rpcs3/.ci/deploy-windows.sh diff --git a/.ci/docker.env b/rpcs3/.ci/docker.env similarity index 100% rename from .ci/docker.env rename to rpcs3/.ci/docker.env diff --git a/.ci/export-azure-vars.sh b/rpcs3/.ci/export-azure-vars.sh similarity index 100% rename from .ci/export-azure-vars.sh rename to rpcs3/.ci/export-azure-vars.sh diff --git a/.ci/export-cirrus-vars.sh b/rpcs3/.ci/export-cirrus-vars.sh similarity index 100% rename from .ci/export-cirrus-vars.sh rename to rpcs3/.ci/export-cirrus-vars.sh diff --git a/.ci/generate-qt-ts.sh b/rpcs3/.ci/generate-qt-ts.sh similarity index 100% rename from .ci/generate-qt-ts.sh rename to rpcs3/.ci/generate-qt-ts.sh diff --git a/.ci/get_keys-windows.sh b/rpcs3/.ci/get_keys-windows.sh similarity index 100% rename from .ci/get_keys-windows.sh rename to rpcs3/.ci/get_keys-windows.sh diff --git a/.ci/github-upload.sh b/rpcs3/.ci/github-upload.sh similarity index 100% rename from .ci/github-upload.sh rename to rpcs3/.ci/github-upload.sh diff --git a/.ci/install-freebsd.sh b/rpcs3/.ci/install-freebsd.sh similarity index 100% rename from .ci/install-freebsd.sh rename to rpcs3/.ci/install-freebsd.sh diff --git a/.ci/optimize-mac.sh b/rpcs3/.ci/optimize-mac.sh similarity index 100% rename from .ci/optimize-mac.sh rename to rpcs3/.ci/optimize-mac.sh diff --git a/.ci/setup-windows.sh b/rpcs3/.ci/setup-windows.sh similarity index 100% rename from .ci/setup-windows.sh rename to rpcs3/.ci/setup-windows.sh diff --git a/.cirrus.yml b/rpcs3/.cirrus.yml similarity index 100% rename from .cirrus.yml rename to rpcs3/.cirrus.yml diff --git a/.clang-format b/rpcs3/.clang-format similarity index 100% rename from .clang-format rename to rpcs3/.clang-format diff --git a/.editorconfig b/rpcs3/.editorconfig similarity index 100% rename from .editorconfig rename to rpcs3/.editorconfig diff --git a/.gdbinit b/rpcs3/.gdbinit similarity index 100% rename from .gdbinit rename to rpcs3/.gdbinit diff --git a/.github/CONTRIBUTING.md b/rpcs3/.github/CONTRIBUTING.md similarity index 100% rename from .github/CONTRIBUTING.md rename to rpcs3/.github/CONTRIBUTING.md diff --git a/.github/FUNDING.yml b/rpcs3/.github/FUNDING.yml similarity index 100% rename from .github/FUNDING.yml rename to rpcs3/.github/FUNDING.yml diff --git a/.github/ISSUE_TEMPLATE/1-regression-report.yml b/rpcs3/.github/ISSUE_TEMPLATE/1-regression-report.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/1-regression-report.yml rename to rpcs3/.github/ISSUE_TEMPLATE/1-regression-report.yml diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.yml b/rpcs3/.github/ISSUE_TEMPLATE/2-bug-report.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/2-bug-report.yml rename to rpcs3/.github/ISSUE_TEMPLATE/2-bug-report.yml diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.yml b/rpcs3/.github/ISSUE_TEMPLATE/3-feature-request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/3-feature-request.yml rename to rpcs3/.github/ISSUE_TEMPLATE/3-feature-request.yml diff --git a/.github/ISSUE_TEMPLATE/4-advanced.md b/rpcs3/.github/ISSUE_TEMPLATE/4-advanced.md similarity index 100% rename from .github/ISSUE_TEMPLATE/4-advanced.md rename to rpcs3/.github/ISSUE_TEMPLATE/4-advanced.md diff --git a/.github/ISSUE_TEMPLATE/config.yml b/rpcs3/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yml rename to rpcs3/.github/ISSUE_TEMPLATE/config.yml diff --git a/.github/PR-BUILD.md b/rpcs3/.github/PR-BUILD.md similarity index 100% rename from .github/PR-BUILD.md rename to rpcs3/.github/PR-BUILD.md diff --git a/.github/PULL_REQUEST_TEMPLATE/1-default.md b/rpcs3/.github/PULL_REQUEST_TEMPLATE/1-default.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE/1-default.md rename to rpcs3/.github/PULL_REQUEST_TEMPLATE/1-default.md diff --git a/.github/workflows/qt-ts.yml b/rpcs3/.github/workflows/qt-ts.yml similarity index 100% rename from .github/workflows/qt-ts.yml rename to rpcs3/.github/workflows/qt-ts.yml diff --git a/.github/workflows/rpcs3.yml b/rpcs3/.github/workflows/rpcs3.yml similarity index 100% rename from .github/workflows/rpcs3.yml rename to rpcs3/.github/workflows/rpcs3.yml diff --git a/.gitignore b/rpcs3/.gitignore similarity index 100% rename from .gitignore rename to rpcs3/.gitignore diff --git a/.gitmodules b/rpcs3/.gitmodules similarity index 69% rename from .gitmodules rename to rpcs3/.gitmodules index 305705b06..adb183ec2 100644 --- a/.gitmodules +++ b/rpcs3/.gitmodules @@ -1,110 +1,110 @@ [submodule "rpcs3-ffmpeg"] - path = 3rdparty/ffmpeg + path = rpcs3/3rdparty/ffmpeg url = ../../RPCS3/ffmpeg-core.git ignore = dirty [submodule "asmjit"] - path = 3rdparty/asmjit/asmjit + path = rpcs3/3rdparty/asmjit/asmjit url = ../../asmjit/asmjit.git branch = master ignore = dirty [submodule "3rdparty/llvm/llvm"] - path = 3rdparty/llvm/llvm + path = rpcs3/3rdparty/llvm/llvm url = ../../llvm/llvm-project.git ignore = dirty [submodule "3rdparty/glslang"] - path = 3rdparty/glslang/glslang + path = rpcs3/3rdparty/glslang/glslang url = ../../KhronosGroup/glslang.git ignore = dirty [submodule "3rdparty/zlib"] - path = 3rdparty/zlib/zlib + path = rpcs3/3rdparty/zlib/zlib url = ../../madler/zlib ignore = dirty [submodule "3rdparty/hidapi"] - path = 3rdparty/hidapi/hidapi + path = rpcs3/3rdparty/hidapi/hidapi url = ../../RPCS3/hidapi.git branch = master ignore = dirty [submodule "3rdparty/pugixml"] - path = 3rdparty/pugixml + path = rpcs3/3rdparty/pugixml url = ../../zeux/pugixml.git ignore = dirty [submodule "3rdparty/yaml-cpp"] - path = 3rdparty/yaml-cpp/yaml-cpp + path = rpcs3/3rdparty/yaml-cpp/yaml-cpp url = ../../RPCS3/yaml-cpp.git ignore = dirty [submodule "3rdparty/libpng"] - path = 3rdparty/libpng/libpng + path = rpcs3/3rdparty/libpng/libpng url = ../../glennrp/libpng.git ignore = dirty [submodule "3rdparty/libusb"] - path = 3rdparty/libusb/libusb + path = rpcs3/3rdparty/libusb/libusb url = ../../libusb/libusb.git ignore = dirty [submodule "3rdparty/FAudio"] - path = 3rdparty/FAudio + path = rpcs3/3rdparty/FAudio url = ../../FNA-XNA/FAudio.git ignore = dirty [submodule "3rdparty/curl"] - path = 3rdparty/curl/curl + path = rpcs3/3rdparty/curl/curl url = ../../curl/curl.git ignore = dirty [submodule "3rdparty/wolfssl"] - path = 3rdparty/wolfssl/wolfssl + path = rpcs3/3rdparty/wolfssl/wolfssl url = ../../wolfSSL/wolfssl.git ignore = dirty [submodule "3rdparty/flatbuffers"] - path = 3rdparty/flatbuffers + path = rpcs3/3rdparty/flatbuffers url = ../../google/flatbuffers.git ignore = dirty [submodule "3rdparty/cubeb/cubeb"] - path = 3rdparty/cubeb/cubeb + path = rpcs3/3rdparty/cubeb/cubeb url = ../../mozilla/cubeb.git ignore = dirty [submodule "3rdparty/SoundTouch/soundtouch"] - path = 3rdparty/SoundTouch/soundtouch + path = rpcs3/3rdparty/SoundTouch/soundtouch url = ../../RPCS3/soundtouch.git ignore = dirty [submodule "3rdparty/libsdl-org/SDL"] - path = 3rdparty/libsdl-org/SDL + path = rpcs3/3rdparty/libsdl-org/SDL url = ../../libsdl-org/SDL.git ignore = dirty [submodule "3rdparty/miniupnp/miniupnp"] - path = 3rdparty/miniupnp/miniupnp + path = rpcs3/3rdparty/miniupnp/miniupnp url = ../../miniupnp/miniupnp.git ignore = dirty [submodule "3rdparty/rtmidi/rtmidi"] - path = 3rdparty/rtmidi/rtmidi + path = rpcs3/3rdparty/rtmidi/rtmidi url = ../../thestk/rtmidi ignore = dirty [submodule "3rdparty/zstd/zstd"] - path = 3rdparty/zstd/zstd + path = rpcs3/3rdparty/zstd/zstd url = ../../facebook/zstd ignore = dirty [submodule "3rdparty/7zip/7zip"] - path = 3rdparty/7zip/7zip + path = rpcs3/3rdparty/7zip/7zip url = ../../ip7z/7zip.git ignore = dirty [submodule "3rdparty/OpenAL/openal-soft"] - path = 3rdparty/OpenAL/openal-soft + path = rpcs3/3rdparty/OpenAL/openal-soft url = ../../kcat/openal-soft.git ignore = dirty [submodule "3rdparty/stblib/stb"] - path = 3rdparty/stblib/stb + path = rpcs3/3rdparty/stblib/stb url = ../../nothings/stb.git ignore = dirty [submodule "3rdparty/opencv/opencv"] - path = 3rdparty/opencv/opencv + path = rpcs3/3rdparty/opencv/opencv url = ../../Megamouse/opencv_minimal.git ignore = dirty [submodule "3rdparty/fusion/fusion"] - path = 3rdparty/fusion/fusion + path = rpcs3/3rdparty/fusion/fusion url = ../../xioTechnologies/Fusion.git ignore = dirty [submodule "3rdparty/discord-rpc/discord-rpc"] - path = 3rdparty/discord-rpc/discord-rpc + path = rpcs3/3rdparty/discord-rpc/discord-rpc url = ../../Vestrel/discord-rpc ignore = dirty [submodule "3rdparty/GPUOpen/VulkanMemoryAllocator"] - path = 3rdparty/GPUOpen/VulkanMemoryAllocator + path = rpcs3/3rdparty/GPUOpen/VulkanMemoryAllocator url = ../../Megamouse/VulkanMemoryAllocator.git ignore = dirty diff --git a/3rdparty/7zip/7zip b/rpcs3/3rdparty/7zip/7zip similarity index 100% rename from 3rdparty/7zip/7zip rename to rpcs3/3rdparty/7zip/7zip diff --git a/3rdparty/7zip/7zip.filters b/rpcs3/3rdparty/7zip/7zip.filters similarity index 100% rename from 3rdparty/7zip/7zip.filters rename to rpcs3/3rdparty/7zip/7zip.filters diff --git a/3rdparty/7zip/7zip.vcxproj b/rpcs3/3rdparty/7zip/7zip.vcxproj similarity index 100% rename from 3rdparty/7zip/7zip.vcxproj rename to rpcs3/3rdparty/7zip/7zip.vcxproj diff --git a/3rdparty/7zip/CMakeLists.txt b/rpcs3/3rdparty/7zip/CMakeLists.txt similarity index 100% rename from 3rdparty/7zip/CMakeLists.txt rename to rpcs3/3rdparty/7zip/CMakeLists.txt diff --git a/3rdparty/CMakeLists.txt b/rpcs3/3rdparty/CMakeLists.txt similarity index 100% rename from 3rdparty/CMakeLists.txt rename to rpcs3/3rdparty/CMakeLists.txt diff --git a/3rdparty/DetectArchitecture.cmake b/rpcs3/3rdparty/DetectArchitecture.cmake similarity index 100% rename from 3rdparty/DetectArchitecture.cmake rename to rpcs3/3rdparty/DetectArchitecture.cmake diff --git a/3rdparty/FAudio b/rpcs3/3rdparty/FAudio similarity index 100% rename from 3rdparty/FAudio rename to rpcs3/3rdparty/FAudio diff --git a/3rdparty/GL/KHR/khrplatform.h b/rpcs3/3rdparty/GL/KHR/khrplatform.h similarity index 100% rename from 3rdparty/GL/KHR/khrplatform.h rename to rpcs3/3rdparty/GL/KHR/khrplatform.h diff --git a/3rdparty/GL/glext.h b/rpcs3/3rdparty/GL/glext.h similarity index 100% rename from 3rdparty/GL/glext.h rename to rpcs3/3rdparty/GL/glext.h diff --git a/3rdparty/GPUOpen/VulkanMemoryAllocator b/rpcs3/3rdparty/GPUOpen/VulkanMemoryAllocator similarity index 100% rename from 3rdparty/GPUOpen/VulkanMemoryAllocator rename to rpcs3/3rdparty/GPUOpen/VulkanMemoryAllocator diff --git a/3rdparty/GPUOpen/include/ffx_a.h b/rpcs3/3rdparty/GPUOpen/include/ffx_a.h similarity index 100% rename from 3rdparty/GPUOpen/include/ffx_a.h rename to rpcs3/3rdparty/GPUOpen/include/ffx_a.h diff --git a/3rdparty/GPUOpen/include/ffx_fsr1.h b/rpcs3/3rdparty/GPUOpen/include/ffx_fsr1.h similarity index 100% rename from 3rdparty/GPUOpen/include/ffx_fsr1.h rename to rpcs3/3rdparty/GPUOpen/include/ffx_fsr1.h diff --git a/3rdparty/MoltenVK/.gitignore b/rpcs3/3rdparty/MoltenVK/.gitignore similarity index 100% rename from 3rdparty/MoltenVK/.gitignore rename to rpcs3/3rdparty/MoltenVK/.gitignore diff --git a/3rdparty/MoltenVK/CMakeLists.txt b/rpcs3/3rdparty/MoltenVK/CMakeLists.txt similarity index 100% rename from 3rdparty/MoltenVK/CMakeLists.txt rename to rpcs3/3rdparty/MoltenVK/CMakeLists.txt diff --git a/3rdparty/OpenAL/CMakeLists.txt b/rpcs3/3rdparty/OpenAL/CMakeLists.txt similarity index 100% rename from 3rdparty/OpenAL/CMakeLists.txt rename to rpcs3/3rdparty/OpenAL/CMakeLists.txt diff --git a/3rdparty/OpenAL/openal-soft b/rpcs3/3rdparty/OpenAL/openal-soft similarity index 100% rename from 3rdparty/OpenAL/openal-soft rename to rpcs3/3rdparty/OpenAL/openal-soft diff --git a/3rdparty/OpenAL/openal-soft.vcxproj b/rpcs3/3rdparty/OpenAL/openal-soft.vcxproj similarity index 100% rename from 3rdparty/OpenAL/openal-soft.vcxproj rename to rpcs3/3rdparty/OpenAL/openal-soft.vcxproj diff --git a/3rdparty/SoundTouch/CMakeLists.txt b/rpcs3/3rdparty/SoundTouch/CMakeLists.txt similarity index 100% rename from 3rdparty/SoundTouch/CMakeLists.txt rename to rpcs3/3rdparty/SoundTouch/CMakeLists.txt diff --git a/3rdparty/SoundTouch/soundtouch b/rpcs3/3rdparty/SoundTouch/soundtouch similarity index 100% rename from 3rdparty/SoundTouch/soundtouch rename to rpcs3/3rdparty/SoundTouch/soundtouch diff --git a/3rdparty/SoundTouch/soundtouch.vcxproj b/rpcs3/3rdparty/SoundTouch/soundtouch.vcxproj similarity index 100% rename from 3rdparty/SoundTouch/soundtouch.vcxproj rename to rpcs3/3rdparty/SoundTouch/soundtouch.vcxproj diff --git a/3rdparty/SoundTouch/soundtouch.vcxproj.filters b/rpcs3/3rdparty/SoundTouch/soundtouch.vcxproj.filters similarity index 100% rename from 3rdparty/SoundTouch/soundtouch.vcxproj.filters rename to rpcs3/3rdparty/SoundTouch/soundtouch.vcxproj.filters diff --git a/3rdparty/asmjit/CMakeLists.txt b/rpcs3/3rdparty/asmjit/CMakeLists.txt similarity index 100% rename from 3rdparty/asmjit/CMakeLists.txt rename to rpcs3/3rdparty/asmjit/CMakeLists.txt diff --git a/3rdparty/asmjit/asmjit b/rpcs3/3rdparty/asmjit/asmjit similarity index 100% rename from 3rdparty/asmjit/asmjit rename to rpcs3/3rdparty/asmjit/asmjit diff --git a/3rdparty/asmjit/asmjit.vcxproj b/rpcs3/3rdparty/asmjit/asmjit.vcxproj similarity index 100% rename from 3rdparty/asmjit/asmjit.vcxproj rename to rpcs3/3rdparty/asmjit/asmjit.vcxproj diff --git a/3rdparty/asmjit/asmjit.vcxproj.filters b/rpcs3/3rdparty/asmjit/asmjit.vcxproj.filters similarity index 100% rename from 3rdparty/asmjit/asmjit.vcxproj.filters rename to rpcs3/3rdparty/asmjit/asmjit.vcxproj.filters diff --git a/3rdparty/bcdec/bcdec.hpp b/rpcs3/3rdparty/bcdec/bcdec.hpp similarity index 100% rename from 3rdparty/bcdec/bcdec.hpp rename to rpcs3/3rdparty/bcdec/bcdec.hpp diff --git a/3rdparty/cubeb/CMakeLists.txt b/rpcs3/3rdparty/cubeb/CMakeLists.txt similarity index 100% rename from 3rdparty/cubeb/CMakeLists.txt rename to rpcs3/3rdparty/cubeb/CMakeLists.txt diff --git a/3rdparty/cubeb/cubeb b/rpcs3/3rdparty/cubeb/cubeb similarity index 100% rename from 3rdparty/cubeb/cubeb rename to rpcs3/3rdparty/cubeb/cubeb diff --git a/3rdparty/cubeb/extra/cubeb_export.h b/rpcs3/3rdparty/cubeb/extra/cubeb_export.h similarity index 100% rename from 3rdparty/cubeb/extra/cubeb_export.h rename to rpcs3/3rdparty/cubeb/extra/cubeb_export.h diff --git a/3rdparty/cubeb/libcubeb.vcxproj b/rpcs3/3rdparty/cubeb/libcubeb.vcxproj similarity index 100% rename from 3rdparty/cubeb/libcubeb.vcxproj rename to rpcs3/3rdparty/cubeb/libcubeb.vcxproj diff --git a/3rdparty/cubeb/libcubeb.vcxproj.filters b/rpcs3/3rdparty/cubeb/libcubeb.vcxproj.filters similarity index 100% rename from 3rdparty/cubeb/libcubeb.vcxproj.filters rename to rpcs3/3rdparty/cubeb/libcubeb.vcxproj.filters diff --git a/3rdparty/curl/CMakeLists.txt b/rpcs3/3rdparty/curl/CMakeLists.txt similarity index 100% rename from 3rdparty/curl/CMakeLists.txt rename to rpcs3/3rdparty/curl/CMakeLists.txt diff --git a/3rdparty/curl/curl b/rpcs3/3rdparty/curl/curl similarity index 100% rename from 3rdparty/curl/curl rename to rpcs3/3rdparty/curl/curl diff --git a/3rdparty/curl/extra/wolfssl/options.h b/rpcs3/3rdparty/curl/extra/wolfssl/options.h similarity index 100% rename from 3rdparty/curl/extra/wolfssl/options.h rename to rpcs3/3rdparty/curl/extra/wolfssl/options.h diff --git a/3rdparty/curl/libcurl.vcxproj b/rpcs3/3rdparty/curl/libcurl.vcxproj similarity index 100% rename from 3rdparty/curl/libcurl.vcxproj rename to rpcs3/3rdparty/curl/libcurl.vcxproj diff --git a/3rdparty/curl/libcurl.vcxproj.filters b/rpcs3/3rdparty/curl/libcurl.vcxproj.filters similarity index 100% rename from 3rdparty/curl/libcurl.vcxproj.filters rename to rpcs3/3rdparty/curl/libcurl.vcxproj.filters diff --git a/3rdparty/discord-rpc/CMakeLists.txt b/rpcs3/3rdparty/discord-rpc/CMakeLists.txt similarity index 100% rename from 3rdparty/discord-rpc/CMakeLists.txt rename to rpcs3/3rdparty/discord-rpc/CMakeLists.txt diff --git a/3rdparty/discord-rpc/discord-rpc b/rpcs3/3rdparty/discord-rpc/discord-rpc similarity index 100% rename from 3rdparty/discord-rpc/discord-rpc rename to rpcs3/3rdparty/discord-rpc/discord-rpc diff --git a/3rdparty/discord-rpc/discord-rpc.vcxproj b/rpcs3/3rdparty/discord-rpc/discord-rpc.vcxproj similarity index 100% rename from 3rdparty/discord-rpc/discord-rpc.vcxproj rename to rpcs3/3rdparty/discord-rpc/discord-rpc.vcxproj diff --git a/3rdparty/discord-rpc/discord-rpc.vcxproj.filters b/rpcs3/3rdparty/discord-rpc/discord-rpc.vcxproj.filters similarity index 100% rename from 3rdparty/discord-rpc/discord-rpc.vcxproj.filters rename to rpcs3/3rdparty/discord-rpc/discord-rpc.vcxproj.filters diff --git a/3rdparty/ffmpeg b/rpcs3/3rdparty/ffmpeg similarity index 100% rename from 3rdparty/ffmpeg rename to rpcs3/3rdparty/ffmpeg diff --git a/3rdparty/flatbuffers b/rpcs3/3rdparty/flatbuffers similarity index 100% rename from 3rdparty/flatbuffers rename to rpcs3/3rdparty/flatbuffers diff --git a/3rdparty/fusion/CMakeLists.txt b/rpcs3/3rdparty/fusion/CMakeLists.txt similarity index 100% rename from 3rdparty/fusion/CMakeLists.txt rename to rpcs3/3rdparty/fusion/CMakeLists.txt diff --git a/3rdparty/fusion/fusion b/rpcs3/3rdparty/fusion/fusion similarity index 100% rename from 3rdparty/fusion/fusion rename to rpcs3/3rdparty/fusion/fusion diff --git a/3rdparty/fusion/fusion.vcxproj b/rpcs3/3rdparty/fusion/fusion.vcxproj similarity index 100% rename from 3rdparty/fusion/fusion.vcxproj rename to rpcs3/3rdparty/fusion/fusion.vcxproj diff --git a/3rdparty/fusion/fusion.vcxproj.filters b/rpcs3/3rdparty/fusion/fusion.vcxproj.filters similarity index 100% rename from 3rdparty/fusion/fusion.vcxproj.filters rename to rpcs3/3rdparty/fusion/fusion.vcxproj.filters diff --git a/3rdparty/glslang/.gitignore b/rpcs3/3rdparty/glslang/.gitignore similarity index 100% rename from 3rdparty/glslang/.gitignore rename to rpcs3/3rdparty/glslang/.gitignore diff --git a/3rdparty/glslang/CMakeLists.txt b/rpcs3/3rdparty/glslang/CMakeLists.txt similarity index 100% rename from 3rdparty/glslang/CMakeLists.txt rename to rpcs3/3rdparty/glslang/CMakeLists.txt diff --git a/3rdparty/glslang/glslang b/rpcs3/3rdparty/glslang/glslang similarity index 100% rename from 3rdparty/glslang/glslang rename to rpcs3/3rdparty/glslang/glslang diff --git a/3rdparty/glslang/glslang.vcxproj b/rpcs3/3rdparty/glslang/glslang.vcxproj similarity index 100% rename from 3rdparty/glslang/glslang.vcxproj rename to rpcs3/3rdparty/glslang/glslang.vcxproj diff --git a/3rdparty/glslang/glslang.vcxproj.filters b/rpcs3/3rdparty/glslang/glslang.vcxproj.filters similarity index 100% rename from 3rdparty/glslang/glslang.vcxproj.filters rename to rpcs3/3rdparty/glslang/glslang.vcxproj.filters diff --git a/3rdparty/hidapi/CMakeLists.txt b/rpcs3/3rdparty/hidapi/CMakeLists.txt similarity index 100% rename from 3rdparty/hidapi/CMakeLists.txt rename to rpcs3/3rdparty/hidapi/CMakeLists.txt diff --git a/3rdparty/hidapi/hidapi b/rpcs3/3rdparty/hidapi/hidapi similarity index 100% rename from 3rdparty/hidapi/hidapi rename to rpcs3/3rdparty/hidapi/hidapi diff --git a/3rdparty/hidapi/hidapi.vcxproj b/rpcs3/3rdparty/hidapi/hidapi.vcxproj similarity index 100% rename from 3rdparty/hidapi/hidapi.vcxproj rename to rpcs3/3rdparty/hidapi/hidapi.vcxproj diff --git a/3rdparty/hidapi/hidapi.vcxproj.filters b/rpcs3/3rdparty/hidapi/hidapi.vcxproj.filters similarity index 100% rename from 3rdparty/hidapi/hidapi.vcxproj.filters rename to rpcs3/3rdparty/hidapi/hidapi.vcxproj.filters diff --git a/3rdparty/libpng/CMakeLists.txt b/rpcs3/3rdparty/libpng/CMakeLists.txt similarity index 100% rename from 3rdparty/libpng/CMakeLists.txt rename to rpcs3/3rdparty/libpng/CMakeLists.txt diff --git a/3rdparty/libpng/libpng b/rpcs3/3rdparty/libpng/libpng similarity index 100% rename from 3rdparty/libpng/libpng rename to rpcs3/3rdparty/libpng/libpng diff --git a/3rdparty/libpng/libpng.vcxproj b/rpcs3/3rdparty/libpng/libpng.vcxproj similarity index 100% rename from 3rdparty/libpng/libpng.vcxproj rename to rpcs3/3rdparty/libpng/libpng.vcxproj diff --git a/3rdparty/libpng/pnglibconf.vcxproj b/rpcs3/3rdparty/libpng/pnglibconf.vcxproj similarity index 100% rename from 3rdparty/libpng/pnglibconf.vcxproj rename to rpcs3/3rdparty/libpng/pnglibconf.vcxproj diff --git a/3rdparty/libsdl-org/CMakeLists.txt b/rpcs3/3rdparty/libsdl-org/CMakeLists.txt similarity index 100% rename from 3rdparty/libsdl-org/CMakeLists.txt rename to rpcs3/3rdparty/libsdl-org/CMakeLists.txt diff --git a/3rdparty/libsdl-org/SDL b/rpcs3/3rdparty/libsdl-org/SDL similarity index 100% rename from 3rdparty/libsdl-org/SDL rename to rpcs3/3rdparty/libsdl-org/SDL diff --git a/3rdparty/libsdl-org/SDL.vcxproj b/rpcs3/3rdparty/libsdl-org/SDL.vcxproj similarity index 100% rename from 3rdparty/libsdl-org/SDL.vcxproj rename to rpcs3/3rdparty/libsdl-org/SDL.vcxproj diff --git a/3rdparty/libsdl-org/SDL.vcxproj.filters b/rpcs3/3rdparty/libsdl-org/SDL.vcxproj.filters similarity index 100% rename from 3rdparty/libsdl-org/SDL.vcxproj.filters rename to rpcs3/3rdparty/libsdl-org/SDL.vcxproj.filters diff --git a/3rdparty/libusb/CMakeLists.txt b/rpcs3/3rdparty/libusb/CMakeLists.txt similarity index 100% rename from 3rdparty/libusb/CMakeLists.txt rename to rpcs3/3rdparty/libusb/CMakeLists.txt diff --git a/3rdparty/libusb/cmake_modules/FindCoreFoundation.cmake b/rpcs3/3rdparty/libusb/cmake_modules/FindCoreFoundation.cmake similarity index 100% rename from 3rdparty/libusb/cmake_modules/FindCoreFoundation.cmake rename to rpcs3/3rdparty/libusb/cmake_modules/FindCoreFoundation.cmake diff --git a/3rdparty/libusb/cmake_modules/FindIOKit.cmake b/rpcs3/3rdparty/libusb/cmake_modules/FindIOKit.cmake similarity index 100% rename from 3rdparty/libusb/cmake_modules/FindIOKit.cmake rename to rpcs3/3rdparty/libusb/cmake_modules/FindIOKit.cmake diff --git a/3rdparty/libusb/cmake_modules/LibFindMacros.cmake b/rpcs3/3rdparty/libusb/cmake_modules/LibFindMacros.cmake similarity index 100% rename from 3rdparty/libusb/cmake_modules/LibFindMacros.cmake rename to rpcs3/3rdparty/libusb/cmake_modules/LibFindMacros.cmake diff --git a/3rdparty/libusb/config.cmake b/rpcs3/3rdparty/libusb/config.cmake similarity index 100% rename from 3rdparty/libusb/config.cmake rename to rpcs3/3rdparty/libusb/config.cmake diff --git a/3rdparty/libusb/config.h.cmake b/rpcs3/3rdparty/libusb/config.h.cmake similarity index 100% rename from 3rdparty/libusb/config.h.cmake rename to rpcs3/3rdparty/libusb/config.h.cmake diff --git a/3rdparty/libusb/libusb b/rpcs3/3rdparty/libusb/libusb similarity index 100% rename from 3rdparty/libusb/libusb rename to rpcs3/3rdparty/libusb/libusb diff --git a/3rdparty/libusb/libusb-1.0.pc.cmake b/rpcs3/3rdparty/libusb/libusb-1.0.pc.cmake similarity index 100% rename from 3rdparty/libusb/libusb-1.0.pc.cmake rename to rpcs3/3rdparty/libusb/libusb-1.0.pc.cmake diff --git a/3rdparty/libusb/libusb.cmake b/rpcs3/3rdparty/libusb/libusb.cmake similarity index 100% rename from 3rdparty/libusb/libusb.cmake rename to rpcs3/3rdparty/libusb/libusb.cmake diff --git a/3rdparty/libusb/libusb_static.vcxproj b/rpcs3/3rdparty/libusb/libusb_static.vcxproj similarity index 100% rename from 3rdparty/libusb/libusb_static.vcxproj rename to rpcs3/3rdparty/libusb/libusb_static.vcxproj diff --git a/3rdparty/libusb/os.cmake b/rpcs3/3rdparty/libusb/os.cmake similarity index 100% rename from 3rdparty/libusb/os.cmake rename to rpcs3/3rdparty/libusb/os.cmake diff --git a/3rdparty/llvm/CMakeLists.txt b/rpcs3/3rdparty/llvm/CMakeLists.txt similarity index 100% rename from 3rdparty/llvm/CMakeLists.txt rename to rpcs3/3rdparty/llvm/CMakeLists.txt diff --git a/3rdparty/llvm/llvm b/rpcs3/3rdparty/llvm/llvm similarity index 100% rename from 3rdparty/llvm/llvm rename to rpcs3/3rdparty/llvm/llvm diff --git a/3rdparty/llvm/llvm_build.vcxproj b/rpcs3/3rdparty/llvm/llvm_build.vcxproj similarity index 100% rename from 3rdparty/llvm/llvm_build.vcxproj rename to rpcs3/3rdparty/llvm/llvm_build.vcxproj diff --git a/3rdparty/llvm/llvm_build.vcxproj.filters b/rpcs3/3rdparty/llvm/llvm_build.vcxproj.filters similarity index 100% rename from 3rdparty/llvm/llvm_build.vcxproj.filters rename to rpcs3/3rdparty/llvm/llvm_build.vcxproj.filters diff --git a/3rdparty/llvm/llvm_build_clang_cl.vcxproj b/rpcs3/3rdparty/llvm/llvm_build_clang_cl.vcxproj similarity index 100% rename from 3rdparty/llvm/llvm_build_clang_cl.vcxproj rename to rpcs3/3rdparty/llvm/llvm_build_clang_cl.vcxproj diff --git a/3rdparty/llvm/llvm_build_clang_cl.vcxproj.filters b/rpcs3/3rdparty/llvm/llvm_build_clang_cl.vcxproj.filters similarity index 100% rename from 3rdparty/llvm/llvm_build_clang_cl.vcxproj.filters rename to rpcs3/3rdparty/llvm/llvm_build_clang_cl.vcxproj.filters diff --git a/3rdparty/miniupnp/CMakeLists.txt b/rpcs3/3rdparty/miniupnp/CMakeLists.txt similarity index 100% rename from 3rdparty/miniupnp/CMakeLists.txt rename to rpcs3/3rdparty/miniupnp/CMakeLists.txt diff --git a/3rdparty/miniupnp/miniupnp b/rpcs3/3rdparty/miniupnp/miniupnp similarity index 100% rename from 3rdparty/miniupnp/miniupnp rename to rpcs3/3rdparty/miniupnp/miniupnp diff --git a/3rdparty/miniupnp/miniupnpc_static.vcxproj b/rpcs3/3rdparty/miniupnp/miniupnpc_static.vcxproj similarity index 100% rename from 3rdparty/miniupnp/miniupnpc_static.vcxproj rename to rpcs3/3rdparty/miniupnp/miniupnpc_static.vcxproj diff --git a/3rdparty/opencv/CMakeLists.txt b/rpcs3/3rdparty/opencv/CMakeLists.txt similarity index 100% rename from 3rdparty/opencv/CMakeLists.txt rename to rpcs3/3rdparty/opencv/CMakeLists.txt diff --git a/3rdparty/opencv/opencv b/rpcs3/3rdparty/opencv/opencv similarity index 100% rename from 3rdparty/opencv/opencv rename to rpcs3/3rdparty/opencv/opencv diff --git a/3rdparty/pine/pine_server.h b/rpcs3/3rdparty/pine/pine_server.h similarity index 100% rename from 3rdparty/pine/pine_server.h rename to rpcs3/3rdparty/pine/pine_server.h diff --git a/3rdparty/pugixml b/rpcs3/3rdparty/pugixml similarity index 100% rename from 3rdparty/pugixml rename to rpcs3/3rdparty/pugixml diff --git a/3rdparty/qt6.cmake b/rpcs3/3rdparty/qt6.cmake similarity index 100% rename from 3rdparty/qt6.cmake rename to rpcs3/3rdparty/qt6.cmake diff --git a/3rdparty/robin_hood/include/robin_hood.h b/rpcs3/3rdparty/robin_hood/include/robin_hood.h similarity index 100% rename from 3rdparty/robin_hood/include/robin_hood.h rename to rpcs3/3rdparty/robin_hood/include/robin_hood.h diff --git a/3rdparty/rtmidi/CMakeLists.txt b/rpcs3/3rdparty/rtmidi/CMakeLists.txt similarity index 100% rename from 3rdparty/rtmidi/CMakeLists.txt rename to rpcs3/3rdparty/rtmidi/CMakeLists.txt diff --git a/3rdparty/rtmidi/rtmidi b/rpcs3/3rdparty/rtmidi/rtmidi similarity index 100% rename from 3rdparty/rtmidi/rtmidi rename to rpcs3/3rdparty/rtmidi/rtmidi diff --git a/3rdparty/rtmidi/rtmidi.vcxproj b/rpcs3/3rdparty/rtmidi/rtmidi.vcxproj similarity index 100% rename from 3rdparty/rtmidi/rtmidi.vcxproj rename to rpcs3/3rdparty/rtmidi/rtmidi.vcxproj diff --git a/3rdparty/stblib/CMakeLists.txt b/rpcs3/3rdparty/stblib/CMakeLists.txt similarity index 100% rename from 3rdparty/stblib/CMakeLists.txt rename to rpcs3/3rdparty/stblib/CMakeLists.txt diff --git a/3rdparty/stblib/stb b/rpcs3/3rdparty/stblib/stb similarity index 100% rename from 3rdparty/stblib/stb rename to rpcs3/3rdparty/stblib/stb diff --git a/3rdparty/wolfssl/CMakeLists.txt b/rpcs3/3rdparty/wolfssl/CMakeLists.txt similarity index 100% rename from 3rdparty/wolfssl/CMakeLists.txt rename to rpcs3/3rdparty/wolfssl/CMakeLists.txt diff --git a/3rdparty/wolfssl/extra/win32/user_settings.h b/rpcs3/3rdparty/wolfssl/extra/win32/user_settings.h similarity index 100% rename from 3rdparty/wolfssl/extra/win32/user_settings.h rename to rpcs3/3rdparty/wolfssl/extra/win32/user_settings.h diff --git a/3rdparty/wolfssl/wolfssl b/rpcs3/3rdparty/wolfssl/wolfssl similarity index 100% rename from 3rdparty/wolfssl/wolfssl rename to rpcs3/3rdparty/wolfssl/wolfssl diff --git a/3rdparty/wolfssl/wolfssl.vcxproj b/rpcs3/3rdparty/wolfssl/wolfssl.vcxproj similarity index 100% rename from 3rdparty/wolfssl/wolfssl.vcxproj rename to rpcs3/3rdparty/wolfssl/wolfssl.vcxproj diff --git a/3rdparty/yaml-cpp/CMakeLists.txt b/rpcs3/3rdparty/yaml-cpp/CMakeLists.txt similarity index 100% rename from 3rdparty/yaml-cpp/CMakeLists.txt rename to rpcs3/3rdparty/yaml-cpp/CMakeLists.txt diff --git a/3rdparty/yaml-cpp/yaml-cpp b/rpcs3/3rdparty/yaml-cpp/yaml-cpp similarity index 100% rename from 3rdparty/yaml-cpp/yaml-cpp rename to rpcs3/3rdparty/yaml-cpp/yaml-cpp diff --git a/3rdparty/yaml-cpp/yaml-cpp.vcxproj b/rpcs3/3rdparty/yaml-cpp/yaml-cpp.vcxproj similarity index 100% rename from 3rdparty/yaml-cpp/yaml-cpp.vcxproj rename to rpcs3/3rdparty/yaml-cpp/yaml-cpp.vcxproj diff --git a/3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters b/rpcs3/3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters similarity index 100% rename from 3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters rename to rpcs3/3rdparty/yaml-cpp/yaml-cpp.vcxproj.filters diff --git a/3rdparty/zlib/CMakeLists.txt b/rpcs3/3rdparty/zlib/CMakeLists.txt similarity index 100% rename from 3rdparty/zlib/CMakeLists.txt rename to rpcs3/3rdparty/zlib/CMakeLists.txt diff --git a/3rdparty/zlib/zlib b/rpcs3/3rdparty/zlib/zlib similarity index 100% rename from 3rdparty/zlib/zlib rename to rpcs3/3rdparty/zlib/zlib diff --git a/3rdparty/zlib/zlib.props b/rpcs3/3rdparty/zlib/zlib.props similarity index 100% rename from 3rdparty/zlib/zlib.props rename to rpcs3/3rdparty/zlib/zlib.props diff --git a/3rdparty/zlib/zlib.vcxproj b/rpcs3/3rdparty/zlib/zlib.vcxproj similarity index 100% rename from 3rdparty/zlib/zlib.vcxproj rename to rpcs3/3rdparty/zlib/zlib.vcxproj diff --git a/3rdparty/zstd/CMakeLists.txt b/rpcs3/3rdparty/zstd/CMakeLists.txt similarity index 100% rename from 3rdparty/zstd/CMakeLists.txt rename to rpcs3/3rdparty/zstd/CMakeLists.txt diff --git a/3rdparty/zstd/zstd b/rpcs3/3rdparty/zstd/zstd similarity index 100% rename from 3rdparty/zstd/zstd rename to rpcs3/3rdparty/zstd/zstd diff --git a/3rdparty/zstd/zstd.rc b/rpcs3/3rdparty/zstd/zstd.rc similarity index 100% rename from 3rdparty/zstd/zstd.rc rename to rpcs3/3rdparty/zstd/zstd.rc diff --git a/3rdparty/zstd/zstd.vcxproj b/rpcs3/3rdparty/zstd/zstd.vcxproj similarity index 100% rename from 3rdparty/zstd/zstd.vcxproj rename to rpcs3/3rdparty/zstd/zstd.vcxproj diff --git a/BUILDING.md b/rpcs3/BUILDING.md similarity index 100% rename from BUILDING.md rename to rpcs3/BUILDING.md diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index b6d4baecc..40f48a6d5 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -1,203 +1,149 @@ -# Define GNU standard installation directories -include(GNUInstallDirs) +cmake_minimum_required(VERSION 3.28) -# Generate git-version.h at build time. -include(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake) +project(rpcs3 LANGUAGES C CXX) -# Check for a sufficient compiler and set build options -include(ConfigureCompiler) -include(CheckFunctionExists) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_CXX_STANDARD 20) - -set(ADDITIONAL_LIBS "") -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - #on some Linux distros shm_unlink and similar functions are in librt only - set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "rt") -elseif(NOT WIN32 AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG") - #it seems like glibc includes the iconv functions we use but other libc - #implementations like the one on OSX don't seem implement them - set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv") -endif() - -if(UNIX AND NOT APPLE AND NOT ANDROID) - add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/rpcs3") - # Optionally enable X11 for window management - find_package(X11) - if(X11_FOUND) - add_definitions(-DHAVE_X11) +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11) + message(FATAL_ERROR "RPCS3 requires at least gcc-11.") endif() - find_package(Wayland) - if(WAYLAND_FOUND) - add_definitions(-DHAVE_WAYLAND) +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0) + message(FATAL_ERROR "RPCS3 requires at least clang-12.0.") endif() endif() -if (NOT ANDROID) - # Qt - # finds Qt libraries and setups custom commands for MOC and UIC - # Must be done here because generated MOC and UIC targets cant - # be found otherwise - include(${CMAKE_SOURCE_DIR}/3rdparty/qt6.cmake) +option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON) +option(WITH_LLVM "Enable usage of LLVM library" ON) +option(BUILD_LLVM "Build LLVM from git submodule" OFF) +option(STATIC_LINK_LLVM "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." OFF) +option(USE_FAUDIO "FAudio audio backend" ON) +option(USE_LIBEVDEV "libevdev-based joystick support" ON) +option(USE_DISCORD_RPC "Discord rich presence integration" OFF) +option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON) +option(USE_VULKAN "Vulkan render backend" ON) +option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF) +option(USE_SDL "Enables SDL input handler" OFF) +option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON) +option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF) +option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON) +option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON) +option(USE_SYSTEM_OPENCV "Prefer system OpenCV instead of the builtin one" ON) +option(HAS_MEMORY_BREAKPOINTS "Add support for memory breakpoints to the interpreter" OFF) +option(USE_LTO "Use LTO for building" ON) + +set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/buildfiles/cmake") + +include(CheckCXXCompilerFlag) + +get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTI_CONFIG) + # TODO(cjj19970505@live.cn) + # Currently DicordRPC is included as a binary compiled with /MT flag. + # We need all 4 binaries(/MT /MTd /MD /MDd) or including the source instead of binary. + set(USE_DISCORD_RPC OFF CACHE BOOL "Discord RPC is only avaliable with single-config generator" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE) + message(STATUS "No build type selected, default to Release") + set(CMAKE_BUILD_TYPE "Release") + endif() endif() -# subdirectories -add_subdirectory(Emu) - -if (NOT ANDROID) - add_subdirectory(rpcs3qt) +if(CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT MSVC) + add_compile_definitions(_DEBUG) endif() -gen_git_version(${CMAKE_CURRENT_SOURCE_DIR}) +if(MSVC) + option(USE_MSVC_STATIC_CRT "Use static MSVC C runtime" OFF) -if (NOT ANDROID) - if(WIN32) - add_executable(rpcs3 WIN32) - target_sources(rpcs3 PRIVATE rpcs3.rc) - target_compile_definitions(rpcs3 PRIVATE UNICODE _UNICODE) - elseif(APPLE) - add_executable(rpcs3 MACOSX_BUNDLE) - target_sources(rpcs3 PRIVATE rpcs3.icns update_helper.sh) - set_source_files_properties(update_helper.sh PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - set_target_properties(rpcs3 - PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.plist.in") - else() - add_executable(rpcs3) - endif() - - target_sources(rpcs3 - PRIVATE - display_sleep_control.cpp - headless_application.cpp - main.cpp - main_application.cpp - module_verifier.cpp - rpcs3_version.cpp - stb_image.cpp - stdafx.cpp - - Input/basic_keyboard_handler.cpp - Input/basic_mouse_handler.cpp - Input/ds3_pad_handler.cpp - Input/ds4_pad_handler.cpp - Input/dualsense_pad_handler.cpp - Input/evdev_joystick_handler.cpp - Input/evdev_gun_handler.cpp - Input/gui_pad_thread.cpp - Input/hid_pad_handler.cpp - Input/keyboard_pad_handler.cpp - Input/mm_joystick_handler.cpp - Input/pad_thread.cpp - Input/product_info.cpp - Input/ps_move_calibration.cpp - Input/ps_move_config.cpp - Input/ps_move_handler.cpp - Input/ps_move_tracker.cpp - Input/raw_mouse_config.cpp - Input/raw_mouse_handler.cpp - Input/sdl_pad_handler.cpp - Input/skateboard_pad_handler.cpp - Input/xinput_pad_handler.cpp - ) - - set_target_properties(rpcs3 - PROPERTIES - AUTOMOC ON - AUTOUIC ON) - - target_link_libraries(rpcs3 - PRIVATE - rpcs3_emu - rpcs3_ui - 3rdparty::discordRPC - 3rdparty::qt6 - 3rdparty::hidapi - 3rdparty::libusb - 3rdparty::wolfssl - 3rdparty::libcurl - 3rdparty::zlib - 3rdparty::opencv - 3rdparty::fusion - ${ADDITIONAL_LIBS}) - - # Unix display manager - if(X11_FOUND) - target_link_libraries(rpcs3 PRIVATE X11::X11) - elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE AND NOT ANDROID) - # Wayland has been checked in 3rdparty/CMakeLists.txt already. - message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.") - endif() - - if(UNIX) - set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - find_package(Threads REQUIRED) - target_link_libraries(rpcs3 PRIVATE Threads::Threads) - endif() - - if(WIN32) - target_link_libraries(rpcs3 PRIVATE bcrypt ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi pdh) - else() - target_link_libraries(rpcs3 PRIVATE ${CMAKE_DL_LIBS}) - endif() - - if(USE_PRECOMPILED_HEADERS) - target_precompile_headers(rpcs3 PRIVATE stdafx.h) - endif() - - - # Copy icons to executable directory - if(APPLE) - if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo") - set(QT_DEPLOY_FLAGS "-no-strip") - else() - set(QT_DEPLOY_FLAGS "") + # TODO(cjj19970505@live.cn) + # DiscordRPC binary in 3rdparty is compiled /MT + # So theoretically we should enable DiscordRPC in Release and static CRT build + # since we might encounter some rumtime issues when more than one CRT version are presented. + # https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-160#what-problems-exist-if-an-application-uses-more-than-one-crt-version + # Add other DiscordRPC binaries(compiled with /MTd, /MD, /MDd) or compile it from source may address this issue. + if(NOT IS_MULTI_CONFIG) + if(NOT(CMAKE_BUILD_TYPE MATCHES "Release" AND USE_MSVC_STATIC_CRT)) + set(USE_DISCORD_RPC OFF CACHE BOOL "Discord RPC is only available in Release and static CRT build." FORCE) endif() - qt_finalize_target(rpcs3) - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.icns $/../Resources/rpcs3.icns - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/../Resources/Icons - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/../Resources/GuiConfigs - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/../Resources/git - COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app" "${QT_DEPLOY_FLAGS}") - elseif(UNIX) - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git) - elseif(WIN32) - add_custom_command(TARGET rpcs3 POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $ $ - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git - COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt - --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import - --plugindir "$,$/plugins,$/share/qt6/plugins>" - --verbose 0 "$") endif() - # Unix installation - if(UNIX AND NOT APPLE) - # Install the binary - install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - # Install the application icon and menu item - install(FILES rpcs3.svg - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps) - install(FILES rpcs3.png - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps) - install(FILES rpcs3.desktop - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) - install(FILES rpcs3.metainfo.xml - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) - # Install other files - install(DIRECTORY ../bin/Icons - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) - install(DIRECTORY ../bin/GuiConfigs - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) - install(DIRECTORY ../bin/git - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) - install(DIRECTORY ../bin/test - DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + if(USE_MSVC_STATIC_CRT) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + else() + # though doc ( https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html ) + # says if that property is not set then CMake uses the default value MultiThreaded$<$:Debug>DLL + # to select a MSVC runtime library. + # But yaml-cpp set /MT(d) if CMAKE_MSVC_RUNTIME_LIBRARY is undefined + # So we have to define it explicitly + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") + endif() + + # TODO(cjj19970505@live.cn) + # offical QT uses dynamic CRT. + # When building our lib with static CRT and debug build type + # and linking with Qt with dynamic CRT and debug build, + # error is encountered in runtime (which is expected). + # But building our lib with static CRT and release build type, + # and linking with Qt with dynamic CRT and release build seems to be working, + # which is the same config with VS solution. + # (though technically it might still have some hidden errors). + # So we allow static CRT in both relase and debug build, but prompt warning in debug build. + # For more info: + # https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-library-features?view=msvc-160#what-problems-exist-if-an-application-uses-more-than-one-crt-version + # https://wiki.qt.io/Technical_FAQ#Why_does_a_statically_built_Qt_use_the_dynamic_Visual_Studio_runtime_libraries_.3F_Do_I_need_to_deploy_those_with_my_application_.3F + if(USE_MSVC_STATIC_CRT) + if(IS_MULTI_CONFIG OR CMAKE_BUILD_TYPE MATCHES "Debug") + message(AUTHOR_WARNING "Debug build currently can not work with static CRT.") + endif() + endif() + add_compile_options(/MP) +endif() + +if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8) + message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." ) +endif() + +find_program(CCACHE_FOUND ccache) +if(CCACHE_FOUND) + set(CMAKE_CXX_COMPILER_LAUNCHER ccache) +endif() + +if(APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") + include_directories(/opt/homebrew/include) + link_directories(/opt/homebrew/lib) +endif() + +if(MSVC) + add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled +endif() + +add_subdirectory(3rdparty) + +if (DISABLE_LTO) + if (CMAKE_C_FLAGS) + string(REGEX REPLACE "-flto[^ ]*" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) + endif() + if (CMAKE_CXX_FLAGS) + string(REGEX REPLACE "-flto[^ ]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) endif() endif() + +string(FIND "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}" "-flto" FOUND_LTO) +if (NOT FOUND_LTO EQUAL -1) + message(FATAL_ERROR "RPCS3 doesn't support building with LTO, use -DDISABLE_LTO=TRUE to force-disable it") +endif() + +if(NOT WIN32) + add_compile_options(-pthread) +endif() + +# TODO: do real installation, including copying directory structure +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_BINARY_DIR}/bin") + +add_subdirectory(rpcs3) + +set_directory_properties(PROPERTIES VS_STARTUP_PROJECT rpcs3) diff --git a/CMakePresets.json b/rpcs3/CMakePresets.json similarity index 100% rename from CMakePresets.json rename to rpcs3/CMakePresets.json diff --git a/LICENSE b/rpcs3/LICENSE similarity index 100% rename from LICENSE rename to rpcs3/LICENSE diff --git a/README.md b/rpcs3/README.md similarity index 100% rename from README.md rename to rpcs3/README.md diff --git a/Utilities/BitField.h b/rpcs3/Utilities/BitField.h similarity index 100% rename from Utilities/BitField.h rename to rpcs3/Utilities/BitField.h diff --git a/Utilities/CRC.h b/rpcs3/Utilities/CRC.h similarity index 100% rename from Utilities/CRC.h rename to rpcs3/Utilities/CRC.h diff --git a/Utilities/Config.cpp b/rpcs3/Utilities/Config.cpp similarity index 100% rename from Utilities/Config.cpp rename to rpcs3/Utilities/Config.cpp diff --git a/Utilities/Config.h b/rpcs3/Utilities/Config.h similarity index 100% rename from Utilities/Config.h rename to rpcs3/Utilities/Config.h diff --git a/Utilities/File.cpp b/rpcs3/Utilities/File.cpp similarity index 100% rename from Utilities/File.cpp rename to rpcs3/Utilities/File.cpp diff --git a/Utilities/File.h b/rpcs3/Utilities/File.h similarity index 100% rename from Utilities/File.h rename to rpcs3/Utilities/File.h diff --git a/Utilities/JIT.h b/rpcs3/Utilities/JIT.h similarity index 100% rename from Utilities/JIT.h rename to rpcs3/Utilities/JIT.h diff --git a/Utilities/JITASM.cpp b/rpcs3/Utilities/JITASM.cpp similarity index 100% rename from Utilities/JITASM.cpp rename to rpcs3/Utilities/JITASM.cpp diff --git a/Utilities/JITLLVM.cpp b/rpcs3/Utilities/JITLLVM.cpp similarity index 100% rename from Utilities/JITLLVM.cpp rename to rpcs3/Utilities/JITLLVM.cpp diff --git a/Utilities/LUrlParser.cpp b/rpcs3/Utilities/LUrlParser.cpp similarity index 100% rename from Utilities/LUrlParser.cpp rename to rpcs3/Utilities/LUrlParser.cpp diff --git a/Utilities/LUrlParser.h b/rpcs3/Utilities/LUrlParser.h similarity index 100% rename from Utilities/LUrlParser.h rename to rpcs3/Utilities/LUrlParser.h diff --git a/Utilities/StrFmt.cpp b/rpcs3/Utilities/StrFmt.cpp similarity index 100% rename from Utilities/StrFmt.cpp rename to rpcs3/Utilities/StrFmt.cpp diff --git a/Utilities/StrFmt.h b/rpcs3/Utilities/StrFmt.h similarity index 100% rename from Utilities/StrFmt.h rename to rpcs3/Utilities/StrFmt.h diff --git a/Utilities/StrUtil.h b/rpcs3/Utilities/StrUtil.h similarity index 100% rename from Utilities/StrUtil.h rename to rpcs3/Utilities/StrUtil.h diff --git a/Utilities/Thread.cpp b/rpcs3/Utilities/Thread.cpp similarity index 100% rename from Utilities/Thread.cpp rename to rpcs3/Utilities/Thread.cpp diff --git a/Utilities/Thread.h b/rpcs3/Utilities/Thread.h similarity index 100% rename from Utilities/Thread.h rename to rpcs3/Utilities/Thread.h diff --git a/Utilities/Timer.h b/rpcs3/Utilities/Timer.h similarity index 100% rename from Utilities/Timer.h rename to rpcs3/Utilities/Timer.h diff --git a/Utilities/address_range.h b/rpcs3/Utilities/address_range.h similarity index 100% rename from Utilities/address_range.h rename to rpcs3/Utilities/address_range.h diff --git a/Utilities/bin_patch.cpp b/rpcs3/Utilities/bin_patch.cpp similarity index 100% rename from Utilities/bin_patch.cpp rename to rpcs3/Utilities/bin_patch.cpp diff --git a/Utilities/bin_patch.h b/rpcs3/Utilities/bin_patch.h similarity index 100% rename from Utilities/bin_patch.h rename to rpcs3/Utilities/bin_patch.h diff --git a/Utilities/bit_set.h b/rpcs3/Utilities/bit_set.h similarity index 100% rename from Utilities/bit_set.h rename to rpcs3/Utilities/bit_set.h diff --git a/Utilities/cfmt.h b/rpcs3/Utilities/cfmt.h similarity index 100% rename from Utilities/cfmt.h rename to rpcs3/Utilities/cfmt.h diff --git a/Utilities/cheat_info.cpp b/rpcs3/Utilities/cheat_info.cpp similarity index 100% rename from Utilities/cheat_info.cpp rename to rpcs3/Utilities/cheat_info.cpp diff --git a/Utilities/cheat_info.h b/rpcs3/Utilities/cheat_info.h similarity index 100% rename from Utilities/cheat_info.h rename to rpcs3/Utilities/cheat_info.h diff --git a/Utilities/cond.cpp b/rpcs3/Utilities/cond.cpp similarity index 100% rename from Utilities/cond.cpp rename to rpcs3/Utilities/cond.cpp diff --git a/Utilities/cond.h b/rpcs3/Utilities/cond.h similarity index 100% rename from Utilities/cond.h rename to rpcs3/Utilities/cond.h diff --git a/Utilities/date_time.cpp b/rpcs3/Utilities/date_time.cpp similarity index 100% rename from Utilities/date_time.cpp rename to rpcs3/Utilities/date_time.cpp diff --git a/Utilities/date_time.h b/rpcs3/Utilities/date_time.h similarity index 100% rename from Utilities/date_time.h rename to rpcs3/Utilities/date_time.h diff --git a/Utilities/geometry.h b/rpcs3/Utilities/geometry.h similarity index 100% rename from Utilities/geometry.h rename to rpcs3/Utilities/geometry.h diff --git a/Utilities/git-version-gen.cmd b/rpcs3/Utilities/git-version-gen.cmd similarity index 100% rename from Utilities/git-version-gen.cmd rename to rpcs3/Utilities/git-version-gen.cmd diff --git a/Utilities/lockless.h b/rpcs3/Utilities/lockless.h similarity index 100% rename from Utilities/lockless.h rename to rpcs3/Utilities/lockless.h diff --git a/Utilities/mutex.cpp b/rpcs3/Utilities/mutex.cpp similarity index 100% rename from Utilities/mutex.cpp rename to rpcs3/Utilities/mutex.cpp diff --git a/Utilities/mutex.h b/rpcs3/Utilities/mutex.h similarity index 100% rename from Utilities/mutex.h rename to rpcs3/Utilities/mutex.h diff --git a/Utilities/ppu_patch.h b/rpcs3/Utilities/ppu_patch.h similarity index 100% rename from Utilities/ppu_patch.h rename to rpcs3/Utilities/ppu_patch.h diff --git a/Utilities/rXml.cpp b/rpcs3/Utilities/rXml.cpp similarity index 100% rename from Utilities/rXml.cpp rename to rpcs3/Utilities/rXml.cpp diff --git a/Utilities/rXml.h b/rpcs3/Utilities/rXml.h similarity index 100% rename from Utilities/rXml.h rename to rpcs3/Utilities/rXml.h diff --git a/Utilities/sema.cpp b/rpcs3/Utilities/sema.cpp similarity index 100% rename from Utilities/sema.cpp rename to rpcs3/Utilities/sema.cpp diff --git a/Utilities/sema.h b/rpcs3/Utilities/sema.h similarity index 100% rename from Utilities/sema.h rename to rpcs3/Utilities/sema.h diff --git a/Utilities/simple_ringbuf.cpp b/rpcs3/Utilities/simple_ringbuf.cpp similarity index 100% rename from Utilities/simple_ringbuf.cpp rename to rpcs3/Utilities/simple_ringbuf.cpp diff --git a/Utilities/simple_ringbuf.h b/rpcs3/Utilities/simple_ringbuf.h similarity index 100% rename from Utilities/simple_ringbuf.h rename to rpcs3/Utilities/simple_ringbuf.h diff --git a/Utilities/stack_trace.cpp b/rpcs3/Utilities/stack_trace.cpp similarity index 100% rename from Utilities/stack_trace.cpp rename to rpcs3/Utilities/stack_trace.cpp diff --git a/Utilities/stack_trace.h b/rpcs3/Utilities/stack_trace.h similarity index 100% rename from Utilities/stack_trace.h rename to rpcs3/Utilities/stack_trace.h diff --git a/Utilities/sync.h b/rpcs3/Utilities/sync.h similarity index 100% rename from Utilities/sync.h rename to rpcs3/Utilities/sync.h diff --git a/Utilities/transactional_storage.h b/rpcs3/Utilities/transactional_storage.h similarity index 100% rename from Utilities/transactional_storage.h rename to rpcs3/Utilities/transactional_storage.h diff --git a/Utilities/version.cpp b/rpcs3/Utilities/version.cpp similarity index 100% rename from Utilities/version.cpp rename to rpcs3/Utilities/version.cpp diff --git a/Utilities/version.h b/rpcs3/Utilities/version.h similarity index 100% rename from Utilities/version.h rename to rpcs3/Utilities/version.h diff --git a/azure-pipelines.yml b/rpcs3/azure-pipelines.yml similarity index 100% rename from azure-pipelines.yml rename to rpcs3/azure-pipelines.yml diff --git a/bin/GuiConfigs/Classic (Bright).qss b/rpcs3/bin/GuiConfigs/Classic (Bright).qss similarity index 100% rename from bin/GuiConfigs/Classic (Bright).qss rename to rpcs3/bin/GuiConfigs/Classic (Bright).qss diff --git a/bin/GuiConfigs/Darker Style by TheMitoSan.qss b/rpcs3/bin/GuiConfigs/Darker Style by TheMitoSan.qss similarity index 100% rename from bin/GuiConfigs/Darker Style by TheMitoSan.qss rename to rpcs3/bin/GuiConfigs/Darker Style by TheMitoSan.qss diff --git a/bin/GuiConfigs/Envy.qss b/rpcs3/bin/GuiConfigs/Envy.qss similarity index 100% rename from bin/GuiConfigs/Envy.qss rename to rpcs3/bin/GuiConfigs/Envy.qss diff --git a/bin/GuiConfigs/Kuroi (Dark) by Ani.qss b/rpcs3/bin/GuiConfigs/Kuroi (Dark) by Ani.qss similarity index 100% rename from bin/GuiConfigs/Kuroi (Dark) by Ani.qss rename to rpcs3/bin/GuiConfigs/Kuroi (Dark) by Ani.qss diff --git a/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss b/rpcs3/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss similarity index 100% rename from bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss rename to rpcs3/bin/GuiConfigs/ModernBlue Theme by TheMitoSan.qss diff --git a/bin/GuiConfigs/Nekotekina by GooseWing.qss b/rpcs3/bin/GuiConfigs/Nekotekina by GooseWing.qss similarity index 100% rename from bin/GuiConfigs/Nekotekina by GooseWing.qss rename to rpcs3/bin/GuiConfigs/Nekotekina by GooseWing.qss diff --git a/bin/GuiConfigs/Skyline (Nightfall).qss b/rpcs3/bin/GuiConfigs/Skyline (Nightfall).qss similarity index 100% rename from bin/GuiConfigs/Skyline (Nightfall).qss rename to rpcs3/bin/GuiConfigs/Skyline (Nightfall).qss diff --git a/bin/GuiConfigs/Skyline.qss b/rpcs3/bin/GuiConfigs/Skyline.qss similarity index 100% rename from bin/GuiConfigs/Skyline.qss rename to rpcs3/bin/GuiConfigs/Skyline.qss diff --git a/bin/GuiConfigs/YoRHa by Ani.qss b/rpcs3/bin/GuiConfigs/YoRHa by Ani.qss similarity index 100% rename from bin/GuiConfigs/YoRHa by Ani.qss rename to rpcs3/bin/GuiConfigs/YoRHa by Ani.qss diff --git a/bin/GuiConfigs/YoRHa-background.jpg b/rpcs3/bin/GuiConfigs/YoRHa-background.jpg similarity index 100% rename from bin/GuiConfigs/YoRHa-background.jpg rename to rpcs3/bin/GuiConfigs/YoRHa-background.jpg diff --git a/bin/GuiConfigs/check_mark_white.png b/rpcs3/bin/GuiConfigs/check_mark_white.png similarity index 100% rename from bin/GuiConfigs/check_mark_white.png rename to rpcs3/bin/GuiConfigs/check_mark_white.png diff --git a/bin/GuiConfigs/kot-bg.jpg b/rpcs3/bin/GuiConfigs/kot-bg.jpg similarity index 100% rename from bin/GuiConfigs/kot-bg.jpg rename to rpcs3/bin/GuiConfigs/kot-bg.jpg diff --git a/bin/GuiConfigs/list_arrow_blue.png b/rpcs3/bin/GuiConfigs/list_arrow_blue.png similarity index 100% rename from bin/GuiConfigs/list_arrow_blue.png rename to rpcs3/bin/GuiConfigs/list_arrow_blue.png diff --git a/bin/GuiConfigs/list_arrow_down_blue.png b/rpcs3/bin/GuiConfigs/list_arrow_down_blue.png similarity index 100% rename from bin/GuiConfigs/list_arrow_down_blue.png rename to rpcs3/bin/GuiConfigs/list_arrow_down_blue.png diff --git a/bin/GuiConfigs/list_arrow_down_green.png b/rpcs3/bin/GuiConfigs/list_arrow_down_green.png similarity index 100% rename from bin/GuiConfigs/list_arrow_down_green.png rename to rpcs3/bin/GuiConfigs/list_arrow_down_green.png diff --git a/bin/GuiConfigs/list_arrow_down_white.png b/rpcs3/bin/GuiConfigs/list_arrow_down_white.png similarity index 100% rename from bin/GuiConfigs/list_arrow_down_white.png rename to rpcs3/bin/GuiConfigs/list_arrow_down_white.png diff --git a/bin/GuiConfigs/list_arrow_green.png b/rpcs3/bin/GuiConfigs/list_arrow_green.png similarity index 100% rename from bin/GuiConfigs/list_arrow_green.png rename to rpcs3/bin/GuiConfigs/list_arrow_green.png diff --git a/bin/GuiConfigs/list_arrow_white.png b/rpcs3/bin/GuiConfigs/list_arrow_white.png similarity index 100% rename from bin/GuiConfigs/list_arrow_white.png rename to rpcs3/bin/GuiConfigs/list_arrow_white.png diff --git a/bin/Icons/ui/L1.png b/rpcs3/bin/Icons/ui/L1.png similarity index 100% rename from bin/Icons/ui/L1.png rename to rpcs3/bin/Icons/ui/L1.png diff --git a/bin/Icons/ui/L2.png b/rpcs3/bin/Icons/ui/L2.png similarity index 100% rename from bin/Icons/ui/L2.png rename to rpcs3/bin/Icons/ui/L2.png diff --git a/bin/Icons/ui/R1.png b/rpcs3/bin/Icons/ui/R1.png similarity index 100% rename from bin/Icons/ui/R1.png rename to rpcs3/bin/Icons/ui/R1.png diff --git a/bin/Icons/ui/R2.png b/rpcs3/bin/Icons/ui/R2.png similarity index 100% rename from bin/Icons/ui/R2.png rename to rpcs3/bin/Icons/ui/R2.png diff --git a/bin/Icons/ui/circle.png b/rpcs3/bin/Icons/ui/circle.png similarity index 100% rename from bin/Icons/ui/circle.png rename to rpcs3/bin/Icons/ui/circle.png diff --git a/bin/Icons/ui/cross.png b/rpcs3/bin/Icons/ui/cross.png similarity index 100% rename from bin/Icons/ui/cross.png rename to rpcs3/bin/Icons/ui/cross.png diff --git a/bin/Icons/ui/dpad.png b/rpcs3/bin/Icons/ui/dpad.png similarity index 100% rename from bin/Icons/ui/dpad.png rename to rpcs3/bin/Icons/ui/dpad.png diff --git a/bin/Icons/ui/dpad_down.png b/rpcs3/bin/Icons/ui/dpad_down.png similarity index 100% rename from bin/Icons/ui/dpad_down.png rename to rpcs3/bin/Icons/ui/dpad_down.png diff --git a/bin/Icons/ui/dpad_left.png b/rpcs3/bin/Icons/ui/dpad_left.png similarity index 100% rename from bin/Icons/ui/dpad_left.png rename to rpcs3/bin/Icons/ui/dpad_left.png diff --git a/bin/Icons/ui/dpad_right.png b/rpcs3/bin/Icons/ui/dpad_right.png similarity index 100% rename from bin/Icons/ui/dpad_right.png rename to rpcs3/bin/Icons/ui/dpad_right.png diff --git a/bin/Icons/ui/dpad_up.png b/rpcs3/bin/Icons/ui/dpad_up.png similarity index 100% rename from bin/Icons/ui/dpad_up.png rename to rpcs3/bin/Icons/ui/dpad_up.png diff --git a/bin/Icons/ui/fade_bottom.png b/rpcs3/bin/Icons/ui/fade_bottom.png similarity index 100% rename from bin/Icons/ui/fade_bottom.png rename to rpcs3/bin/Icons/ui/fade_bottom.png diff --git a/bin/Icons/ui/fade_top.png b/rpcs3/bin/Icons/ui/fade_top.png similarity index 100% rename from bin/Icons/ui/fade_top.png rename to rpcs3/bin/Icons/ui/fade_top.png diff --git a/bin/Icons/ui/left_stick.png b/rpcs3/bin/Icons/ui/left_stick.png similarity index 100% rename from bin/Icons/ui/left_stick.png rename to rpcs3/bin/Icons/ui/left_stick.png diff --git a/bin/Icons/ui/new.png b/rpcs3/bin/Icons/ui/new.png similarity index 100% rename from bin/Icons/ui/new.png rename to rpcs3/bin/Icons/ui/new.png diff --git a/bin/Icons/ui/right_stick.png b/rpcs3/bin/Icons/ui/right_stick.png similarity index 100% rename from bin/Icons/ui/right_stick.png rename to rpcs3/bin/Icons/ui/right_stick.png diff --git a/bin/Icons/ui/save.png b/rpcs3/bin/Icons/ui/save.png similarity index 100% rename from bin/Icons/ui/save.png rename to rpcs3/bin/Icons/ui/save.png diff --git a/bin/Icons/ui/select.png b/rpcs3/bin/Icons/ui/select.png similarity index 100% rename from bin/Icons/ui/select.png rename to rpcs3/bin/Icons/ui/select.png diff --git a/bin/Icons/ui/spinner-24.png b/rpcs3/bin/Icons/ui/spinner-24.png similarity index 100% rename from bin/Icons/ui/spinner-24.png rename to rpcs3/bin/Icons/ui/spinner-24.png diff --git a/bin/Icons/ui/square.png b/rpcs3/bin/Icons/ui/square.png similarity index 100% rename from bin/Icons/ui/square.png rename to rpcs3/bin/Icons/ui/square.png diff --git a/bin/Icons/ui/start.png b/rpcs3/bin/Icons/ui/start.png similarity index 100% rename from bin/Icons/ui/start.png rename to rpcs3/bin/Icons/ui/start.png diff --git a/bin/Icons/ui/triangle.png b/rpcs3/bin/Icons/ui/triangle.png similarity index 100% rename from bin/Icons/ui/triangle.png rename to rpcs3/bin/Icons/ui/triangle.png diff --git a/bin/git/README.md b/rpcs3/bin/git/README.md similarity index 100% rename from bin/git/README.md rename to rpcs3/bin/git/README.md diff --git a/bin/git/commits.lst b/rpcs3/bin/git/commits.lst similarity index 100% rename from bin/git/commits.lst rename to rpcs3/bin/git/commits.lst diff --git a/bin/test/dump_stack.elf b/rpcs3/bin/test/dump_stack.elf similarity index 100% rename from bin/test/dump_stack.elf rename to rpcs3/bin/test/dump_stack.elf diff --git a/bin/test/gs_gcm_basic_triangle.elf b/rpcs3/bin/test/gs_gcm_basic_triangle.elf similarity index 100% rename from bin/test/gs_gcm_basic_triangle.elf rename to rpcs3/bin/test/gs_gcm_basic_triangle.elf diff --git a/bin/test/gs_gcm_cube.elf b/rpcs3/bin/test/gs_gcm_cube.elf similarity index 100% rename from bin/test/gs_gcm_cube.elf rename to rpcs3/bin/test/gs_gcm_cube.elf diff --git a/bin/test/gs_gcm_handle_system_cmd.elf b/rpcs3/bin/test/gs_gcm_handle_system_cmd.elf similarity index 100% rename from bin/test/gs_gcm_handle_system_cmd.elf rename to rpcs3/bin/test/gs_gcm_handle_system_cmd.elf diff --git a/bin/test/gs_gcm_hello_world.elf b/rpcs3/bin/test/gs_gcm_hello_world.elf similarity index 100% rename from bin/test/gs_gcm_hello_world.elf rename to rpcs3/bin/test/gs_gcm_hello_world.elf diff --git a/bin/test/gs_gcm_tetris.elf b/rpcs3/bin/test/gs_gcm_tetris.elf similarity index 100% rename from bin/test/gs_gcm_tetris.elf rename to rpcs3/bin/test/gs_gcm_tetris.elf diff --git a/bin/test/pad_test.elf b/rpcs3/bin/test/pad_test.elf similarity index 100% rename from bin/test/pad_test.elf rename to rpcs3/bin/test/pad_test.elf diff --git a/bin/test/ppu_thread.elf b/rpcs3/bin/test/ppu_thread.elf similarity index 100% rename from bin/test/ppu_thread.elf rename to rpcs3/bin/test/ppu_thread.elf diff --git a/bin/test/pspgame.elf b/rpcs3/bin/test/pspgame.elf similarity index 100% rename from bin/test/pspgame.elf rename to rpcs3/bin/test/pspgame.elf diff --git a/bin/test/rpcsp.elf b/rpcs3/bin/test/rpcsp.elf similarity index 100% rename from bin/test/rpcsp.elf rename to rpcs3/bin/test/rpcsp.elf diff --git a/bin/test/spurs_test.self b/rpcs3/bin/test/spurs_test.self similarity index 100% rename from bin/test/spurs_test.self rename to rpcs3/bin/test/spurs_test.self diff --git a/buildfiles/cmake/ConfigureCompiler.cmake b/rpcs3/buildfiles/cmake/ConfigureCompiler.cmake similarity index 100% rename from buildfiles/cmake/ConfigureCompiler.cmake rename to rpcs3/buildfiles/cmake/ConfigureCompiler.cmake diff --git a/buildfiles/cmake/FindFFMPEG.cmake b/rpcs3/buildfiles/cmake/FindFFMPEG.cmake similarity index 100% rename from buildfiles/cmake/FindFFMPEG.cmake rename to rpcs3/buildfiles/cmake/FindFFMPEG.cmake diff --git a/buildfiles/cmake/FindWayland.cmake b/rpcs3/buildfiles/cmake/FindWayland.cmake similarity index 100% rename from buildfiles/cmake/FindWayland.cmake rename to rpcs3/buildfiles/cmake/FindWayland.cmake diff --git a/buildfiles/cmake/FindWolfSSL.cmake b/rpcs3/buildfiles/cmake/FindWolfSSL.cmake similarity index 100% rename from buildfiles/cmake/FindWolfSSL.cmake rename to rpcs3/buildfiles/cmake/FindWolfSSL.cmake diff --git a/buildfiles/cmake/FindZLIB.cmake b/rpcs3/buildfiles/cmake/FindZLIB.cmake similarity index 100% rename from buildfiles/cmake/FindZLIB.cmake rename to rpcs3/buildfiles/cmake/FindZLIB.cmake diff --git a/buildfiles/cmake/TCDarwinARM64.cmake b/rpcs3/buildfiles/cmake/TCDarwinARM64.cmake similarity index 100% rename from buildfiles/cmake/TCDarwinARM64.cmake rename to rpcs3/buildfiles/cmake/TCDarwinARM64.cmake diff --git a/buildfiles/msvc/ci_only.targets b/rpcs3/buildfiles/msvc/ci_only.targets similarity index 100% rename from buildfiles/msvc/ci_only.targets rename to rpcs3/buildfiles/msvc/ci_only.targets diff --git a/buildfiles/msvc/common_default.props b/rpcs3/buildfiles/msvc/common_default.props similarity index 100% rename from buildfiles/msvc/common_default.props rename to rpcs3/buildfiles/msvc/common_default.props diff --git a/buildfiles/msvc/common_default_clang_cl.props b/rpcs3/buildfiles/msvc/common_default_clang_cl.props similarity index 100% rename from buildfiles/msvc/common_default_clang_cl.props rename to rpcs3/buildfiles/msvc/common_default_clang_cl.props diff --git a/buildfiles/msvc/common_default_macros.props b/rpcs3/buildfiles/msvc/common_default_macros.props similarity index 100% rename from buildfiles/msvc/common_default_macros.props rename to rpcs3/buildfiles/msvc/common_default_macros.props diff --git a/buildfiles/msvc/rpcs3_debug.props b/rpcs3/buildfiles/msvc/rpcs3_debug.props similarity index 100% rename from buildfiles/msvc/rpcs3_debug.props rename to rpcs3/buildfiles/msvc/rpcs3_debug.props diff --git a/buildfiles/msvc/rpcs3_default.props b/rpcs3/buildfiles/msvc/rpcs3_default.props similarity index 100% rename from buildfiles/msvc/rpcs3_default.props rename to rpcs3/buildfiles/msvc/rpcs3_default.props diff --git a/buildfiles/msvc/rpcs3_release.props b/rpcs3/buildfiles/msvc/rpcs3_release.props similarity index 100% rename from buildfiles/msvc/rpcs3_release.props rename to rpcs3/buildfiles/msvc/rpcs3_release.props diff --git a/darwin/util/sysinfo_darwin.mm b/rpcs3/darwin/util/sysinfo_darwin.mm similarity index 100% rename from darwin/util/sysinfo_darwin.mm rename to rpcs3/darwin/util/sysinfo_darwin.mm diff --git a/git-clang-format b/rpcs3/git-clang-format similarity index 100% rename from git-clang-format rename to rpcs3/git-clang-format diff --git a/objdump.cpp b/rpcs3/objdump.cpp similarity index 100% rename from objdump.cpp rename to rpcs3/objdump.cpp diff --git a/pre-commit.readme b/rpcs3/pre-commit.readme similarity index 100% rename from pre-commit.readme rename to rpcs3/pre-commit.readme diff --git a/rpcs3.sln b/rpcs3/rpcs3.sln similarity index 100% rename from rpcs3.sln rename to rpcs3/rpcs3.sln diff --git a/rpcs3/rpcs3/CMakeLists.txt b/rpcs3/rpcs3/CMakeLists.txt new file mode 100644 index 000000000..b6d4baecc --- /dev/null +++ b/rpcs3/rpcs3/CMakeLists.txt @@ -0,0 +1,203 @@ +# Define GNU standard installation directories +include(GNUInstallDirs) + +# Generate git-version.h at build time. +include(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake) + +# Check for a sufficient compiler and set build options +include(ConfigureCompiler) +include(CheckFunctionExists) + +set(CMAKE_CXX_STANDARD 20) + +set(ADDITIONAL_LIBS "") +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + #on some Linux distros shm_unlink and similar functions are in librt only + set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "rt") +elseif(NOT WIN32 AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG") + #it seems like glibc includes the iconv functions we use but other libc + #implementations like the one on OSX don't seem implement them + set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv") +endif() + +if(UNIX AND NOT APPLE AND NOT ANDROID) + add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/rpcs3") + # Optionally enable X11 for window management + find_package(X11) + if(X11_FOUND) + add_definitions(-DHAVE_X11) + endif() + find_package(Wayland) + if(WAYLAND_FOUND) + add_definitions(-DHAVE_WAYLAND) + endif() +endif() + +if (NOT ANDROID) + # Qt + # finds Qt libraries and setups custom commands for MOC and UIC + # Must be done here because generated MOC and UIC targets cant + # be found otherwise + include(${CMAKE_SOURCE_DIR}/3rdparty/qt6.cmake) +endif() + +# subdirectories +add_subdirectory(Emu) + +if (NOT ANDROID) + add_subdirectory(rpcs3qt) +endif() + +gen_git_version(${CMAKE_CURRENT_SOURCE_DIR}) + +if (NOT ANDROID) + if(WIN32) + add_executable(rpcs3 WIN32) + target_sources(rpcs3 PRIVATE rpcs3.rc) + target_compile_definitions(rpcs3 PRIVATE UNICODE _UNICODE) + elseif(APPLE) + add_executable(rpcs3 MACOSX_BUNDLE) + target_sources(rpcs3 PRIVATE rpcs3.icns update_helper.sh) + set_source_files_properties(update_helper.sh PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set_target_properties(rpcs3 + PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.plist.in") + else() + add_executable(rpcs3) + endif() + + target_sources(rpcs3 + PRIVATE + display_sleep_control.cpp + headless_application.cpp + main.cpp + main_application.cpp + module_verifier.cpp + rpcs3_version.cpp + stb_image.cpp + stdafx.cpp + + Input/basic_keyboard_handler.cpp + Input/basic_mouse_handler.cpp + Input/ds3_pad_handler.cpp + Input/ds4_pad_handler.cpp + Input/dualsense_pad_handler.cpp + Input/evdev_joystick_handler.cpp + Input/evdev_gun_handler.cpp + Input/gui_pad_thread.cpp + Input/hid_pad_handler.cpp + Input/keyboard_pad_handler.cpp + Input/mm_joystick_handler.cpp + Input/pad_thread.cpp + Input/product_info.cpp + Input/ps_move_calibration.cpp + Input/ps_move_config.cpp + Input/ps_move_handler.cpp + Input/ps_move_tracker.cpp + Input/raw_mouse_config.cpp + Input/raw_mouse_handler.cpp + Input/sdl_pad_handler.cpp + Input/skateboard_pad_handler.cpp + Input/xinput_pad_handler.cpp + ) + + set_target_properties(rpcs3 + PROPERTIES + AUTOMOC ON + AUTOUIC ON) + + target_link_libraries(rpcs3 + PRIVATE + rpcs3_emu + rpcs3_ui + 3rdparty::discordRPC + 3rdparty::qt6 + 3rdparty::hidapi + 3rdparty::libusb + 3rdparty::wolfssl + 3rdparty::libcurl + 3rdparty::zlib + 3rdparty::opencv + 3rdparty::fusion + ${ADDITIONAL_LIBS}) + + # Unix display manager + if(X11_FOUND) + target_link_libraries(rpcs3 PRIVATE X11::X11) + elseif(USE_VULKAN AND UNIX AND NOT WAYLAND_FOUND AND NOT APPLE AND NOT ANDROID) + # Wayland has been checked in 3rdparty/CMakeLists.txt already. + message(FATAL_ERROR "RPCS3 requires either X11 or Wayland (or both) for Vulkan.") + endif() + + if(UNIX) + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + find_package(Threads REQUIRED) + target_link_libraries(rpcs3 PRIVATE Threads::Threads) + endif() + + if(WIN32) + target_link_libraries(rpcs3 PRIVATE bcrypt ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi pdh) + else() + target_link_libraries(rpcs3 PRIVATE ${CMAKE_DL_LIBS}) + endif() + + if(USE_PRECOMPILED_HEADERS) + target_precompile_headers(rpcs3 PRIVATE stdafx.h) + endif() + + + # Copy icons to executable directory + if(APPLE) + if (CMAKE_BUILD_TYPE MATCHES "Debug" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo") + set(QT_DEPLOY_FLAGS "-no-strip") + else() + set(QT_DEPLOY_FLAGS "") + endif() + qt_finalize_target(rpcs3) + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rpcs3.icns $/../Resources/rpcs3.icns + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/../Resources/Icons + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/../Resources/GuiConfigs + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/../Resources/git + COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${PROJECT_BINARY_DIR}/bin/rpcs3.app" "${QT_DEPLOY_FLAGS}") + elseif(UNIX) + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git) + elseif(WIN32) + add_custom_command(TARGET rpcs3 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $/Icons + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $/GuiConfigs + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/git $/git + COMMAND "${WINDEPLOYQT_EXECUTABLE}" --no-compiler-runtime --no-opengl-sw --no-patchqt + --no-translations --no-system-d3d-compiler --no-system-dxc-compiler --no-ffmpeg --no-quick-import + --plugindir "$,$/plugins,$/share/qt6/plugins>" + --verbose 0 "$") + endif() + + # Unix installation + if(UNIX AND NOT APPLE) + # Install the binary + install(TARGETS rpcs3 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + # Install the application icon and menu item + install(FILES rpcs3.svg + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps) + install(FILES rpcs3.png + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps) + install(FILES rpcs3.desktop + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) + install(FILES rpcs3.metainfo.xml + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) + # Install other files + install(DIRECTORY ../bin/Icons + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + install(DIRECTORY ../bin/GuiConfigs + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + install(DIRECTORY ../bin/git + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + install(DIRECTORY ../bin/test + DESTINATION ${CMAKE_INSTALL_DATADIR}/rpcs3) + endif() +endif() diff --git a/rpcs3/Crypto/aes.cpp b/rpcs3/rpcs3/Crypto/aes.cpp similarity index 100% rename from rpcs3/Crypto/aes.cpp rename to rpcs3/rpcs3/Crypto/aes.cpp diff --git a/rpcs3/Crypto/aes.h b/rpcs3/rpcs3/Crypto/aes.h similarity index 100% rename from rpcs3/Crypto/aes.h rename to rpcs3/rpcs3/Crypto/aes.h diff --git a/rpcs3/Crypto/aesni.cpp b/rpcs3/rpcs3/Crypto/aesni.cpp similarity index 100% rename from rpcs3/Crypto/aesni.cpp rename to rpcs3/rpcs3/Crypto/aesni.cpp diff --git a/rpcs3/Crypto/aesni.h b/rpcs3/rpcs3/Crypto/aesni.h similarity index 100% rename from rpcs3/Crypto/aesni.h rename to rpcs3/rpcs3/Crypto/aesni.h diff --git a/rpcs3/Crypto/decrypt_binaries.cpp b/rpcs3/rpcs3/Crypto/decrypt_binaries.cpp similarity index 100% rename from rpcs3/Crypto/decrypt_binaries.cpp rename to rpcs3/rpcs3/Crypto/decrypt_binaries.cpp diff --git a/rpcs3/Crypto/decrypt_binaries.h b/rpcs3/rpcs3/Crypto/decrypt_binaries.h similarity index 100% rename from rpcs3/Crypto/decrypt_binaries.h rename to rpcs3/rpcs3/Crypto/decrypt_binaries.h diff --git a/rpcs3/Crypto/ec.cpp b/rpcs3/rpcs3/Crypto/ec.cpp similarity index 100% rename from rpcs3/Crypto/ec.cpp rename to rpcs3/rpcs3/Crypto/ec.cpp diff --git a/rpcs3/Crypto/ec.h b/rpcs3/rpcs3/Crypto/ec.h similarity index 100% rename from rpcs3/Crypto/ec.h rename to rpcs3/rpcs3/Crypto/ec.h diff --git a/rpcs3/Crypto/key_vault.cpp b/rpcs3/rpcs3/Crypto/key_vault.cpp similarity index 100% rename from rpcs3/Crypto/key_vault.cpp rename to rpcs3/rpcs3/Crypto/key_vault.cpp diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/rpcs3/Crypto/key_vault.h similarity index 100% rename from rpcs3/Crypto/key_vault.h rename to rpcs3/rpcs3/Crypto/key_vault.h diff --git a/rpcs3/Crypto/lz.cpp b/rpcs3/rpcs3/Crypto/lz.cpp similarity index 100% rename from rpcs3/Crypto/lz.cpp rename to rpcs3/rpcs3/Crypto/lz.cpp diff --git a/rpcs3/Crypto/lz.h b/rpcs3/rpcs3/Crypto/lz.h similarity index 100% rename from rpcs3/Crypto/lz.h rename to rpcs3/rpcs3/Crypto/lz.h diff --git a/rpcs3/Crypto/md5.cpp b/rpcs3/rpcs3/Crypto/md5.cpp similarity index 100% rename from rpcs3/Crypto/md5.cpp rename to rpcs3/rpcs3/Crypto/md5.cpp diff --git a/rpcs3/Crypto/md5.h b/rpcs3/rpcs3/Crypto/md5.h similarity index 100% rename from rpcs3/Crypto/md5.h rename to rpcs3/rpcs3/Crypto/md5.h diff --git a/rpcs3/Crypto/sha1.cpp b/rpcs3/rpcs3/Crypto/sha1.cpp similarity index 100% rename from rpcs3/Crypto/sha1.cpp rename to rpcs3/rpcs3/Crypto/sha1.cpp diff --git a/rpcs3/Crypto/sha1.h b/rpcs3/rpcs3/Crypto/sha1.h similarity index 100% rename from rpcs3/Crypto/sha1.h rename to rpcs3/rpcs3/Crypto/sha1.h diff --git a/rpcs3/Crypto/sha256.cpp b/rpcs3/rpcs3/Crypto/sha256.cpp similarity index 100% rename from rpcs3/Crypto/sha256.cpp rename to rpcs3/rpcs3/Crypto/sha256.cpp diff --git a/rpcs3/Crypto/sha256.h b/rpcs3/rpcs3/Crypto/sha256.h similarity index 100% rename from rpcs3/Crypto/sha256.h rename to rpcs3/rpcs3/Crypto/sha256.h diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/rpcs3/Crypto/unedat.cpp similarity index 100% rename from rpcs3/Crypto/unedat.cpp rename to rpcs3/rpcs3/Crypto/unedat.cpp diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/rpcs3/Crypto/unedat.h similarity index 100% rename from rpcs3/Crypto/unedat.h rename to rpcs3/rpcs3/Crypto/unedat.h diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/rpcs3/Crypto/unpkg.cpp similarity index 100% rename from rpcs3/Crypto/unpkg.cpp rename to rpcs3/rpcs3/Crypto/unpkg.cpp diff --git a/rpcs3/Crypto/unpkg.h b/rpcs3/rpcs3/Crypto/unpkg.h similarity index 100% rename from rpcs3/Crypto/unpkg.h rename to rpcs3/rpcs3/Crypto/unpkg.h diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/rpcs3/Crypto/unself.cpp similarity index 100% rename from rpcs3/Crypto/unself.cpp rename to rpcs3/rpcs3/Crypto/unself.cpp diff --git a/rpcs3/Crypto/unself.h b/rpcs3/rpcs3/Crypto/unself.h similarity index 100% rename from rpcs3/Crypto/unself.h rename to rpcs3/rpcs3/Crypto/unself.h diff --git a/rpcs3/Crypto/unzip.cpp b/rpcs3/rpcs3/Crypto/unzip.cpp similarity index 100% rename from rpcs3/Crypto/unzip.cpp rename to rpcs3/rpcs3/Crypto/unzip.cpp diff --git a/rpcs3/Crypto/unzip.h b/rpcs3/rpcs3/Crypto/unzip.h similarity index 100% rename from rpcs3/Crypto/unzip.h rename to rpcs3/rpcs3/Crypto/unzip.h diff --git a/rpcs3/Crypto/utils.cpp b/rpcs3/rpcs3/Crypto/utils.cpp similarity index 100% rename from rpcs3/Crypto/utils.cpp rename to rpcs3/rpcs3/Crypto/utils.cpp diff --git a/rpcs3/Crypto/utils.h b/rpcs3/rpcs3/Crypto/utils.h similarity index 100% rename from rpcs3/Crypto/utils.h rename to rpcs3/rpcs3/Crypto/utils.h diff --git a/rpcs3/Cubeb.vcxproj b/rpcs3/rpcs3/Cubeb.vcxproj similarity index 100% rename from rpcs3/Cubeb.vcxproj rename to rpcs3/rpcs3/Cubeb.vcxproj diff --git a/rpcs3/Cubeb.vcxproj.filters b/rpcs3/rpcs3/Cubeb.vcxproj.filters similarity index 100% rename from rpcs3/Cubeb.vcxproj.filters rename to rpcs3/rpcs3/Cubeb.vcxproj.filters diff --git a/rpcs3/Emu/Audio/AudioBackend.cpp b/rpcs3/rpcs3/Emu/Audio/AudioBackend.cpp similarity index 100% rename from rpcs3/Emu/Audio/AudioBackend.cpp rename to rpcs3/rpcs3/Emu/Audio/AudioBackend.cpp diff --git a/rpcs3/Emu/Audio/AudioBackend.h b/rpcs3/rpcs3/Emu/Audio/AudioBackend.h similarity index 100% rename from rpcs3/Emu/Audio/AudioBackend.h rename to rpcs3/rpcs3/Emu/Audio/AudioBackend.h diff --git a/rpcs3/Emu/Audio/AudioDumper.cpp b/rpcs3/rpcs3/Emu/Audio/AudioDumper.cpp similarity index 100% rename from rpcs3/Emu/Audio/AudioDumper.cpp rename to rpcs3/rpcs3/Emu/Audio/AudioDumper.cpp diff --git a/rpcs3/Emu/Audio/AudioDumper.h b/rpcs3/rpcs3/Emu/Audio/AudioDumper.h similarity index 100% rename from rpcs3/Emu/Audio/AudioDumper.h rename to rpcs3/rpcs3/Emu/Audio/AudioDumper.h diff --git a/rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp b/rpcs3/rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp similarity index 100% rename from rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp rename to rpcs3/rpcs3/Emu/Audio/Cubeb/CubebBackend.cpp diff --git a/rpcs3/Emu/Audio/Cubeb/CubebBackend.h b/rpcs3/rpcs3/Emu/Audio/Cubeb/CubebBackend.h similarity index 100% rename from rpcs3/Emu/Audio/Cubeb/CubebBackend.h rename to rpcs3/rpcs3/Emu/Audio/Cubeb/CubebBackend.h diff --git a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp b/rpcs3/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp similarity index 100% rename from rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp rename to rpcs3/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.cpp diff --git a/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.h b/rpcs3/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.h similarity index 100% rename from rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.h rename to rpcs3/rpcs3/Emu/Audio/Cubeb/cubeb_enumerator.h diff --git a/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp b/rpcs3/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp similarity index 100% rename from rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp rename to rpcs3/rpcs3/Emu/Audio/FAudio/FAudioBackend.cpp diff --git a/rpcs3/Emu/Audio/FAudio/FAudioBackend.h b/rpcs3/rpcs3/Emu/Audio/FAudio/FAudioBackend.h similarity index 100% rename from rpcs3/Emu/Audio/FAudio/FAudioBackend.h rename to rpcs3/rpcs3/Emu/Audio/FAudio/FAudioBackend.h diff --git a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp b/rpcs3/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp similarity index 100% rename from rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp rename to rpcs3/rpcs3/Emu/Audio/FAudio/faudio_enumerator.cpp diff --git a/rpcs3/Emu/Audio/FAudio/faudio_enumerator.h b/rpcs3/rpcs3/Emu/Audio/FAudio/faudio_enumerator.h similarity index 100% rename from rpcs3/Emu/Audio/FAudio/faudio_enumerator.h rename to rpcs3/rpcs3/Emu/Audio/FAudio/faudio_enumerator.h diff --git a/rpcs3/Emu/Audio/Null/NullAudioBackend.h b/rpcs3/rpcs3/Emu/Audio/Null/NullAudioBackend.h similarity index 100% rename from rpcs3/Emu/Audio/Null/NullAudioBackend.h rename to rpcs3/rpcs3/Emu/Audio/Null/NullAudioBackend.h diff --git a/rpcs3/Emu/Audio/Null/null_enumerator.h b/rpcs3/rpcs3/Emu/Audio/Null/null_enumerator.h similarity index 100% rename from rpcs3/Emu/Audio/Null/null_enumerator.h rename to rpcs3/rpcs3/Emu/Audio/Null/null_enumerator.h diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp b/rpcs3/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp similarity index 100% rename from rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp rename to rpcs3/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.cpp diff --git a/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h b/rpcs3/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h similarity index 100% rename from rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h rename to rpcs3/rpcs3/Emu/Audio/XAudio2/XAudio2Backend.h diff --git a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp b/rpcs3/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp similarity index 100% rename from rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp rename to rpcs3/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.cpp diff --git a/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.h b/rpcs3/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.h similarity index 100% rename from rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.h rename to rpcs3/rpcs3/Emu/Audio/XAudio2/xaudio2_enumerator.h diff --git a/rpcs3/Emu/Audio/audio_device_enumerator.h b/rpcs3/rpcs3/Emu/Audio/audio_device_enumerator.h similarity index 100% rename from rpcs3/Emu/Audio/audio_device_enumerator.h rename to rpcs3/rpcs3/Emu/Audio/audio_device_enumerator.h diff --git a/rpcs3/Emu/Audio/audio_resampler.cpp b/rpcs3/rpcs3/Emu/Audio/audio_resampler.cpp similarity index 100% rename from rpcs3/Emu/Audio/audio_resampler.cpp rename to rpcs3/rpcs3/Emu/Audio/audio_resampler.cpp diff --git a/rpcs3/Emu/Audio/audio_resampler.h b/rpcs3/rpcs3/Emu/Audio/audio_resampler.h similarity index 100% rename from rpcs3/Emu/Audio/audio_resampler.h rename to rpcs3/rpcs3/Emu/Audio/audio_resampler.h diff --git a/rpcs3/Emu/Audio/audio_utils.cpp b/rpcs3/rpcs3/Emu/Audio/audio_utils.cpp similarity index 100% rename from rpcs3/Emu/Audio/audio_utils.cpp rename to rpcs3/rpcs3/Emu/Audio/audio_utils.cpp diff --git a/rpcs3/Emu/Audio/audio_utils.h b/rpcs3/rpcs3/Emu/Audio/audio_utils.h similarity index 100% rename from rpcs3/Emu/Audio/audio_utils.h rename to rpcs3/rpcs3/Emu/Audio/audio_utils.h diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/rpcs3/Emu/CMakeLists.txt similarity index 100% rename from rpcs3/Emu/CMakeLists.txt rename to rpcs3/rpcs3/Emu/CMakeLists.txt diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.cpp b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.cpp similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.cpp rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.cpp diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.h b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.h similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.h rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64ASM.h diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.cpp diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Common.h diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.cpp b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.cpp similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.cpp rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.cpp diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.h b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.h similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.h rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64JIT.h diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.cpp diff --git a/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.h b/rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.h similarity index 100% rename from rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.h rename to rpcs3/rpcs3/Emu/CPU/Backends/AArch64/AArch64Signal.h diff --git a/rpcs3/Emu/CPU/CPUDisAsm.h b/rpcs3/rpcs3/Emu/CPU/CPUDisAsm.h similarity index 100% rename from rpcs3/Emu/CPU/CPUDisAsm.h rename to rpcs3/rpcs3/Emu/CPU/CPUDisAsm.h diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/rpcs3/Emu/CPU/CPUThread.cpp similarity index 100% rename from rpcs3/Emu/CPU/CPUThread.cpp rename to rpcs3/rpcs3/Emu/CPU/CPUThread.cpp diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/rpcs3/Emu/CPU/CPUThread.h similarity index 100% rename from rpcs3/Emu/CPU/CPUThread.h rename to rpcs3/rpcs3/Emu/CPU/CPUThread.h diff --git a/rpcs3/Emu/CPU/CPUTranslator.cpp b/rpcs3/rpcs3/Emu/CPU/CPUTranslator.cpp similarity index 100% rename from rpcs3/Emu/CPU/CPUTranslator.cpp rename to rpcs3/rpcs3/Emu/CPU/CPUTranslator.cpp diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/rpcs3/Emu/CPU/CPUTranslator.h similarity index 100% rename from rpcs3/Emu/CPU/CPUTranslator.h rename to rpcs3/rpcs3/Emu/CPU/CPUTranslator.h diff --git a/rpcs3/Emu/CPU/Hypervisor.h b/rpcs3/rpcs3/Emu/CPU/Hypervisor.h similarity index 100% rename from rpcs3/Emu/CPU/Hypervisor.h rename to rpcs3/rpcs3/Emu/CPU/Hypervisor.h diff --git a/rpcs3/Emu/CPU/sse2neon.h b/rpcs3/rpcs3/Emu/CPU/sse2neon.h similarity index 100% rename from rpcs3/Emu/CPU/sse2neon.h rename to rpcs3/rpcs3/Emu/CPU/sse2neon.h diff --git a/rpcs3/Emu/Cell/Common.h b/rpcs3/rpcs3/Emu/Cell/Common.h similarity index 100% rename from rpcs3/Emu/Cell/Common.h rename to rpcs3/rpcs3/Emu/Cell/Common.h diff --git a/rpcs3/Emu/Cell/ErrorCodes.cpp b/rpcs3/rpcs3/Emu/Cell/ErrorCodes.cpp similarity index 100% rename from rpcs3/Emu/Cell/ErrorCodes.cpp rename to rpcs3/rpcs3/Emu/Cell/ErrorCodes.cpp diff --git a/rpcs3/Emu/Cell/ErrorCodes.h b/rpcs3/rpcs3/Emu/Cell/ErrorCodes.h similarity index 100% rename from rpcs3/Emu/Cell/ErrorCodes.h rename to rpcs3/rpcs3/Emu/Cell/ErrorCodes.h diff --git a/rpcs3/Emu/Cell/MFC.cpp b/rpcs3/rpcs3/Emu/Cell/MFC.cpp similarity index 100% rename from rpcs3/Emu/Cell/MFC.cpp rename to rpcs3/rpcs3/Emu/Cell/MFC.cpp diff --git a/rpcs3/Emu/Cell/MFC.h b/rpcs3/rpcs3/Emu/Cell/MFC.h similarity index 100% rename from rpcs3/Emu/Cell/MFC.h rename to rpcs3/rpcs3/Emu/Cell/MFC.h diff --git a/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/HLE_PATCHES.cpp diff --git a/rpcs3/Emu/Cell/Modules/StaticHLE.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/StaticHLE.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/StaticHLE.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/StaticHLE.cpp diff --git a/rpcs3/Emu/Cell/Modules/StaticHLE.h b/rpcs3/rpcs3/Emu/Cell/Modules/StaticHLE.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/StaticHLE.h rename to rpcs3/rpcs3/Emu/Cell/Modules/StaticHLE.h diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAdec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAdec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAdec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellAdec.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAdec.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAdec.h diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAtrac.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAtrac.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAtrac.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellAtrac.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAtrac.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAtrac.h diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellAtracMulti.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAtracMulti.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAtracMulti.h diff --git a/rpcs3/Emu/Cell/Modules/cellAtracXdec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAtracXdec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAtracXdec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAtracXdec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAtracXdec.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellAtracXdec.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAtracXdec.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAtracXdec.h diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAudio.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAudio.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAudio.h diff --git a/rpcs3/Emu/Cell/Modules/cellAudioIn.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellAudioIn.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAudioIn.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAudioIn.h diff --git a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAudioOut.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAudioOut.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellAudioOut.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAudioOut.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAudioOut.h diff --git a/rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAuthDialog.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellBgdl.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellBgdl.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellBgdl.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellBgdl.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellBgdl.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellBgdl.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellBgdl.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellBgdl.h diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellCamera.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCamera.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCamera.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellCamera.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCamera.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCamera.h diff --git a/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellCelp8Enc.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellCelp8Enc.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCelp8Enc.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCelp8Enc.h diff --git a/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellCelpEnc.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellCelpEnc.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCelpEnc.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCelpEnc.h diff --git a/rpcs3/Emu/Cell/Modules/cellCrossController.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellCrossController.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCrossController.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCrossController.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellCrossController.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellCrossController.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellCrossController.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellCrossController.h diff --git a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellDaisy.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellDaisy.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellDaisy.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellDaisy.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellDaisy.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellDaisy.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellDaisy.h diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellDmux.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellDmux.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellDmux.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellDmux.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellDmux.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellDmux.h diff --git a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellDmuxPamf.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellDmuxPamf.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellDmuxPamf.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellDmuxPamf.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellDmuxPamf.h diff --git a/rpcs3/Emu/Cell/Modules/cellDtcpIpUtility.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellDtcpIpUtility.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellDtcpIpUtility.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellDtcpIpUtility.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellFiber.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellFiber.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFiber.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFiber.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellFiber.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellFiber.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFiber.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFiber.h diff --git a/rpcs3/Emu/Cell/Modules/cellFont.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellFont.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFont.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFont.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellFont.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellFont.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFont.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFont.h diff --git a/rpcs3/Emu/Cell/Modules/cellFontFT.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellFontFT.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFontFT.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFontFT.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellFontFT.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellFontFT.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFontFT.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFontFT.h diff --git a/rpcs3/Emu/Cell/Modules/cellFs.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellFs.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFs.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFs.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellFs.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellFs.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellFs.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellFs.h diff --git a/rpcs3/Emu/Cell/Modules/cellGame.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellGame.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGame.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGame.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellGame.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellGame.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGame.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGame.h diff --git a/rpcs3/Emu/Cell/Modules/cellGameExec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellGameExec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGameExec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGameExec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGcmSys.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellGcmSys.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGcmSys.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGcmSys.h diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellGem.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGem.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGem.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellGem.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellGem.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGem.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGem.h diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellGifDec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGifDec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGifDec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellGifDec.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellGifDec.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellGifDec.h diff --git a/rpcs3/Emu/Cell/Modules/cellHttp.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellHttp.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellHttp.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellHttp.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellHttp.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellHttp.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellHttp.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellHttp.h diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellHttpUtil.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellHttpUtil.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellHttpUtil.h diff --git a/rpcs3/Emu/Cell/Modules/cellImeJp.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellImeJp.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellImeJp.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellImeJp.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellImeJp.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellImeJp.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellImeJp.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellImeJp.h diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellJpgDec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellJpgDec.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellJpgDec.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellJpgDec.h diff --git a/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellJpgEnc.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellJpgEnc.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellJpgEnc.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellJpgEnc.h diff --git a/rpcs3/Emu/Cell/Modules/cellKb.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellKb.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellKb.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellKb.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellKb.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellKb.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellKb.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellKb.h diff --git a/rpcs3/Emu/Cell/Modules/cellKey2char.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellKey2char.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellKey2char.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellKey2char.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellL10n.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellL10n.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellL10n.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellL10n.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellL10n.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellL10n.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellL10n.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellL10n.h diff --git a/rpcs3/Emu/Cell/Modules/cellLibprof.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellLibprof.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellLibprof.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellLibprof.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellMic.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMic.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMic.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellMic.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMic.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMic.h diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellMouse.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMouse.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMouse.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellMouse.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMouse.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMouse.h diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellMsgDialog.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMsgDialog.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMsgDialog.h diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellMusic.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMusic.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMusic.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellMusic.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMusic.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMusic.h diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellMusicDecode.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMusicDecode.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMusicDecode.h diff --git a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMusicExport.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellMusicSelectionContext.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellNetAoi.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellNetAoi.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellNetAoi.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellNetAoi.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellNetCtl.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellNetCtl.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellNetCtl.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellNetCtl.h diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellOskDialog.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellOskDialog.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellOskDialog.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellOskDialog.h diff --git a/rpcs3/Emu/Cell/Modules/cellOvis.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellOvis.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellOvis.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellOvis.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPad.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPad.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPad.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPad.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPad.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellPad.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPad.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPad.h diff --git a/rpcs3/Emu/Cell/Modules/cellPamf.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPamf.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPamf.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPamf.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPamf.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellPamf.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPamf.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPamf.h diff --git a/rpcs3/Emu/Cell/Modules/cellPesmUtility.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPesmUtility.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPesmUtility.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPesmUtility.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPng.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellPng.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPng.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPng.h diff --git a/rpcs3/Emu/Cell/Modules/cellPngDec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPngDec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPngDec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPngDec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPngDec.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellPngDec.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPngDec.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPngDec.h diff --git a/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPngEnc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellPngEnc.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellPngEnc.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPngEnc.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPngEnc.h diff --git a/rpcs3/Emu/Cell/Modules/cellPrint.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellPrint.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellPrint.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellPrint.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellRec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellRec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellRec.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellRec.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRec.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRec.h diff --git a/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellRemotePlay.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellRemotePlay.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRemotePlay.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRemotePlay.h diff --git a/rpcs3/Emu/Cell/Modules/cellResc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellResc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellResc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellResc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellResc.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellResc.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellResc.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellResc.h diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellRtc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRtc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRtc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellRtc.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRtc.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRtc.h diff --git a/rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellRudp.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellRudp.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRudp.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRudp.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellRudp.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellRudp.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellRudp.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellRudp.h diff --git a/rpcs3/Emu/Cell/Modules/cellSail.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSail.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSail.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSail.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSail.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSail.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSail.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSail.h diff --git a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSailRec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSailRec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSailRec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSaveData.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSaveData.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSaveData.h diff --git a/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellScreenshot.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellScreenshot.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellScreenshot.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellScreenshot.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellScreenshot.h diff --git a/rpcs3/Emu/Cell/Modules/cellSearch.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSearch.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSearch.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSearch.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSearch.h diff --git a/rpcs3/Emu/Cell/Modules/cellSheap.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSheap.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSheap.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSheap.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSpudll.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSpudll.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSpudll.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSpudll.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSpudll.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSpudll.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSpudll.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSpudll.h diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSpurs.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSpurs.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSpurs.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSpurs.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSpurs.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSpurs.h diff --git a/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSpursJq.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSpursJq.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSpursJq.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSpursJq.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSpursJq.h diff --git a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSsl.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSsl.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSsl.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSsl.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSsl.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSsl.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSsl.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSsl.h diff --git a/rpcs3/Emu/Cell/Modules/cellStorage.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellStorage.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellStorage.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellStorage.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellStorage.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellStorage.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellStorage.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellStorage.h diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSubDisplay.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSubDisplay.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSubDisplay.h diff --git a/rpcs3/Emu/Cell/Modules/cellSync.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSync.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSync.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSync.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSync.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSync.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSync.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSync.h diff --git a/rpcs3/Emu/Cell/Modules/cellSync2.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSync2.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSync2.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSync2.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSync2.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSync2.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSync2.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSync2.h diff --git a/rpcs3/Emu/Cell/Modules/cellSysCache.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysCache.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysCache.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysCache.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysconf.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysconf.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysconf.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysconf.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysconf.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysconf.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysconf.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysconf.h diff --git a/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysmodule.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutil.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutil.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutil.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutil.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutil.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutil.h diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilAvc.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc.h diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.h diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilAvcExt.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellUsbd.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellUsbd.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellUsbd.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellUsbd.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellUsbd.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellUsbd.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellUsbd.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellUsbd.h diff --git a/rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellUserInfo.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellUserInfo.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellUserInfo.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellUserInfo.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellUserInfo.h diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellVdec.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVdec.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVdec.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellVdec.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVdec.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVdec.h diff --git a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVideoExport.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVideoOut.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellVideoOut.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVideoOut.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVideoOut.h diff --git a/rpcs3/Emu/Cell/Modules/cellVideoPlayerUtility.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellVideoPlayerUtility.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVideoPlayerUtility.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVideoPlayerUtility.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellVideoUpload.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellVideoUpload.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVideoUpload.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVideoUpload.h diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellVoice.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVoice.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVoice.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellVoice.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVoice.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVoice.h diff --git a/rpcs3/Emu/Cell/Modules/cellVpost.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellVpost.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVpost.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVpost.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellVpost.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellVpost.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellVpost.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellVpost.h diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp diff --git a/rpcs3/Emu/Cell/Modules/cellWebBrowser.h b/rpcs3/rpcs3/Emu/Cell/Modules/cellWebBrowser.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/cellWebBrowser.h rename to rpcs3/rpcs3/Emu/Cell/Modules/cellWebBrowser.h diff --git a/rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp diff --git a/rpcs3/Emu/Cell/Modules/libad_async.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/libad_async.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/libad_async.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/libad_async.cpp diff --git a/rpcs3/Emu/Cell/Modules/libad_core.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/libad_core.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/libad_core.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/libad_core.cpp diff --git a/rpcs3/Emu/Cell/Modules/libfs_utility_init.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/libfs_utility_init.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/libfs_utility_init.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/libfs_utility_init.cpp diff --git a/rpcs3/Emu/Cell/Modules/libfs_utility_init.h b/rpcs3/rpcs3/Emu/Cell/Modules/libfs_utility_init.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/libfs_utility_init.h rename to rpcs3/rpcs3/Emu/Cell/Modules/libfs_utility_init.h diff --git a/rpcs3/Emu/Cell/Modules/libmedi.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/libmedi.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/libmedi.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/libmedi.cpp diff --git a/rpcs3/Emu/Cell/Modules/libmixer.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/libmixer.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/libmixer.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/libmixer.cpp diff --git a/rpcs3/Emu/Cell/Modules/libmixer.h b/rpcs3/rpcs3/Emu/Cell/Modules/libmixer.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/libmixer.h rename to rpcs3/rpcs3/Emu/Cell/Modules/libmixer.h diff --git a/rpcs3/Emu/Cell/Modules/libsnd3.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/libsnd3.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/libsnd3.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/libsnd3.cpp diff --git a/rpcs3/Emu/Cell/Modules/libsnd3.h b/rpcs3/rpcs3/Emu/Cell/Modules/libsnd3.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/libsnd3.h rename to rpcs3/rpcs3/Emu/Cell/Modules/libsnd3.h diff --git a/rpcs3/Emu/Cell/Modules/libsynth2.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/libsynth2.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/libsynth2.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/libsynth2.cpp diff --git a/rpcs3/Emu/Cell/Modules/libsynth2.h b/rpcs3/rpcs3/Emu/Cell/Modules/libsynth2.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/libsynth2.h rename to rpcs3/rpcs3/Emu/Cell/Modules/libsynth2.h diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNp.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNp.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNp.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNp.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNp.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNp.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNp.h diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNp2.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNp2.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNp2.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNp2.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNp2.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNp2.h diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpClans.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpClans.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpClans.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpClans.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpClans.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpClans.h diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpCommerce2.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h diff --git a/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpMatchingInt.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpPlus.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpPlus.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpPlus.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpPlus.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpPlus.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpPlus.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpPlus.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpPlus.h diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpSns.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpSns.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpSns.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpSns.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpSns.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpSns.h diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpTrophy.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpTrophy.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpTrophy.h diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpTus.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpTus.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpTus.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpTus.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpTus.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpTus.h diff --git a/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpUtil.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp diff --git a/rpcs3/Emu/Cell/Modules/sceNpUtil.h b/rpcs3/rpcs3/Emu/Cell/Modules/sceNpUtil.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sceNpUtil.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sceNpUtil.h diff --git a/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp diff --git a/rpcs3/Emu/Cell/Modules/sysPrxForUser.h b/rpcs3/rpcs3/Emu/Cell/Modules/sysPrxForUser.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sysPrxForUser.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sysPrxForUser.h diff --git a/rpcs3/Emu/Cell/Modules/sys_crashdump.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_crashdump.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_crashdump.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_crashdump.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_crashdump.h b/rpcs3/rpcs3/Emu/Cell/Modules/sys_crashdump.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_crashdump.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_crashdump.h diff --git a/rpcs3/Emu/Cell/Modules/sys_game_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_game_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_game_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_game_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_heap.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_heap.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_heap.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_heap.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_io_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_io_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_io_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_io_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_libc.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_libc.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_libc.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_libc.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_libc_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_libc_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_libc_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_libc_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.h b/rpcs3/rpcs3/Emu/Cell/Modules/sys_lv2dbg.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_lv2dbg.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_lv2dbg.h diff --git a/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_lwcond_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_lwmutex_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_mempool.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_mempool.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_mempool.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_mempool.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_mmapper_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_mmapper_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_mmapper_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_mmapper_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_net_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_net_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_net_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_net_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_net_.h b/rpcs3/rpcs3/Emu/Cell/Modules/sys_net_.h similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_net_.h rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_net_.h diff --git a/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_ppu_thread_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_prx_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_prx_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_prx_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_prx_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_rsxaudio_.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_spinlock.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_spinlock.cpp diff --git a/rpcs3/Emu/Cell/Modules/sys_spu_.cpp b/rpcs3/rpcs3/Emu/Cell/Modules/sys_spu_.cpp similarity index 100% rename from rpcs3/Emu/Cell/Modules/sys_spu_.cpp rename to rpcs3/rpcs3/Emu/Cell/Modules/sys_spu_.cpp diff --git a/rpcs3/Emu/Cell/PPCDisAsm.h b/rpcs3/rpcs3/Emu/Cell/PPCDisAsm.h similarity index 100% rename from rpcs3/Emu/Cell/PPCDisAsm.h rename to rpcs3/rpcs3/Emu/Cell/PPCDisAsm.h diff --git a/rpcs3/Emu/Cell/PPUAnalyser.cpp b/rpcs3/rpcs3/Emu/Cell/PPUAnalyser.cpp similarity index 100% rename from rpcs3/Emu/Cell/PPUAnalyser.cpp rename to rpcs3/rpcs3/Emu/Cell/PPUAnalyser.cpp diff --git a/rpcs3/Emu/Cell/PPUAnalyser.h b/rpcs3/rpcs3/Emu/Cell/PPUAnalyser.h similarity index 100% rename from rpcs3/Emu/Cell/PPUAnalyser.h rename to rpcs3/rpcs3/Emu/Cell/PPUAnalyser.h diff --git a/rpcs3/Emu/Cell/PPUCallback.h b/rpcs3/rpcs3/Emu/Cell/PPUCallback.h similarity index 100% rename from rpcs3/Emu/Cell/PPUCallback.h rename to rpcs3/rpcs3/Emu/Cell/PPUCallback.h diff --git a/rpcs3/Emu/Cell/PPUDisAsm.cpp b/rpcs3/rpcs3/Emu/Cell/PPUDisAsm.cpp similarity index 100% rename from rpcs3/Emu/Cell/PPUDisAsm.cpp rename to rpcs3/rpcs3/Emu/Cell/PPUDisAsm.cpp diff --git a/rpcs3/Emu/Cell/PPUDisAsm.h b/rpcs3/rpcs3/Emu/Cell/PPUDisAsm.h similarity index 100% rename from rpcs3/Emu/Cell/PPUDisAsm.h rename to rpcs3/rpcs3/Emu/Cell/PPUDisAsm.h diff --git a/rpcs3/Emu/Cell/PPUFunction.cpp b/rpcs3/rpcs3/Emu/Cell/PPUFunction.cpp similarity index 100% rename from rpcs3/Emu/Cell/PPUFunction.cpp rename to rpcs3/rpcs3/Emu/Cell/PPUFunction.cpp diff --git a/rpcs3/Emu/Cell/PPUFunction.h b/rpcs3/rpcs3/Emu/Cell/PPUFunction.h similarity index 100% rename from rpcs3/Emu/Cell/PPUFunction.h rename to rpcs3/rpcs3/Emu/Cell/PPUFunction.h diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/rpcs3/Emu/Cell/PPUInterpreter.cpp similarity index 100% rename from rpcs3/Emu/Cell/PPUInterpreter.cpp rename to rpcs3/rpcs3/Emu/Cell/PPUInterpreter.cpp diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/rpcs3/Emu/Cell/PPUInterpreter.h similarity index 100% rename from rpcs3/Emu/Cell/PPUInterpreter.h rename to rpcs3/rpcs3/Emu/Cell/PPUInterpreter.h diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/rpcs3/Emu/Cell/PPUModule.cpp similarity index 100% rename from rpcs3/Emu/Cell/PPUModule.cpp rename to rpcs3/rpcs3/Emu/Cell/PPUModule.cpp diff --git a/rpcs3/Emu/Cell/PPUModule.h b/rpcs3/rpcs3/Emu/Cell/PPUModule.h similarity index 100% rename from rpcs3/Emu/Cell/PPUModule.h rename to rpcs3/rpcs3/Emu/Cell/PPUModule.h diff --git a/rpcs3/Emu/Cell/PPUOpcodes.h b/rpcs3/rpcs3/Emu/Cell/PPUOpcodes.h similarity index 100% rename from rpcs3/Emu/Cell/PPUOpcodes.h rename to rpcs3/rpcs3/Emu/Cell/PPUOpcodes.h diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/rpcs3/Emu/Cell/PPUThread.cpp similarity index 100% rename from rpcs3/Emu/Cell/PPUThread.cpp rename to rpcs3/rpcs3/Emu/Cell/PPUThread.cpp diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/rpcs3/Emu/Cell/PPUThread.h similarity index 100% rename from rpcs3/Emu/Cell/PPUThread.h rename to rpcs3/rpcs3/Emu/Cell/PPUThread.h diff --git a/rpcs3/Emu/Cell/PPUTranslator.cpp b/rpcs3/rpcs3/Emu/Cell/PPUTranslator.cpp similarity index 100% rename from rpcs3/Emu/Cell/PPUTranslator.cpp rename to rpcs3/rpcs3/Emu/Cell/PPUTranslator.cpp diff --git a/rpcs3/Emu/Cell/PPUTranslator.h b/rpcs3/rpcs3/Emu/Cell/PPUTranslator.h similarity index 100% rename from rpcs3/Emu/Cell/PPUTranslator.h rename to rpcs3/rpcs3/Emu/Cell/PPUTranslator.h diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/rpcs3/Emu/Cell/RawSPUThread.cpp similarity index 100% rename from rpcs3/Emu/Cell/RawSPUThread.cpp rename to rpcs3/rpcs3/Emu/Cell/RawSPUThread.cpp diff --git a/rpcs3/Emu/Cell/RawSPUThread.h b/rpcs3/rpcs3/Emu/Cell/RawSPUThread.h similarity index 100% rename from rpcs3/Emu/Cell/RawSPUThread.h rename to rpcs3/rpcs3/Emu/Cell/RawSPUThread.h diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp b/rpcs3/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp similarity index 100% rename from rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp rename to rpcs3/rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp diff --git a/rpcs3/Emu/Cell/SPUASMJITRecompiler.h b/rpcs3/rpcs3/Emu/Cell/SPUASMJITRecompiler.h similarity index 100% rename from rpcs3/Emu/Cell/SPUASMJITRecompiler.h rename to rpcs3/rpcs3/Emu/Cell/SPUASMJITRecompiler.h diff --git a/rpcs3/Emu/Cell/SPUAnalyser.cpp b/rpcs3/rpcs3/Emu/Cell/SPUAnalyser.cpp similarity index 100% rename from rpcs3/Emu/Cell/SPUAnalyser.cpp rename to rpcs3/rpcs3/Emu/Cell/SPUAnalyser.cpp diff --git a/rpcs3/Emu/Cell/SPUAnalyser.h b/rpcs3/rpcs3/Emu/Cell/SPUAnalyser.h similarity index 100% rename from rpcs3/Emu/Cell/SPUAnalyser.h rename to rpcs3/rpcs3/Emu/Cell/SPUAnalyser.h diff --git a/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp b/rpcs3/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp similarity index 100% rename from rpcs3/Emu/Cell/SPUCommonRecompiler.cpp rename to rpcs3/rpcs3/Emu/Cell/SPUCommonRecompiler.cpp diff --git a/rpcs3/Emu/Cell/SPUDisAsm.cpp b/rpcs3/rpcs3/Emu/Cell/SPUDisAsm.cpp similarity index 100% rename from rpcs3/Emu/Cell/SPUDisAsm.cpp rename to rpcs3/rpcs3/Emu/Cell/SPUDisAsm.cpp diff --git a/rpcs3/Emu/Cell/SPUDisAsm.h b/rpcs3/rpcs3/Emu/Cell/SPUDisAsm.h similarity index 100% rename from rpcs3/Emu/Cell/SPUDisAsm.h rename to rpcs3/rpcs3/Emu/Cell/SPUDisAsm.h diff --git a/rpcs3/Emu/Cell/SPUInterpreter.cpp b/rpcs3/rpcs3/Emu/Cell/SPUInterpreter.cpp similarity index 100% rename from rpcs3/Emu/Cell/SPUInterpreter.cpp rename to rpcs3/rpcs3/Emu/Cell/SPUInterpreter.cpp diff --git a/rpcs3/Emu/Cell/SPUInterpreter.h b/rpcs3/rpcs3/Emu/Cell/SPUInterpreter.h similarity index 100% rename from rpcs3/Emu/Cell/SPUInterpreter.h rename to rpcs3/rpcs3/Emu/Cell/SPUInterpreter.h diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp similarity index 100% rename from rpcs3/Emu/Cell/SPULLVMRecompiler.cpp rename to rpcs3/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp diff --git a/rpcs3/Emu/Cell/SPUOpcodes.h b/rpcs3/rpcs3/Emu/Cell/SPUOpcodes.h similarity index 100% rename from rpcs3/Emu/Cell/SPUOpcodes.h rename to rpcs3/rpcs3/Emu/Cell/SPUOpcodes.h diff --git a/rpcs3/Emu/Cell/SPURecompiler.h b/rpcs3/rpcs3/Emu/Cell/SPURecompiler.h similarity index 100% rename from rpcs3/Emu/Cell/SPURecompiler.h rename to rpcs3/rpcs3/Emu/Cell/SPURecompiler.h diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/rpcs3/Emu/Cell/SPUThread.cpp similarity index 100% rename from rpcs3/Emu/Cell/SPUThread.cpp rename to rpcs3/rpcs3/Emu/Cell/SPUThread.cpp diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/rpcs3/Emu/Cell/SPUThread.h similarity index 100% rename from rpcs3/Emu/Cell/SPUThread.h rename to rpcs3/rpcs3/Emu/Cell/SPUThread.h diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/lv2.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/lv2.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/lv2.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_bdemu.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_bdemu.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_bdemu.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_bdemu.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_bdemu.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_bdemu.h diff --git a/rpcs3/Emu/Cell/lv2/sys_btsetting.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_btsetting.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_btsetting.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_btsetting.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_btsetting.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_btsetting.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_btsetting.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_btsetting.h diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_cond.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_cond.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_cond.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_cond.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_cond.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_cond.h diff --git a/rpcs3/Emu/Cell/lv2/sys_config.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_config.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_config.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_config.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_config.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_config.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_config.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_config.h diff --git a/rpcs3/Emu/Cell/lv2/sys_console.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_console.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_console.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_console.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_console.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_console.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_console.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_console.h diff --git a/rpcs3/Emu/Cell/lv2/sys_crypto_engine.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_crypto_engine.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_crypto_engine.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_crypto_engine.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_crypto_engine.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_crypto_engine.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_crypto_engine.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_crypto_engine.h diff --git a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_dbg.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_dbg.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_dbg.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_dbg.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_dbg.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_dbg.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_dbg.h diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_event.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_event.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_event.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_event.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_event.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_event.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_event.h diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_event_flag.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_event_flag.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_event_flag.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_event_flag.h diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_fs.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_fs.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_fs.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_fs.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_fs.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_fs.h diff --git a/rpcs3/Emu/Cell/lv2/sys_game.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_game.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_game.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_game.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_game.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_game.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_game.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_game.h diff --git a/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_gamepad.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_gamepad.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_gamepad.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_gamepad.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_gamepad.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_gamepad.h diff --git a/rpcs3/Emu/Cell/lv2/sys_gpio.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_gpio.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_gpio.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_gpio.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_gpio.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_gpio.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_gpio.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_gpio.h diff --git a/rpcs3/Emu/Cell/lv2/sys_hid.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_hid.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_hid.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_hid.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_hid.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_hid.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_hid.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_hid.h diff --git a/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_interrupt.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_interrupt.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_interrupt.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_interrupt.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_interrupt.h diff --git a/rpcs3/Emu/Cell/lv2/sys_io.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_io.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_io.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_io.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_io.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_io.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_io.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_io.h diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_lwcond.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_lwcond.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_lwcond.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_lwcond.h diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_lwmutex.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_lwmutex.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_lwmutex.h diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_memory.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_memory.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_memory.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_memory.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_memory.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_memory.h diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_mmapper.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_mmapper.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_mmapper.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_mmapper.h diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_mutex.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_mutex.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_mutex.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_mutex.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_mutex.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_mutex.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/network_context.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/network_context.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/network_context.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/network_context.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/network_context.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/network_context.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/network_context.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/network_context.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.h diff --git a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h diff --git a/rpcs3/Emu/Cell/lv2/sys_overlay.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_overlay.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_overlay.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_overlay.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_overlay.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_overlay.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_overlay.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_overlay.h diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_ppu_thread.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_ppu_thread.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_ppu_thread.h diff --git a/rpcs3/Emu/Cell/lv2/sys_process.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_process.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_process.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_process.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_process.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_process.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_process.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_process.h diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_prx.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_prx.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_prx.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_prx.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_prx.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_prx.h diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_rsx.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_rsx.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_rsx.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_rsx.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_rsx.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_rsx.h diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_rsxaudio.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_rsxaudio.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_rsxaudio.h diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_rwlock.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_rwlock.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_rwlock.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_rwlock.h diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_semaphore.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_semaphore.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_semaphore.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_semaphore.h diff --git a/rpcs3/Emu/Cell/lv2/sys_sm.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_sm.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_sm.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_sm.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_sm.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_sm.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_sm.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_sm.h diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_spu.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_spu.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_spu.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_spu.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_spu.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_spu.h diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_ss.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_ss.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_ss.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_ss.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_ss.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_ss.h diff --git a/rpcs3/Emu/Cell/lv2/sys_storage.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_storage.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_storage.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_storage.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_storage.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_storage.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_storage.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_storage.h diff --git a/rpcs3/Emu/Cell/lv2/sys_sync.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_sync.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_sync.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_sync.h diff --git a/rpcs3/Emu/Cell/lv2/sys_time.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_time.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_time.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_time.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_time.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_time.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_time.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_time.h diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_timer.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_timer.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_timer.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_timer.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_timer.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_timer.h diff --git a/rpcs3/Emu/Cell/lv2/sys_trace.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_trace.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_trace.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_trace.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_trace.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_trace.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_trace.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_trace.h diff --git a/rpcs3/Emu/Cell/lv2/sys_tty.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_tty.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_tty.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_tty.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_tty.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_tty.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_tty.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_tty.h diff --git a/rpcs3/Emu/Cell/lv2/sys_uart.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_uart.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_uart.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_uart.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_uart.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_uart.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_uart.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_uart.h diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_usbd.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_usbd.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_usbd.h diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.cpp b/rpcs3/rpcs3/Emu/Cell/lv2/sys_vm.cpp similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_vm.cpp rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_vm.cpp diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.h b/rpcs3/rpcs3/Emu/Cell/lv2/sys_vm.h similarity index 100% rename from rpcs3/Emu/Cell/lv2/sys_vm.h rename to rpcs3/rpcs3/Emu/Cell/lv2/sys_vm.h diff --git a/rpcs3/Emu/Cell/timers.hpp b/rpcs3/rpcs3/Emu/Cell/timers.hpp similarity index 100% rename from rpcs3/Emu/Cell/timers.hpp rename to rpcs3/rpcs3/Emu/Cell/timers.hpp diff --git a/rpcs3/Emu/GDB.cpp b/rpcs3/rpcs3/Emu/GDB.cpp similarity index 100% rename from rpcs3/Emu/GDB.cpp rename to rpcs3/rpcs3/Emu/GDB.cpp diff --git a/rpcs3/Emu/GDB.h b/rpcs3/rpcs3/Emu/GDB.h similarity index 100% rename from rpcs3/Emu/GDB.h rename to rpcs3/rpcs3/Emu/GDB.h diff --git a/rpcs3/Emu/GameInfo.h b/rpcs3/rpcs3/Emu/GameInfo.h similarity index 100% rename from rpcs3/Emu/GameInfo.h rename to rpcs3/rpcs3/Emu/GameInfo.h diff --git a/rpcs3/Emu/IPC.h b/rpcs3/rpcs3/Emu/IPC.h similarity index 100% rename from rpcs3/Emu/IPC.h rename to rpcs3/rpcs3/Emu/IPC.h diff --git a/rpcs3/Emu/IPC_config.cpp b/rpcs3/rpcs3/Emu/IPC_config.cpp similarity index 100% rename from rpcs3/Emu/IPC_config.cpp rename to rpcs3/rpcs3/Emu/IPC_config.cpp diff --git a/rpcs3/Emu/IPC_config.h b/rpcs3/rpcs3/Emu/IPC_config.h similarity index 100% rename from rpcs3/Emu/IPC_config.h rename to rpcs3/rpcs3/Emu/IPC_config.h diff --git a/rpcs3/Emu/IPC_socket.cpp b/rpcs3/rpcs3/Emu/IPC_socket.cpp similarity index 100% rename from rpcs3/Emu/IPC_socket.cpp rename to rpcs3/rpcs3/Emu/IPC_socket.cpp diff --git a/rpcs3/Emu/IPC_socket.h b/rpcs3/rpcs3/Emu/IPC_socket.h similarity index 100% rename from rpcs3/Emu/IPC_socket.h rename to rpcs3/rpcs3/Emu/IPC_socket.h diff --git a/rpcs3/Emu/IdManager.cpp b/rpcs3/rpcs3/Emu/IdManager.cpp similarity index 100% rename from rpcs3/Emu/IdManager.cpp rename to rpcs3/rpcs3/Emu/IdManager.cpp diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/rpcs3/Emu/IdManager.h similarity index 100% rename from rpcs3/Emu/IdManager.h rename to rpcs3/rpcs3/Emu/IdManager.h diff --git a/rpcs3/Emu/Io/Buzz.cpp b/rpcs3/rpcs3/Emu/Io/Buzz.cpp similarity index 100% rename from rpcs3/Emu/Io/Buzz.cpp rename to rpcs3/rpcs3/Emu/Io/Buzz.cpp diff --git a/rpcs3/Emu/Io/Buzz.h b/rpcs3/rpcs3/Emu/Io/Buzz.h similarity index 100% rename from rpcs3/Emu/Io/Buzz.h rename to rpcs3/rpcs3/Emu/Io/Buzz.h diff --git a/rpcs3/Emu/Io/Dimensions.cpp b/rpcs3/rpcs3/Emu/Io/Dimensions.cpp similarity index 100% rename from rpcs3/Emu/Io/Dimensions.cpp rename to rpcs3/rpcs3/Emu/Io/Dimensions.cpp diff --git a/rpcs3/Emu/Io/Dimensions.h b/rpcs3/rpcs3/Emu/Io/Dimensions.h similarity index 100% rename from rpcs3/Emu/Io/Dimensions.h rename to rpcs3/rpcs3/Emu/Io/Dimensions.h diff --git a/rpcs3/Emu/Io/GHLtar.cpp b/rpcs3/rpcs3/Emu/Io/GHLtar.cpp similarity index 100% rename from rpcs3/Emu/Io/GHLtar.cpp rename to rpcs3/rpcs3/Emu/Io/GHLtar.cpp diff --git a/rpcs3/Emu/Io/GHLtar.h b/rpcs3/rpcs3/Emu/Io/GHLtar.h similarity index 100% rename from rpcs3/Emu/Io/GHLtar.h rename to rpcs3/rpcs3/Emu/Io/GHLtar.h diff --git a/rpcs3/Emu/Io/GameTablet.cpp b/rpcs3/rpcs3/Emu/Io/GameTablet.cpp similarity index 100% rename from rpcs3/Emu/Io/GameTablet.cpp rename to rpcs3/rpcs3/Emu/Io/GameTablet.cpp diff --git a/rpcs3/Emu/Io/GameTablet.h b/rpcs3/rpcs3/Emu/Io/GameTablet.h similarity index 100% rename from rpcs3/Emu/Io/GameTablet.h rename to rpcs3/rpcs3/Emu/Io/GameTablet.h diff --git a/rpcs3/Emu/Io/GunCon3.cpp b/rpcs3/rpcs3/Emu/Io/GunCon3.cpp similarity index 100% rename from rpcs3/Emu/Io/GunCon3.cpp rename to rpcs3/rpcs3/Emu/Io/GunCon3.cpp diff --git a/rpcs3/Emu/Io/GunCon3.h b/rpcs3/rpcs3/Emu/Io/GunCon3.h similarity index 100% rename from rpcs3/Emu/Io/GunCon3.h rename to rpcs3/rpcs3/Emu/Io/GunCon3.h diff --git a/rpcs3/Emu/Io/Infinity.cpp b/rpcs3/rpcs3/Emu/Io/Infinity.cpp similarity index 100% rename from rpcs3/Emu/Io/Infinity.cpp rename to rpcs3/rpcs3/Emu/Io/Infinity.cpp diff --git a/rpcs3/Emu/Io/Infinity.h b/rpcs3/rpcs3/Emu/Io/Infinity.h similarity index 100% rename from rpcs3/Emu/Io/Infinity.h rename to rpcs3/rpcs3/Emu/Io/Infinity.h diff --git a/rpcs3/Emu/Io/Keyboard.h b/rpcs3/rpcs3/Emu/Io/Keyboard.h similarity index 100% rename from rpcs3/Emu/Io/Keyboard.h rename to rpcs3/rpcs3/Emu/Io/Keyboard.h diff --git a/rpcs3/Emu/Io/KeyboardHandler.cpp b/rpcs3/rpcs3/Emu/Io/KeyboardHandler.cpp similarity index 100% rename from rpcs3/Emu/Io/KeyboardHandler.cpp rename to rpcs3/rpcs3/Emu/Io/KeyboardHandler.cpp diff --git a/rpcs3/Emu/Io/KeyboardHandler.h b/rpcs3/rpcs3/Emu/Io/KeyboardHandler.h similarity index 100% rename from rpcs3/Emu/Io/KeyboardHandler.h rename to rpcs3/rpcs3/Emu/Io/KeyboardHandler.h diff --git a/rpcs3/Emu/Io/MouseHandler.cpp b/rpcs3/rpcs3/Emu/Io/MouseHandler.cpp similarity index 100% rename from rpcs3/Emu/Io/MouseHandler.cpp rename to rpcs3/rpcs3/Emu/Io/MouseHandler.cpp diff --git a/rpcs3/Emu/Io/MouseHandler.h b/rpcs3/rpcs3/Emu/Io/MouseHandler.h similarity index 100% rename from rpcs3/Emu/Io/MouseHandler.h rename to rpcs3/rpcs3/Emu/Io/MouseHandler.h diff --git a/rpcs3/Emu/Io/Null/NullKeyboardHandler.h b/rpcs3/rpcs3/Emu/Io/Null/NullKeyboardHandler.h similarity index 100% rename from rpcs3/Emu/Io/Null/NullKeyboardHandler.h rename to rpcs3/rpcs3/Emu/Io/Null/NullKeyboardHandler.h diff --git a/rpcs3/Emu/Io/Null/NullMouseHandler.h b/rpcs3/rpcs3/Emu/Io/Null/NullMouseHandler.h similarity index 100% rename from rpcs3/Emu/Io/Null/NullMouseHandler.h rename to rpcs3/rpcs3/Emu/Io/Null/NullMouseHandler.h diff --git a/rpcs3/Emu/Io/Null/NullPadHandler.h b/rpcs3/rpcs3/Emu/Io/Null/NullPadHandler.h similarity index 100% rename from rpcs3/Emu/Io/Null/NullPadHandler.h rename to rpcs3/rpcs3/Emu/Io/Null/NullPadHandler.h diff --git a/rpcs3/Emu/Io/Null/null_camera_handler.h b/rpcs3/rpcs3/Emu/Io/Null/null_camera_handler.h similarity index 100% rename from rpcs3/Emu/Io/Null/null_camera_handler.h rename to rpcs3/rpcs3/Emu/Io/Null/null_camera_handler.h diff --git a/rpcs3/Emu/Io/Null/null_music_handler.h b/rpcs3/rpcs3/Emu/Io/Null/null_music_handler.h similarity index 100% rename from rpcs3/Emu/Io/Null/null_music_handler.h rename to rpcs3/rpcs3/Emu/Io/Null/null_music_handler.h diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/rpcs3/Emu/Io/PadHandler.cpp similarity index 100% rename from rpcs3/Emu/Io/PadHandler.cpp rename to rpcs3/rpcs3/Emu/Io/PadHandler.cpp diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/rpcs3/Emu/Io/PadHandler.h similarity index 100% rename from rpcs3/Emu/Io/PadHandler.h rename to rpcs3/rpcs3/Emu/Io/PadHandler.h diff --git a/rpcs3/Emu/Io/RB3MidiDrums.cpp b/rpcs3/rpcs3/Emu/Io/RB3MidiDrums.cpp similarity index 100% rename from rpcs3/Emu/Io/RB3MidiDrums.cpp rename to rpcs3/rpcs3/Emu/Io/RB3MidiDrums.cpp diff --git a/rpcs3/Emu/Io/RB3MidiDrums.h b/rpcs3/rpcs3/Emu/Io/RB3MidiDrums.h similarity index 100% rename from rpcs3/Emu/Io/RB3MidiDrums.h rename to rpcs3/rpcs3/Emu/Io/RB3MidiDrums.h diff --git a/rpcs3/Emu/Io/RB3MidiGuitar.cpp b/rpcs3/rpcs3/Emu/Io/RB3MidiGuitar.cpp similarity index 100% rename from rpcs3/Emu/Io/RB3MidiGuitar.cpp rename to rpcs3/rpcs3/Emu/Io/RB3MidiGuitar.cpp diff --git a/rpcs3/Emu/Io/RB3MidiGuitar.h b/rpcs3/rpcs3/Emu/Io/RB3MidiGuitar.h similarity index 100% rename from rpcs3/Emu/Io/RB3MidiGuitar.h rename to rpcs3/rpcs3/Emu/Io/RB3MidiGuitar.h diff --git a/rpcs3/Emu/Io/RB3MidiKeyboard.cpp b/rpcs3/rpcs3/Emu/Io/RB3MidiKeyboard.cpp similarity index 100% rename from rpcs3/Emu/Io/RB3MidiKeyboard.cpp rename to rpcs3/rpcs3/Emu/Io/RB3MidiKeyboard.cpp diff --git a/rpcs3/Emu/Io/RB3MidiKeyboard.h b/rpcs3/rpcs3/Emu/Io/RB3MidiKeyboard.h similarity index 100% rename from rpcs3/Emu/Io/RB3MidiKeyboard.h rename to rpcs3/rpcs3/Emu/Io/RB3MidiKeyboard.h diff --git a/rpcs3/Emu/Io/Skylander.cpp b/rpcs3/rpcs3/Emu/Io/Skylander.cpp similarity index 100% rename from rpcs3/Emu/Io/Skylander.cpp rename to rpcs3/rpcs3/Emu/Io/Skylander.cpp diff --git a/rpcs3/Emu/Io/Skylander.h b/rpcs3/rpcs3/Emu/Io/Skylander.h similarity index 100% rename from rpcs3/Emu/Io/Skylander.h rename to rpcs3/rpcs3/Emu/Io/Skylander.h diff --git a/rpcs3/Emu/Io/TopShotElite.cpp b/rpcs3/rpcs3/Emu/Io/TopShotElite.cpp similarity index 100% rename from rpcs3/Emu/Io/TopShotElite.cpp rename to rpcs3/rpcs3/Emu/Io/TopShotElite.cpp diff --git a/rpcs3/Emu/Io/TopShotElite.h b/rpcs3/rpcs3/Emu/Io/TopShotElite.h similarity index 100% rename from rpcs3/Emu/Io/TopShotElite.h rename to rpcs3/rpcs3/Emu/Io/TopShotElite.h diff --git a/rpcs3/Emu/Io/TopShotFearmaster.cpp b/rpcs3/rpcs3/Emu/Io/TopShotFearmaster.cpp similarity index 100% rename from rpcs3/Emu/Io/TopShotFearmaster.cpp rename to rpcs3/rpcs3/Emu/Io/TopShotFearmaster.cpp diff --git a/rpcs3/Emu/Io/TopShotFearmaster.h b/rpcs3/rpcs3/Emu/Io/TopShotFearmaster.h similarity index 100% rename from rpcs3/Emu/Io/TopShotFearmaster.h rename to rpcs3/rpcs3/Emu/Io/TopShotFearmaster.h diff --git a/rpcs3/Emu/Io/Turntable.cpp b/rpcs3/rpcs3/Emu/Io/Turntable.cpp similarity index 100% rename from rpcs3/Emu/Io/Turntable.cpp rename to rpcs3/rpcs3/Emu/Io/Turntable.cpp diff --git a/rpcs3/Emu/Io/Turntable.h b/rpcs3/rpcs3/Emu/Io/Turntable.h similarity index 100% rename from rpcs3/Emu/Io/Turntable.h rename to rpcs3/rpcs3/Emu/Io/Turntable.h diff --git a/rpcs3/Emu/Io/buzz_config.h b/rpcs3/rpcs3/Emu/Io/buzz_config.h similarity index 100% rename from rpcs3/Emu/Io/buzz_config.h rename to rpcs3/rpcs3/Emu/Io/buzz_config.h diff --git a/rpcs3/Emu/Io/camera_config.cpp b/rpcs3/rpcs3/Emu/Io/camera_config.cpp similarity index 100% rename from rpcs3/Emu/Io/camera_config.cpp rename to rpcs3/rpcs3/Emu/Io/camera_config.cpp diff --git a/rpcs3/Emu/Io/camera_config.h b/rpcs3/rpcs3/Emu/Io/camera_config.h similarity index 100% rename from rpcs3/Emu/Io/camera_config.h rename to rpcs3/rpcs3/Emu/Io/camera_config.h diff --git a/rpcs3/Emu/Io/camera_handler_base.h b/rpcs3/rpcs3/Emu/Io/camera_handler_base.h similarity index 100% rename from rpcs3/Emu/Io/camera_handler_base.h rename to rpcs3/rpcs3/Emu/Io/camera_handler_base.h diff --git a/rpcs3/Emu/Io/emulated_pad_config.h b/rpcs3/rpcs3/Emu/Io/emulated_pad_config.h similarity index 100% rename from rpcs3/Emu/Io/emulated_pad_config.h rename to rpcs3/rpcs3/Emu/Io/emulated_pad_config.h diff --git a/rpcs3/Emu/Io/gem_config.h b/rpcs3/rpcs3/Emu/Io/gem_config.h similarity index 100% rename from rpcs3/Emu/Io/gem_config.h rename to rpcs3/rpcs3/Emu/Io/gem_config.h diff --git a/rpcs3/Emu/Io/ghltar_config.h b/rpcs3/rpcs3/Emu/Io/ghltar_config.h similarity index 100% rename from rpcs3/Emu/Io/ghltar_config.h rename to rpcs3/rpcs3/Emu/Io/ghltar_config.h diff --git a/rpcs3/Emu/Io/guncon3_config.h b/rpcs3/rpcs3/Emu/Io/guncon3_config.h similarity index 100% rename from rpcs3/Emu/Io/guncon3_config.h rename to rpcs3/rpcs3/Emu/Io/guncon3_config.h diff --git a/rpcs3/Emu/Io/interception.cpp b/rpcs3/rpcs3/Emu/Io/interception.cpp similarity index 100% rename from rpcs3/Emu/Io/interception.cpp rename to rpcs3/rpcs3/Emu/Io/interception.cpp diff --git a/rpcs3/Emu/Io/interception.h b/rpcs3/rpcs3/Emu/Io/interception.h similarity index 100% rename from rpcs3/Emu/Io/interception.h rename to rpcs3/rpcs3/Emu/Io/interception.h diff --git a/rpcs3/Emu/Io/midi_config_types.cpp b/rpcs3/rpcs3/Emu/Io/midi_config_types.cpp similarity index 100% rename from rpcs3/Emu/Io/midi_config_types.cpp rename to rpcs3/rpcs3/Emu/Io/midi_config_types.cpp diff --git a/rpcs3/Emu/Io/midi_config_types.h b/rpcs3/rpcs3/Emu/Io/midi_config_types.h similarity index 100% rename from rpcs3/Emu/Io/midi_config_types.h rename to rpcs3/rpcs3/Emu/Io/midi_config_types.h diff --git a/rpcs3/Emu/Io/mouse_config.cpp b/rpcs3/rpcs3/Emu/Io/mouse_config.cpp similarity index 100% rename from rpcs3/Emu/Io/mouse_config.cpp rename to rpcs3/rpcs3/Emu/Io/mouse_config.cpp diff --git a/rpcs3/Emu/Io/mouse_config.h b/rpcs3/rpcs3/Emu/Io/mouse_config.h similarity index 100% rename from rpcs3/Emu/Io/mouse_config.h rename to rpcs3/rpcs3/Emu/Io/mouse_config.h diff --git a/rpcs3/Emu/Io/music_handler_base.h b/rpcs3/rpcs3/Emu/Io/music_handler_base.h similarity index 100% rename from rpcs3/Emu/Io/music_handler_base.h rename to rpcs3/rpcs3/Emu/Io/music_handler_base.h diff --git a/rpcs3/Emu/Io/pad_config.cpp b/rpcs3/rpcs3/Emu/Io/pad_config.cpp similarity index 100% rename from rpcs3/Emu/Io/pad_config.cpp rename to rpcs3/rpcs3/Emu/Io/pad_config.cpp diff --git a/rpcs3/Emu/Io/pad_config.h b/rpcs3/rpcs3/Emu/Io/pad_config.h similarity index 100% rename from rpcs3/Emu/Io/pad_config.h rename to rpcs3/rpcs3/Emu/Io/pad_config.h diff --git a/rpcs3/Emu/Io/pad_config_types.cpp b/rpcs3/rpcs3/Emu/Io/pad_config_types.cpp similarity index 100% rename from rpcs3/Emu/Io/pad_config_types.cpp rename to rpcs3/rpcs3/Emu/Io/pad_config_types.cpp diff --git a/rpcs3/Emu/Io/pad_config_types.h b/rpcs3/rpcs3/Emu/Io/pad_config_types.h similarity index 100% rename from rpcs3/Emu/Io/pad_config_types.h rename to rpcs3/rpcs3/Emu/Io/pad_config_types.h diff --git a/rpcs3/Emu/Io/pad_types.cpp b/rpcs3/rpcs3/Emu/Io/pad_types.cpp similarity index 100% rename from rpcs3/Emu/Io/pad_types.cpp rename to rpcs3/rpcs3/Emu/Io/pad_types.cpp diff --git a/rpcs3/Emu/Io/pad_types.h b/rpcs3/rpcs3/Emu/Io/pad_types.h similarity index 100% rename from rpcs3/Emu/Io/pad_types.h rename to rpcs3/rpcs3/Emu/Io/pad_types.h diff --git a/rpcs3/Emu/Io/rb3drums_config.cpp b/rpcs3/rpcs3/Emu/Io/rb3drums_config.cpp similarity index 100% rename from rpcs3/Emu/Io/rb3drums_config.cpp rename to rpcs3/rpcs3/Emu/Io/rb3drums_config.cpp diff --git a/rpcs3/Emu/Io/rb3drums_config.h b/rpcs3/rpcs3/Emu/Io/rb3drums_config.h similarity index 100% rename from rpcs3/Emu/Io/rb3drums_config.h rename to rpcs3/rpcs3/Emu/Io/rb3drums_config.h diff --git a/rpcs3/Emu/Io/recording_config.cpp b/rpcs3/rpcs3/Emu/Io/recording_config.cpp similarity index 100% rename from rpcs3/Emu/Io/recording_config.cpp rename to rpcs3/rpcs3/Emu/Io/recording_config.cpp diff --git a/rpcs3/Emu/Io/recording_config.h b/rpcs3/rpcs3/Emu/Io/recording_config.h similarity index 100% rename from rpcs3/Emu/Io/recording_config.h rename to rpcs3/rpcs3/Emu/Io/recording_config.h diff --git a/rpcs3/Emu/Io/topshotelite_config.h b/rpcs3/rpcs3/Emu/Io/topshotelite_config.h similarity index 100% rename from rpcs3/Emu/Io/topshotelite_config.h rename to rpcs3/rpcs3/Emu/Io/topshotelite_config.h diff --git a/rpcs3/Emu/Io/topshotfearmaster_config.h b/rpcs3/rpcs3/Emu/Io/topshotfearmaster_config.h similarity index 100% rename from rpcs3/Emu/Io/topshotfearmaster_config.h rename to rpcs3/rpcs3/Emu/Io/topshotfearmaster_config.h diff --git a/rpcs3/Emu/Io/turntable_config.h b/rpcs3/rpcs3/Emu/Io/turntable_config.h similarity index 100% rename from rpcs3/Emu/Io/turntable_config.h rename to rpcs3/rpcs3/Emu/Io/turntable_config.h diff --git a/rpcs3/Emu/Io/usb_device.cpp b/rpcs3/rpcs3/Emu/Io/usb_device.cpp similarity index 100% rename from rpcs3/Emu/Io/usb_device.cpp rename to rpcs3/rpcs3/Emu/Io/usb_device.cpp diff --git a/rpcs3/Emu/Io/usb_device.h b/rpcs3/rpcs3/Emu/Io/usb_device.h similarity index 100% rename from rpcs3/Emu/Io/usb_device.h rename to rpcs3/rpcs3/Emu/Io/usb_device.h diff --git a/rpcs3/Emu/Io/usb_vfs.cpp b/rpcs3/rpcs3/Emu/Io/usb_vfs.cpp similarity index 100% rename from rpcs3/Emu/Io/usb_vfs.cpp rename to rpcs3/rpcs3/Emu/Io/usb_vfs.cpp diff --git a/rpcs3/Emu/Io/usb_vfs.h b/rpcs3/rpcs3/Emu/Io/usb_vfs.h similarity index 100% rename from rpcs3/Emu/Io/usb_vfs.h rename to rpcs3/rpcs3/Emu/Io/usb_vfs.h diff --git a/rpcs3/Emu/Io/usio.cpp b/rpcs3/rpcs3/Emu/Io/usio.cpp similarity index 100% rename from rpcs3/Emu/Io/usio.cpp rename to rpcs3/rpcs3/Emu/Io/usio.cpp diff --git a/rpcs3/Emu/Io/usio.h b/rpcs3/rpcs3/Emu/Io/usio.h similarity index 100% rename from rpcs3/Emu/Io/usio.h rename to rpcs3/rpcs3/Emu/Io/usio.h diff --git a/rpcs3/Emu/Io/usio_config.h b/rpcs3/rpcs3/Emu/Io/usio_config.h similarity index 100% rename from rpcs3/Emu/Io/usio_config.h rename to rpcs3/rpcs3/Emu/Io/usio_config.h diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/rpcs3/Emu/Memory/vm.cpp similarity index 100% rename from rpcs3/Emu/Memory/vm.cpp rename to rpcs3/rpcs3/Emu/Memory/vm.cpp diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/rpcs3/Emu/Memory/vm.h similarity index 100% rename from rpcs3/Emu/Memory/vm.h rename to rpcs3/rpcs3/Emu/Memory/vm.h diff --git a/rpcs3/Emu/Memory/vm_locking.h b/rpcs3/rpcs3/Emu/Memory/vm_locking.h similarity index 100% rename from rpcs3/Emu/Memory/vm_locking.h rename to rpcs3/rpcs3/Emu/Memory/vm_locking.h diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/rpcs3/Emu/Memory/vm_ptr.h similarity index 100% rename from rpcs3/Emu/Memory/vm_ptr.h rename to rpcs3/rpcs3/Emu/Memory/vm_ptr.h diff --git a/rpcs3/Emu/Memory/vm_ref.h b/rpcs3/rpcs3/Emu/Memory/vm_ref.h similarity index 100% rename from rpcs3/Emu/Memory/vm_ref.h rename to rpcs3/rpcs3/Emu/Memory/vm_ref.h diff --git a/rpcs3/Emu/Memory/vm_reservation.h b/rpcs3/rpcs3/Emu/Memory/vm_reservation.h similarity index 100% rename from rpcs3/Emu/Memory/vm_reservation.h rename to rpcs3/rpcs3/Emu/Memory/vm_reservation.h diff --git a/rpcs3/Emu/Memory/vm_var.h b/rpcs3/rpcs3/Emu/Memory/vm_var.h similarity index 100% rename from rpcs3/Emu/Memory/vm_var.h rename to rpcs3/rpcs3/Emu/Memory/vm_var.h diff --git a/rpcs3/Emu/NP/fb_helpers.cpp b/rpcs3/rpcs3/Emu/NP/fb_helpers.cpp similarity index 100% rename from rpcs3/Emu/NP/fb_helpers.cpp rename to rpcs3/rpcs3/Emu/NP/fb_helpers.cpp diff --git a/rpcs3/Emu/NP/fb_helpers.h b/rpcs3/rpcs3/Emu/NP/fb_helpers.h similarity index 100% rename from rpcs3/Emu/NP/fb_helpers.h rename to rpcs3/rpcs3/Emu/NP/fb_helpers.h diff --git a/rpcs3/Emu/NP/generated/np2_structs.fbs b/rpcs3/rpcs3/Emu/NP/generated/np2_structs.fbs similarity index 100% rename from rpcs3/Emu/NP/generated/np2_structs.fbs rename to rpcs3/rpcs3/Emu/NP/generated/np2_structs.fbs diff --git a/rpcs3/Emu/NP/generated/np2_structs_generated.h b/rpcs3/rpcs3/Emu/NP/generated/np2_structs_generated.h similarity index 100% rename from rpcs3/Emu/NP/generated/np2_structs_generated.h rename to rpcs3/rpcs3/Emu/NP/generated/np2_structs_generated.h diff --git a/rpcs3/Emu/NP/ip_address.cpp b/rpcs3/rpcs3/Emu/NP/ip_address.cpp similarity index 100% rename from rpcs3/Emu/NP/ip_address.cpp rename to rpcs3/rpcs3/Emu/NP/ip_address.cpp diff --git a/rpcs3/Emu/NP/ip_address.h b/rpcs3/rpcs3/Emu/NP/ip_address.h similarity index 100% rename from rpcs3/Emu/NP/ip_address.h rename to rpcs3/rpcs3/Emu/NP/ip_address.h diff --git a/rpcs3/Emu/NP/np_allocator.h b/rpcs3/rpcs3/Emu/NP/np_allocator.h similarity index 100% rename from rpcs3/Emu/NP/np_allocator.h rename to rpcs3/rpcs3/Emu/NP/np_allocator.h diff --git a/rpcs3/Emu/NP/np_cache.cpp b/rpcs3/rpcs3/Emu/NP/np_cache.cpp similarity index 100% rename from rpcs3/Emu/NP/np_cache.cpp rename to rpcs3/rpcs3/Emu/NP/np_cache.cpp diff --git a/rpcs3/Emu/NP/np_cache.h b/rpcs3/rpcs3/Emu/NP/np_cache.h similarity index 100% rename from rpcs3/Emu/NP/np_cache.h rename to rpcs3/rpcs3/Emu/NP/np_cache.h diff --git a/rpcs3/Emu/NP/np_contexts.cpp b/rpcs3/rpcs3/Emu/NP/np_contexts.cpp similarity index 100% rename from rpcs3/Emu/NP/np_contexts.cpp rename to rpcs3/rpcs3/Emu/NP/np_contexts.cpp diff --git a/rpcs3/Emu/NP/np_contexts.h b/rpcs3/rpcs3/Emu/NP/np_contexts.h similarity index 100% rename from rpcs3/Emu/NP/np_contexts.h rename to rpcs3/rpcs3/Emu/NP/np_contexts.h diff --git a/rpcs3/Emu/NP/np_dnshook.cpp b/rpcs3/rpcs3/Emu/NP/np_dnshook.cpp similarity index 100% rename from rpcs3/Emu/NP/np_dnshook.cpp rename to rpcs3/rpcs3/Emu/NP/np_dnshook.cpp diff --git a/rpcs3/Emu/NP/np_dnshook.h b/rpcs3/rpcs3/Emu/NP/np_dnshook.h similarity index 100% rename from rpcs3/Emu/NP/np_dnshook.h rename to rpcs3/rpcs3/Emu/NP/np_dnshook.h diff --git a/rpcs3/Emu/NP/np_event_data.h b/rpcs3/rpcs3/Emu/NP/np_event_data.h similarity index 100% rename from rpcs3/Emu/NP/np_event_data.h rename to rpcs3/rpcs3/Emu/NP/np_event_data.h diff --git a/rpcs3/Emu/NP/np_gui_cache.cpp b/rpcs3/rpcs3/Emu/NP/np_gui_cache.cpp similarity index 100% rename from rpcs3/Emu/NP/np_gui_cache.cpp rename to rpcs3/rpcs3/Emu/NP/np_gui_cache.cpp diff --git a/rpcs3/Emu/NP/np_gui_cache.h b/rpcs3/rpcs3/Emu/NP/np_gui_cache.h similarity index 100% rename from rpcs3/Emu/NP/np_gui_cache.h rename to rpcs3/rpcs3/Emu/NP/np_gui_cache.h diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/rpcs3/Emu/NP/np_handler.cpp similarity index 100% rename from rpcs3/Emu/NP/np_handler.cpp rename to rpcs3/rpcs3/Emu/NP/np_handler.cpp diff --git a/rpcs3/Emu/NP/np_handler.h b/rpcs3/rpcs3/Emu/NP/np_handler.h similarity index 100% rename from rpcs3/Emu/NP/np_handler.h rename to rpcs3/rpcs3/Emu/NP/np_handler.h diff --git a/rpcs3/Emu/NP/np_helpers.cpp b/rpcs3/rpcs3/Emu/NP/np_helpers.cpp similarity index 100% rename from rpcs3/Emu/NP/np_helpers.cpp rename to rpcs3/rpcs3/Emu/NP/np_helpers.cpp diff --git a/rpcs3/Emu/NP/np_helpers.h b/rpcs3/rpcs3/Emu/NP/np_helpers.h similarity index 100% rename from rpcs3/Emu/NP/np_helpers.h rename to rpcs3/rpcs3/Emu/NP/np_helpers.h diff --git a/rpcs3/Emu/NP/np_notifications.cpp b/rpcs3/rpcs3/Emu/NP/np_notifications.cpp similarity index 100% rename from rpcs3/Emu/NP/np_notifications.cpp rename to rpcs3/rpcs3/Emu/NP/np_notifications.cpp diff --git a/rpcs3/Emu/NP/np_requests.cpp b/rpcs3/rpcs3/Emu/NP/np_requests.cpp similarity index 100% rename from rpcs3/Emu/NP/np_requests.cpp rename to rpcs3/rpcs3/Emu/NP/np_requests.cpp diff --git a/rpcs3/Emu/NP/np_requests_gui.cpp b/rpcs3/rpcs3/Emu/NP/np_requests_gui.cpp similarity index 100% rename from rpcs3/Emu/NP/np_requests_gui.cpp rename to rpcs3/rpcs3/Emu/NP/np_requests_gui.cpp diff --git a/rpcs3/Emu/NP/np_structs_extra.cpp b/rpcs3/rpcs3/Emu/NP/np_structs_extra.cpp similarity index 100% rename from rpcs3/Emu/NP/np_structs_extra.cpp rename to rpcs3/rpcs3/Emu/NP/np_structs_extra.cpp diff --git a/rpcs3/Emu/NP/np_structs_extra.h b/rpcs3/rpcs3/Emu/NP/np_structs_extra.h similarity index 100% rename from rpcs3/Emu/NP/np_structs_extra.h rename to rpcs3/rpcs3/Emu/NP/np_structs_extra.h diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/rpcs3/Emu/NP/rpcn_client.cpp similarity index 100% rename from rpcs3/Emu/NP/rpcn_client.cpp rename to rpcs3/rpcs3/Emu/NP/rpcn_client.cpp diff --git a/rpcs3/Emu/NP/rpcn_client.h b/rpcs3/rpcs3/Emu/NP/rpcn_client.h similarity index 100% rename from rpcs3/Emu/NP/rpcn_client.h rename to rpcs3/rpcs3/Emu/NP/rpcn_client.h diff --git a/rpcs3/Emu/NP/rpcn_config.cpp b/rpcs3/rpcs3/Emu/NP/rpcn_config.cpp similarity index 100% rename from rpcs3/Emu/NP/rpcn_config.cpp rename to rpcs3/rpcs3/Emu/NP/rpcn_config.cpp diff --git a/rpcs3/Emu/NP/rpcn_config.h b/rpcs3/rpcs3/Emu/NP/rpcn_config.h similarity index 100% rename from rpcs3/Emu/NP/rpcn_config.h rename to rpcs3/rpcs3/Emu/NP/rpcn_config.h diff --git a/rpcs3/Emu/NP/rpcn_countries.cpp b/rpcs3/rpcs3/Emu/NP/rpcn_countries.cpp similarity index 100% rename from rpcs3/Emu/NP/rpcn_countries.cpp rename to rpcs3/rpcs3/Emu/NP/rpcn_countries.cpp diff --git a/rpcs3/Emu/NP/rpcn_countries.h b/rpcs3/rpcs3/Emu/NP/rpcn_countries.h similarity index 100% rename from rpcs3/Emu/NP/rpcn_countries.h rename to rpcs3/rpcs3/Emu/NP/rpcn_countries.h diff --git a/rpcs3/Emu/NP/rpcn_types.h b/rpcs3/rpcs3/Emu/NP/rpcn_types.h similarity index 100% rename from rpcs3/Emu/NP/rpcn_types.h rename to rpcs3/rpcs3/Emu/NP/rpcn_types.h diff --git a/rpcs3/Emu/NP/signaling_handler.cpp b/rpcs3/rpcs3/Emu/NP/signaling_handler.cpp similarity index 100% rename from rpcs3/Emu/NP/signaling_handler.cpp rename to rpcs3/rpcs3/Emu/NP/signaling_handler.cpp diff --git a/rpcs3/Emu/NP/signaling_handler.h b/rpcs3/rpcs3/Emu/NP/signaling_handler.h similarity index 100% rename from rpcs3/Emu/NP/signaling_handler.h rename to rpcs3/rpcs3/Emu/NP/signaling_handler.h diff --git a/rpcs3/Emu/NP/upnp_config.cpp b/rpcs3/rpcs3/Emu/NP/upnp_config.cpp similarity index 100% rename from rpcs3/Emu/NP/upnp_config.cpp rename to rpcs3/rpcs3/Emu/NP/upnp_config.cpp diff --git a/rpcs3/Emu/NP/upnp_config.h b/rpcs3/rpcs3/Emu/NP/upnp_config.h similarity index 100% rename from rpcs3/Emu/NP/upnp_config.h rename to rpcs3/rpcs3/Emu/NP/upnp_config.h diff --git a/rpcs3/Emu/NP/upnp_handler.cpp b/rpcs3/rpcs3/Emu/NP/upnp_handler.cpp similarity index 100% rename from rpcs3/Emu/NP/upnp_handler.cpp rename to rpcs3/rpcs3/Emu/NP/upnp_handler.cpp diff --git a/rpcs3/Emu/NP/upnp_handler.h b/rpcs3/rpcs3/Emu/NP/upnp_handler.h similarity index 100% rename from rpcs3/Emu/NP/upnp_handler.h rename to rpcs3/rpcs3/Emu/NP/upnp_handler.h diff --git a/rpcs3/Emu/NP/vport0.h b/rpcs3/rpcs3/Emu/NP/vport0.h similarity index 100% rename from rpcs3/Emu/NP/vport0.h rename to rpcs3/rpcs3/Emu/NP/vport0.h diff --git a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp b/rpcs3/rpcs3/Emu/RSX/Capture/rsx_capture.cpp similarity index 100% rename from rpcs3/Emu/RSX/Capture/rsx_capture.cpp rename to rpcs3/rpcs3/Emu/RSX/Capture/rsx_capture.cpp diff --git a/rpcs3/Emu/RSX/Capture/rsx_capture.h b/rpcs3/rpcs3/Emu/RSX/Capture/rsx_capture.h similarity index 100% rename from rpcs3/Emu/RSX/Capture/rsx_capture.h rename to rpcs3/rpcs3/Emu/RSX/Capture/rsx_capture.h diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp b/rpcs3/rpcs3/Emu/RSX/Capture/rsx_replay.cpp similarity index 100% rename from rpcs3/Emu/RSX/Capture/rsx_replay.cpp rename to rpcs3/rpcs3/Emu/RSX/Capture/rsx_replay.cpp diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.h b/rpcs3/rpcs3/Emu/RSX/Capture/rsx_replay.h similarity index 100% rename from rpcs3/Emu/RSX/Capture/rsx_replay.h rename to rpcs3/rpcs3/Emu/RSX/Capture/rsx_replay.h diff --git a/rpcs3/Emu/RSX/Capture/rsx_trace.h b/rpcs3/rpcs3/Emu/RSX/Capture/rsx_trace.h similarity index 100% rename from rpcs3/Emu/RSX/Capture/rsx_trace.h rename to rpcs3/rpcs3/Emu/RSX/Capture/rsx_trace.h diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/rpcs3/Emu/RSX/Common/BufferUtils.cpp similarity index 100% rename from rpcs3/Emu/RSX/Common/BufferUtils.cpp rename to rpcs3/rpcs3/Emu/RSX/Common/BufferUtils.cpp diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.h b/rpcs3/rpcs3/Emu/RSX/Common/BufferUtils.h similarity index 100% rename from rpcs3/Emu/RSX/Common/BufferUtils.h rename to rpcs3/rpcs3/Emu/RSX/Common/BufferUtils.h diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.cpp b/rpcs3/rpcs3/Emu/RSX/Common/TextureUtils.cpp similarity index 100% rename from rpcs3/Emu/RSX/Common/TextureUtils.cpp rename to rpcs3/rpcs3/Emu/RSX/Common/TextureUtils.cpp diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.h b/rpcs3/rpcs3/Emu/RSX/Common/TextureUtils.h similarity index 100% rename from rpcs3/Emu/RSX/Common/TextureUtils.h rename to rpcs3/rpcs3/Emu/RSX/Common/TextureUtils.h diff --git a/rpcs3/Emu/RSX/Common/bitfield.hpp b/rpcs3/rpcs3/Emu/RSX/Common/bitfield.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/bitfield.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/bitfield.hpp diff --git a/rpcs3/Emu/RSX/Common/buffer_stream.hpp b/rpcs3/rpcs3/Emu/RSX/Common/buffer_stream.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/buffer_stream.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/buffer_stream.hpp diff --git a/rpcs3/Emu/RSX/Common/expected.hpp b/rpcs3/rpcs3/Emu/RSX/Common/expected.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/expected.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/expected.hpp diff --git a/rpcs3/Emu/RSX/Common/io_buffer.h b/rpcs3/rpcs3/Emu/RSX/Common/io_buffer.h similarity index 100% rename from rpcs3/Emu/RSX/Common/io_buffer.h rename to rpcs3/rpcs3/Emu/RSX/Common/io_buffer.h diff --git a/rpcs3/Emu/RSX/Common/profiling_timer.hpp b/rpcs3/rpcs3/Emu/RSX/Common/profiling_timer.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/profiling_timer.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/profiling_timer.hpp diff --git a/rpcs3/Emu/RSX/Common/ranged_map.hpp b/rpcs3/rpcs3/Emu/RSX/Common/ranged_map.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/ranged_map.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/ranged_map.hpp diff --git a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h b/rpcs3/rpcs3/Emu/RSX/Common/ring_buffer_helper.h similarity index 100% rename from rpcs3/Emu/RSX/Common/ring_buffer_helper.h rename to rpcs3/rpcs3/Emu/RSX/Common/ring_buffer_helper.h diff --git a/rpcs3/Emu/RSX/Common/simple_array.hpp b/rpcs3/rpcs3/Emu/RSX/Common/simple_array.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/simple_array.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/simple_array.hpp diff --git a/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp b/rpcs3/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/surface_cache_dma.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/surface_cache_dma.hpp diff --git a/rpcs3/Emu/RSX/Common/surface_store.cpp b/rpcs3/rpcs3/Emu/RSX/Common/surface_store.cpp similarity index 100% rename from rpcs3/Emu/RSX/Common/surface_store.cpp rename to rpcs3/rpcs3/Emu/RSX/Common/surface_store.cpp diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/rpcs3/Emu/RSX/Common/surface_store.h similarity index 100% rename from rpcs3/Emu/RSX/Common/surface_store.h rename to rpcs3/rpcs3/Emu/RSX/Common/surface_store.h diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/rpcs3/Emu/RSX/Common/surface_utils.h similarity index 100% rename from rpcs3/Emu/RSX/Common/surface_utils.h rename to rpcs3/rpcs3/Emu/RSX/Common/surface_utils.h diff --git a/rpcs3/Emu/RSX/Common/texture_cache.cpp b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache.cpp similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache.cpp rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache.cpp diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache.h similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache.h rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache.h diff --git a/rpcs3/Emu/RSX/Common/texture_cache_checker.h b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache_checker.h similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache_checker.h rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache_checker.h diff --git a/rpcs3/Emu/RSX/Common/texture_cache_helpers.h b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache_helpers.h similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache_helpers.h rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache_helpers.h diff --git a/rpcs3/Emu/RSX/Common/texture_cache_predictor.h b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache_predictor.h similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache_predictor.h rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache_predictor.h diff --git a/rpcs3/Emu/RSX/Common/texture_cache_types.cpp b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache_types.cpp similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache_types.cpp rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache_types.cpp diff --git a/rpcs3/Emu/RSX/Common/texture_cache_types.h b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache_types.h similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache_types.h rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache_types.h diff --git a/rpcs3/Emu/RSX/Common/texture_cache_utils.h b/rpcs3/rpcs3/Emu/RSX/Common/texture_cache_utils.h similarity index 100% rename from rpcs3/Emu/RSX/Common/texture_cache_utils.h rename to rpcs3/rpcs3/Emu/RSX/Common/texture_cache_utils.h diff --git a/rpcs3/Emu/RSX/Common/tiled_dma_copy.hpp b/rpcs3/rpcs3/Emu/RSX/Common/tiled_dma_copy.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/tiled_dma_copy.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/tiled_dma_copy.hpp diff --git a/rpcs3/Emu/RSX/Common/time.hpp b/rpcs3/rpcs3/Emu/RSX/Common/time.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/time.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/time.hpp diff --git a/rpcs3/Emu/RSX/Common/unordered_map.hpp b/rpcs3/rpcs3/Emu/RSX/Common/unordered_map.hpp similarity index 100% rename from rpcs3/Emu/RSX/Common/unordered_map.hpp rename to rpcs3/rpcs3/Emu/RSX/Common/unordered_map.hpp diff --git a/rpcs3/Emu/RSX/Core/RSXContext.cpp b/rpcs3/rpcs3/Emu/RSX/Core/RSXContext.cpp similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXContext.cpp rename to rpcs3/rpcs3/Emu/RSX/Core/RSXContext.cpp diff --git a/rpcs3/Emu/RSX/Core/RSXContext.h b/rpcs3/rpcs3/Emu/RSX/Core/RSXContext.h similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXContext.h rename to rpcs3/rpcs3/Emu/RSX/Core/RSXContext.h diff --git a/rpcs3/Emu/RSX/Core/RSXDisplay.cpp b/rpcs3/rpcs3/Emu/RSX/Core/RSXDisplay.cpp similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXDisplay.cpp rename to rpcs3/rpcs3/Emu/RSX/Core/RSXDisplay.cpp diff --git a/rpcs3/Emu/RSX/Core/RSXDisplay.h b/rpcs3/rpcs3/Emu/RSX/Core/RSXDisplay.h similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXDisplay.h rename to rpcs3/rpcs3/Emu/RSX/Core/RSXDisplay.h diff --git a/rpcs3/Emu/RSX/Core/RSXDrawCommands.cpp b/rpcs3/rpcs3/Emu/RSX/Core/RSXDrawCommands.cpp similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXDrawCommands.cpp rename to rpcs3/rpcs3/Emu/RSX/Core/RSXDrawCommands.cpp diff --git a/rpcs3/Emu/RSX/Core/RSXDrawCommands.h b/rpcs3/rpcs3/Emu/RSX/Core/RSXDrawCommands.h similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXDrawCommands.h rename to rpcs3/rpcs3/Emu/RSX/Core/RSXDrawCommands.h diff --git a/rpcs3/Emu/RSX/Core/RSXDriverState.h b/rpcs3/rpcs3/Emu/RSX/Core/RSXDriverState.h similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXDriverState.h rename to rpcs3/rpcs3/Emu/RSX/Core/RSXDriverState.h diff --git a/rpcs3/Emu/RSX/Core/RSXEngLock.hpp b/rpcs3/rpcs3/Emu/RSX/Core/RSXEngLock.hpp similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXEngLock.hpp rename to rpcs3/rpcs3/Emu/RSX/Core/RSXEngLock.hpp diff --git a/rpcs3/Emu/RSX/Core/RSXFrameBuffer.h b/rpcs3/rpcs3/Emu/RSX/Core/RSXFrameBuffer.h similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXFrameBuffer.h rename to rpcs3/rpcs3/Emu/RSX/Core/RSXFrameBuffer.h diff --git a/rpcs3/Emu/RSX/Core/RSXIOMap.hpp b/rpcs3/rpcs3/Emu/RSX/Core/RSXIOMap.hpp similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXIOMap.hpp rename to rpcs3/rpcs3/Emu/RSX/Core/RSXIOMap.hpp diff --git a/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp b/rpcs3/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXReservationLock.hpp rename to rpcs3/rpcs3/Emu/RSX/Core/RSXReservationLock.hpp diff --git a/rpcs3/Emu/RSX/Core/RSXVertexTypes.h b/rpcs3/rpcs3/Emu/RSX/Core/RSXVertexTypes.h similarity index 100% rename from rpcs3/Emu/RSX/Core/RSXVertexTypes.h rename to rpcs3/rpcs3/Emu/RSX/Core/RSXVertexTypes.h diff --git a/rpcs3/Emu/RSX/GCM.h b/rpcs3/rpcs3/Emu/RSX/GCM.h similarity index 100% rename from rpcs3/Emu/RSX/GCM.h rename to rpcs3/rpcs3/Emu/RSX/GCM.h diff --git a/rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp diff --git a/rpcs3/Emu/RSX/GL/GLCommonDecompiler.h b/rpcs3/rpcs3/Emu/RSX/GL/GLCommonDecompiler.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLCommonDecompiler.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLCommonDecompiler.h diff --git a/rpcs3/Emu/RSX/GL/GLCompute.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLCompute.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLCompute.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLCompute.cpp diff --git a/rpcs3/Emu/RSX/GL/GLCompute.h b/rpcs3/rpcs3/Emu/RSX/GL/GLCompute.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLCompute.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLCompute.h diff --git a/rpcs3/Emu/RSX/GL/GLDMA.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLDMA.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLDMA.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLDMA.cpp diff --git a/rpcs3/Emu/RSX/GL/GLDMA.h b/rpcs3/rpcs3/Emu/RSX/GL/GLDMA.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLDMA.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLDMA.h diff --git a/rpcs3/Emu/RSX/GL/GLDraw.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLDraw.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLDraw.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLDraw.cpp diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h b/rpcs3/rpcs3/Emu/RSX/GL/GLFragmentProgram.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLFragmentProgram.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLFragmentProgram.h diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLGSRender.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLGSRender.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLGSRender.cpp diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/rpcs3/Emu/RSX/GL/GLGSRender.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLGSRender.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLGSRender.h diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLHelpers.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLHelpers.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLHelpers.cpp diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/rpcs3/Emu/RSX/GL/GLHelpers.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLHelpers.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLHelpers.h diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLOverlays.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLOverlays.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLOverlays.cpp diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.h b/rpcs3/rpcs3/Emu/RSX/GL/GLOverlays.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLOverlays.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLOverlays.h diff --git a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLPipelineCompiler.cpp diff --git a/rpcs3/Emu/RSX/GL/GLPipelineCompiler.h b/rpcs3/rpcs3/Emu/RSX/GL/GLPipelineCompiler.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLPipelineCompiler.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLPipelineCompiler.h diff --git a/rpcs3/Emu/RSX/GL/GLPresent.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLPresent.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLPresent.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLPresent.cpp diff --git a/rpcs3/Emu/RSX/GL/GLProcTable.h b/rpcs3/rpcs3/Emu/RSX/GL/GLProcTable.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLProcTable.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLProcTable.h diff --git a/rpcs3/Emu/RSX/GL/GLProgramBuffer.h b/rpcs3/rpcs3/Emu/RSX/GL/GLProgramBuffer.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLProgramBuffer.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLProgramBuffer.h diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLRenderTargets.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLRenderTargets.cpp diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.h b/rpcs3/rpcs3/Emu/RSX/GL/GLRenderTargets.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLRenderTargets.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLRenderTargets.h diff --git a/rpcs3/Emu/RSX/GL/GLResolveHelper.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLResolveHelper.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLResolveHelper.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLResolveHelper.cpp diff --git a/rpcs3/Emu/RSX/GL/GLResolveHelper.h b/rpcs3/rpcs3/Emu/RSX/GL/GLResolveHelper.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLResolveHelper.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLResolveHelper.h diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h b/rpcs3/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLShaderInterpreter.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLShaderInterpreter.h diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLTexture.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLTexture.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLTexture.cpp diff --git a/rpcs3/Emu/RSX/GL/GLTexture.h b/rpcs3/rpcs3/Emu/RSX/GL/GLTexture.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLTexture.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLTexture.h diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLTextureCache.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLTextureCache.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLTextureCache.cpp diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/rpcs3/Emu/RSX/GL/GLTextureCache.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLTextureCache.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLTextureCache.h diff --git a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/GLVertexProgram.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.h b/rpcs3/rpcs3/Emu/RSX/GL/GLVertexProgram.h similarity index 100% rename from rpcs3/Emu/RSX/GL/GLVertexProgram.h rename to rpcs3/rpcs3/Emu/RSX/GL/GLVertexProgram.h diff --git a/rpcs3/Emu/RSX/GL/OpenGL.cpp b/rpcs3/rpcs3/Emu/RSX/GL/OpenGL.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/OpenGL.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/OpenGL.cpp diff --git a/rpcs3/Emu/RSX/GL/OpenGL.h b/rpcs3/rpcs3/Emu/RSX/GL/OpenGL.h similarity index 100% rename from rpcs3/Emu/RSX/GL/OpenGL.h rename to rpcs3/rpcs3/Emu/RSX/GL/OpenGL.h diff --git a/rpcs3/Emu/RSX/GL/glutils/blitter.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/blitter.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/blitter.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/blitter.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/blitter.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/blitter.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/blitter.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/blitter.h diff --git a/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/buffer_object.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/buffer_object.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/buffer_object.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/buffer_object.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/buffer_object.h diff --git a/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/capabilities.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/capabilities.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/capabilities.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/capabilities.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/capabilities.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/capabilities.h diff --git a/rpcs3/Emu/RSX/GL/glutils/common.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/common.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/common.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/common.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/common.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/common.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/common.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/common.h diff --git a/rpcs3/Emu/RSX/GL/glutils/fbo.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/fbo.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/fbo.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/fbo.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/fbo.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/fbo.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/fbo.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/fbo.h diff --git a/rpcs3/Emu/RSX/GL/glutils/image.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/image.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/image.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/image.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/image.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/image.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/image.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/image.h diff --git a/rpcs3/Emu/RSX/GL/glutils/pixel_settings.hpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/pixel_settings.hpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/pixel_settings.hpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/pixel_settings.hpp diff --git a/rpcs3/Emu/RSX/GL/glutils/program.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/program.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/program.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/program.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/program.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/program.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/program.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/program.h diff --git a/rpcs3/Emu/RSX/GL/glutils/ring_buffer.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/ring_buffer.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/ring_buffer.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/ring_buffer.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/ring_buffer.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/ring_buffer.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/ring_buffer.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/ring_buffer.h diff --git a/rpcs3/Emu/RSX/GL/glutils/sampler.cpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/sampler.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/sampler.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/sampler.cpp diff --git a/rpcs3/Emu/RSX/GL/glutils/sampler.h b/rpcs3/rpcs3/Emu/RSX/GL/glutils/sampler.h similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/sampler.h rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/sampler.h diff --git a/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/state_tracker.hpp diff --git a/rpcs3/Emu/RSX/GL/glutils/sync.hpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/sync.hpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/sync.hpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/sync.hpp diff --git a/rpcs3/Emu/RSX/GL/glutils/vao.hpp b/rpcs3/rpcs3/Emu/RSX/GL/glutils/vao.hpp similarity index 100% rename from rpcs3/Emu/RSX/GL/glutils/vao.hpp rename to rpcs3/rpcs3/Emu/RSX/GL/glutils/vao.hpp diff --git a/rpcs3/Emu/RSX/GL/upscalers/bilinear_pass.hpp b/rpcs3/rpcs3/Emu/RSX/GL/upscalers/bilinear_pass.hpp similarity index 100% rename from rpcs3/Emu/RSX/GL/upscalers/bilinear_pass.hpp rename to rpcs3/rpcs3/Emu/RSX/GL/upscalers/bilinear_pass.hpp diff --git a/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp b/rpcs3/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp similarity index 100% rename from rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp rename to rpcs3/rpcs3/Emu/RSX/GL/upscalers/fsr1/fsr_pass.cpp diff --git a/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h b/rpcs3/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h similarity index 100% rename from rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h rename to rpcs3/rpcs3/Emu/RSX/GL/upscalers/fsr_pass.h diff --git a/rpcs3/Emu/RSX/GL/upscalers/nearest_pass.hpp b/rpcs3/rpcs3/Emu/RSX/GL/upscalers/nearest_pass.hpp similarity index 100% rename from rpcs3/Emu/RSX/GL/upscalers/nearest_pass.hpp rename to rpcs3/rpcs3/Emu/RSX/GL/upscalers/nearest_pass.hpp diff --git a/rpcs3/Emu/RSX/GL/upscalers/static_pass.hpp b/rpcs3/rpcs3/Emu/RSX/GL/upscalers/static_pass.hpp similarity index 100% rename from rpcs3/Emu/RSX/GL/upscalers/static_pass.hpp rename to rpcs3/rpcs3/Emu/RSX/GL/upscalers/static_pass.hpp diff --git a/rpcs3/Emu/RSX/GL/upscalers/upscaling.h b/rpcs3/rpcs3/Emu/RSX/GL/upscalers/upscaling.h similarity index 100% rename from rpcs3/Emu/RSX/GL/upscalers/upscaling.h rename to rpcs3/rpcs3/Emu/RSX/GL/upscalers/upscaling.h diff --git a/rpcs3/Emu/RSX/GSFrameBase.cpp b/rpcs3/rpcs3/Emu/RSX/GSFrameBase.cpp similarity index 100% rename from rpcs3/Emu/RSX/GSFrameBase.cpp rename to rpcs3/rpcs3/Emu/RSX/GSFrameBase.cpp diff --git a/rpcs3/Emu/RSX/GSFrameBase.h b/rpcs3/rpcs3/Emu/RSX/GSFrameBase.h similarity index 100% rename from rpcs3/Emu/RSX/GSFrameBase.h rename to rpcs3/rpcs3/Emu/RSX/GSFrameBase.h diff --git a/rpcs3/Emu/RSX/GSRender.cpp b/rpcs3/rpcs3/Emu/RSX/GSRender.cpp similarity index 100% rename from rpcs3/Emu/RSX/GSRender.cpp rename to rpcs3/rpcs3/Emu/RSX/GSRender.cpp diff --git a/rpcs3/Emu/RSX/GSRender.h b/rpcs3/rpcs3/Emu/RSX/GSRender.h similarity index 100% rename from rpcs3/Emu/RSX/GSRender.h rename to rpcs3/rpcs3/Emu/RSX/GSRender.h diff --git a/rpcs3/Emu/RSX/Host/MM.cpp b/rpcs3/rpcs3/Emu/RSX/Host/MM.cpp similarity index 100% rename from rpcs3/Emu/RSX/Host/MM.cpp rename to rpcs3/rpcs3/Emu/RSX/Host/MM.cpp diff --git a/rpcs3/Emu/RSX/Host/MM.h b/rpcs3/rpcs3/Emu/RSX/Host/MM.h similarity index 100% rename from rpcs3/Emu/RSX/Host/MM.h rename to rpcs3/rpcs3/Emu/RSX/Host/MM.h diff --git a/rpcs3/Emu/RSX/Host/RSXDMAWriter.cpp b/rpcs3/rpcs3/Emu/RSX/Host/RSXDMAWriter.cpp similarity index 100% rename from rpcs3/Emu/RSX/Host/RSXDMAWriter.cpp rename to rpcs3/rpcs3/Emu/RSX/Host/RSXDMAWriter.cpp diff --git a/rpcs3/Emu/RSX/Host/RSXDMAWriter.h b/rpcs3/rpcs3/Emu/RSX/Host/RSXDMAWriter.h similarity index 100% rename from rpcs3/Emu/RSX/Host/RSXDMAWriter.h rename to rpcs3/rpcs3/Emu/RSX/Host/RSXDMAWriter.h diff --git a/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h b/rpcs3/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h rename to rpcs3/rpcs3/Emu/RSX/NV47/FW/GRAPH_backend.h diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/FW/draw_call.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp b/rpcs3/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/FW/draw_call.hpp rename to rpcs3/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.inc.h b/rpcs3/rpcs3/Emu/RSX/NV47/FW/draw_call.inc.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/FW/draw_call.inc.h rename to rpcs3/rpcs3/Emu/RSX/NV47/FW/draw_call.inc.h diff --git a/rpcs3/Emu/RSX/NV47/FW/reg_context.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/FW/reg_context.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/FW/reg_context.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/FW/reg_context.cpp diff --git a/rpcs3/Emu/RSX/NV47/FW/reg_context.h b/rpcs3/rpcs3/Emu/RSX/NV47/FW/reg_context.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/FW/reg_context.h rename to rpcs3/rpcs3/Emu/RSX/NV47/FW/reg_context.h diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/HW/common.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/common.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/common.cpp diff --git a/rpcs3/Emu/RSX/NV47/HW/common.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/common.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/common.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/common.h diff --git a/rpcs3/Emu/RSX/NV47/HW/context.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/context.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/context.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/context.h diff --git a/rpcs3/Emu/RSX/NV47/HW/context_accessors.define.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/context_accessors.define.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/context_accessors.define.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/context_accessors.define.h diff --git a/rpcs3/Emu/RSX/NV47/HW/context_accessors.undef.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/context_accessors.undef.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/context_accessors.undef.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/context_accessors.undef.h diff --git a/rpcs3/Emu/RSX/NV47/HW/nv0039.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv0039.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv0039.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv0039.cpp diff --git a/rpcs3/Emu/RSX/NV47/HW/nv0039.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv0039.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv0039.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv0039.h diff --git a/rpcs3/Emu/RSX/NV47/HW/nv3089.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv3089.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv3089.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv3089.cpp diff --git a/rpcs3/Emu/RSX/NV47/HW/nv3089.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv3089.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv3089.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv3089.h diff --git a/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv308a.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv308a.cpp diff --git a/rpcs3/Emu/RSX/NV47/HW/nv308a.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv308a.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv308a.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv308a.h diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv406e.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv406e.cpp diff --git a/rpcs3/Emu/RSX/NV47/HW/nv406e.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv406e.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv406e.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv406e.h diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv4097.cpp rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv4097.cpp diff --git a/rpcs3/Emu/RSX/NV47/HW/nv4097.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv4097.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv4097.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv4097.h diff --git a/rpcs3/Emu/RSX/NV47/HW/nv47.h b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv47.h similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv47.h rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv47.h diff --git a/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp b/rpcs3/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp similarity index 100% rename from rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp rename to rpcs3/rpcs3/Emu/RSX/NV47/HW/nv47_sync.hpp diff --git a/rpcs3/Emu/RSX/Null/NullGSRender.cpp b/rpcs3/rpcs3/Emu/RSX/Null/NullGSRender.cpp similarity index 100% rename from rpcs3/Emu/RSX/Null/NullGSRender.cpp rename to rpcs3/rpcs3/Emu/RSX/Null/NullGSRender.cpp diff --git a/rpcs3/Emu/RSX/Null/NullGSRender.h b/rpcs3/rpcs3/Emu/RSX/Null/NullGSRender.h similarity index 100% rename from rpcs3/Emu/RSX/Null/NullGSRender.h rename to rpcs3/rpcs3/Emu/RSX/Null/NullGSRender.h diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu.h diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_components.h diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.h b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.h diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_message_box.h diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_page.h diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.h b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.h diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h b/rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_recvmessage_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/Network/overlay_sendmessage_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp diff --git a/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h b/rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.h diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animated_icon.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_animation.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animation.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animation.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animation.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_animation.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_animation.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_compile_notification.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_compile_notification.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_controls.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_controls.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_controls.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_controls.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_cursor.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_cursor.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_cursor.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_cursor.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_cursor.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_edit_text.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_edit_text.hpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_fonts.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_fonts.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_fonts.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_list_view.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_list_view.hpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_loading_icon.hpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_loading_icon.hpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_loading_icon.hpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_loading_icon.hpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_manager.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_manager.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_manager.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_manager.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_manager.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_manager.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_manager.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_manager.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_message.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_message.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_osk.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_osk.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_perf_metrics.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_progress_bar.hpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_utils.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_utils.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_utils.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_utils.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_utils.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_utils.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_utils.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_utils.h diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_video.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_video.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_video.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlay_video.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlay_video.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlay_video.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlay_video.h diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/rpcs3/Emu/RSX/Overlays/overlays.cpp similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlays.cpp rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlays.cpp diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/rpcs3/Emu/RSX/Overlays/overlays.h similarity index 100% rename from rpcs3/Emu/RSX/Overlays/overlays.h rename to rpcs3/rpcs3/Emu/RSX/Overlays/overlays.h diff --git a/rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp b/rpcs3/rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/CgBinaryFragmentProgram.cpp diff --git a/rpcs3/Emu/RSX/Program/CgBinaryProgram.h b/rpcs3/rpcs3/Emu/RSX/Program/CgBinaryProgram.h similarity index 100% rename from rpcs3/Emu/RSX/Program/CgBinaryProgram.h rename to rpcs3/rpcs3/Emu/RSX/Program/CgBinaryProgram.h diff --git a/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp b/rpcs3/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/CgBinaryVertexProgram.cpp diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp b/rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h b/rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h similarity index 100% rename from rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h rename to rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramRegister.cpp b/rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramRegister.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/FragmentProgramRegister.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramRegister.cpp diff --git a/rpcs3/Emu/RSX/Program/FragmentProgramRegister.h b/rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramRegister.h similarity index 100% rename from rpcs3/Emu/RSX/Program/FragmentProgramRegister.h rename to rpcs3/rpcs3/Emu/RSX/Program/FragmentProgramRegister.h diff --git a/rpcs3/Emu/RSX/Program/GLSLCommon.cpp b/rpcs3/rpcs3/Emu/RSX/Program/GLSLCommon.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLCommon.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLCommon.cpp diff --git a/rpcs3/Emu/RSX/Program/GLSLCommon.h b/rpcs3/rpcs3/Emu/RSX/Program/GLSLCommon.h similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLCommon.h rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLCommon.h diff --git a/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLInterpreter/VertexInterpreter.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToColorImage.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToColorImage.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToColorImage.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToColorImage.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToGenericImage.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToGenericImage.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToGenericImage.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyBufferToGenericImage.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyD24x8ToBuffer.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyD24x8ToBuffer.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/CopyD24x8ToBuffer.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyD24x8ToBuffer.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/CopyRGBA8ToBuffer.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/GPUDeswizzle.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/GenericVSPassthrough.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderFS.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderVS.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderVS.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderVS.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/OverlayRenderVS.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXMemoryTiling.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXMemoryTiling.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXMemoryTiling.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXMemoryTiling.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXDefines2.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXDefines2.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXDefines2.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXDefines2.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentPrologue.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureDepthConversion.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOps.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureMSAAOpsInternal.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgramCommon.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgramCommon.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgramCommon.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgramCommon.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXProgrammableBlendPrologue.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPEpilogue.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPEpilogue.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPEpilogue.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPEpilogue.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPPrologue.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPPrologue.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPPrologue.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXROPPrologue.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexFetch.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXVertexPrologue.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/ShuffleBytes.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/ShuffleBytes.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/ShuffleBytes.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/ShuffleBytes.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLSnippets/VideoOutCalibrationPass.glsl diff --git a/rpcs3/Emu/RSX/Program/GLSLTypes.h b/rpcs3/rpcs3/Emu/RSX/Program/GLSLTypes.h similarity index 100% rename from rpcs3/Emu/RSX/Program/GLSLTypes.h rename to rpcs3/rpcs3/Emu/RSX/Program/GLSLTypes.h diff --git a/rpcs3/Emu/RSX/Program/MSAA/ColorResolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/ColorResolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/ColorResolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/ColorResolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/ColorUnresolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthResolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthResolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/DepthResolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthResolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthStencilResolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthStencilUnresolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/DepthUnresolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/MSAA/StencilResolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/StencilResolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/StencilResolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/StencilResolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl b/rpcs3/rpcs3/Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/MSAA/StencilUnresolvePass.glsl diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/ProgramStateCache.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.h b/rpcs3/rpcs3/Emu/RSX/Program/ProgramStateCache.h similarity index 100% rename from rpcs3/Emu/RSX/Program/ProgramStateCache.h rename to rpcs3/rpcs3/Emu/RSX/Program/ProgramStateCache.h diff --git a/rpcs3/Emu/RSX/Program/RSXFragmentProgram.h b/rpcs3/rpcs3/Emu/RSX/Program/RSXFragmentProgram.h similarity index 100% rename from rpcs3/Emu/RSX/Program/RSXFragmentProgram.h rename to rpcs3/rpcs3/Emu/RSX/Program/RSXFragmentProgram.h diff --git a/rpcs3/Emu/RSX/Program/RSXOverlay.h b/rpcs3/rpcs3/Emu/RSX/Program/RSXOverlay.h similarity index 100% rename from rpcs3/Emu/RSX/Program/RSXOverlay.h rename to rpcs3/rpcs3/Emu/RSX/Program/RSXOverlay.h diff --git a/rpcs3/Emu/RSX/Program/RSXVertexProgram.h b/rpcs3/rpcs3/Emu/RSX/Program/RSXVertexProgram.h similarity index 100% rename from rpcs3/Emu/RSX/Program/RSXVertexProgram.h rename to rpcs3/rpcs3/Emu/RSX/Program/RSXVertexProgram.h diff --git a/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp b/rpcs3/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/SPIRVCommon.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/SPIRVCommon.cpp diff --git a/rpcs3/Emu/RSX/Program/SPIRVCommon.h b/rpcs3/rpcs3/Emu/RSX/Program/SPIRVCommon.h similarity index 100% rename from rpcs3/Emu/RSX/Program/SPIRVCommon.h rename to rpcs3/rpcs3/Emu/RSX/Program/SPIRVCommon.h diff --git a/rpcs3/Emu/RSX/Program/ShaderInterpreter.h b/rpcs3/rpcs3/Emu/RSX/Program/ShaderInterpreter.h similarity index 100% rename from rpcs3/Emu/RSX/Program/ShaderInterpreter.h rename to rpcs3/rpcs3/Emu/RSX/Program/ShaderInterpreter.h diff --git a/rpcs3/Emu/RSX/Program/ShaderParam.h b/rpcs3/rpcs3/Emu/RSX/Program/ShaderParam.h similarity index 100% rename from rpcs3/Emu/RSX/Program/ShaderParam.h rename to rpcs3/rpcs3/Emu/RSX/Program/ShaderParam.h diff --git a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc b/rpcs3/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc similarity index 100% rename from rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc rename to rpcs3/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc diff --git a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc b/rpcs3/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc similarity index 100% rename from rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc rename to rpcs3/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc diff --git a/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl b/rpcs3/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl similarity index 100% rename from rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl rename to rpcs3/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl diff --git a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp b/rpcs3/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.cpp diff --git a/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h b/rpcs3/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h similarity index 100% rename from rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h rename to rpcs3/rpcs3/Emu/RSX/Program/VertexProgramDecompiler.h diff --git a/rpcs3/Emu/RSX/Program/program_util.cpp b/rpcs3/rpcs3/Emu/RSX/Program/program_util.cpp similarity index 100% rename from rpcs3/Emu/RSX/Program/program_util.cpp rename to rpcs3/rpcs3/Emu/RSX/Program/program_util.cpp diff --git a/rpcs3/Emu/RSX/Program/program_util.h b/rpcs3/rpcs3/Emu/RSX/Program/program_util.h similarity index 100% rename from rpcs3/Emu/RSX/Program/program_util.h rename to rpcs3/rpcs3/Emu/RSX/Program/program_util.h diff --git a/rpcs3/Emu/RSX/RSXDisAsm.cpp b/rpcs3/rpcs3/Emu/RSX/RSXDisAsm.cpp similarity index 100% rename from rpcs3/Emu/RSX/RSXDisAsm.cpp rename to rpcs3/rpcs3/Emu/RSX/RSXDisAsm.cpp diff --git a/rpcs3/Emu/RSX/RSXDisAsm.h b/rpcs3/rpcs3/Emu/RSX/RSXDisAsm.h similarity index 100% rename from rpcs3/Emu/RSX/RSXDisAsm.h rename to rpcs3/rpcs3/Emu/RSX/RSXDisAsm.h diff --git a/rpcs3/Emu/RSX/RSXFIFO.cpp b/rpcs3/rpcs3/Emu/RSX/RSXFIFO.cpp similarity index 100% rename from rpcs3/Emu/RSX/RSXFIFO.cpp rename to rpcs3/rpcs3/Emu/RSX/RSXFIFO.cpp diff --git a/rpcs3/Emu/RSX/RSXFIFO.h b/rpcs3/rpcs3/Emu/RSX/RSXFIFO.h similarity index 100% rename from rpcs3/Emu/RSX/RSXFIFO.h rename to rpcs3/rpcs3/Emu/RSX/RSXFIFO.h diff --git a/rpcs3/Emu/RSX/RSXOffload.cpp b/rpcs3/rpcs3/Emu/RSX/RSXOffload.cpp similarity index 100% rename from rpcs3/Emu/RSX/RSXOffload.cpp rename to rpcs3/rpcs3/Emu/RSX/RSXOffload.cpp diff --git a/rpcs3/Emu/RSX/RSXOffload.h b/rpcs3/rpcs3/Emu/RSX/RSXOffload.h similarity index 100% rename from rpcs3/Emu/RSX/RSXOffload.h rename to rpcs3/rpcs3/Emu/RSX/RSXOffload.h diff --git a/rpcs3/Emu/RSX/RSXTexture.cpp b/rpcs3/rpcs3/Emu/RSX/RSXTexture.cpp similarity index 100% rename from rpcs3/Emu/RSX/RSXTexture.cpp rename to rpcs3/rpcs3/Emu/RSX/RSXTexture.cpp diff --git a/rpcs3/Emu/RSX/RSXTexture.h b/rpcs3/rpcs3/Emu/RSX/RSXTexture.h similarity index 100% rename from rpcs3/Emu/RSX/RSXTexture.h rename to rpcs3/rpcs3/Emu/RSX/RSXTexture.h diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/rpcs3/Emu/RSX/RSXThread.cpp similarity index 100% rename from rpcs3/Emu/RSX/RSXThread.cpp rename to rpcs3/rpcs3/Emu/RSX/RSXThread.cpp diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/rpcs3/Emu/RSX/RSXThread.h similarity index 100% rename from rpcs3/Emu/RSX/RSXThread.h rename to rpcs3/rpcs3/Emu/RSX/RSXThread.h diff --git a/rpcs3/Emu/RSX/RSXZCULL.cpp b/rpcs3/rpcs3/Emu/RSX/RSXZCULL.cpp similarity index 100% rename from rpcs3/Emu/RSX/RSXZCULL.cpp rename to rpcs3/rpcs3/Emu/RSX/RSXZCULL.cpp diff --git a/rpcs3/Emu/RSX/RSXZCULL.h b/rpcs3/rpcs3/Emu/RSX/RSXZCULL.h similarity index 100% rename from rpcs3/Emu/RSX/RSXZCULL.h rename to rpcs3/rpcs3/Emu/RSX/RSXZCULL.h diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp diff --git a/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h b/rpcs3/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKAsyncScheduler.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKAsyncScheduler.h diff --git a/rpcs3/Emu/RSX/VK/VKCommandStream.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKCommandStream.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCommandStream.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKCommandStream.cpp diff --git a/rpcs3/Emu/RSX/VK/VKCommandStream.h b/rpcs3/rpcs3/Emu/RSX/VK/VKCommandStream.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCommandStream.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKCommandStream.h diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.h b/rpcs3/rpcs3/Emu/RSX/VK/VKCommonDecompiler.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCommonDecompiler.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKCommonDecompiler.h diff --git a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.cpp diff --git a/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h b/rpcs3/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKCommonPipelineLayout.h diff --git a/rpcs3/Emu/RSX/VK/VKCompute.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKCompute.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCompute.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKCompute.cpp diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/rpcs3/Emu/RSX/VK/VKCompute.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKCompute.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKCompute.h diff --git a/rpcs3/Emu/RSX/VK/VKDMA.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKDMA.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKDMA.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKDMA.cpp diff --git a/rpcs3/Emu/RSX/VK/VKDMA.h b/rpcs3/rpcs3/Emu/RSX/VK/VKDMA.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKDMA.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKDMA.h diff --git a/rpcs3/Emu/RSX/VK/VKDraw.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKDraw.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKDraw.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKDraw.cpp diff --git a/rpcs3/Emu/RSX/VK/VKFormats.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKFormats.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKFormats.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKFormats.cpp diff --git a/rpcs3/Emu/RSX/VK/VKFormats.h b/rpcs3/rpcs3/Emu/RSX/VK/VKFormats.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKFormats.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKFormats.h diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h b/rpcs3/rpcs3/Emu/RSX/VK/VKFragmentProgram.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKFragmentProgram.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKFragmentProgram.h diff --git a/rpcs3/Emu/RSX/VK/VKFramebuffer.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKFramebuffer.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKFramebuffer.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKFramebuffer.cpp diff --git a/rpcs3/Emu/RSX/VK/VKFramebuffer.h b/rpcs3/rpcs3/Emu/RSX/VK/VKFramebuffer.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKFramebuffer.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKFramebuffer.h diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKGSRender.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKGSRender.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKGSRender.cpp diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/rpcs3/Emu/RSX/VK/VKGSRender.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKGSRender.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKGSRender.h diff --git a/rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp b/rpcs3/rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKHelpers.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKHelpers.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKHelpers.cpp diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/rpcs3/Emu/RSX/VK/VKHelpers.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKHelpers.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKHelpers.h diff --git a/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKMemAlloc.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKOverlays.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKOverlays.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKOverlays.cpp diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/rpcs3/Emu/RSX/VK/VKOverlays.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKOverlays.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKOverlays.h diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKPipelineCompiler.cpp diff --git a/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h b/rpcs3/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKPipelineCompiler.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKPipelineCompiler.h diff --git a/rpcs3/Emu/RSX/VK/VKPresent.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKPresent.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKPresent.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKPresent.cpp diff --git a/rpcs3/Emu/RSX/VK/VKProgramBuffer.h b/rpcs3/rpcs3/Emu/RSX/VK/VKProgramBuffer.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKProgramBuffer.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKProgramBuffer.h diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.h b/rpcs3/rpcs3/Emu/RSX/VK/VKProgramPipeline.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKProgramPipeline.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKProgramPipeline.h diff --git a/rpcs3/Emu/RSX/VK/VKQueryPool.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKQueryPool.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKQueryPool.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKQueryPool.cpp diff --git a/rpcs3/Emu/RSX/VK/VKQueryPool.h b/rpcs3/rpcs3/Emu/RSX/VK/VKQueryPool.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKQueryPool.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKQueryPool.h diff --git a/rpcs3/Emu/RSX/VK/VKRenderPass.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKRenderPass.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKRenderPass.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKRenderPass.cpp diff --git a/rpcs3/Emu/RSX/VK/VKRenderPass.h b/rpcs3/rpcs3/Emu/RSX/VK/VKRenderPass.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKRenderPass.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKRenderPass.h diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKRenderTargets.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKRenderTargets.cpp diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/rpcs3/Emu/RSX/VK/VKRenderTargets.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKRenderTargets.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKRenderTargets.h diff --git a/rpcs3/Emu/RSX/VK/VKResolveHelper.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKResolveHelper.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKResolveHelper.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKResolveHelper.cpp diff --git a/rpcs3/Emu/RSX/VK/VKResolveHelper.h b/rpcs3/rpcs3/Emu/RSX/VK/VKResolveHelper.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKResolveHelper.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKResolveHelper.h diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKResourceManager.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKResourceManager.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKResourceManager.cpp diff --git a/rpcs3/Emu/RSX/VK/VKResourceManager.h b/rpcs3/rpcs3/Emu/RSX/VK/VKResourceManager.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKResourceManager.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKResourceManager.h diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h b/rpcs3/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKShaderInterpreter.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKTexture.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKTexture.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKTexture.cpp diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKTextureCache.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKTextureCache.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKTextureCache.cpp diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/rpcs3/Emu/RSX/VK/VKTextureCache.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKTextureCache.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKTextureCache.h diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/VKVertexProgram.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.h b/rpcs3/rpcs3/Emu/RSX/VK/VKVertexProgram.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VKVertexProgram.h rename to rpcs3/rpcs3/Emu/RSX/VK/VKVertexProgram.h diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/rpcs3/Emu/RSX/VK/VulkanAPI.h similarity index 100% rename from rpcs3/Emu/RSX/VK/VulkanAPI.h rename to rpcs3/rpcs3/Emu/RSX/VK/VulkanAPI.h diff --git a/rpcs3/Emu/RSX/VK/upscalers/bilinear_pass.hpp b/rpcs3/rpcs3/Emu/RSX/VK/upscalers/bilinear_pass.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/upscalers/bilinear_pass.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/upscalers/bilinear_pass.hpp diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp b/rpcs3/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h b/rpcs3/rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h similarity index 100% rename from rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h rename to rpcs3/rpcs3/Emu/RSX/VK/upscalers/fsr_pass.h diff --git a/rpcs3/Emu/RSX/VK/upscalers/nearest_pass.hpp b/rpcs3/rpcs3/Emu/RSX/VK/upscalers/nearest_pass.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/upscalers/nearest_pass.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/upscalers/nearest_pass.hpp diff --git a/rpcs3/Emu/RSX/VK/upscalers/upscaling.h b/rpcs3/rpcs3/Emu/RSX/VK/upscalers/upscaling.h similarity index 100% rename from rpcs3/Emu/RSX/VK/upscalers/upscaling.h rename to rpcs3/rpcs3/Emu/RSX/VK/upscalers/upscaling.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/barriers.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/barriers.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/barriers.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/barriers.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/barriers.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/barriers.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/barriers.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/barriers.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/buffer_object.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/buffer_object.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/buffer_object.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/buffer_object.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/chip_class.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/chip_class.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/chip_class.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/chip_class.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/chip_class.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/commands.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/commands.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/commands.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/commands.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/commands.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/commands.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/commands.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/commands.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/data_heap.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/data_heap.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/data_heap.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/data_heap.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/descriptors.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/descriptors.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/descriptors.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/device.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/device.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/device.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/device.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/device.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/device.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/device.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/framebuffer_object.hpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/garbage_collector.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/garbage_collector.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/garbage_collector.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/garbage_collector.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/graphics_pipeline_state.hpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/image.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/image.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/image.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/image.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/image.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/image.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/image.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/image.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/image_helpers.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/image_helpers.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/image_helpers.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/image_helpers.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/image_helpers.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/instance.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/instance.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/instance.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/instance.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/instance.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/instance.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/memory.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/memory.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/memory.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/memory.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/memory.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/memory.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/memory.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/memory.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/pipeline_binding_table.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/query_pool.hpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/sampler.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/sampler.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/sampler.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/sampler.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/sampler.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/sampler.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/scratch.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/scratch.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/scratch.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/scratch.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/scratch.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/scratch.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/shared.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/shared.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/shared.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/shared.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/shared.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/shared.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/shared.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/shared.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/swapchain.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_android.hpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_core.h diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_macos.hpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_unix.hpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/swapchain_win32.hpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.cpp b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/sync.cpp similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/sync.cpp rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/sync.cpp diff --git a/rpcs3/Emu/RSX/VK/vkutils/sync.h b/rpcs3/rpcs3/Emu/RSX/VK/vkutils/sync.h similarity index 100% rename from rpcs3/Emu/RSX/VK/vkutils/sync.h rename to rpcs3/rpcs3/Emu/RSX/VK/vkutils/sync.h diff --git a/rpcs3/Emu/RSX/color_utils.h b/rpcs3/rpcs3/Emu/RSX/color_utils.h similarity index 100% rename from rpcs3/Emu/RSX/color_utils.h rename to rpcs3/rpcs3/Emu/RSX/color_utils.h diff --git a/rpcs3/Emu/RSX/display.h b/rpcs3/rpcs3/Emu/RSX/display.h similarity index 100% rename from rpcs3/Emu/RSX/display.h rename to rpcs3/rpcs3/Emu/RSX/display.h diff --git a/rpcs3/Emu/RSX/gcm_enums.cpp b/rpcs3/rpcs3/Emu/RSX/gcm_enums.cpp similarity index 100% rename from rpcs3/Emu/RSX/gcm_enums.cpp rename to rpcs3/rpcs3/Emu/RSX/gcm_enums.cpp diff --git a/rpcs3/Emu/RSX/gcm_enums.h b/rpcs3/rpcs3/Emu/RSX/gcm_enums.h similarity index 100% rename from rpcs3/Emu/RSX/gcm_enums.h rename to rpcs3/rpcs3/Emu/RSX/gcm_enums.h diff --git a/rpcs3/Emu/RSX/gcm_printing.cpp b/rpcs3/rpcs3/Emu/RSX/gcm_printing.cpp similarity index 100% rename from rpcs3/Emu/RSX/gcm_printing.cpp rename to rpcs3/rpcs3/Emu/RSX/gcm_printing.cpp diff --git a/rpcs3/Emu/RSX/gcm_printing.h b/rpcs3/rpcs3/Emu/RSX/gcm_printing.h similarity index 100% rename from rpcs3/Emu/RSX/gcm_printing.h rename to rpcs3/rpcs3/Emu/RSX/gcm_printing.h diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/rpcs3/Emu/RSX/rsx_cache.h similarity index 100% rename from rpcs3/Emu/RSX/rsx_cache.h rename to rpcs3/rpcs3/Emu/RSX/rsx_cache.h diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/rpcs3/Emu/RSX/rsx_decode.h similarity index 100% rename from rpcs3/Emu/RSX/rsx_decode.h rename to rpcs3/rpcs3/Emu/RSX/rsx_decode.h diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/rpcs3/Emu/RSX/rsx_methods.cpp similarity index 100% rename from rpcs3/Emu/RSX/rsx_methods.cpp rename to rpcs3/rpcs3/Emu/RSX/rsx_methods.cpp diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/rpcs3/Emu/RSX/rsx_methods.h similarity index 100% rename from rpcs3/Emu/RSX/rsx_methods.h rename to rpcs3/rpcs3/Emu/RSX/rsx_methods.h diff --git a/rpcs3/Emu/RSX/rsx_utils.cpp b/rpcs3/rpcs3/Emu/RSX/rsx_utils.cpp similarity index 100% rename from rpcs3/Emu/RSX/rsx_utils.cpp rename to rpcs3/rpcs3/Emu/RSX/rsx_utils.cpp diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/rpcs3/Emu/RSX/rsx_utils.h similarity index 100% rename from rpcs3/Emu/RSX/rsx_utils.h rename to rpcs3/rpcs3/Emu/RSX/rsx_utils.h diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.cpp b/rpcs3/rpcs3/Emu/RSX/rsx_vertex_data.cpp similarity index 100% rename from rpcs3/Emu/RSX/rsx_vertex_data.cpp rename to rpcs3/rpcs3/Emu/RSX/rsx_vertex_data.cpp diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.h b/rpcs3/rpcs3/Emu/RSX/rsx_vertex_data.h similarity index 100% rename from rpcs3/Emu/RSX/rsx_vertex_data.h rename to rpcs3/rpcs3/Emu/RSX/rsx_vertex_data.h diff --git a/rpcs3/Emu/System.cpp b/rpcs3/rpcs3/Emu/System.cpp similarity index 100% rename from rpcs3/Emu/System.cpp rename to rpcs3/rpcs3/Emu/System.cpp diff --git a/rpcs3/Emu/System.h b/rpcs3/rpcs3/Emu/System.h similarity index 100% rename from rpcs3/Emu/System.h rename to rpcs3/rpcs3/Emu/System.h diff --git a/rpcs3/Emu/VFS.cpp b/rpcs3/rpcs3/Emu/VFS.cpp similarity index 100% rename from rpcs3/Emu/VFS.cpp rename to rpcs3/rpcs3/Emu/VFS.cpp diff --git a/rpcs3/Emu/VFS.h b/rpcs3/rpcs3/Emu/VFS.h similarity index 100% rename from rpcs3/Emu/VFS.h rename to rpcs3/rpcs3/Emu/VFS.h diff --git a/rpcs3/Emu/cache_utils.cpp b/rpcs3/rpcs3/Emu/cache_utils.cpp similarity index 100% rename from rpcs3/Emu/cache_utils.cpp rename to rpcs3/rpcs3/Emu/cache_utils.cpp diff --git a/rpcs3/Emu/cache_utils.hpp b/rpcs3/rpcs3/Emu/cache_utils.hpp similarity index 100% rename from rpcs3/Emu/cache_utils.hpp rename to rpcs3/rpcs3/Emu/cache_utils.hpp diff --git a/rpcs3/Emu/config_mode.h b/rpcs3/rpcs3/Emu/config_mode.h similarity index 100% rename from rpcs3/Emu/config_mode.h rename to rpcs3/rpcs3/Emu/config_mode.h diff --git a/rpcs3/Emu/games_config.cpp b/rpcs3/rpcs3/Emu/games_config.cpp similarity index 100% rename from rpcs3/Emu/games_config.cpp rename to rpcs3/rpcs3/Emu/games_config.cpp diff --git a/rpcs3/Emu/games_config.h b/rpcs3/rpcs3/Emu/games_config.h similarity index 100% rename from rpcs3/Emu/games_config.h rename to rpcs3/rpcs3/Emu/games_config.h diff --git a/rpcs3/Emu/localized_string.cpp b/rpcs3/rpcs3/Emu/localized_string.cpp similarity index 100% rename from rpcs3/Emu/localized_string.cpp rename to rpcs3/rpcs3/Emu/localized_string.cpp diff --git a/rpcs3/Emu/localized_string.h b/rpcs3/rpcs3/Emu/localized_string.h similarity index 100% rename from rpcs3/Emu/localized_string.h rename to rpcs3/rpcs3/Emu/localized_string.h diff --git a/rpcs3/Emu/localized_string_id.h b/rpcs3/rpcs3/Emu/localized_string_id.h similarity index 100% rename from rpcs3/Emu/localized_string_id.h rename to rpcs3/rpcs3/Emu/localized_string_id.h diff --git a/rpcs3/Emu/perf_meter.cpp b/rpcs3/rpcs3/Emu/perf_meter.cpp similarity index 100% rename from rpcs3/Emu/perf_meter.cpp rename to rpcs3/rpcs3/Emu/perf_meter.cpp diff --git a/rpcs3/Emu/perf_meter.hpp b/rpcs3/rpcs3/Emu/perf_meter.hpp similarity index 100% rename from rpcs3/Emu/perf_meter.hpp rename to rpcs3/rpcs3/Emu/perf_meter.hpp diff --git a/rpcs3/Emu/perf_monitor.cpp b/rpcs3/rpcs3/Emu/perf_monitor.cpp similarity index 100% rename from rpcs3/Emu/perf_monitor.cpp rename to rpcs3/rpcs3/Emu/perf_monitor.cpp diff --git a/rpcs3/Emu/perf_monitor.hpp b/rpcs3/rpcs3/Emu/perf_monitor.hpp similarity index 100% rename from rpcs3/Emu/perf_monitor.hpp rename to rpcs3/rpcs3/Emu/perf_monitor.hpp diff --git a/rpcs3/Emu/savestate_utils.cpp b/rpcs3/rpcs3/Emu/savestate_utils.cpp similarity index 100% rename from rpcs3/Emu/savestate_utils.cpp rename to rpcs3/rpcs3/Emu/savestate_utils.cpp diff --git a/rpcs3/Emu/savestate_utils.hpp b/rpcs3/rpcs3/Emu/savestate_utils.hpp similarity index 100% rename from rpcs3/Emu/savestate_utils.hpp rename to rpcs3/rpcs3/Emu/savestate_utils.hpp diff --git a/rpcs3/Emu/scoped_progress_dialog.cpp b/rpcs3/rpcs3/Emu/scoped_progress_dialog.cpp similarity index 100% rename from rpcs3/Emu/scoped_progress_dialog.cpp rename to rpcs3/rpcs3/Emu/scoped_progress_dialog.cpp diff --git a/rpcs3/Emu/system_config.cpp b/rpcs3/rpcs3/Emu/system_config.cpp similarity index 100% rename from rpcs3/Emu/system_config.cpp rename to rpcs3/rpcs3/Emu/system_config.cpp diff --git a/rpcs3/Emu/system_config.h b/rpcs3/rpcs3/Emu/system_config.h similarity index 100% rename from rpcs3/Emu/system_config.h rename to rpcs3/rpcs3/Emu/system_config.h diff --git a/rpcs3/Emu/system_config_types.cpp b/rpcs3/rpcs3/Emu/system_config_types.cpp similarity index 100% rename from rpcs3/Emu/system_config_types.cpp rename to rpcs3/rpcs3/Emu/system_config_types.cpp diff --git a/rpcs3/Emu/system_config_types.h b/rpcs3/rpcs3/Emu/system_config_types.h similarity index 100% rename from rpcs3/Emu/system_config_types.h rename to rpcs3/rpcs3/Emu/system_config_types.h diff --git a/rpcs3/Emu/system_progress.cpp b/rpcs3/rpcs3/Emu/system_progress.cpp similarity index 100% rename from rpcs3/Emu/system_progress.cpp rename to rpcs3/rpcs3/Emu/system_progress.cpp diff --git a/rpcs3/Emu/system_progress.hpp b/rpcs3/rpcs3/Emu/system_progress.hpp similarity index 100% rename from rpcs3/Emu/system_progress.hpp rename to rpcs3/rpcs3/Emu/system_progress.hpp diff --git a/rpcs3/Emu/system_utils.cpp b/rpcs3/rpcs3/Emu/system_utils.cpp similarity index 100% rename from rpcs3/Emu/system_utils.cpp rename to rpcs3/rpcs3/Emu/system_utils.cpp diff --git a/rpcs3/Emu/system_utils.hpp b/rpcs3/rpcs3/Emu/system_utils.hpp similarity index 100% rename from rpcs3/Emu/system_utils.hpp rename to rpcs3/rpcs3/Emu/system_utils.hpp diff --git a/rpcs3/Emu/title.cpp b/rpcs3/rpcs3/Emu/title.cpp similarity index 100% rename from rpcs3/Emu/title.cpp rename to rpcs3/rpcs3/Emu/title.cpp diff --git a/rpcs3/Emu/title.h b/rpcs3/rpcs3/Emu/title.h similarity index 100% rename from rpcs3/Emu/title.h rename to rpcs3/rpcs3/Emu/title.h diff --git a/rpcs3/Emu/vfs_config.cpp b/rpcs3/rpcs3/Emu/vfs_config.cpp similarity index 100% rename from rpcs3/Emu/vfs_config.cpp rename to rpcs3/rpcs3/Emu/vfs_config.cpp diff --git a/rpcs3/Emu/vfs_config.h b/rpcs3/rpcs3/Emu/vfs_config.h similarity index 100% rename from rpcs3/Emu/vfs_config.h rename to rpcs3/rpcs3/Emu/vfs_config.h diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/rpcs3/GLGSRender.vcxproj similarity index 100% rename from rpcs3/GLGSRender.vcxproj rename to rpcs3/rpcs3/GLGSRender.vcxproj diff --git a/rpcs3/GLGSRender.vcxproj.filters b/rpcs3/rpcs3/GLGSRender.vcxproj.filters similarity index 100% rename from rpcs3/GLGSRender.vcxproj.filters rename to rpcs3/rpcs3/GLGSRender.vcxproj.filters diff --git a/rpcs3/Icons/DualShock_3.svg b/rpcs3/rpcs3/Icons/DualShock_3.svg similarity index 100% rename from rpcs3/Icons/DualShock_3.svg rename to rpcs3/rpcs3/Icons/DualShock_3.svg diff --git a/rpcs3/Icons/combo_config_bordered.png b/rpcs3/rpcs3/Icons/combo_config_bordered.png similarity index 100% rename from rpcs3/Icons/combo_config_bordered.png rename to rpcs3/rpcs3/Icons/combo_config_bordered.png diff --git a/rpcs3/Icons/configure.png b/rpcs3/rpcs3/Icons/configure.png similarity index 100% rename from rpcs3/Icons/configure.png rename to rpcs3/rpcs3/Icons/configure.png diff --git a/rpcs3/Icons/controllers.png b/rpcs3/rpcs3/Icons/controllers.png similarity index 100% rename from rpcs3/Icons/controllers.png rename to rpcs3/rpcs3/Icons/controllers.png diff --git a/rpcs3/Icons/custom_config.png b/rpcs3/rpcs3/Icons/custom_config.png similarity index 100% rename from rpcs3/Icons/custom_config.png rename to rpcs3/rpcs3/Icons/custom_config.png diff --git a/rpcs3/Icons/exit_fullscreen.png b/rpcs3/rpcs3/Icons/exit_fullscreen.png similarity index 100% rename from rpcs3/Icons/exit_fullscreen.png rename to rpcs3/rpcs3/Icons/exit_fullscreen.png diff --git a/rpcs3/Icons/fullscreen.png b/rpcs3/rpcs3/Icons/fullscreen.png similarity index 100% rename from rpcs3/Icons/fullscreen.png rename to rpcs3/rpcs3/Icons/fullscreen.png diff --git a/rpcs3/Icons/grid.png b/rpcs3/rpcs3/Icons/grid.png similarity index 100% rename from rpcs3/Icons/grid.png rename to rpcs3/rpcs3/Icons/grid.png diff --git a/rpcs3/Icons/list.png b/rpcs3/rpcs3/Icons/list.png similarity index 100% rename from rpcs3/Icons/list.png rename to rpcs3/rpcs3/Icons/list.png diff --git a/rpcs3/Icons/open.png b/rpcs3/rpcs3/Icons/open.png similarity index 100% rename from rpcs3/Icons/open.png rename to rpcs3/rpcs3/Icons/open.png diff --git a/rpcs3/Icons/pause.png b/rpcs3/rpcs3/Icons/pause.png similarity index 100% rename from rpcs3/Icons/pause.png rename to rpcs3/rpcs3/Icons/pause.png diff --git a/rpcs3/Icons/play.png b/rpcs3/rpcs3/Icons/play.png similarity index 100% rename from rpcs3/Icons/play.png rename to rpcs3/rpcs3/Icons/play.png diff --git a/rpcs3/Icons/refresh.png b/rpcs3/rpcs3/Icons/refresh.png similarity index 100% rename from rpcs3/Icons/refresh.png rename to rpcs3/rpcs3/Icons/refresh.png diff --git a/rpcs3/Icons/restart.png b/rpcs3/rpcs3/Icons/restart.png similarity index 100% rename from rpcs3/Icons/restart.png rename to rpcs3/rpcs3/Icons/restart.png diff --git a/rpcs3/Icons/stop.png b/rpcs3/rpcs3/Icons/stop.png similarity index 100% rename from rpcs3/Icons/stop.png rename to rpcs3/rpcs3/Icons/stop.png diff --git a/rpcs3/Input/basic_keyboard_handler.cpp b/rpcs3/rpcs3/Input/basic_keyboard_handler.cpp similarity index 100% rename from rpcs3/Input/basic_keyboard_handler.cpp rename to rpcs3/rpcs3/Input/basic_keyboard_handler.cpp diff --git a/rpcs3/Input/basic_keyboard_handler.h b/rpcs3/rpcs3/Input/basic_keyboard_handler.h similarity index 100% rename from rpcs3/Input/basic_keyboard_handler.h rename to rpcs3/rpcs3/Input/basic_keyboard_handler.h diff --git a/rpcs3/Input/basic_mouse_handler.cpp b/rpcs3/rpcs3/Input/basic_mouse_handler.cpp similarity index 100% rename from rpcs3/Input/basic_mouse_handler.cpp rename to rpcs3/rpcs3/Input/basic_mouse_handler.cpp diff --git a/rpcs3/Input/basic_mouse_handler.h b/rpcs3/rpcs3/Input/basic_mouse_handler.h similarity index 100% rename from rpcs3/Input/basic_mouse_handler.h rename to rpcs3/rpcs3/Input/basic_mouse_handler.h diff --git a/rpcs3/Input/ds3_pad_handler.cpp b/rpcs3/rpcs3/Input/ds3_pad_handler.cpp similarity index 100% rename from rpcs3/Input/ds3_pad_handler.cpp rename to rpcs3/rpcs3/Input/ds3_pad_handler.cpp diff --git a/rpcs3/Input/ds3_pad_handler.h b/rpcs3/rpcs3/Input/ds3_pad_handler.h similarity index 100% rename from rpcs3/Input/ds3_pad_handler.h rename to rpcs3/rpcs3/Input/ds3_pad_handler.h diff --git a/rpcs3/Input/ds4_pad_handler.cpp b/rpcs3/rpcs3/Input/ds4_pad_handler.cpp similarity index 100% rename from rpcs3/Input/ds4_pad_handler.cpp rename to rpcs3/rpcs3/Input/ds4_pad_handler.cpp diff --git a/rpcs3/Input/ds4_pad_handler.h b/rpcs3/rpcs3/Input/ds4_pad_handler.h similarity index 100% rename from rpcs3/Input/ds4_pad_handler.h rename to rpcs3/rpcs3/Input/ds4_pad_handler.h diff --git a/rpcs3/Input/dualsense_pad_handler.cpp b/rpcs3/rpcs3/Input/dualsense_pad_handler.cpp similarity index 100% rename from rpcs3/Input/dualsense_pad_handler.cpp rename to rpcs3/rpcs3/Input/dualsense_pad_handler.cpp diff --git a/rpcs3/Input/dualsense_pad_handler.h b/rpcs3/rpcs3/Input/dualsense_pad_handler.h similarity index 100% rename from rpcs3/Input/dualsense_pad_handler.h rename to rpcs3/rpcs3/Input/dualsense_pad_handler.h diff --git a/rpcs3/Input/evdev_gun_handler.cpp b/rpcs3/rpcs3/Input/evdev_gun_handler.cpp similarity index 100% rename from rpcs3/Input/evdev_gun_handler.cpp rename to rpcs3/rpcs3/Input/evdev_gun_handler.cpp diff --git a/rpcs3/Input/evdev_gun_handler.h b/rpcs3/rpcs3/Input/evdev_gun_handler.h similarity index 100% rename from rpcs3/Input/evdev_gun_handler.h rename to rpcs3/rpcs3/Input/evdev_gun_handler.h diff --git a/rpcs3/Input/evdev_joystick_handler.cpp b/rpcs3/rpcs3/Input/evdev_joystick_handler.cpp similarity index 100% rename from rpcs3/Input/evdev_joystick_handler.cpp rename to rpcs3/rpcs3/Input/evdev_joystick_handler.cpp diff --git a/rpcs3/Input/evdev_joystick_handler.h b/rpcs3/rpcs3/Input/evdev_joystick_handler.h similarity index 100% rename from rpcs3/Input/evdev_joystick_handler.h rename to rpcs3/rpcs3/Input/evdev_joystick_handler.h diff --git a/rpcs3/Input/gui_pad_thread.cpp b/rpcs3/rpcs3/Input/gui_pad_thread.cpp similarity index 100% rename from rpcs3/Input/gui_pad_thread.cpp rename to rpcs3/rpcs3/Input/gui_pad_thread.cpp diff --git a/rpcs3/Input/gui_pad_thread.h b/rpcs3/rpcs3/Input/gui_pad_thread.h similarity index 100% rename from rpcs3/Input/gui_pad_thread.h rename to rpcs3/rpcs3/Input/gui_pad_thread.h diff --git a/rpcs3/Input/hid_pad_handler.cpp b/rpcs3/rpcs3/Input/hid_pad_handler.cpp similarity index 100% rename from rpcs3/Input/hid_pad_handler.cpp rename to rpcs3/rpcs3/Input/hid_pad_handler.cpp diff --git a/rpcs3/Input/hid_pad_handler.h b/rpcs3/rpcs3/Input/hid_pad_handler.h similarity index 100% rename from rpcs3/Input/hid_pad_handler.h rename to rpcs3/rpcs3/Input/hid_pad_handler.h diff --git a/rpcs3/Input/keyboard_pad_handler.cpp b/rpcs3/rpcs3/Input/keyboard_pad_handler.cpp similarity index 100% rename from rpcs3/Input/keyboard_pad_handler.cpp rename to rpcs3/rpcs3/Input/keyboard_pad_handler.cpp diff --git a/rpcs3/Input/keyboard_pad_handler.h b/rpcs3/rpcs3/Input/keyboard_pad_handler.h similarity index 100% rename from rpcs3/Input/keyboard_pad_handler.h rename to rpcs3/rpcs3/Input/keyboard_pad_handler.h diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/rpcs3/Input/mm_joystick_handler.cpp similarity index 100% rename from rpcs3/Input/mm_joystick_handler.cpp rename to rpcs3/rpcs3/Input/mm_joystick_handler.cpp diff --git a/rpcs3/Input/mm_joystick_handler.h b/rpcs3/rpcs3/Input/mm_joystick_handler.h similarity index 100% rename from rpcs3/Input/mm_joystick_handler.h rename to rpcs3/rpcs3/Input/mm_joystick_handler.h diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/rpcs3/Input/pad_thread.cpp similarity index 100% rename from rpcs3/Input/pad_thread.cpp rename to rpcs3/rpcs3/Input/pad_thread.cpp diff --git a/rpcs3/Input/pad_thread.h b/rpcs3/rpcs3/Input/pad_thread.h similarity index 100% rename from rpcs3/Input/pad_thread.h rename to rpcs3/rpcs3/Input/pad_thread.h diff --git a/rpcs3/Input/product_info.cpp b/rpcs3/rpcs3/Input/product_info.cpp similarity index 100% rename from rpcs3/Input/product_info.cpp rename to rpcs3/rpcs3/Input/product_info.cpp diff --git a/rpcs3/Input/product_info.h b/rpcs3/rpcs3/Input/product_info.h similarity index 100% rename from rpcs3/Input/product_info.h rename to rpcs3/rpcs3/Input/product_info.h diff --git a/rpcs3/Input/ps_move_calibration.cpp b/rpcs3/rpcs3/Input/ps_move_calibration.cpp similarity index 100% rename from rpcs3/Input/ps_move_calibration.cpp rename to rpcs3/rpcs3/Input/ps_move_calibration.cpp diff --git a/rpcs3/Input/ps_move_calibration.h b/rpcs3/rpcs3/Input/ps_move_calibration.h similarity index 100% rename from rpcs3/Input/ps_move_calibration.h rename to rpcs3/rpcs3/Input/ps_move_calibration.h diff --git a/rpcs3/Input/ps_move_config.cpp b/rpcs3/rpcs3/Input/ps_move_config.cpp similarity index 100% rename from rpcs3/Input/ps_move_config.cpp rename to rpcs3/rpcs3/Input/ps_move_config.cpp diff --git a/rpcs3/Input/ps_move_config.h b/rpcs3/rpcs3/Input/ps_move_config.h similarity index 100% rename from rpcs3/Input/ps_move_config.h rename to rpcs3/rpcs3/Input/ps_move_config.h diff --git a/rpcs3/Input/ps_move_handler.cpp b/rpcs3/rpcs3/Input/ps_move_handler.cpp similarity index 100% rename from rpcs3/Input/ps_move_handler.cpp rename to rpcs3/rpcs3/Input/ps_move_handler.cpp diff --git a/rpcs3/Input/ps_move_handler.h b/rpcs3/rpcs3/Input/ps_move_handler.h similarity index 100% rename from rpcs3/Input/ps_move_handler.h rename to rpcs3/rpcs3/Input/ps_move_handler.h diff --git a/rpcs3/Input/ps_move_tracker.cpp b/rpcs3/rpcs3/Input/ps_move_tracker.cpp similarity index 100% rename from rpcs3/Input/ps_move_tracker.cpp rename to rpcs3/rpcs3/Input/ps_move_tracker.cpp diff --git a/rpcs3/Input/ps_move_tracker.h b/rpcs3/rpcs3/Input/ps_move_tracker.h similarity index 100% rename from rpcs3/Input/ps_move_tracker.h rename to rpcs3/rpcs3/Input/ps_move_tracker.h diff --git a/rpcs3/Input/raw_mouse_config.cpp b/rpcs3/rpcs3/Input/raw_mouse_config.cpp similarity index 100% rename from rpcs3/Input/raw_mouse_config.cpp rename to rpcs3/rpcs3/Input/raw_mouse_config.cpp diff --git a/rpcs3/Input/raw_mouse_config.h b/rpcs3/rpcs3/Input/raw_mouse_config.h similarity index 100% rename from rpcs3/Input/raw_mouse_config.h rename to rpcs3/rpcs3/Input/raw_mouse_config.h diff --git a/rpcs3/Input/raw_mouse_handler.cpp b/rpcs3/rpcs3/Input/raw_mouse_handler.cpp similarity index 100% rename from rpcs3/Input/raw_mouse_handler.cpp rename to rpcs3/rpcs3/Input/raw_mouse_handler.cpp diff --git a/rpcs3/Input/raw_mouse_handler.h b/rpcs3/rpcs3/Input/raw_mouse_handler.h similarity index 100% rename from rpcs3/Input/raw_mouse_handler.h rename to rpcs3/rpcs3/Input/raw_mouse_handler.h diff --git a/rpcs3/Input/sdl_pad_handler.cpp b/rpcs3/rpcs3/Input/sdl_pad_handler.cpp similarity index 100% rename from rpcs3/Input/sdl_pad_handler.cpp rename to rpcs3/rpcs3/Input/sdl_pad_handler.cpp diff --git a/rpcs3/Input/sdl_pad_handler.h b/rpcs3/rpcs3/Input/sdl_pad_handler.h similarity index 100% rename from rpcs3/Input/sdl_pad_handler.h rename to rpcs3/rpcs3/Input/sdl_pad_handler.h diff --git a/rpcs3/Input/skateboard_pad_handler.cpp b/rpcs3/rpcs3/Input/skateboard_pad_handler.cpp similarity index 100% rename from rpcs3/Input/skateboard_pad_handler.cpp rename to rpcs3/rpcs3/Input/skateboard_pad_handler.cpp diff --git a/rpcs3/Input/skateboard_pad_handler.h b/rpcs3/rpcs3/Input/skateboard_pad_handler.h similarity index 100% rename from rpcs3/Input/skateboard_pad_handler.h rename to rpcs3/rpcs3/Input/skateboard_pad_handler.h diff --git a/rpcs3/Input/xinput_pad_handler.cpp b/rpcs3/rpcs3/Input/xinput_pad_handler.cpp similarity index 100% rename from rpcs3/Input/xinput_pad_handler.cpp rename to rpcs3/rpcs3/Input/xinput_pad_handler.cpp diff --git a/rpcs3/Input/xinput_pad_handler.h b/rpcs3/rpcs3/Input/xinput_pad_handler.h similarity index 100% rename from rpcs3/Input/xinput_pad_handler.h rename to rpcs3/rpcs3/Input/xinput_pad_handler.h diff --git a/rpcs3/Loader/ELF.cpp b/rpcs3/rpcs3/Loader/ELF.cpp similarity index 100% rename from rpcs3/Loader/ELF.cpp rename to rpcs3/rpcs3/Loader/ELF.cpp diff --git a/rpcs3/Loader/ELF.h b/rpcs3/rpcs3/Loader/ELF.h similarity index 100% rename from rpcs3/Loader/ELF.h rename to rpcs3/rpcs3/Loader/ELF.h diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/rpcs3/Loader/PSF.cpp similarity index 100% rename from rpcs3/Loader/PSF.cpp rename to rpcs3/rpcs3/Loader/PSF.cpp diff --git a/rpcs3/Loader/PSF.h b/rpcs3/rpcs3/Loader/PSF.h similarity index 100% rename from rpcs3/Loader/PSF.h rename to rpcs3/rpcs3/Loader/PSF.h diff --git a/rpcs3/Loader/PUP.cpp b/rpcs3/rpcs3/Loader/PUP.cpp similarity index 100% rename from rpcs3/Loader/PUP.cpp rename to rpcs3/rpcs3/Loader/PUP.cpp diff --git a/rpcs3/Loader/PUP.h b/rpcs3/rpcs3/Loader/PUP.h similarity index 100% rename from rpcs3/Loader/PUP.h rename to rpcs3/rpcs3/Loader/PUP.h diff --git a/rpcs3/Loader/TAR.cpp b/rpcs3/rpcs3/Loader/TAR.cpp similarity index 100% rename from rpcs3/Loader/TAR.cpp rename to rpcs3/rpcs3/Loader/TAR.cpp diff --git a/rpcs3/Loader/TAR.h b/rpcs3/rpcs3/Loader/TAR.h similarity index 100% rename from rpcs3/Loader/TAR.h rename to rpcs3/rpcs3/Loader/TAR.h diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/rpcs3/Loader/TROPUSR.cpp similarity index 100% rename from rpcs3/Loader/TROPUSR.cpp rename to rpcs3/rpcs3/Loader/TROPUSR.cpp diff --git a/rpcs3/Loader/TROPUSR.h b/rpcs3/rpcs3/Loader/TROPUSR.h similarity index 100% rename from rpcs3/Loader/TROPUSR.h rename to rpcs3/rpcs3/Loader/TROPUSR.h diff --git a/rpcs3/Loader/TRP.cpp b/rpcs3/rpcs3/Loader/TRP.cpp similarity index 100% rename from rpcs3/Loader/TRP.cpp rename to rpcs3/rpcs3/Loader/TRP.cpp diff --git a/rpcs3/Loader/TRP.h b/rpcs3/rpcs3/Loader/TRP.h similarity index 100% rename from rpcs3/Loader/TRP.h rename to rpcs3/rpcs3/Loader/TRP.h diff --git a/rpcs3/Loader/disc.cpp b/rpcs3/rpcs3/Loader/disc.cpp similarity index 100% rename from rpcs3/Loader/disc.cpp rename to rpcs3/rpcs3/Loader/disc.cpp diff --git a/rpcs3/Loader/disc.h b/rpcs3/rpcs3/Loader/disc.h similarity index 100% rename from rpcs3/Loader/disc.h rename to rpcs3/rpcs3/Loader/disc.h diff --git a/rpcs3/Loader/mself.cpp b/rpcs3/rpcs3/Loader/mself.cpp similarity index 100% rename from rpcs3/Loader/mself.cpp rename to rpcs3/rpcs3/Loader/mself.cpp diff --git a/rpcs3/Loader/mself.hpp b/rpcs3/rpcs3/Loader/mself.hpp similarity index 100% rename from rpcs3/Loader/mself.hpp rename to rpcs3/rpcs3/Loader/mself.hpp diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/rpcs3/VKGSRender.vcxproj similarity index 100% rename from rpcs3/VKGSRender.vcxproj rename to rpcs3/rpcs3/VKGSRender.vcxproj diff --git a/rpcs3/VKGSRender.vcxproj.filters b/rpcs3/rpcs3/VKGSRender.vcxproj.filters similarity index 100% rename from rpcs3/VKGSRender.vcxproj.filters rename to rpcs3/rpcs3/VKGSRender.vcxproj.filters diff --git a/rpcs3/XAudio.vcxproj b/rpcs3/rpcs3/XAudio.vcxproj similarity index 100% rename from rpcs3/XAudio.vcxproj rename to rpcs3/rpcs3/XAudio.vcxproj diff --git a/rpcs3/XAudio.vcxproj.filters b/rpcs3/rpcs3/XAudio.vcxproj.filters similarity index 100% rename from rpcs3/XAudio.vcxproj.filters rename to rpcs3/rpcs3/XAudio.vcxproj.filters diff --git a/rpcs3/display_sleep_control.cpp b/rpcs3/rpcs3/display_sleep_control.cpp similarity index 100% rename from rpcs3/display_sleep_control.cpp rename to rpcs3/rpcs3/display_sleep_control.cpp diff --git a/rpcs3/display_sleep_control.h b/rpcs3/rpcs3/display_sleep_control.h similarity index 100% rename from rpcs3/display_sleep_control.h rename to rpcs3/rpcs3/display_sleep_control.h diff --git a/rpcs3/emucore.vcxproj b/rpcs3/rpcs3/emucore.vcxproj similarity index 100% rename from rpcs3/emucore.vcxproj rename to rpcs3/rpcs3/emucore.vcxproj diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/rpcs3/emucore.vcxproj.filters similarity index 100% rename from rpcs3/emucore.vcxproj.filters rename to rpcs3/rpcs3/emucore.vcxproj.filters diff --git a/rpcs3/frame_icon.xpm b/rpcs3/rpcs3/frame_icon.xpm similarity index 100% rename from rpcs3/frame_icon.xpm rename to rpcs3/rpcs3/frame_icon.xpm diff --git a/rpcs3/git-version.cmake b/rpcs3/rpcs3/git-version.cmake similarity index 100% rename from rpcs3/git-version.cmake rename to rpcs3/rpcs3/git-version.cmake diff --git a/rpcs3/headless_application.cpp b/rpcs3/rpcs3/headless_application.cpp similarity index 100% rename from rpcs3/headless_application.cpp rename to rpcs3/rpcs3/headless_application.cpp diff --git a/rpcs3/headless_application.h b/rpcs3/rpcs3/headless_application.h similarity index 100% rename from rpcs3/headless_application.h rename to rpcs3/rpcs3/headless_application.h diff --git a/rpcs3/main.cpp b/rpcs3/rpcs3/main.cpp similarity index 100% rename from rpcs3/main.cpp rename to rpcs3/rpcs3/main.cpp diff --git a/rpcs3/main_application.cpp b/rpcs3/rpcs3/main_application.cpp similarity index 100% rename from rpcs3/main_application.cpp rename to rpcs3/rpcs3/main_application.cpp diff --git a/rpcs3/main_application.h b/rpcs3/rpcs3/main_application.h similarity index 100% rename from rpcs3/main_application.h rename to rpcs3/rpcs3/main_application.h diff --git a/rpcs3/module_verifier.cpp b/rpcs3/rpcs3/module_verifier.cpp similarity index 100% rename from rpcs3/module_verifier.cpp rename to rpcs3/rpcs3/module_verifier.cpp diff --git a/rpcs3/module_verifier.hpp b/rpcs3/rpcs3/module_verifier.hpp similarity index 100% rename from rpcs3/module_verifier.hpp rename to rpcs3/rpcs3/module_verifier.hpp diff --git a/rpcs3/qt/etc/qt.conf b/rpcs3/rpcs3/qt/etc/qt.conf similarity index 100% rename from rpcs3/qt/etc/qt.conf rename to rpcs3/rpcs3/qt/etc/qt.conf diff --git a/rpcs3/resource.h b/rpcs3/rpcs3/resource.h similarity index 100% rename from rpcs3/resource.h rename to rpcs3/rpcs3/resource.h diff --git a/rpcs3/resources.qrc b/rpcs3/rpcs3/resources.qrc similarity index 100% rename from rpcs3/resources.qrc rename to rpcs3/rpcs3/resources.qrc diff --git a/rpcs3/rpcs3.desktop b/rpcs3/rpcs3/rpcs3.desktop similarity index 100% rename from rpcs3/rpcs3.desktop rename to rpcs3/rpcs3/rpcs3.desktop diff --git a/rpcs3/rpcs3.icns b/rpcs3/rpcs3/rpcs3.icns similarity index 100% rename from rpcs3/rpcs3.icns rename to rpcs3/rpcs3/rpcs3.icns diff --git a/rpcs3/rpcs3.ico b/rpcs3/rpcs3/rpcs3.ico similarity index 100% rename from rpcs3/rpcs3.ico rename to rpcs3/rpcs3/rpcs3.ico diff --git a/rpcs3/rpcs3.metainfo.xml b/rpcs3/rpcs3/rpcs3.metainfo.xml similarity index 100% rename from rpcs3/rpcs3.metainfo.xml rename to rpcs3/rpcs3/rpcs3.metainfo.xml diff --git a/rpcs3/rpcs3.plist.in b/rpcs3/rpcs3/rpcs3.plist.in similarity index 100% rename from rpcs3/rpcs3.plist.in rename to rpcs3/rpcs3/rpcs3.plist.in diff --git a/rpcs3/rpcs3.png b/rpcs3/rpcs3/rpcs3.png similarity index 100% rename from rpcs3/rpcs3.png rename to rpcs3/rpcs3/rpcs3.png diff --git a/rpcs3/rpcs3.rc b/rpcs3/rpcs3/rpcs3.rc similarity index 100% rename from rpcs3/rpcs3.rc rename to rpcs3/rpcs3/rpcs3.rc diff --git a/rpcs3/rpcs3.svg b/rpcs3/rpcs3/rpcs3.svg similarity index 100% rename from rpcs3/rpcs3.svg rename to rpcs3/rpcs3/rpcs3.svg diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3/rpcs3.vcxproj similarity index 100% rename from rpcs3/rpcs3.vcxproj rename to rpcs3/rpcs3/rpcs3.vcxproj diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3/rpcs3.vcxproj.filters similarity index 100% rename from rpcs3/rpcs3.vcxproj.filters rename to rpcs3/rpcs3/rpcs3.vcxproj.filters diff --git a/rpcs3/rpcs3_version.cpp b/rpcs3/rpcs3/rpcs3_version.cpp similarity index 100% rename from rpcs3/rpcs3_version.cpp rename to rpcs3/rpcs3/rpcs3_version.cpp diff --git a/rpcs3/rpcs3_version.h b/rpcs3/rpcs3/rpcs3_version.h similarity index 100% rename from rpcs3/rpcs3_version.h rename to rpcs3/rpcs3/rpcs3_version.h diff --git a/rpcs3/rpcs3qt/CMakeLists.txt b/rpcs3/rpcs3/rpcs3qt/CMakeLists.txt similarity index 100% rename from rpcs3/rpcs3qt/CMakeLists.txt rename to rpcs3/rpcs3/rpcs3qt/CMakeLists.txt diff --git a/rpcs3/rpcs3qt/_discord_utils.cpp b/rpcs3/rpcs3/rpcs3qt/_discord_utils.cpp similarity index 100% rename from rpcs3/rpcs3qt/_discord_utils.cpp rename to rpcs3/rpcs3/rpcs3qt/_discord_utils.cpp diff --git a/rpcs3/rpcs3qt/_discord_utils.h b/rpcs3/rpcs3/rpcs3qt/_discord_utils.h similarity index 100% rename from rpcs3/rpcs3qt/_discord_utils.h rename to rpcs3/rpcs3/rpcs3qt/_discord_utils.h diff --git a/rpcs3/rpcs3qt/about_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/about_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/about_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/about_dialog.cpp diff --git a/rpcs3/rpcs3qt/about_dialog.h b/rpcs3/rpcs3/rpcs3qt/about_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/about_dialog.h rename to rpcs3/rpcs3/rpcs3qt/about_dialog.h diff --git a/rpcs3/rpcs3qt/about_dialog.ui b/rpcs3/rpcs3/rpcs3qt/about_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/about_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/about_dialog.ui diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/auto_pause_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/auto_pause_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/auto_pause_settings_dialog.h diff --git a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/basic_mouse_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/basic_mouse_settings_dialog.h diff --git a/rpcs3/rpcs3qt/breakpoint_handler.cpp b/rpcs3/rpcs3/rpcs3qt/breakpoint_handler.cpp similarity index 100% rename from rpcs3/rpcs3qt/breakpoint_handler.cpp rename to rpcs3/rpcs3/rpcs3qt/breakpoint_handler.cpp diff --git a/rpcs3/rpcs3qt/breakpoint_handler.h b/rpcs3/rpcs3/rpcs3qt/breakpoint_handler.h similarity index 100% rename from rpcs3/rpcs3qt/breakpoint_handler.h rename to rpcs3/rpcs3/rpcs3qt/breakpoint_handler.h diff --git a/rpcs3/rpcs3qt/breakpoint_list.cpp b/rpcs3/rpcs3/rpcs3qt/breakpoint_list.cpp similarity index 100% rename from rpcs3/rpcs3qt/breakpoint_list.cpp rename to rpcs3/rpcs3/rpcs3qt/breakpoint_list.cpp diff --git a/rpcs3/rpcs3qt/breakpoint_list.h b/rpcs3/rpcs3/rpcs3qt/breakpoint_list.h similarity index 100% rename from rpcs3/rpcs3qt/breakpoint_list.h rename to rpcs3/rpcs3/rpcs3qt/breakpoint_list.h diff --git a/rpcs3/rpcs3qt/call_stack_list.cpp b/rpcs3/rpcs3/rpcs3qt/call_stack_list.cpp similarity index 100% rename from rpcs3/rpcs3qt/call_stack_list.cpp rename to rpcs3/rpcs3/rpcs3qt/call_stack_list.cpp diff --git a/rpcs3/rpcs3qt/call_stack_list.h b/rpcs3/rpcs3/rpcs3qt/call_stack_list.h similarity index 100% rename from rpcs3/rpcs3qt/call_stack_list.h rename to rpcs3/rpcs3/rpcs3qt/call_stack_list.h diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/camera_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/camera_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/camera_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/camera_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/camera_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/camera_settings_dialog.h diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.ui b/rpcs3/rpcs3/rpcs3qt/camera_settings_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/camera_settings_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/camera_settings_dialog.ui diff --git a/rpcs3/rpcs3qt/category.h b/rpcs3/rpcs3/rpcs3qt/category.h similarity index 100% rename from rpcs3/rpcs3qt/category.h rename to rpcs3/rpcs3/rpcs3qt/category.h diff --git a/rpcs3/rpcs3qt/cg_disasm_window.cpp b/rpcs3/rpcs3/rpcs3qt/cg_disasm_window.cpp similarity index 100% rename from rpcs3/rpcs3qt/cg_disasm_window.cpp rename to rpcs3/rpcs3/rpcs3qt/cg_disasm_window.cpp diff --git a/rpcs3/rpcs3qt/cg_disasm_window.h b/rpcs3/rpcs3/rpcs3qt/cg_disasm_window.h similarity index 100% rename from rpcs3/rpcs3qt/cg_disasm_window.h rename to rpcs3/rpcs3/rpcs3qt/cg_disasm_window.h diff --git a/rpcs3/rpcs3qt/cheat_manager.cpp b/rpcs3/rpcs3/rpcs3qt/cheat_manager.cpp similarity index 100% rename from rpcs3/rpcs3qt/cheat_manager.cpp rename to rpcs3/rpcs3/rpcs3qt/cheat_manager.cpp diff --git a/rpcs3/rpcs3qt/cheat_manager.h b/rpcs3/rpcs3/rpcs3qt/cheat_manager.h similarity index 100% rename from rpcs3/rpcs3qt/cheat_manager.h rename to rpcs3/rpcs3/rpcs3qt/cheat_manager.h diff --git a/rpcs3/rpcs3qt/config_adapter.cpp b/rpcs3/rpcs3/rpcs3qt/config_adapter.cpp similarity index 100% rename from rpcs3/rpcs3qt/config_adapter.cpp rename to rpcs3/rpcs3/rpcs3qt/config_adapter.cpp diff --git a/rpcs3/rpcs3qt/config_adapter.h b/rpcs3/rpcs3/rpcs3qt/config_adapter.h similarity index 100% rename from rpcs3/rpcs3qt/config_adapter.h rename to rpcs3/rpcs3/rpcs3qt/config_adapter.h diff --git a/rpcs3/rpcs3qt/config_checker.cpp b/rpcs3/rpcs3/rpcs3qt/config_checker.cpp similarity index 100% rename from rpcs3/rpcs3qt/config_checker.cpp rename to rpcs3/rpcs3/rpcs3qt/config_checker.cpp diff --git a/rpcs3/rpcs3qt/config_checker.h b/rpcs3/rpcs3/rpcs3qt/config_checker.h similarity index 100% rename from rpcs3/rpcs3qt/config_checker.h rename to rpcs3/rpcs3/rpcs3qt/config_checker.h diff --git a/rpcs3/rpcs3qt/curl_handle.cpp b/rpcs3/rpcs3/rpcs3qt/curl_handle.cpp similarity index 100% rename from rpcs3/rpcs3qt/curl_handle.cpp rename to rpcs3/rpcs3/rpcs3qt/curl_handle.cpp diff --git a/rpcs3/rpcs3qt/curl_handle.h b/rpcs3/rpcs3/rpcs3qt/curl_handle.h similarity index 100% rename from rpcs3/rpcs3qt/curl_handle.h rename to rpcs3/rpcs3/rpcs3qt/curl_handle.h diff --git a/rpcs3/rpcs3qt/custom_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/custom_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/custom_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/custom_dialog.cpp diff --git a/rpcs3/rpcs3qt/custom_dialog.h b/rpcs3/rpcs3/rpcs3qt/custom_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/custom_dialog.h rename to rpcs3/rpcs3/rpcs3qt/custom_dialog.h diff --git a/rpcs3/rpcs3qt/custom_dock_widget.h b/rpcs3/rpcs3/rpcs3qt/custom_dock_widget.h similarity index 100% rename from rpcs3/rpcs3qt/custom_dock_widget.h rename to rpcs3/rpcs3/rpcs3qt/custom_dock_widget.h diff --git a/rpcs3/rpcs3qt/custom_table_widget_item.cpp b/rpcs3/rpcs3/rpcs3qt/custom_table_widget_item.cpp similarity index 100% rename from rpcs3/rpcs3qt/custom_table_widget_item.cpp rename to rpcs3/rpcs3/rpcs3qt/custom_table_widget_item.cpp diff --git a/rpcs3/rpcs3qt/custom_table_widget_item.h b/rpcs3/rpcs3/rpcs3qt/custom_table_widget_item.h similarity index 100% rename from rpcs3/rpcs3qt/custom_table_widget_item.h rename to rpcs3/rpcs3/rpcs3qt/custom_table_widget_item.h diff --git a/rpcs3/rpcs3qt/debugger_add_bp_window.cpp b/rpcs3/rpcs3/rpcs3qt/debugger_add_bp_window.cpp similarity index 100% rename from rpcs3/rpcs3qt/debugger_add_bp_window.cpp rename to rpcs3/rpcs3/rpcs3qt/debugger_add_bp_window.cpp diff --git a/rpcs3/rpcs3qt/debugger_add_bp_window.h b/rpcs3/rpcs3/rpcs3qt/debugger_add_bp_window.h similarity index 100% rename from rpcs3/rpcs3qt/debugger_add_bp_window.h rename to rpcs3/rpcs3/rpcs3qt/debugger_add_bp_window.h diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3/rpcs3qt/debugger_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/debugger_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/debugger_frame.cpp diff --git a/rpcs3/rpcs3qt/debugger_frame.h b/rpcs3/rpcs3/rpcs3qt/debugger_frame.h similarity index 100% rename from rpcs3/rpcs3qt/debugger_frame.h rename to rpcs3/rpcs3/rpcs3qt/debugger_frame.h diff --git a/rpcs3/rpcs3qt/debugger_list.cpp b/rpcs3/rpcs3/rpcs3qt/debugger_list.cpp similarity index 100% rename from rpcs3/rpcs3qt/debugger_list.cpp rename to rpcs3/rpcs3/rpcs3qt/debugger_list.cpp diff --git a/rpcs3/rpcs3qt/debugger_list.h b/rpcs3/rpcs3/rpcs3qt/debugger_list.h similarity index 100% rename from rpcs3/rpcs3qt/debugger_list.h rename to rpcs3/rpcs3/rpcs3qt/debugger_list.h diff --git a/rpcs3/rpcs3qt/dimensions_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/dimensions_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/dimensions_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/dimensions_dialog.cpp diff --git a/rpcs3/rpcs3qt/dimensions_dialog.h b/rpcs3/rpcs3/rpcs3qt/dimensions_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/dimensions_dialog.h rename to rpcs3/rpcs3/rpcs3qt/dimensions_dialog.h diff --git a/rpcs3/rpcs3qt/downloader.cpp b/rpcs3/rpcs3/rpcs3qt/downloader.cpp similarity index 100% rename from rpcs3/rpcs3qt/downloader.cpp rename to rpcs3/rpcs3/rpcs3qt/downloader.cpp diff --git a/rpcs3/rpcs3qt/downloader.h b/rpcs3/rpcs3/rpcs3qt/downloader.h similarity index 100% rename from rpcs3/rpcs3qt/downloader.h rename to rpcs3/rpcs3/rpcs3qt/downloader.h diff --git a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/elf_memory_dumping_dialog.cpp diff --git a/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h b/rpcs3/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/elf_memory_dumping_dialog.h rename to rpcs3/rpcs3/rpcs3qt/elf_memory_dumping_dialog.h diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3/rpcs3qt/emu_settings.cpp similarity index 100% rename from rpcs3/rpcs3qt/emu_settings.cpp rename to rpcs3/rpcs3/rpcs3qt/emu_settings.cpp diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3/rpcs3qt/emu_settings.h similarity index 100% rename from rpcs3/rpcs3qt/emu_settings.h rename to rpcs3/rpcs3/rpcs3qt/emu_settings.h diff --git a/rpcs3/rpcs3qt/emu_settings_type.h b/rpcs3/rpcs3/rpcs3qt/emu_settings_type.h similarity index 100% rename from rpcs3/rpcs3qt/emu_settings_type.h rename to rpcs3/rpcs3/rpcs3qt/emu_settings_type.h diff --git a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/emulated_pad_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/emulated_pad_settings_dialog.h diff --git a/rpcs3/rpcs3qt/fatal_error_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/fatal_error_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/fatal_error_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/fatal_error_dialog.cpp diff --git a/rpcs3/rpcs3qt/fatal_error_dialog.h b/rpcs3/rpcs3/rpcs3qt/fatal_error_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/fatal_error_dialog.h rename to rpcs3/rpcs3/rpcs3qt/fatal_error_dialog.h diff --git a/rpcs3/rpcs3qt/find_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/find_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/find_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/find_dialog.cpp diff --git a/rpcs3/rpcs3qt/find_dialog.h b/rpcs3/rpcs3/rpcs3qt/find_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/find_dialog.h rename to rpcs3/rpcs3/rpcs3qt/find_dialog.h diff --git a/rpcs3/rpcs3qt/flow_layout.cpp b/rpcs3/rpcs3/rpcs3qt/flow_layout.cpp similarity index 100% rename from rpcs3/rpcs3qt/flow_layout.cpp rename to rpcs3/rpcs3/rpcs3qt/flow_layout.cpp diff --git a/rpcs3/rpcs3qt/flow_layout.h b/rpcs3/rpcs3/rpcs3qt/flow_layout.h similarity index 100% rename from rpcs3/rpcs3qt/flow_layout.h rename to rpcs3/rpcs3/rpcs3qt/flow_layout.h diff --git a/rpcs3/rpcs3qt/flow_widget.cpp b/rpcs3/rpcs3/rpcs3qt/flow_widget.cpp similarity index 100% rename from rpcs3/rpcs3qt/flow_widget.cpp rename to rpcs3/rpcs3/rpcs3qt/flow_widget.cpp diff --git a/rpcs3/rpcs3qt/flow_widget.h b/rpcs3/rpcs3/rpcs3qt/flow_widget.h similarity index 100% rename from rpcs3/rpcs3qt/flow_widget.h rename to rpcs3/rpcs3/rpcs3qt/flow_widget.h diff --git a/rpcs3/rpcs3qt/flow_widget_item.cpp b/rpcs3/rpcs3/rpcs3qt/flow_widget_item.cpp similarity index 100% rename from rpcs3/rpcs3qt/flow_widget_item.cpp rename to rpcs3/rpcs3/rpcs3qt/flow_widget_item.cpp diff --git a/rpcs3/rpcs3qt/flow_widget_item.h b/rpcs3/rpcs3/rpcs3qt/flow_widget_item.h similarity index 100% rename from rpcs3/rpcs3qt/flow_widget_item.h rename to rpcs3/rpcs3/rpcs3qt/flow_widget_item.h diff --git a/rpcs3/rpcs3qt/game_compatibility.cpp b/rpcs3/rpcs3/rpcs3qt/game_compatibility.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_compatibility.cpp rename to rpcs3/rpcs3/rpcs3qt/game_compatibility.cpp diff --git a/rpcs3/rpcs3qt/game_compatibility.h b/rpcs3/rpcs3/rpcs3qt/game_compatibility.h similarity index 100% rename from rpcs3/rpcs3qt/game_compatibility.h rename to rpcs3/rpcs3/rpcs3qt/game_compatibility.h diff --git a/rpcs3/rpcs3qt/game_list.cpp b/rpcs3/rpcs3/rpcs3qt/game_list.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_list.cpp rename to rpcs3/rpcs3/rpcs3qt/game_list.cpp diff --git a/rpcs3/rpcs3qt/game_list.h b/rpcs3/rpcs3/rpcs3qt/game_list.h similarity index 100% rename from rpcs3/rpcs3qt/game_list.h rename to rpcs3/rpcs3/rpcs3qt/game_list.h diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3/rpcs3qt/game_list_base.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_list_base.cpp rename to rpcs3/rpcs3/rpcs3qt/game_list_base.cpp diff --git a/rpcs3/rpcs3qt/game_list_base.h b/rpcs3/rpcs3/rpcs3qt/game_list_base.h similarity index 100% rename from rpcs3/rpcs3qt/game_list_base.h rename to rpcs3/rpcs3/rpcs3qt/game_list_base.h diff --git a/rpcs3/rpcs3qt/game_list_delegate.cpp b/rpcs3/rpcs3/rpcs3qt/game_list_delegate.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_list_delegate.cpp rename to rpcs3/rpcs3/rpcs3qt/game_list_delegate.cpp diff --git a/rpcs3/rpcs3qt/game_list_delegate.h b/rpcs3/rpcs3/rpcs3qt/game_list_delegate.h similarity index 100% rename from rpcs3/rpcs3qt/game_list_delegate.h rename to rpcs3/rpcs3/rpcs3qt/game_list_delegate.h diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3/rpcs3qt/game_list_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_list_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/game_list_frame.cpp diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3/rpcs3qt/game_list_frame.h similarity index 100% rename from rpcs3/rpcs3qt/game_list_frame.h rename to rpcs3/rpcs3/rpcs3qt/game_list_frame.h diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3/rpcs3qt/game_list_grid.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_list_grid.cpp rename to rpcs3/rpcs3/rpcs3qt/game_list_grid.cpp diff --git a/rpcs3/rpcs3qt/game_list_grid.h b/rpcs3/rpcs3/rpcs3qt/game_list_grid.h similarity index 100% rename from rpcs3/rpcs3qt/game_list_grid.h rename to rpcs3/rpcs3/rpcs3qt/game_list_grid.h diff --git a/rpcs3/rpcs3qt/game_list_grid_item.cpp b/rpcs3/rpcs3/rpcs3qt/game_list_grid_item.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_list_grid_item.cpp rename to rpcs3/rpcs3/rpcs3qt/game_list_grid_item.cpp diff --git a/rpcs3/rpcs3qt/game_list_grid_item.h b/rpcs3/rpcs3/rpcs3qt/game_list_grid_item.h similarity index 100% rename from rpcs3/rpcs3qt/game_list_grid_item.h rename to rpcs3/rpcs3/rpcs3qt/game_list_grid_item.h diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3/rpcs3qt/game_list_table.cpp similarity index 100% rename from rpcs3/rpcs3qt/game_list_table.cpp rename to rpcs3/rpcs3/rpcs3qt/game_list_table.cpp diff --git a/rpcs3/rpcs3qt/game_list_table.h b/rpcs3/rpcs3/rpcs3qt/game_list_table.h similarity index 100% rename from rpcs3/rpcs3qt/game_list_table.h rename to rpcs3/rpcs3/rpcs3qt/game_list_table.h diff --git a/rpcs3/rpcs3qt/gl_gs_frame.cpp b/rpcs3/rpcs3/rpcs3qt/gl_gs_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/gl_gs_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/gl_gs_frame.cpp diff --git a/rpcs3/rpcs3qt/gl_gs_frame.h b/rpcs3/rpcs3/rpcs3qt/gl_gs_frame.h similarity index 100% rename from rpcs3/rpcs3qt/gl_gs_frame.h rename to rpcs3/rpcs3/rpcs3qt/gl_gs_frame.h diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3/rpcs3qt/gs_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/gs_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/gs_frame.cpp diff --git a/rpcs3/rpcs3qt/gs_frame.h b/rpcs3/rpcs3/rpcs3qt/gs_frame.h similarity index 100% rename from rpcs3/rpcs3qt/gs_frame.h rename to rpcs3/rpcs3/rpcs3qt/gs_frame.h diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3/rpcs3qt/gui_application.cpp similarity index 100% rename from rpcs3/rpcs3qt/gui_application.cpp rename to rpcs3/rpcs3/rpcs3qt/gui_application.cpp diff --git a/rpcs3/rpcs3qt/gui_application.h b/rpcs3/rpcs3/rpcs3qt/gui_application.h similarity index 100% rename from rpcs3/rpcs3qt/gui_application.h rename to rpcs3/rpcs3/rpcs3qt/gui_application.h diff --git a/rpcs3/rpcs3qt/gui_game_info.cpp b/rpcs3/rpcs3/rpcs3qt/gui_game_info.cpp similarity index 100% rename from rpcs3/rpcs3qt/gui_game_info.cpp rename to rpcs3/rpcs3/rpcs3qt/gui_game_info.cpp diff --git a/rpcs3/rpcs3qt/gui_game_info.h b/rpcs3/rpcs3/rpcs3qt/gui_game_info.h similarity index 100% rename from rpcs3/rpcs3qt/gui_game_info.h rename to rpcs3/rpcs3/rpcs3qt/gui_game_info.h diff --git a/rpcs3/rpcs3qt/gui_save.h b/rpcs3/rpcs3/rpcs3qt/gui_save.h similarity index 100% rename from rpcs3/rpcs3qt/gui_save.h rename to rpcs3/rpcs3/rpcs3qt/gui_save.h diff --git a/rpcs3/rpcs3qt/gui_settings.cpp b/rpcs3/rpcs3/rpcs3qt/gui_settings.cpp similarity index 100% rename from rpcs3/rpcs3qt/gui_settings.cpp rename to rpcs3/rpcs3/rpcs3qt/gui_settings.cpp diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3/rpcs3qt/gui_settings.h similarity index 100% rename from rpcs3/rpcs3qt/gui_settings.h rename to rpcs3/rpcs3/rpcs3qt/gui_settings.h diff --git a/rpcs3/rpcs3qt/infinity_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/infinity_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/infinity_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/infinity_dialog.cpp diff --git a/rpcs3/rpcs3qt/infinity_dialog.h b/rpcs3/rpcs3/rpcs3qt/infinity_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/infinity_dialog.h rename to rpcs3/rpcs3/rpcs3qt/infinity_dialog.h diff --git a/rpcs3/rpcs3qt/input_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/input_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/input_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/input_dialog.cpp diff --git a/rpcs3/rpcs3qt/input_dialog.h b/rpcs3/rpcs3/rpcs3qt/input_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/input_dialog.h rename to rpcs3/rpcs3/rpcs3qt/input_dialog.h diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/instruction_editor_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/instruction_editor_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/instruction_editor_dialog.cpp diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.h b/rpcs3/rpcs3/rpcs3qt/instruction_editor_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/instruction_editor_dialog.h rename to rpcs3/rpcs3/rpcs3qt/instruction_editor_dialog.h diff --git a/rpcs3/rpcs3qt/ipc_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/ipc_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/ipc_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/ipc_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/ipc_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/ipc_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/ipc_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/ipc_settings_dialog.h diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3/rpcs3qt/kernel_explorer.cpp similarity index 100% rename from rpcs3/rpcs3qt/kernel_explorer.cpp rename to rpcs3/rpcs3/rpcs3qt/kernel_explorer.cpp diff --git a/rpcs3/rpcs3qt/kernel_explorer.h b/rpcs3/rpcs3/rpcs3qt/kernel_explorer.h similarity index 100% rename from rpcs3/rpcs3qt/kernel_explorer.h rename to rpcs3/rpcs3/rpcs3qt/kernel_explorer.h diff --git a/rpcs3/rpcs3qt/localized.cpp b/rpcs3/rpcs3/rpcs3qt/localized.cpp similarity index 100% rename from rpcs3/rpcs3qt/localized.cpp rename to rpcs3/rpcs3/rpcs3qt/localized.cpp diff --git a/rpcs3/rpcs3qt/localized.h b/rpcs3/rpcs3/rpcs3qt/localized.h similarity index 100% rename from rpcs3/rpcs3qt/localized.h rename to rpcs3/rpcs3/rpcs3qt/localized.h diff --git a/rpcs3/rpcs3qt/localized_emu.cpp b/rpcs3/rpcs3/rpcs3qt/localized_emu.cpp similarity index 100% rename from rpcs3/rpcs3qt/localized_emu.cpp rename to rpcs3/rpcs3/rpcs3qt/localized_emu.cpp diff --git a/rpcs3/rpcs3qt/localized_emu.h b/rpcs3/rpcs3/rpcs3qt/localized_emu.h similarity index 100% rename from rpcs3/rpcs3qt/localized_emu.h rename to rpcs3/rpcs3/rpcs3qt/localized_emu.h diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3/rpcs3qt/log_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/log_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/log_frame.cpp diff --git a/rpcs3/rpcs3qt/log_frame.h b/rpcs3/rpcs3/rpcs3qt/log_frame.h similarity index 100% rename from rpcs3/rpcs3qt/log_frame.h rename to rpcs3/rpcs3/rpcs3qt/log_frame.h diff --git a/rpcs3/rpcs3qt/log_viewer.cpp b/rpcs3/rpcs3/rpcs3qt/log_viewer.cpp similarity index 100% rename from rpcs3/rpcs3qt/log_viewer.cpp rename to rpcs3/rpcs3/rpcs3qt/log_viewer.cpp diff --git a/rpcs3/rpcs3qt/log_viewer.h b/rpcs3/rpcs3/rpcs3qt/log_viewer.h similarity index 100% rename from rpcs3/rpcs3qt/log_viewer.h rename to rpcs3/rpcs3/rpcs3qt/log_viewer.h diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3/rpcs3qt/main_window.cpp similarity index 100% rename from rpcs3/rpcs3qt/main_window.cpp rename to rpcs3/rpcs3/rpcs3qt/main_window.cpp diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3/rpcs3qt/main_window.h similarity index 100% rename from rpcs3/rpcs3qt/main_window.h rename to rpcs3/rpcs3/rpcs3qt/main_window.h diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3/rpcs3qt/main_window.ui similarity index 100% rename from rpcs3/rpcs3qt/main_window.ui rename to rpcs3/rpcs3/rpcs3qt/main_window.ui diff --git a/rpcs3/rpcs3qt/memory_string_searcher.cpp b/rpcs3/rpcs3/rpcs3qt/memory_string_searcher.cpp similarity index 100% rename from rpcs3/rpcs3qt/memory_string_searcher.cpp rename to rpcs3/rpcs3/rpcs3qt/memory_string_searcher.cpp diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3/rpcs3qt/memory_viewer_panel.cpp similarity index 100% rename from rpcs3/rpcs3qt/memory_viewer_panel.cpp rename to rpcs3/rpcs3/rpcs3qt/memory_viewer_panel.cpp diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.h b/rpcs3/rpcs3/rpcs3qt/memory_viewer_panel.h similarity index 100% rename from rpcs3/rpcs3qt/memory_viewer_panel.h rename to rpcs3/rpcs3/rpcs3qt/memory_viewer_panel.h diff --git a/rpcs3/rpcs3qt/microphone_creator.cpp b/rpcs3/rpcs3/rpcs3qt/microphone_creator.cpp similarity index 100% rename from rpcs3/rpcs3qt/microphone_creator.cpp rename to rpcs3/rpcs3/rpcs3qt/microphone_creator.cpp diff --git a/rpcs3/rpcs3qt/microphone_creator.h b/rpcs3/rpcs3/rpcs3qt/microphone_creator.h similarity index 100% rename from rpcs3/rpcs3qt/microphone_creator.h rename to rpcs3/rpcs3/rpcs3qt/microphone_creator.h diff --git a/rpcs3/rpcs3qt/midi_creator.cpp b/rpcs3/rpcs3/rpcs3qt/midi_creator.cpp similarity index 100% rename from rpcs3/rpcs3qt/midi_creator.cpp rename to rpcs3/rpcs3/rpcs3qt/midi_creator.cpp diff --git a/rpcs3/rpcs3qt/midi_creator.h b/rpcs3/rpcs3/rpcs3qt/midi_creator.h similarity index 100% rename from rpcs3/rpcs3qt/midi_creator.h rename to rpcs3/rpcs3/rpcs3qt/midi_creator.h diff --git a/rpcs3/rpcs3qt/movie_item.cpp b/rpcs3/rpcs3/rpcs3qt/movie_item.cpp similarity index 100% rename from rpcs3/rpcs3qt/movie_item.cpp rename to rpcs3/rpcs3/rpcs3qt/movie_item.cpp diff --git a/rpcs3/rpcs3qt/movie_item.h b/rpcs3/rpcs3/rpcs3qt/movie_item.h similarity index 100% rename from rpcs3/rpcs3qt/movie_item.h rename to rpcs3/rpcs3/rpcs3qt/movie_item.h diff --git a/rpcs3/rpcs3qt/movie_item_base.cpp b/rpcs3/rpcs3/rpcs3qt/movie_item_base.cpp similarity index 100% rename from rpcs3/rpcs3qt/movie_item_base.cpp rename to rpcs3/rpcs3/rpcs3qt/movie_item_base.cpp diff --git a/rpcs3/rpcs3qt/movie_item_base.h b/rpcs3/rpcs3/rpcs3qt/movie_item_base.h similarity index 100% rename from rpcs3/rpcs3qt/movie_item_base.h rename to rpcs3/rpcs3/rpcs3qt/movie_item_base.h diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.cpp b/rpcs3/rpcs3/rpcs3qt/msg_dialog_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/msg_dialog_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/msg_dialog_frame.cpp diff --git a/rpcs3/rpcs3qt/msg_dialog_frame.h b/rpcs3/rpcs3/rpcs3qt/msg_dialog_frame.h similarity index 100% rename from rpcs3/rpcs3qt/msg_dialog_frame.h rename to rpcs3/rpcs3/rpcs3qt/msg_dialog_frame.h diff --git a/rpcs3/rpcs3qt/numbered_widget_item.h b/rpcs3/rpcs3/rpcs3qt/numbered_widget_item.h similarity index 100% rename from rpcs3/rpcs3qt/numbered_widget_item.h rename to rpcs3/rpcs3/rpcs3qt/numbered_widget_item.h diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.cpp b/rpcs3/rpcs3/rpcs3qt/osk_dialog_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/osk_dialog_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/osk_dialog_frame.cpp diff --git a/rpcs3/rpcs3qt/osk_dialog_frame.h b/rpcs3/rpcs3/rpcs3qt/osk_dialog_frame.h similarity index 100% rename from rpcs3/rpcs3qt/osk_dialog_frame.h rename to rpcs3/rpcs3/rpcs3qt/osk_dialog_frame.h diff --git a/rpcs3/rpcs3qt/pad_device_info.h b/rpcs3/rpcs3/rpcs3qt/pad_device_info.h similarity index 100% rename from rpcs3/rpcs3qt/pad_device_info.h rename to rpcs3/rpcs3/rpcs3qt/pad_device_info.h diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/pad_led_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/pad_led_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/pad_led_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/pad_led_settings_dialog.h diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.ui b/rpcs3/rpcs3/rpcs3qt/pad_led_settings_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/pad_led_settings_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/pad_led_settings_dialog.ui diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/pad_motion_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/pad_motion_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/pad_motion_settings_dialog.h diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.ui b/rpcs3/rpcs3/rpcs3qt/pad_motion_settings_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/pad_motion_settings_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/pad_motion_settings_dialog.ui diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/pad_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/pad_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/pad_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/pad_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/pad_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/pad_settings_dialog.h diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.ui b/rpcs3/rpcs3/rpcs3qt/pad_settings_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/pad_settings_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/pad_settings_dialog.ui diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/patch_creator_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/patch_creator_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/patch_creator_dialog.cpp diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.h b/rpcs3/rpcs3/rpcs3qt/patch_creator_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/patch_creator_dialog.h rename to rpcs3/rpcs3/rpcs3qt/patch_creator_dialog.h diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.ui b/rpcs3/rpcs3/rpcs3qt/patch_creator_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/patch_creator_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/patch_creator_dialog.ui diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/patch_manager_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/patch_manager_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/patch_manager_dialog.cpp diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.h b/rpcs3/rpcs3/rpcs3qt/patch_manager_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/patch_manager_dialog.h rename to rpcs3/rpcs3/rpcs3qt/patch_manager_dialog.h diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.ui b/rpcs3/rpcs3/rpcs3qt/patch_manager_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/patch_manager_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/patch_manager_dialog.ui diff --git a/rpcs3/rpcs3qt/permissions.cpp b/rpcs3/rpcs3/rpcs3qt/permissions.cpp similarity index 100% rename from rpcs3/rpcs3qt/permissions.cpp rename to rpcs3/rpcs3/rpcs3qt/permissions.cpp diff --git a/rpcs3/rpcs3qt/permissions.h b/rpcs3/rpcs3/rpcs3qt/permissions.h similarity index 100% rename from rpcs3/rpcs3qt/permissions.h rename to rpcs3/rpcs3/rpcs3qt/permissions.h diff --git a/rpcs3/rpcs3qt/persistent_settings.cpp b/rpcs3/rpcs3/rpcs3qt/persistent_settings.cpp similarity index 100% rename from rpcs3/rpcs3qt/persistent_settings.cpp rename to rpcs3/rpcs3/rpcs3qt/persistent_settings.cpp diff --git a/rpcs3/rpcs3qt/persistent_settings.h b/rpcs3/rpcs3/rpcs3qt/persistent_settings.h similarity index 100% rename from rpcs3/rpcs3qt/persistent_settings.h rename to rpcs3/rpcs3/rpcs3qt/persistent_settings.h diff --git a/rpcs3/rpcs3qt/pkg_install_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/pkg_install_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/pkg_install_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/pkg_install_dialog.cpp diff --git a/rpcs3/rpcs3qt/pkg_install_dialog.h b/rpcs3/rpcs3/rpcs3qt/pkg_install_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/pkg_install_dialog.h rename to rpcs3/rpcs3/rpcs3qt/pkg_install_dialog.h diff --git a/rpcs3/rpcs3qt/progress_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/progress_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/progress_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/progress_dialog.cpp diff --git a/rpcs3/rpcs3qt/progress_dialog.h b/rpcs3/rpcs3/rpcs3qt/progress_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/progress_dialog.h rename to rpcs3/rpcs3/rpcs3qt/progress_dialog.h diff --git a/rpcs3/rpcs3qt/progress_indicator.cpp b/rpcs3/rpcs3/rpcs3qt/progress_indicator.cpp similarity index 100% rename from rpcs3/rpcs3qt/progress_indicator.cpp rename to rpcs3/rpcs3/rpcs3qt/progress_indicator.cpp diff --git a/rpcs3/rpcs3qt/progress_indicator.h b/rpcs3/rpcs3/rpcs3qt/progress_indicator.h similarity index 100% rename from rpcs3/rpcs3qt/progress_indicator.h rename to rpcs3/rpcs3/rpcs3qt/progress_indicator.h diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.h b/rpcs3/rpcs3/rpcs3qt/ps_move_tracker_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/ps_move_tracker_dialog.h rename to rpcs3/rpcs3/rpcs3qt/ps_move_tracker_dialog.h diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.ui b/rpcs3/rpcs3/rpcs3qt/ps_move_tracker_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/ps_move_tracker_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/ps_move_tracker_dialog.ui diff --git a/rpcs3/rpcs3qt/qt_camera_handler.cpp b/rpcs3/rpcs3/rpcs3qt/qt_camera_handler.cpp similarity index 100% rename from rpcs3/rpcs3qt/qt_camera_handler.cpp rename to rpcs3/rpcs3/rpcs3qt/qt_camera_handler.cpp diff --git a/rpcs3/rpcs3qt/qt_camera_handler.h b/rpcs3/rpcs3/rpcs3qt/qt_camera_handler.h similarity index 100% rename from rpcs3/rpcs3qt/qt_camera_handler.h rename to rpcs3/rpcs3/rpcs3qt/qt_camera_handler.h diff --git a/rpcs3/rpcs3qt/qt_camera_video_sink.cpp b/rpcs3/rpcs3/rpcs3qt/qt_camera_video_sink.cpp similarity index 100% rename from rpcs3/rpcs3qt/qt_camera_video_sink.cpp rename to rpcs3/rpcs3/rpcs3qt/qt_camera_video_sink.cpp diff --git a/rpcs3/rpcs3qt/qt_camera_video_sink.h b/rpcs3/rpcs3/rpcs3qt/qt_camera_video_sink.h similarity index 100% rename from rpcs3/rpcs3qt/qt_camera_video_sink.h rename to rpcs3/rpcs3/rpcs3qt/qt_camera_video_sink.h diff --git a/rpcs3/rpcs3qt/qt_music_handler.cpp b/rpcs3/rpcs3/rpcs3qt/qt_music_handler.cpp similarity index 100% rename from rpcs3/rpcs3qt/qt_music_handler.cpp rename to rpcs3/rpcs3/rpcs3qt/qt_music_handler.cpp diff --git a/rpcs3/rpcs3qt/qt_music_handler.h b/rpcs3/rpcs3/rpcs3qt/qt_music_handler.h similarity index 100% rename from rpcs3/rpcs3qt/qt_music_handler.h rename to rpcs3/rpcs3/rpcs3qt/qt_music_handler.h diff --git a/rpcs3/rpcs3qt/qt_utils.cpp b/rpcs3/rpcs3/rpcs3qt/qt_utils.cpp similarity index 100% rename from rpcs3/rpcs3qt/qt_utils.cpp rename to rpcs3/rpcs3/rpcs3qt/qt_utils.cpp diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3/rpcs3qt/qt_utils.h similarity index 100% rename from rpcs3/rpcs3qt/qt_utils.h rename to rpcs3/rpcs3/rpcs3qt/qt_utils.h diff --git a/rpcs3/rpcs3qt/qt_video_source.cpp b/rpcs3/rpcs3/rpcs3qt/qt_video_source.cpp similarity index 100% rename from rpcs3/rpcs3qt/qt_video_source.cpp rename to rpcs3/rpcs3/rpcs3qt/qt_video_source.cpp diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3/rpcs3qt/qt_video_source.h similarity index 100% rename from rpcs3/rpcs3qt/qt_video_source.h rename to rpcs3/rpcs3/rpcs3qt/qt_video_source.h diff --git a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/raw_mouse_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/raw_mouse_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/raw_mouse_settings_dialog.h diff --git a/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp b/rpcs3/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/recvmessage_dialog_frame.cpp diff --git a/rpcs3/rpcs3qt/recvmessage_dialog_frame.h b/rpcs3/rpcs3/rpcs3qt/recvmessage_dialog_frame.h similarity index 100% rename from rpcs3/rpcs3qt/recvmessage_dialog_frame.h rename to rpcs3/rpcs3/rpcs3qt/recvmessage_dialog_frame.h diff --git a/rpcs3/rpcs3qt/register_editor_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/register_editor_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/register_editor_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/register_editor_dialog.cpp diff --git a/rpcs3/rpcs3qt/register_editor_dialog.h b/rpcs3/rpcs3/rpcs3qt/register_editor_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/register_editor_dialog.h rename to rpcs3/rpcs3/rpcs3qt/register_editor_dialog.h diff --git a/rpcs3/rpcs3qt/render_creator.cpp b/rpcs3/rpcs3/rpcs3qt/render_creator.cpp similarity index 100% rename from rpcs3/rpcs3qt/render_creator.cpp rename to rpcs3/rpcs3/rpcs3qt/render_creator.cpp diff --git a/rpcs3/rpcs3qt/render_creator.h b/rpcs3/rpcs3/rpcs3qt/render_creator.h similarity index 100% rename from rpcs3/rpcs3qt/render_creator.h rename to rpcs3/rpcs3/rpcs3qt/render_creator.h diff --git a/rpcs3/rpcs3qt/richtext_item_delegate.h b/rpcs3/rpcs3/rpcs3qt/richtext_item_delegate.h similarity index 100% rename from rpcs3/rpcs3qt/richtext_item_delegate.h rename to rpcs3/rpcs3/rpcs3qt/richtext_item_delegate.h diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/rpcn_settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/rpcn_settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/rpcn_settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/rpcn_settings_dialog.h diff --git a/rpcs3/rpcs3qt/rsx_debugger.cpp b/rpcs3/rpcs3/rpcs3qt/rsx_debugger.cpp similarity index 100% rename from rpcs3/rpcs3qt/rsx_debugger.cpp rename to rpcs3/rpcs3/rpcs3qt/rsx_debugger.cpp diff --git a/rpcs3/rpcs3qt/rsx_debugger.h b/rpcs3/rpcs3/rpcs3qt/rsx_debugger.h similarity index 100% rename from rpcs3/rpcs3qt/rsx_debugger.h rename to rpcs3/rpcs3/rpcs3qt/rsx_debugger.h diff --git a/rpcs3/rpcs3qt/save_data_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/save_data_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/save_data_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/save_data_dialog.cpp diff --git a/rpcs3/rpcs3qt/save_data_dialog.h b/rpcs3/rpcs3/rpcs3qt/save_data_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/save_data_dialog.h rename to rpcs3/rpcs3/rpcs3qt/save_data_dialog.h diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/save_data_info_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/save_data_info_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/save_data_info_dialog.cpp diff --git a/rpcs3/rpcs3qt/save_data_info_dialog.h b/rpcs3/rpcs3/rpcs3qt/save_data_info_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/save_data_info_dialog.h rename to rpcs3/rpcs3/rpcs3qt/save_data_info_dialog.h diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/save_data_list_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/save_data_list_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/save_data_list_dialog.cpp diff --git a/rpcs3/rpcs3qt/save_data_list_dialog.h b/rpcs3/rpcs3/rpcs3qt/save_data_list_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/save_data_list_dialog.h rename to rpcs3/rpcs3/rpcs3qt/save_data_list_dialog.h diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/save_manager_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/save_manager_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/save_manager_dialog.cpp diff --git a/rpcs3/rpcs3qt/save_manager_dialog.h b/rpcs3/rpcs3/rpcs3qt/save_manager_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/save_manager_dialog.h rename to rpcs3/rpcs3/rpcs3qt/save_manager_dialog.h diff --git a/rpcs3/rpcs3qt/savestate_manager_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/savestate_manager_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/savestate_manager_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/savestate_manager_dialog.cpp diff --git a/rpcs3/rpcs3qt/savestate_manager_dialog.h b/rpcs3/rpcs3/rpcs3qt/savestate_manager_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/savestate_manager_dialog.h rename to rpcs3/rpcs3/rpcs3qt/savestate_manager_dialog.h diff --git a/rpcs3/rpcs3qt/screenshot_item.cpp b/rpcs3/rpcs3/rpcs3qt/screenshot_item.cpp similarity index 100% rename from rpcs3/rpcs3qt/screenshot_item.cpp rename to rpcs3/rpcs3/rpcs3qt/screenshot_item.cpp diff --git a/rpcs3/rpcs3qt/screenshot_item.h b/rpcs3/rpcs3/rpcs3qt/screenshot_item.h similarity index 100% rename from rpcs3/rpcs3qt/screenshot_item.h rename to rpcs3/rpcs3/rpcs3qt/screenshot_item.h diff --git a/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/screenshot_manager_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/screenshot_manager_dialog.cpp diff --git a/rpcs3/rpcs3qt/screenshot_manager_dialog.h b/rpcs3/rpcs3/rpcs3qt/screenshot_manager_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/screenshot_manager_dialog.h rename to rpcs3/rpcs3/rpcs3qt/screenshot_manager_dialog.h diff --git a/rpcs3/rpcs3qt/screenshot_preview.cpp b/rpcs3/rpcs3/rpcs3qt/screenshot_preview.cpp similarity index 100% rename from rpcs3/rpcs3qt/screenshot_preview.cpp rename to rpcs3/rpcs3/rpcs3qt/screenshot_preview.cpp diff --git a/rpcs3/rpcs3qt/screenshot_preview.h b/rpcs3/rpcs3/rpcs3qt/screenshot_preview.h similarity index 100% rename from rpcs3/rpcs3qt/screenshot_preview.h rename to rpcs3/rpcs3/rpcs3qt/screenshot_preview.h diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp b/rpcs3/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/sendmessage_dialog_frame.cpp diff --git a/rpcs3/rpcs3qt/sendmessage_dialog_frame.h b/rpcs3/rpcs3/rpcs3qt/sendmessage_dialog_frame.h similarity index 100% rename from rpcs3/rpcs3qt/sendmessage_dialog_frame.h rename to rpcs3/rpcs3/rpcs3qt/sendmessage_dialog_frame.h diff --git a/rpcs3/rpcs3qt/settings.cpp b/rpcs3/rpcs3/rpcs3qt/settings.cpp similarity index 100% rename from rpcs3/rpcs3qt/settings.cpp rename to rpcs3/rpcs3/rpcs3qt/settings.cpp diff --git a/rpcs3/rpcs3qt/settings.h b/rpcs3/rpcs3/rpcs3qt/settings.h similarity index 100% rename from rpcs3/rpcs3qt/settings.h rename to rpcs3/rpcs3/rpcs3qt/settings.h diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/settings_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/settings_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/settings_dialog.cpp diff --git a/rpcs3/rpcs3qt/settings_dialog.h b/rpcs3/rpcs3/rpcs3qt/settings_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/settings_dialog.h rename to rpcs3/rpcs3/rpcs3qt/settings_dialog.h diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3/rpcs3qt/settings_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/settings_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/settings_dialog.ui diff --git a/rpcs3/rpcs3qt/shortcut_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/shortcut_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/shortcut_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/shortcut_dialog.cpp diff --git a/rpcs3/rpcs3qt/shortcut_dialog.h b/rpcs3/rpcs3/rpcs3qt/shortcut_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/shortcut_dialog.h rename to rpcs3/rpcs3/rpcs3qt/shortcut_dialog.h diff --git a/rpcs3/rpcs3qt/shortcut_dialog.ui b/rpcs3/rpcs3/rpcs3qt/shortcut_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/shortcut_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/shortcut_dialog.ui diff --git a/rpcs3/rpcs3qt/shortcut_handler.cpp b/rpcs3/rpcs3/rpcs3qt/shortcut_handler.cpp similarity index 100% rename from rpcs3/rpcs3qt/shortcut_handler.cpp rename to rpcs3/rpcs3/rpcs3qt/shortcut_handler.cpp diff --git a/rpcs3/rpcs3qt/shortcut_handler.h b/rpcs3/rpcs3/rpcs3qt/shortcut_handler.h similarity index 100% rename from rpcs3/rpcs3qt/shortcut_handler.h rename to rpcs3/rpcs3/rpcs3qt/shortcut_handler.h diff --git a/rpcs3/rpcs3qt/shortcut_settings.cpp b/rpcs3/rpcs3/rpcs3qt/shortcut_settings.cpp similarity index 100% rename from rpcs3/rpcs3qt/shortcut_settings.cpp rename to rpcs3/rpcs3/rpcs3qt/shortcut_settings.cpp diff --git a/rpcs3/rpcs3qt/shortcut_settings.h b/rpcs3/rpcs3/rpcs3qt/shortcut_settings.h similarity index 100% rename from rpcs3/rpcs3qt/shortcut_settings.h rename to rpcs3/rpcs3/rpcs3qt/shortcut_settings.h diff --git a/rpcs3/rpcs3qt/shortcut_utils.cpp b/rpcs3/rpcs3/rpcs3qt/shortcut_utils.cpp similarity index 100% rename from rpcs3/rpcs3qt/shortcut_utils.cpp rename to rpcs3/rpcs3/rpcs3qt/shortcut_utils.cpp diff --git a/rpcs3/rpcs3qt/shortcut_utils.h b/rpcs3/rpcs3/rpcs3qt/shortcut_utils.h similarity index 100% rename from rpcs3/rpcs3qt/shortcut_utils.h rename to rpcs3/rpcs3/rpcs3qt/shortcut_utils.h diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/skylander_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/skylander_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/skylander_dialog.cpp diff --git a/rpcs3/rpcs3qt/skylander_dialog.h b/rpcs3/rpcs3/rpcs3qt/skylander_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/skylander_dialog.h rename to rpcs3/rpcs3/rpcs3qt/skylander_dialog.h diff --git a/rpcs3/rpcs3qt/stylesheets.h b/rpcs3/rpcs3/rpcs3qt/stylesheets.h similarity index 100% rename from rpcs3/rpcs3qt/stylesheets.h rename to rpcs3/rpcs3/rpcs3qt/stylesheets.h diff --git a/rpcs3/rpcs3qt/syntax_highlighter.cpp b/rpcs3/rpcs3/rpcs3qt/syntax_highlighter.cpp similarity index 100% rename from rpcs3/rpcs3qt/syntax_highlighter.cpp rename to rpcs3/rpcs3/rpcs3qt/syntax_highlighter.cpp diff --git a/rpcs3/rpcs3qt/syntax_highlighter.h b/rpcs3/rpcs3/rpcs3qt/syntax_highlighter.h similarity index 100% rename from rpcs3/rpcs3qt/syntax_highlighter.h rename to rpcs3/rpcs3/rpcs3qt/syntax_highlighter.h diff --git a/rpcs3/rpcs3qt/system_cmd_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/system_cmd_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/system_cmd_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/system_cmd_dialog.cpp diff --git a/rpcs3/rpcs3qt/system_cmd_dialog.h b/rpcs3/rpcs3/rpcs3qt/system_cmd_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/system_cmd_dialog.h rename to rpcs3/rpcs3/rpcs3qt/system_cmd_dialog.h diff --git a/rpcs3/rpcs3qt/table_item_delegate.cpp b/rpcs3/rpcs3/rpcs3qt/table_item_delegate.cpp similarity index 100% rename from rpcs3/rpcs3qt/table_item_delegate.cpp rename to rpcs3/rpcs3/rpcs3qt/table_item_delegate.cpp diff --git a/rpcs3/rpcs3qt/table_item_delegate.h b/rpcs3/rpcs3/rpcs3qt/table_item_delegate.h similarity index 100% rename from rpcs3/rpcs3qt/table_item_delegate.h rename to rpcs3/rpcs3/rpcs3qt/table_item_delegate.h diff --git a/rpcs3/rpcs3qt/tooltips.cpp b/rpcs3/rpcs3/rpcs3qt/tooltips.cpp similarity index 100% rename from rpcs3/rpcs3qt/tooltips.cpp rename to rpcs3/rpcs3/rpcs3qt/tooltips.cpp diff --git a/rpcs3/rpcs3qt/tooltips.h b/rpcs3/rpcs3/rpcs3qt/tooltips.h similarity index 100% rename from rpcs3/rpcs3qt/tooltips.h rename to rpcs3/rpcs3/rpcs3qt/tooltips.h diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/trophy_manager_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/trophy_manager_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/trophy_manager_dialog.cpp diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.h b/rpcs3/rpcs3/rpcs3qt/trophy_manager_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/trophy_manager_dialog.h rename to rpcs3/rpcs3/rpcs3qt/trophy_manager_dialog.h diff --git a/rpcs3/rpcs3qt/trophy_notification_frame.cpp b/rpcs3/rpcs3/rpcs3qt/trophy_notification_frame.cpp similarity index 100% rename from rpcs3/rpcs3qt/trophy_notification_frame.cpp rename to rpcs3/rpcs3/rpcs3qt/trophy_notification_frame.cpp diff --git a/rpcs3/rpcs3qt/trophy_notification_frame.h b/rpcs3/rpcs3/rpcs3qt/trophy_notification_frame.h similarity index 100% rename from rpcs3/rpcs3qt/trophy_notification_frame.h rename to rpcs3/rpcs3/rpcs3qt/trophy_notification_frame.h diff --git a/rpcs3/rpcs3qt/trophy_notification_helper.cpp b/rpcs3/rpcs3/rpcs3qt/trophy_notification_helper.cpp similarity index 100% rename from rpcs3/rpcs3qt/trophy_notification_helper.cpp rename to rpcs3/rpcs3/rpcs3qt/trophy_notification_helper.cpp diff --git a/rpcs3/rpcs3qt/trophy_notification_helper.h b/rpcs3/rpcs3/rpcs3qt/trophy_notification_helper.h similarity index 100% rename from rpcs3/rpcs3qt/trophy_notification_helper.h rename to rpcs3/rpcs3/rpcs3qt/trophy_notification_helper.h diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3/rpcs3qt/update_manager.cpp similarity index 100% rename from rpcs3/rpcs3qt/update_manager.cpp rename to rpcs3/rpcs3/rpcs3qt/update_manager.cpp diff --git a/rpcs3/rpcs3qt/update_manager.h b/rpcs3/rpcs3/rpcs3qt/update_manager.h similarity index 100% rename from rpcs3/rpcs3qt/update_manager.h rename to rpcs3/rpcs3/rpcs3qt/update_manager.h diff --git a/rpcs3/rpcs3qt/user_account.cpp b/rpcs3/rpcs3/rpcs3qt/user_account.cpp similarity index 100% rename from rpcs3/rpcs3qt/user_account.cpp rename to rpcs3/rpcs3/rpcs3qt/user_account.cpp diff --git a/rpcs3/rpcs3qt/user_account.h b/rpcs3/rpcs3/rpcs3qt/user_account.h similarity index 100% rename from rpcs3/rpcs3qt/user_account.h rename to rpcs3/rpcs3/rpcs3qt/user_account.h diff --git a/rpcs3/rpcs3qt/user_manager_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/user_manager_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/user_manager_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/user_manager_dialog.cpp diff --git a/rpcs3/rpcs3qt/user_manager_dialog.h b/rpcs3/rpcs3/rpcs3qt/user_manager_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/user_manager_dialog.h rename to rpcs3/rpcs3/rpcs3qt/user_manager_dialog.h diff --git a/rpcs3/rpcs3qt/uuid.cpp b/rpcs3/rpcs3/rpcs3qt/uuid.cpp similarity index 100% rename from rpcs3/rpcs3qt/uuid.cpp rename to rpcs3/rpcs3/rpcs3qt/uuid.cpp diff --git a/rpcs3/rpcs3qt/uuid.h b/rpcs3/rpcs3/rpcs3qt/uuid.h similarity index 100% rename from rpcs3/rpcs3qt/uuid.h rename to rpcs3/rpcs3/rpcs3qt/uuid.h diff --git a/rpcs3/rpcs3qt/vfs_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/vfs_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog.cpp diff --git a/rpcs3/rpcs3qt/vfs_dialog.h b/rpcs3/rpcs3/rpcs3qt/vfs_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog.h rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog.h diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.h b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_path_widget.h similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_path_widget.h rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_path_widget.h diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.cpp b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_tab.cpp similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_tab.cpp rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_tab.cpp diff --git a/rpcs3/rpcs3qt/vfs_dialog_tab.h b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_tab.h similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_tab.h rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_tab.h diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_input.h b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_input.h similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_usb_input.h rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_input.h diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_tab.cpp diff --git a/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h b/rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h similarity index 100% rename from rpcs3/rpcs3qt/vfs_dialog_usb_tab.h rename to rpcs3/rpcs3/rpcs3qt/vfs_dialog_usb_tab.h diff --git a/rpcs3/rpcs3qt/vfs_tool_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/vfs_tool_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/vfs_tool_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/vfs_tool_dialog.cpp diff --git a/rpcs3/rpcs3qt/vfs_tool_dialog.h b/rpcs3/rpcs3/rpcs3qt/vfs_tool_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/vfs_tool_dialog.h rename to rpcs3/rpcs3/rpcs3qt/vfs_tool_dialog.h diff --git a/rpcs3/rpcs3qt/vfs_tool_dialog.ui b/rpcs3/rpcs3/rpcs3qt/vfs_tool_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/vfs_tool_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/vfs_tool_dialog.ui diff --git a/rpcs3/rpcs3qt/video_label.cpp b/rpcs3/rpcs3/rpcs3qt/video_label.cpp similarity index 100% rename from rpcs3/rpcs3qt/video_label.cpp rename to rpcs3/rpcs3/rpcs3qt/video_label.cpp diff --git a/rpcs3/rpcs3qt/video_label.h b/rpcs3/rpcs3/rpcs3qt/video_label.h similarity index 100% rename from rpcs3/rpcs3qt/video_label.h rename to rpcs3/rpcs3/rpcs3qt/video_label.h diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3/rpcs3qt/welcome_dialog.cpp similarity index 100% rename from rpcs3/rpcs3qt/welcome_dialog.cpp rename to rpcs3/rpcs3/rpcs3qt/welcome_dialog.cpp diff --git a/rpcs3/rpcs3qt/welcome_dialog.h b/rpcs3/rpcs3/rpcs3qt/welcome_dialog.h similarity index 100% rename from rpcs3/rpcs3qt/welcome_dialog.h rename to rpcs3/rpcs3/rpcs3qt/welcome_dialog.h diff --git a/rpcs3/rpcs3qt/welcome_dialog.ui b/rpcs3/rpcs3/rpcs3qt/welcome_dialog.ui similarity index 100% rename from rpcs3/rpcs3qt/welcome_dialog.ui rename to rpcs3/rpcs3/rpcs3qt/welcome_dialog.ui diff --git a/rpcs3/stb_image.cpp b/rpcs3/rpcs3/stb_image.cpp similarity index 100% rename from rpcs3/stb_image.cpp rename to rpcs3/rpcs3/stb_image.cpp diff --git a/rpcs3/stdafx.cpp b/rpcs3/rpcs3/stdafx.cpp similarity index 100% rename from rpcs3/stdafx.cpp rename to rpcs3/rpcs3/stdafx.cpp diff --git a/rpcs3/stdafx.h b/rpcs3/rpcs3/stdafx.h similarity index 100% rename from rpcs3/stdafx.h rename to rpcs3/rpcs3/stdafx.h diff --git a/rpcs3/update_helper.sh b/rpcs3/rpcs3/update_helper.sh similarity index 100% rename from rpcs3/update_helper.sh rename to rpcs3/rpcs3/update_helper.sh diff --git a/rpcs3/util/asm.hpp b/rpcs3/rpcs3/util/asm.hpp similarity index 100% rename from rpcs3/util/asm.hpp rename to rpcs3/rpcs3/util/asm.hpp diff --git a/rpcs3/util/atomic.cpp b/rpcs3/rpcs3/util/atomic.cpp similarity index 100% rename from rpcs3/util/atomic.cpp rename to rpcs3/rpcs3/util/atomic.cpp diff --git a/rpcs3/util/atomic.hpp b/rpcs3/rpcs3/util/atomic.hpp similarity index 100% rename from rpcs3/util/atomic.hpp rename to rpcs3/rpcs3/util/atomic.hpp diff --git a/rpcs3/util/auto_typemap.hpp b/rpcs3/rpcs3/util/auto_typemap.hpp similarity index 100% rename from rpcs3/util/auto_typemap.hpp rename to rpcs3/rpcs3/util/auto_typemap.hpp diff --git a/rpcs3/util/bless.hpp b/rpcs3/rpcs3/util/bless.hpp similarity index 100% rename from rpcs3/util/bless.hpp rename to rpcs3/rpcs3/util/bless.hpp diff --git a/rpcs3/util/console.cpp b/rpcs3/rpcs3/util/console.cpp similarity index 100% rename from rpcs3/util/console.cpp rename to rpcs3/rpcs3/util/console.cpp diff --git a/rpcs3/util/console.h b/rpcs3/rpcs3/util/console.h similarity index 100% rename from rpcs3/util/console.h rename to rpcs3/rpcs3/util/console.h diff --git a/rpcs3/util/coro.hpp b/rpcs3/rpcs3/util/coro.hpp similarity index 100% rename from rpcs3/util/coro.hpp rename to rpcs3/rpcs3/util/coro.hpp diff --git a/rpcs3/util/cpu_stats.cpp b/rpcs3/rpcs3/util/cpu_stats.cpp similarity index 100% rename from rpcs3/util/cpu_stats.cpp rename to rpcs3/rpcs3/util/cpu_stats.cpp diff --git a/rpcs3/util/cpu_stats.hpp b/rpcs3/rpcs3/util/cpu_stats.hpp similarity index 100% rename from rpcs3/util/cpu_stats.hpp rename to rpcs3/rpcs3/util/cpu_stats.hpp diff --git a/rpcs3/util/dyn_lib.cpp b/rpcs3/rpcs3/util/dyn_lib.cpp similarity index 100% rename from rpcs3/util/dyn_lib.cpp rename to rpcs3/rpcs3/util/dyn_lib.cpp diff --git a/rpcs3/util/dyn_lib.hpp b/rpcs3/rpcs3/util/dyn_lib.hpp similarity index 100% rename from rpcs3/util/dyn_lib.hpp rename to rpcs3/rpcs3/util/dyn_lib.hpp diff --git a/rpcs3/util/emu_utils.cpp b/rpcs3/rpcs3/util/emu_utils.cpp similarity index 100% rename from rpcs3/util/emu_utils.cpp rename to rpcs3/rpcs3/util/emu_utils.cpp diff --git a/rpcs3/util/endian.hpp b/rpcs3/rpcs3/util/endian.hpp similarity index 100% rename from rpcs3/util/endian.hpp rename to rpcs3/rpcs3/util/endian.hpp diff --git a/rpcs3/util/fence.hpp b/rpcs3/rpcs3/util/fence.hpp similarity index 100% rename from rpcs3/util/fence.hpp rename to rpcs3/rpcs3/util/fence.hpp diff --git a/rpcs3/util/fifo_mutex.hpp b/rpcs3/rpcs3/util/fifo_mutex.hpp similarity index 100% rename from rpcs3/util/fifo_mutex.hpp rename to rpcs3/rpcs3/util/fifo_mutex.hpp diff --git a/rpcs3/util/fixed_typemap.hpp b/rpcs3/rpcs3/util/fixed_typemap.hpp similarity index 100% rename from rpcs3/util/fixed_typemap.hpp rename to rpcs3/rpcs3/util/fixed_typemap.hpp diff --git a/rpcs3/util/fnv_hash.hpp b/rpcs3/rpcs3/util/fnv_hash.hpp similarity index 100% rename from rpcs3/util/fnv_hash.hpp rename to rpcs3/rpcs3/util/fnv_hash.hpp diff --git a/rpcs3/util/init_mutex.hpp b/rpcs3/rpcs3/util/init_mutex.hpp similarity index 100% rename from rpcs3/util/init_mutex.hpp rename to rpcs3/rpcs3/util/init_mutex.hpp diff --git a/rpcs3/util/logs.cpp b/rpcs3/rpcs3/util/logs.cpp similarity index 100% rename from rpcs3/util/logs.cpp rename to rpcs3/rpcs3/util/logs.cpp diff --git a/rpcs3/util/logs.hpp b/rpcs3/rpcs3/util/logs.hpp similarity index 100% rename from rpcs3/util/logs.hpp rename to rpcs3/rpcs3/util/logs.hpp diff --git a/rpcs3/util/media_utils.cpp b/rpcs3/rpcs3/util/media_utils.cpp similarity index 100% rename from rpcs3/util/media_utils.cpp rename to rpcs3/rpcs3/util/media_utils.cpp diff --git a/rpcs3/util/media_utils.h b/rpcs3/rpcs3/util/media_utils.h similarity index 100% rename from rpcs3/util/media_utils.h rename to rpcs3/rpcs3/util/media_utils.h diff --git a/rpcs3/util/serialization.hpp b/rpcs3/rpcs3/util/serialization.hpp similarity index 100% rename from rpcs3/util/serialization.hpp rename to rpcs3/rpcs3/util/serialization.hpp diff --git a/rpcs3/util/serialization_ext.cpp b/rpcs3/rpcs3/util/serialization_ext.cpp similarity index 100% rename from rpcs3/util/serialization_ext.cpp rename to rpcs3/rpcs3/util/serialization_ext.cpp diff --git a/rpcs3/util/serialization_ext.hpp b/rpcs3/rpcs3/util/serialization_ext.hpp similarity index 100% rename from rpcs3/util/serialization_ext.hpp rename to rpcs3/rpcs3/util/serialization_ext.hpp diff --git a/rpcs3/util/shared_ptr.hpp b/rpcs3/rpcs3/util/shared_ptr.hpp similarity index 100% rename from rpcs3/util/shared_ptr.hpp rename to rpcs3/rpcs3/util/shared_ptr.hpp diff --git a/rpcs3/util/simd.hpp b/rpcs3/rpcs3/util/simd.hpp similarity index 100% rename from rpcs3/util/simd.hpp rename to rpcs3/rpcs3/util/simd.hpp diff --git a/rpcs3/util/slow_mutex.hpp b/rpcs3/rpcs3/util/slow_mutex.hpp similarity index 100% rename from rpcs3/util/slow_mutex.hpp rename to rpcs3/rpcs3/util/slow_mutex.hpp diff --git a/rpcs3/util/sysinfo.cpp b/rpcs3/rpcs3/util/sysinfo.cpp similarity index 100% rename from rpcs3/util/sysinfo.cpp rename to rpcs3/rpcs3/util/sysinfo.cpp diff --git a/rpcs3/util/sysinfo.hpp b/rpcs3/rpcs3/util/sysinfo.hpp similarity index 100% rename from rpcs3/util/sysinfo.hpp rename to rpcs3/rpcs3/util/sysinfo.hpp diff --git a/rpcs3/util/to_endian.hpp b/rpcs3/rpcs3/util/to_endian.hpp similarity index 100% rename from rpcs3/util/to_endian.hpp rename to rpcs3/rpcs3/util/to_endian.hpp diff --git a/rpcs3/util/tsc.hpp b/rpcs3/rpcs3/util/tsc.hpp similarity index 100% rename from rpcs3/util/tsc.hpp rename to rpcs3/rpcs3/util/tsc.hpp diff --git a/rpcs3/util/typeindices.hpp b/rpcs3/rpcs3/util/typeindices.hpp similarity index 100% rename from rpcs3/util/typeindices.hpp rename to rpcs3/rpcs3/util/typeindices.hpp diff --git a/rpcs3/util/types.hpp b/rpcs3/rpcs3/util/types.hpp similarity index 100% rename from rpcs3/util/types.hpp rename to rpcs3/rpcs3/util/types.hpp diff --git a/rpcs3/util/v128.hpp b/rpcs3/rpcs3/util/v128.hpp similarity index 100% rename from rpcs3/util/v128.hpp rename to rpcs3/rpcs3/util/v128.hpp diff --git a/rpcs3/util/video_provider.cpp b/rpcs3/rpcs3/util/video_provider.cpp similarity index 100% rename from rpcs3/util/video_provider.cpp rename to rpcs3/rpcs3/util/video_provider.cpp diff --git a/rpcs3/util/video_provider.h b/rpcs3/rpcs3/util/video_provider.h similarity index 100% rename from rpcs3/util/video_provider.h rename to rpcs3/rpcs3/util/video_provider.h diff --git a/rpcs3/util/video_sink.h b/rpcs3/rpcs3/util/video_sink.h similarity index 100% rename from rpcs3/util/video_sink.h rename to rpcs3/rpcs3/util/video_sink.h diff --git a/rpcs3/util/video_source.h b/rpcs3/rpcs3/util/video_source.h similarity index 100% rename from rpcs3/util/video_source.h rename to rpcs3/rpcs3/util/video_source.h diff --git a/rpcs3/util/vm.hpp b/rpcs3/rpcs3/util/vm.hpp similarity index 100% rename from rpcs3/util/vm.hpp rename to rpcs3/rpcs3/util/vm.hpp diff --git a/rpcs3/util/vm_native.cpp b/rpcs3/rpcs3/util/vm_native.cpp similarity index 100% rename from rpcs3/util/vm_native.cpp rename to rpcs3/rpcs3/util/vm_native.cpp diff --git a/rpcs3/util/yaml.cpp b/rpcs3/rpcs3/util/yaml.cpp similarity index 100% rename from rpcs3/util/yaml.cpp rename to rpcs3/rpcs3/util/yaml.cpp diff --git a/rpcs3/util/yaml.hpp b/rpcs3/rpcs3/util/yaml.hpp similarity index 100% rename from rpcs3/util/yaml.hpp rename to rpcs3/rpcs3/util/yaml.hpp diff --git a/rpcs3/windows.qrc b/rpcs3/rpcs3/windows.qrc similarity index 100% rename from rpcs3/windows.qrc rename to rpcs3/rpcs3/windows.qrc diff --git a/usertype.dat b/rpcs3/usertype.dat similarity index 100% rename from usertype.dat rename to rpcs3/usertype.dat