diff --git a/CMakeLists.txt b/CMakeLists.txt
index f033ecf7..65d0777f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ add_subdirectory(tools)
 add_subdirectory(orbis-kernel)
 add_subdirectory(rpcsx-os)
 add_subdirectory(rpcsx-gpu-legacy)
-add_subdirectory(rpcsx-gpu2)
+add_subdirectory(rpcsx-gpu)
 add_subdirectory(hw/amdgpu)
 add_subdirectory(rx)
 
diff --git a/rpcsx-gpu2/CMakeLists.txt b/rpcsx-gpu/CMakeLists.txt
similarity index 68%
rename from rpcsx-gpu2/CMakeLists.txt
rename to rpcsx-gpu/CMakeLists.txt
index 98b4e0ff..a3aa8ce8 100644
--- a/rpcsx-gpu2/CMakeLists.txt
+++ b/rpcsx-gpu/CMakeLists.txt
@@ -8,7 +8,7 @@ add_precompiled_vulkan_spirv(rpcsx-gpu-shaders
     shaders/rect_list.geom.glsl
 )
 
-add_executable(rpcsx-gpu2
+add_executable(rpcsx-gpu
     Cache.cpp
     main.cpp
     Device.cpp
@@ -18,7 +18,7 @@ add_executable(rpcsx-gpu2
     Renderer.cpp
 )
 
-target_link_libraries(rpcsx-gpu2
+target_link_libraries(rpcsx-gpu
 PUBLIC
     rpcsx-gpu-shaders
     amdgpu::bridge
@@ -32,7 +32,7 @@ PUBLIC
     gnm
 )
 
-install(TARGETS rpcsx-gpu2 RUNTIME DESTINATION bin)
-set_target_properties(rpcsx-gpu2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-target_base_address(rpcsx-gpu2 0x0000060000000000)
+install(TARGETS rpcsx-gpu RUNTIME DESTINATION bin)
+set_target_properties(rpcsx-gpu PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+target_base_address(rpcsx-gpu 0x0000060000000000)
 add_subdirectory(lib)
diff --git a/rpcsx-gpu2/Cache.cpp b/rpcsx-gpu/Cache.cpp
similarity index 100%
rename from rpcsx-gpu2/Cache.cpp
rename to rpcsx-gpu/Cache.cpp
diff --git a/rpcsx-gpu2/Cache.hpp b/rpcsx-gpu/Cache.hpp
similarity index 100%
rename from rpcsx-gpu2/Cache.hpp
rename to rpcsx-gpu/Cache.hpp
diff --git a/rpcsx-gpu2/Device.cpp b/rpcsx-gpu/Device.cpp
similarity index 100%
rename from rpcsx-gpu2/Device.cpp
rename to rpcsx-gpu/Device.cpp
diff --git a/rpcsx-gpu2/Device.hpp b/rpcsx-gpu/Device.hpp
similarity index 100%
rename from rpcsx-gpu2/Device.hpp
rename to rpcsx-gpu/Device.hpp
diff --git a/rpcsx-gpu2/FlipPipeline.cpp b/rpcsx-gpu/FlipPipeline.cpp
similarity index 100%
rename from rpcsx-gpu2/FlipPipeline.cpp
rename to rpcsx-gpu/FlipPipeline.cpp
diff --git a/rpcsx-gpu2/FlipPipeline.hpp b/rpcsx-gpu/FlipPipeline.hpp
similarity index 100%
rename from rpcsx-gpu2/FlipPipeline.hpp
rename to rpcsx-gpu/FlipPipeline.hpp
diff --git a/rpcsx-gpu2/Pipe.cpp b/rpcsx-gpu/Pipe.cpp
similarity index 100%
rename from rpcsx-gpu2/Pipe.cpp
rename to rpcsx-gpu/Pipe.cpp
diff --git a/rpcsx-gpu2/Pipe.hpp b/rpcsx-gpu/Pipe.hpp
similarity index 100%
rename from rpcsx-gpu2/Pipe.hpp
rename to rpcsx-gpu/Pipe.hpp
diff --git a/rpcsx-gpu2/Registers.cpp b/rpcsx-gpu/Registers.cpp
similarity index 100%
rename from rpcsx-gpu2/Registers.cpp
rename to rpcsx-gpu/Registers.cpp
diff --git a/rpcsx-gpu2/Registers.hpp b/rpcsx-gpu/Registers.hpp
similarity index 100%
rename from rpcsx-gpu2/Registers.hpp
rename to rpcsx-gpu/Registers.hpp
diff --git a/rpcsx-gpu2/Renderer.cpp b/rpcsx-gpu/Renderer.cpp
similarity index 100%
rename from rpcsx-gpu2/Renderer.cpp
rename to rpcsx-gpu/Renderer.cpp
diff --git a/rpcsx-gpu2/Renderer.hpp b/rpcsx-gpu/Renderer.hpp
similarity index 100%
rename from rpcsx-gpu2/Renderer.hpp
rename to rpcsx-gpu/Renderer.hpp
diff --git a/rpcsx-gpu2/lib/CMakeLists.txt b/rpcsx-gpu/lib/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/CMakeLists.txt
rename to rpcsx-gpu/lib/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/CMakeLists.txt b/rpcsx-gpu/lib/amdgpu-tiler/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/CMakeLists.txt
rename to rpcsx-gpu/lib/amdgpu-tiler/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp b/rpcsx-gpu/lib/amdgpu-tiler/include/amdgpu/tiler.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp
rename to rpcsx-gpu/lib/amdgpu-tiler/include/amdgpu/tiler.hpp
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler_cpu.hpp b/rpcsx-gpu/lib/amdgpu-tiler/include/amdgpu/tiler_cpu.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler_cpu.hpp
rename to rpcsx-gpu/lib/amdgpu-tiler/include/amdgpu/tiler_cpu.hpp
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler_vulkan.hpp b/rpcsx-gpu/lib/amdgpu-tiler/include/amdgpu/tiler_vulkan.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler_vulkan.hpp
rename to rpcsx-gpu/lib/amdgpu-tiler/include/amdgpu/tiler_vulkan.hpp
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/shaders/detiler1d.comp.glsl b/rpcsx-gpu/lib/amdgpu-tiler/shaders/detiler1d.comp.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/shaders/detiler1d.comp.glsl
rename to rpcsx-gpu/lib/amdgpu-tiler/shaders/detiler1d.comp.glsl
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/shaders/detiler2d.comp.glsl b/rpcsx-gpu/lib/amdgpu-tiler/shaders/detiler2d.comp.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/shaders/detiler2d.comp.glsl
rename to rpcsx-gpu/lib/amdgpu-tiler/shaders/detiler2d.comp.glsl
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/shaders/detilerLinear.comp.glsl b/rpcsx-gpu/lib/amdgpu-tiler/shaders/detilerLinear.comp.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/shaders/detilerLinear.comp.glsl
rename to rpcsx-gpu/lib/amdgpu-tiler/shaders/detilerLinear.comp.glsl
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/shaders/tiler.glsl b/rpcsx-gpu/lib/amdgpu-tiler/shaders/tiler.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/shaders/tiler.glsl
rename to rpcsx-gpu/lib/amdgpu-tiler/shaders/tiler.glsl
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/shaders/tiler1d.comp.glsl b/rpcsx-gpu/lib/amdgpu-tiler/shaders/tiler1d.comp.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/shaders/tiler1d.comp.glsl
rename to rpcsx-gpu/lib/amdgpu-tiler/shaders/tiler1d.comp.glsl
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/shaders/tiler2d.comp.glsl b/rpcsx-gpu/lib/amdgpu-tiler/shaders/tiler2d.comp.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/shaders/tiler2d.comp.glsl
rename to rpcsx-gpu/lib/amdgpu-tiler/shaders/tiler2d.comp.glsl
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/shaders/tilerLinear.comp.glsl b/rpcsx-gpu/lib/amdgpu-tiler/shaders/tilerLinear.comp.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/shaders/tilerLinear.comp.glsl
rename to rpcsx-gpu/lib/amdgpu-tiler/shaders/tilerLinear.comp.glsl
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/src/tiler.cpp b/rpcsx-gpu/lib/amdgpu-tiler/src/tiler.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/src/tiler.cpp
rename to rpcsx-gpu/lib/amdgpu-tiler/src/tiler.cpp
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/src/tiler_cpu.cpp b/rpcsx-gpu/lib/amdgpu-tiler/src/tiler_cpu.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/src/tiler_cpu.cpp
rename to rpcsx-gpu/lib/amdgpu-tiler/src/tiler_cpu.cpp
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/src/tiler_vulkan.cpp b/rpcsx-gpu/lib/amdgpu-tiler/src/tiler_vulkan.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/amdgpu-tiler/src/tiler_vulkan.cpp
rename to rpcsx-gpu/lib/amdgpu-tiler/src/tiler_vulkan.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/CMakeLists.txt b/rpcsx-gpu/lib/gcn-shader/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/CMakeLists.txt
rename to rpcsx-gpu/lib/gcn-shader/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/Access.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/Access.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/Access.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/Access.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/Evaluator.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/Evaluator.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/Evaluator.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/Evaluator.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/GcnConverter.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/GcnConverter.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/GcnConverter.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/GcnConverter.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/GcnInstruction.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/GcnInstruction.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/GcnInstruction.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/GcnInstruction.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ModuleInfo.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ModuleInfo.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ModuleInfo.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ModuleInfo.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/SemanticInfo.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/SemanticInfo.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/SemanticInfo.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/SemanticInfo.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/SpvConverter.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/SpvConverter.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/SpvConverter.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/SpvConverter.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/SpvTypeInfo.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/SpvTypeInfo.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/SpvTypeInfo.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/SpvTypeInfo.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/Vector.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/Vector.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/Vector.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/Vector.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/analyze.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/analyze.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/analyze.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/analyze.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/amdgpu.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/amdgpu.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/amdgpu.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/amdgpu.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/builtin.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/builtin.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/builtin.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/builtin.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/ds.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/ds.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/ds.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/ds.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/exp.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/exp.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/exp.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/exp.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/memssa.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/memssa.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/memssa.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/memssa.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/mimg.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/mimg.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/mimg.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/mimg.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/mtbuf.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/mtbuf.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/mtbuf.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/mtbuf.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/mubuf.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/mubuf.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/mubuf.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/mubuf.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/smrd.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/smrd.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/smrd.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/smrd.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sop1.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sop1.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sop1.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sop1.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sop2.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sop2.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sop2.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sop2.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sopc.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sopc.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sopc.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sopc.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sopk.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sopk.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sopk.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sopk.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sopp.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sopp.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/sopp.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/sopp.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vintrp.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vintrp.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vintrp.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vintrp.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vop1.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vop1.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vop1.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vop1.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vop2.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vop2.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vop2.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vop2.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vop3.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vop3.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vop3.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vop3.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vopc.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vopc.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/dialect/vopc.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/dialect/vopc.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/eval.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/eval.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/eval.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/eval.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/gcn.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/gcn.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/gcn.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/gcn.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/glsl.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/glsl.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/glsl.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/glsl.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/graph.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/graph.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/graph.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/graph.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Block.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Block.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Block.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Block.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Builder.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Builder.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Builder.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Builder.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Context.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Context.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Context.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Context.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Impl.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Impl.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Impl.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Impl.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Instruction.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Instruction.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Instruction.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Instruction.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/InstructionImpl.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/InstructionImpl.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/InstructionImpl.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/InstructionImpl.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Kind.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Kind.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Kind.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Kind.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Location.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Location.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Location.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Location.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/NameStorage.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/NameStorage.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/NameStorage.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/NameStorage.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Node.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Node.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Node.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Node.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/NodeImpl.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/NodeImpl.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/NodeImpl.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/NodeImpl.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Operand.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Operand.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Operand.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Operand.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/OperandPrint.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/OperandPrint.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/OperandPrint.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/OperandPrint.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/PointerWrapper.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/PointerWrapper.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/PointerWrapper.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/PointerWrapper.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/PreincNodeIterable.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/PreincNodeIterable.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/PreincNodeIterable.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/PreincNodeIterable.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/PrintableWrapper.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Region.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Region.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Region.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Region.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/RegionImpl.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/RegionImpl.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/RegionImpl.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/RegionImpl.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/RegionLike.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/RegionLike.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/RegionLike.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/RegionLike.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/RegionLikeImpl.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/RegionLikeImpl.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/RegionLikeImpl.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/RegionLikeImpl.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Value.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/Value.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/Value.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/Value.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/ir/ValueImpl.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/ir/ValueImpl.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/ir/ValueImpl.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/ir/ValueImpl.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/opt.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/opt.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/opt.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/opt.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/spv.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/spv.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/spv.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/spv.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/include/shader/transform.hpp b/rpcsx-gpu/lib/gcn-shader/include/shader/transform.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/include/shader/transform.hpp
rename to rpcsx-gpu/lib/gcn-shader/include/shader/transform.hpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/shaders/CMakeLists.txt b/rpcsx-gpu/lib/gcn-shader/shaders/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/shaders/CMakeLists.txt
rename to rpcsx-gpu/lib/gcn-shader/shaders/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/gcn-shader/shaders/rdna.glsl b/rpcsx-gpu/lib/gcn-shader/shaders/rdna.glsl
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/shaders/rdna.glsl
rename to rpcsx-gpu/lib/gcn-shader/shaders/rdna.glsl
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/Evaluator.cpp b/rpcsx-gpu/lib/gcn-shader/src/Evaluator.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/Evaluator.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/Evaluator.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/GcnConverter.cpp b/rpcsx-gpu/lib/gcn-shader/src/GcnConverter.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/GcnConverter.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/GcnConverter.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/GcnInstruction.cpp b/rpcsx-gpu/lib/gcn-shader/src/GcnInstruction.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/GcnInstruction.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/GcnInstruction.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/ModuleInfo.cpp b/rpcsx-gpu/lib/gcn-shader/src/ModuleInfo.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/ModuleInfo.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/ModuleInfo.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/SemanticModuleInfo.cpp b/rpcsx-gpu/lib/gcn-shader/src/SemanticModuleInfo.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/SemanticModuleInfo.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/SemanticModuleInfo.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/SpvConverter.cpp b/rpcsx-gpu/lib/gcn-shader/src/SpvConverter.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/SpvConverter.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/SpvConverter.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/SpvTypeInfo.cpp b/rpcsx-gpu/lib/gcn-shader/src/SpvTypeInfo.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/SpvTypeInfo.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/SpvTypeInfo.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/analyze.cpp b/rpcsx-gpu/lib/gcn-shader/src/analyze.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/analyze.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/analyze.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/eval.cpp b/rpcsx-gpu/lib/gcn-shader/src/eval.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/eval.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/eval.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/gcn.cpp b/rpcsx-gpu/lib/gcn-shader/src/gcn.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/gcn.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/gcn.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/glsl.cpp b/rpcsx-gpu/lib/gcn-shader/src/glsl.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/glsl.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/glsl.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/opt.cpp b/rpcsx-gpu/lib/gcn-shader/src/opt.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/opt.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/opt.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/spv.cpp b/rpcsx-gpu/lib/gcn-shader/src/spv.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/spv.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/spv.cpp
diff --git a/rpcsx-gpu2/lib/gcn-shader/src/transform.cpp b/rpcsx-gpu/lib/gcn-shader/src/transform.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gcn-shader/src/transform.cpp
rename to rpcsx-gpu/lib/gcn-shader/src/transform.cpp
diff --git a/rpcsx-gpu2/lib/gnm/CMakeLists.txt b/rpcsx-gpu/lib/gnm/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/CMakeLists.txt
rename to rpcsx-gpu/lib/gnm/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/gnm/include/gnm/constants.hpp b/rpcsx-gpu/lib/gnm/include/gnm/constants.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/include/gnm/constants.hpp
rename to rpcsx-gpu/lib/gnm/include/gnm/constants.hpp
diff --git a/rpcsx-gpu2/lib/gnm/include/gnm/descriptors.hpp b/rpcsx-gpu/lib/gnm/include/gnm/descriptors.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/include/gnm/descriptors.hpp
rename to rpcsx-gpu/lib/gnm/include/gnm/descriptors.hpp
diff --git a/rpcsx-gpu2/lib/gnm/include/gnm/gnm.hpp b/rpcsx-gpu/lib/gnm/include/gnm/gnm.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/include/gnm/gnm.hpp
rename to rpcsx-gpu/lib/gnm/include/gnm/gnm.hpp
diff --git a/rpcsx-gpu2/lib/gnm/include/gnm/mmio.hpp b/rpcsx-gpu/lib/gnm/include/gnm/mmio.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/include/gnm/mmio.hpp
rename to rpcsx-gpu/lib/gnm/include/gnm/mmio.hpp
diff --git a/rpcsx-gpu2/lib/gnm/include/gnm/pm4.hpp b/rpcsx-gpu/lib/gnm/include/gnm/pm4.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/include/gnm/pm4.hpp
rename to rpcsx-gpu/lib/gnm/include/gnm/pm4.hpp
diff --git a/rpcsx-gpu2/lib/gnm/lib/CMakeLists.txt b/rpcsx-gpu/lib/gnm/lib/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/lib/CMakeLists.txt
rename to rpcsx-gpu/lib/gnm/lib/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/gnm/lib/gnm-vulkan/CMakeLists.txt b/rpcsx-gpu/lib/gnm/lib/gnm-vulkan/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/lib/gnm-vulkan/CMakeLists.txt
rename to rpcsx-gpu/lib/gnm/lib/gnm-vulkan/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/gnm/lib/gnm-vulkan/include/gnm/vulkan.hpp b/rpcsx-gpu/lib/gnm/lib/gnm-vulkan/include/gnm/vulkan.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/lib/gnm-vulkan/include/gnm/vulkan.hpp
rename to rpcsx-gpu/lib/gnm/lib/gnm-vulkan/include/gnm/vulkan.hpp
diff --git a/rpcsx-gpu2/lib/gnm/lib/gnm-vulkan/src/vulkan.cpp b/rpcsx-gpu/lib/gnm/lib/gnm-vulkan/src/vulkan.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/lib/gnm-vulkan/src/vulkan.cpp
rename to rpcsx-gpu/lib/gnm/lib/gnm-vulkan/src/vulkan.cpp
diff --git a/rpcsx-gpu2/lib/gnm/src/mmio.cpp b/rpcsx-gpu/lib/gnm/src/mmio.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/src/mmio.cpp
rename to rpcsx-gpu/lib/gnm/src/mmio.cpp
diff --git a/rpcsx-gpu2/lib/gnm/src/pm4.cpp b/rpcsx-gpu/lib/gnm/src/pm4.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/gnm/src/pm4.cpp
rename to rpcsx-gpu/lib/gnm/src/pm4.cpp
diff --git a/rpcsx-gpu2/lib/vk/CMakeLists.txt b/rpcsx-gpu/lib/vk/CMakeLists.txt
similarity index 100%
rename from rpcsx-gpu2/lib/vk/CMakeLists.txt
rename to rpcsx-gpu/lib/vk/CMakeLists.txt
diff --git a/rpcsx-gpu2/lib/vk/include/Scheduler.hpp b/rpcsx-gpu/lib/vk/include/Scheduler.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/vk/include/Scheduler.hpp
rename to rpcsx-gpu/lib/vk/include/Scheduler.hpp
diff --git a/rpcsx-gpu2/lib/vk/include/vk.hpp b/rpcsx-gpu/lib/vk/include/vk.hpp
similarity index 100%
rename from rpcsx-gpu2/lib/vk/include/vk.hpp
rename to rpcsx-gpu/lib/vk/include/vk.hpp
diff --git a/rpcsx-gpu2/lib/vk/src/vk.cpp b/rpcsx-gpu/lib/vk/src/vk.cpp
similarity index 100%
rename from rpcsx-gpu2/lib/vk/src/vk.cpp
rename to rpcsx-gpu/lib/vk/src/vk.cpp
diff --git a/rpcsx-gpu2/main.cpp b/rpcsx-gpu/main.cpp
similarity index 100%
rename from rpcsx-gpu2/main.cpp
rename to rpcsx-gpu/main.cpp
diff --git a/rpcsx-gpu2/shaders/fill_red.frag.glsl b/rpcsx-gpu/shaders/fill_red.frag.glsl
similarity index 100%
rename from rpcsx-gpu2/shaders/fill_red.frag.glsl
rename to rpcsx-gpu/shaders/fill_red.frag.glsl
diff --git a/rpcsx-gpu2/shaders/flip.vert.glsl b/rpcsx-gpu/shaders/flip.vert.glsl
similarity index 100%
rename from rpcsx-gpu2/shaders/flip.vert.glsl
rename to rpcsx-gpu/shaders/flip.vert.glsl
diff --git a/rpcsx-gpu2/shaders/flip_alt.frag.glsl b/rpcsx-gpu/shaders/flip_alt.frag.glsl
similarity index 100%
rename from rpcsx-gpu2/shaders/flip_alt.frag.glsl
rename to rpcsx-gpu/shaders/flip_alt.frag.glsl
diff --git a/rpcsx-gpu2/shaders/flip_std.frag.glsl b/rpcsx-gpu/shaders/flip_std.frag.glsl
similarity index 100%
rename from rpcsx-gpu2/shaders/flip_std.frag.glsl
rename to rpcsx-gpu/shaders/flip_std.frag.glsl
diff --git a/rpcsx-gpu2/shaders/rect_list.geom.glsl b/rpcsx-gpu/shaders/rect_list.geom.glsl
similarity index 100%
rename from rpcsx-gpu2/shaders/rect_list.geom.glsl
rename to rpcsx-gpu/shaders/rect_list.geom.glsl