diff --git a/hecl/driver/CMakeLists.txt b/hecl/driver/CMakeLists.txt
index 2331b1758..828c6f96a 100644
--- a/hecl/driver/CMakeLists.txt
+++ b/hecl/driver/CMakeLists.txt
@@ -14,6 +14,7 @@ add_executable(hecl main.cpp
 
 list(APPEND DATA_SPEC_LIBS
      RetroDataSpec
+     DNACommon
      DNAMP1
      DNAMP2
      DNAMP3)
diff --git a/hecl/driver/ToolExtract.hpp b/hecl/driver/ToolExtract.hpp
index a8d6d6e13..13b315cdc 100644
--- a/hecl/driver/ToolExtract.hpp
+++ b/hecl/driver/ToolExtract.hpp
@@ -18,12 +18,12 @@ public:
         if (!m_info.args.size())
             LogModule.report(LogVisor::FatalError, "hecl extract needs a source path as its first argument");
 
-        m_einfo.srcpath = &m_info.args[0];
+        m_einfo.srcpath = m_info.args[0];
         m_einfo.extractArgs.reserve(info.args.size() - 1);
         for (std::vector<HECL::SystemString>::const_iterator it=info.args.begin() + 1;
              it != info.args.end();
              ++it)
-            m_einfo.extractArgs.push_back(&*it);
+            m_einfo.extractArgs.push_back(*it);
 
         for (const HECL::Database::DataSpecEntry* entry : HECL::Database::DATA_SPEC_REGISTRY)
         {
@@ -99,7 +99,10 @@ public:
             HECL::Printf(_S("ABOUT TO EXTRACT:\n"));
 
         for (HECL::Database::IDataSpec::ExtractReport& rep : m_reps)
+        {
             _recursivePrint(0, rep);
+            HECL::Printf(_S("\n"));
+        }
 
         if (XTERM_COLOR)
             HECL::Printf(_S("\n" BLUE BOLD "Continue?" NORMAL " (Y/N) "));
diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon
index abb9d4c00..7876d4c20 160000
--- a/hecl/extern/RetroCommon
+++ b/hecl/extern/RetroCommon
@@ -1 +1 @@
-Subproject commit abb9d4c0004daa0c892b7d81eb189549089f8cf2
+Subproject commit 7876d4c209a1f5ce85eede73f8e34d4b9f6ca2bc
diff --git a/hecl/include/HECL/Database.hpp b/hecl/include/HECL/Database.hpp
index 8422f18fb..d003c673d 100644
--- a/hecl/include/HECL/Database.hpp
+++ b/hecl/include/HECL/Database.hpp
@@ -70,8 +70,8 @@ public:
      */
     struct ExtractPassInfo
     {
-        const SystemString* srcpath;
-        std::vector<const SystemString*> extractArgs;
+        SystemString srcpath;
+        std::vector<SystemString> extractArgs;
     };
 
     /**
diff --git a/hecl/include/HECL/HECL.hpp b/hecl/include/HECL/HECL.hpp
index e7c3c668b..f0a3fd0d4 100644
--- a/hecl/include/HECL/HECL.hpp
+++ b/hecl/include/HECL/HECL.hpp
@@ -231,6 +231,8 @@ protected:
 public:
     FourCC() /* Sentinel FourCC */
     : num(0) {}
+    FourCC(const FourCC& other)
+    {num = other.num;}
     FourCC(const char* name)
     : num(*(uint32_t*)name) {}
     inline bool operator==(const FourCC& other) const {return num == other.num;}
@@ -238,6 +240,7 @@ public:
     inline bool operator==(const char* other) const {return num == *(uint32_t*)other;}
     inline bool operator!=(const char* other) const {return num != *(uint32_t*)other;}
     inline std::string toString() const {return std::string(fcc, 4);}
+    inline uint32_t toUint32() const {return num;}
 };
 
 /**
@@ -511,6 +514,11 @@ static inline uint64_t SBig(uint64_t val) {return val;}
 
 namespace std
 {
+template <> struct hash<HECL::FourCC>
+{
+    inline size_t operator()(const HECL::FourCC& val) const noexcept
+    {return val.toUint32();}
+};
 template <> struct hash<HECL::ProjectPath>
 {
     inline size_t operator()(const HECL::ProjectPath& val) const noexcept
diff --git a/hecl/lib/backend/CMakeLists.txt b/hecl/lib/Backend/CMakeLists.txt
similarity index 100%
rename from hecl/lib/backend/CMakeLists.txt
rename to hecl/lib/Backend/CMakeLists.txt
diff --git a/hecl/lib/backend/GLSL/CGLSLFragEmitter.cpp b/hecl/lib/Backend/GLSL/CGLSLFragEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/GLSL/CGLSLFragEmitter.cpp
rename to hecl/lib/Backend/GLSL/CGLSLFragEmitter.cpp
diff --git a/hecl/lib/backend/GLSL/CGLSLObject.cpp b/hecl/lib/Backend/GLSL/CGLSLObject.cpp
similarity index 100%
rename from hecl/lib/backend/GLSL/CGLSLObject.cpp
rename to hecl/lib/Backend/GLSL/CGLSLObject.cpp
diff --git a/hecl/lib/backend/GLSL/CGLSLSpec.cpp b/hecl/lib/Backend/GLSL/CGLSLSpec.cpp
similarity index 100%
rename from hecl/lib/backend/GLSL/CGLSLSpec.cpp
rename to hecl/lib/Backend/GLSL/CGLSLSpec.cpp
diff --git a/hecl/lib/backend/GLSL/CGLSLVertEmitter.cpp b/hecl/lib/Backend/GLSL/CGLSLVertEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/GLSL/CGLSLVertEmitter.cpp
rename to hecl/lib/Backend/GLSL/CGLSLVertEmitter.cpp
diff --git a/hecl/lib/backend/GX/CGXFragEmitter.cpp b/hecl/lib/Backend/GX/CGXFragEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/GX/CGXFragEmitter.cpp
rename to hecl/lib/Backend/GX/CGXFragEmitter.cpp
diff --git a/hecl/lib/backend/GX/CGXObject.cpp b/hecl/lib/Backend/GX/CGXObject.cpp
similarity index 100%
rename from hecl/lib/backend/GX/CGXObject.cpp
rename to hecl/lib/Backend/GX/CGXObject.cpp
diff --git a/hecl/lib/backend/GX/CGXSpec.cpp b/hecl/lib/Backend/GX/CGXSpec.cpp
similarity index 100%
rename from hecl/lib/backend/GX/CGXSpec.cpp
rename to hecl/lib/Backend/GX/CGXSpec.cpp
diff --git a/hecl/lib/backend/GX/CGXVertEmitter.cpp b/hecl/lib/Backend/GX/CGXVertEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/GX/CGXVertEmitter.cpp
rename to hecl/lib/Backend/GX/CGXVertEmitter.cpp
diff --git a/hecl/lib/backend/GX2LLVM/CGX2LLVMFragEmitter.cpp b/hecl/lib/Backend/GX2LLVM/CGX2LLVMFragEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/GX2LLVM/CGX2LLVMFragEmitter.cpp
rename to hecl/lib/Backend/GX2LLVM/CGX2LLVMFragEmitter.cpp
diff --git a/hecl/lib/backend/GX2LLVM/CGX2LLVMObject.cpp b/hecl/lib/Backend/GX2LLVM/CGX2LLVMObject.cpp
similarity index 100%
rename from hecl/lib/backend/GX2LLVM/CGX2LLVMObject.cpp
rename to hecl/lib/Backend/GX2LLVM/CGX2LLVMObject.cpp
diff --git a/hecl/lib/backend/GX2LLVM/CGX2LLVMSpec.cpp b/hecl/lib/Backend/GX2LLVM/CGX2LLVMSpec.cpp
similarity index 100%
rename from hecl/lib/backend/GX2LLVM/CGX2LLVMSpec.cpp
rename to hecl/lib/Backend/GX2LLVM/CGX2LLVMSpec.cpp
diff --git a/hecl/lib/backend/GX2LLVM/CGX2LLVMVertEmitter.cpp b/hecl/lib/Backend/GX2LLVM/CGX2LLVMVertEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/GX2LLVM/CGX2LLVMVertEmitter.cpp
rename to hecl/lib/Backend/GX2LLVM/CGX2LLVMVertEmitter.cpp
diff --git a/hecl/lib/backend/HECLBackend.cpp b/hecl/lib/Backend/HECLBackend.cpp
similarity index 100%
rename from hecl/lib/backend/HECLBackend.cpp
rename to hecl/lib/Backend/HECLBackend.cpp
diff --git a/hecl/lib/backend/HLSL/CHLSLFragEmitter.cpp b/hecl/lib/Backend/HLSL/CHLSLFragEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/HLSL/CHLSLFragEmitter.cpp
rename to hecl/lib/Backend/HLSL/CHLSLFragEmitter.cpp
diff --git a/hecl/lib/backend/HLSL/CHLSLObject.cpp b/hecl/lib/Backend/HLSL/CHLSLObject.cpp
similarity index 100%
rename from hecl/lib/backend/HLSL/CHLSLObject.cpp
rename to hecl/lib/Backend/HLSL/CHLSLObject.cpp
diff --git a/hecl/lib/backend/HLSL/CHLSLSpec.cpp b/hecl/lib/Backend/HLSL/CHLSLSpec.cpp
similarity index 100%
rename from hecl/lib/backend/HLSL/CHLSLSpec.cpp
rename to hecl/lib/Backend/HLSL/CHLSLSpec.cpp
diff --git a/hecl/lib/backend/HLSL/CHLSLVertEmitter.cpp b/hecl/lib/Backend/HLSL/CHLSLVertEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/HLSL/CHLSLVertEmitter.cpp
rename to hecl/lib/Backend/HLSL/CHLSLVertEmitter.cpp
diff --git a/hecl/lib/backend/IBackendFragEmitter.hpp b/hecl/lib/Backend/IBackendFragEmitter.hpp
similarity index 100%
rename from hecl/lib/backend/IBackendFragEmitter.hpp
rename to hecl/lib/Backend/IBackendFragEmitter.hpp
diff --git a/hecl/lib/backend/IBackendObject.hpp b/hecl/lib/Backend/IBackendObject.hpp
similarity index 100%
rename from hecl/lib/backend/IBackendObject.hpp
rename to hecl/lib/Backend/IBackendObject.hpp
diff --git a/hecl/lib/backend/IBackendSpec.hpp b/hecl/lib/Backend/IBackendSpec.hpp
similarity index 100%
rename from hecl/lib/backend/IBackendSpec.hpp
rename to hecl/lib/Backend/IBackendSpec.hpp
diff --git a/hecl/lib/backend/IBackendVertEmitter.hpp b/hecl/lib/Backend/IBackendVertEmitter.hpp
similarity index 100%
rename from hecl/lib/backend/IBackendVertEmitter.hpp
rename to hecl/lib/Backend/IBackendVertEmitter.hpp
diff --git a/hecl/lib/backend/SPIRV/CSPIRVFragEmitter.cpp b/hecl/lib/Backend/SPIRV/CSPIRVFragEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/SPIRV/CSPIRVFragEmitter.cpp
rename to hecl/lib/Backend/SPIRV/CSPIRVFragEmitter.cpp
diff --git a/hecl/lib/backend/SPIRV/CSPIRVObject.cpp b/hecl/lib/Backend/SPIRV/CSPIRVObject.cpp
similarity index 100%
rename from hecl/lib/backend/SPIRV/CSPIRVObject.cpp
rename to hecl/lib/Backend/SPIRV/CSPIRVObject.cpp
diff --git a/hecl/lib/backend/SPIRV/CSPIRVSpec.cpp b/hecl/lib/Backend/SPIRV/CSPIRVSpec.cpp
similarity index 100%
rename from hecl/lib/backend/SPIRV/CSPIRVSpec.cpp
rename to hecl/lib/Backend/SPIRV/CSPIRVSpec.cpp
diff --git a/hecl/lib/backend/SPIRV/CSPIRVVertEmitter.cpp b/hecl/lib/Backend/SPIRV/CSPIRVVertEmitter.cpp
similarity index 100%
rename from hecl/lib/backend/SPIRV/CSPIRVVertEmitter.cpp
rename to hecl/lib/Backend/SPIRV/CSPIRVVertEmitter.cpp
diff --git a/hecl/lib/CMakeLists.txt b/hecl/lib/CMakeLists.txt
index 43883f812..1898af543 100644
--- a/hecl/lib/CMakeLists.txt
+++ b/hecl/lib/CMakeLists.txt
@@ -1,10 +1,15 @@
-add_subdirectory(backend)
-add_subdirectory(database)
-add_subdirectory(frontend)
-add_subdirectory(runtime)
+add_subdirectory(Backend)
+add_subdirectory(Database)
+add_subdirectory(Frontend)
+add_subdirectory(Runtime)
 
 add_library(HECL
             HECL.cpp
             ProjectPath.cpp
-            WideStringConvert.cpp)
+            WideStringConvert.cpp
+            ../include/HECL/HECL.hpp
+            ../include/HECL/Backend.hpp
+            ../include/HECL/Frontend.hpp
+            ../include/HECL/Database.hpp
+            ../include/HECL/Runtime.hpp)
 
diff --git a/hecl/lib/database/CMakeLists.txt b/hecl/lib/Database/CMakeLists.txt
similarity index 100%
rename from hecl/lib/database/CMakeLists.txt
rename to hecl/lib/Database/CMakeLists.txt
diff --git a/hecl/lib/database/Project.cpp b/hecl/lib/Database/Project.cpp
similarity index 100%
rename from hecl/lib/database/Project.cpp
rename to hecl/lib/Database/Project.cpp
diff --git a/hecl/lib/database/Registry.cpp b/hecl/lib/Database/Registry.cpp
similarity index 100%
rename from hecl/lib/database/Registry.cpp
rename to hecl/lib/Database/Registry.cpp
diff --git a/hecl/lib/frontend/CHECLIR.cpp b/hecl/lib/Frontend/CHECLIR.cpp
similarity index 100%
rename from hecl/lib/frontend/CHECLIR.cpp
rename to hecl/lib/Frontend/CHECLIR.cpp
diff --git a/hecl/lib/frontend/CHECLLexer.cpp b/hecl/lib/Frontend/CHECLLexer.cpp
similarity index 100%
rename from hecl/lib/frontend/CHECLLexer.cpp
rename to hecl/lib/Frontend/CHECLLexer.cpp
diff --git a/hecl/lib/frontend/CMakeLists.txt b/hecl/lib/Frontend/CMakeLists.txt
similarity index 100%
rename from hecl/lib/frontend/CMakeLists.txt
rename to hecl/lib/Frontend/CMakeLists.txt
diff --git a/hecl/lib/frontend/expr/CExprAdd.hpp b/hecl/lib/Frontend/expr/CExprAdd.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprAdd.hpp
rename to hecl/lib/Frontend/expr/CExprAdd.hpp
diff --git a/hecl/lib/frontend/expr/CExprBase.hpp b/hecl/lib/Frontend/expr/CExprBase.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprBase.hpp
rename to hecl/lib/Frontend/expr/CExprBase.hpp
diff --git a/hecl/lib/frontend/expr/CExprCall.hpp b/hecl/lib/Frontend/expr/CExprCall.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprCall.hpp
rename to hecl/lib/Frontend/expr/CExprCall.hpp
diff --git a/hecl/lib/frontend/expr/CExprGroup.hpp b/hecl/lib/Frontend/expr/CExprGroup.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprGroup.hpp
rename to hecl/lib/Frontend/expr/CExprGroup.hpp
diff --git a/hecl/lib/frontend/expr/CExprLighting.hpp b/hecl/lib/Frontend/expr/CExprLighting.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprLighting.hpp
rename to hecl/lib/Frontend/expr/CExprLighting.hpp
diff --git a/hecl/lib/frontend/expr/CExprMul.hpp b/hecl/lib/Frontend/expr/CExprMul.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprMul.hpp
rename to hecl/lib/Frontend/expr/CExprMul.hpp
diff --git a/hecl/lib/frontend/expr/CExprRoot.hpp b/hecl/lib/Frontend/expr/CExprRoot.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprRoot.hpp
rename to hecl/lib/Frontend/expr/CExprRoot.hpp
diff --git a/hecl/lib/frontend/expr/CExprSub.hpp b/hecl/lib/Frontend/expr/CExprSub.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprSub.hpp
rename to hecl/lib/Frontend/expr/CExprSub.hpp
diff --git a/hecl/lib/frontend/expr/CExprTexture.hpp b/hecl/lib/Frontend/expr/CExprTexture.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprTexture.hpp
rename to hecl/lib/Frontend/expr/CExprTexture.hpp
diff --git a/hecl/lib/frontend/expr/CExprTextureGather.hpp b/hecl/lib/Frontend/expr/CExprTextureGather.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/CExprTextureGather.hpp
rename to hecl/lib/Frontend/expr/CExprTextureGather.hpp
diff --git a/hecl/lib/frontend/expr/expr.hpp b/hecl/lib/Frontend/expr/expr.hpp
similarity index 100%
rename from hecl/lib/frontend/expr/expr.hpp
rename to hecl/lib/Frontend/expr/expr.hpp
diff --git a/hecl/lib/runtime/CMakeLists.txt b/hecl/lib/Runtime/CMakeLists.txt
similarity index 100%
rename from hecl/lib/runtime/CMakeLists.txt
rename to hecl/lib/Runtime/CMakeLists.txt
diff --git a/hecl/lib/runtime/D3D11/CD3D11RuntimeCache.cpp b/hecl/lib/Runtime/D3D11/CD3D11RuntimeCache.cpp
similarity index 100%
rename from hecl/lib/runtime/D3D11/CD3D11RuntimeCache.cpp
rename to hecl/lib/Runtime/D3D11/CD3D11RuntimeCache.cpp
diff --git a/hecl/lib/runtime/D3D11/CD3D11RuntimeObject.cpp b/hecl/lib/Runtime/D3D11/CD3D11RuntimeObject.cpp
similarity index 100%
rename from hecl/lib/runtime/D3D11/CD3D11RuntimeObject.cpp
rename to hecl/lib/Runtime/D3D11/CD3D11RuntimeObject.cpp
diff --git a/hecl/lib/runtime/D3D11/CD3D11RuntimeSpec.cpp b/hecl/lib/Runtime/D3D11/CD3D11RuntimeSpec.cpp
similarity index 100%
rename from hecl/lib/runtime/D3D11/CD3D11RuntimeSpec.cpp
rename to hecl/lib/Runtime/D3D11/CD3D11RuntimeSpec.cpp
diff --git a/hecl/lib/runtime/GX/CGXRuntimeCache.cpp b/hecl/lib/Runtime/GX/CGXRuntimeCache.cpp
similarity index 100%
rename from hecl/lib/runtime/GX/CGXRuntimeCache.cpp
rename to hecl/lib/Runtime/GX/CGXRuntimeCache.cpp
diff --git a/hecl/lib/runtime/GX/CGXRuntimeObject.cpp b/hecl/lib/Runtime/GX/CGXRuntimeObject.cpp
similarity index 100%
rename from hecl/lib/runtime/GX/CGXRuntimeObject.cpp
rename to hecl/lib/Runtime/GX/CGXRuntimeObject.cpp
diff --git a/hecl/lib/runtime/GX/CGXRuntimeSpec.cpp b/hecl/lib/Runtime/GX/CGXRuntimeSpec.cpp
similarity index 100%
rename from hecl/lib/runtime/GX/CGXRuntimeSpec.cpp
rename to hecl/lib/Runtime/GX/CGXRuntimeSpec.cpp
diff --git a/hecl/lib/runtime/GX2/CGX2RuntimeCache.cpp b/hecl/lib/Runtime/GX2/CGX2RuntimeCache.cpp
similarity index 100%
rename from hecl/lib/runtime/GX2/CGX2RuntimeCache.cpp
rename to hecl/lib/Runtime/GX2/CGX2RuntimeCache.cpp
diff --git a/hecl/lib/runtime/GX2/CGX2RuntimeObject.cpp b/hecl/lib/Runtime/GX2/CGX2RuntimeObject.cpp
similarity index 100%
rename from hecl/lib/runtime/GX2/CGX2RuntimeObject.cpp
rename to hecl/lib/Runtime/GX2/CGX2RuntimeObject.cpp
diff --git a/hecl/lib/runtime/GX2/CGX2RuntimeSpec.cpp b/hecl/lib/Runtime/GX2/CGX2RuntimeSpec.cpp
similarity index 100%
rename from hecl/lib/runtime/GX2/CGX2RuntimeSpec.cpp
rename to hecl/lib/Runtime/GX2/CGX2RuntimeSpec.cpp
diff --git a/hecl/lib/runtime/HECLRuntime.cpp b/hecl/lib/Runtime/HECLRuntime.cpp
similarity index 100%
rename from hecl/lib/runtime/HECLRuntime.cpp
rename to hecl/lib/Runtime/HECLRuntime.cpp
diff --git a/hecl/lib/runtime/IRuntimeCache.hpp b/hecl/lib/Runtime/IRuntimeCache.hpp
similarity index 100%
rename from hecl/lib/runtime/IRuntimeCache.hpp
rename to hecl/lib/Runtime/IRuntimeCache.hpp
diff --git a/hecl/lib/runtime/IRuntimeObject.hpp b/hecl/lib/Runtime/IRuntimeObject.hpp
similarity index 100%
rename from hecl/lib/runtime/IRuntimeObject.hpp
rename to hecl/lib/Runtime/IRuntimeObject.hpp
diff --git a/hecl/lib/runtime/IRuntimeSpec.hpp b/hecl/lib/Runtime/IRuntimeSpec.hpp
similarity index 100%
rename from hecl/lib/runtime/IRuntimeSpec.hpp
rename to hecl/lib/Runtime/IRuntimeSpec.hpp
diff --git a/hecl/lib/runtime/Metal/CMetalRuntimeCache.cpp b/hecl/lib/Runtime/Metal/CMetalRuntimeCache.cpp
similarity index 100%
rename from hecl/lib/runtime/Metal/CMetalRuntimeCache.cpp
rename to hecl/lib/Runtime/Metal/CMetalRuntimeCache.cpp
diff --git a/hecl/lib/runtime/Metal/CMetalRuntimeObject.cpp b/hecl/lib/Runtime/Metal/CMetalRuntimeObject.cpp
similarity index 100%
rename from hecl/lib/runtime/Metal/CMetalRuntimeObject.cpp
rename to hecl/lib/Runtime/Metal/CMetalRuntimeObject.cpp
diff --git a/hecl/lib/runtime/Metal/CMetalRuntimeSpec.cpp b/hecl/lib/Runtime/Metal/CMetalRuntimeSpec.cpp
similarity index 100%
rename from hecl/lib/runtime/Metal/CMetalRuntimeSpec.cpp
rename to hecl/lib/Runtime/Metal/CMetalRuntimeSpec.cpp
diff --git a/hecl/lib/runtime/OGL3/COGL3RuntimeCache.cpp b/hecl/lib/Runtime/OGL3/COGL3RuntimeCache.cpp
similarity index 100%
rename from hecl/lib/runtime/OGL3/COGL3RuntimeCache.cpp
rename to hecl/lib/Runtime/OGL3/COGL3RuntimeCache.cpp
diff --git a/hecl/lib/runtime/OGL3/COGL3RuntimeObject.cpp b/hecl/lib/Runtime/OGL3/COGL3RuntimeObject.cpp
similarity index 100%
rename from hecl/lib/runtime/OGL3/COGL3RuntimeObject.cpp
rename to hecl/lib/Runtime/OGL3/COGL3RuntimeObject.cpp
diff --git a/hecl/lib/runtime/OGL3/COGL3RuntimeSpec.cpp b/hecl/lib/Runtime/OGL3/COGL3RuntimeSpec.cpp
similarity index 100%
rename from hecl/lib/runtime/OGL3/COGL3RuntimeSpec.cpp
rename to hecl/lib/Runtime/OGL3/COGL3RuntimeSpec.cpp
diff --git a/hecl/lib/runtime/Vulkan/CMetalRuntimeCache.cpp b/hecl/lib/Runtime/Vulkan/CMetalRuntimeCache.cpp
similarity index 100%
rename from hecl/lib/runtime/Vulkan/CMetalRuntimeCache.cpp
rename to hecl/lib/Runtime/Vulkan/CMetalRuntimeCache.cpp
diff --git a/hecl/lib/runtime/Vulkan/CMetalRuntimeObject.cpp b/hecl/lib/Runtime/Vulkan/CMetalRuntimeObject.cpp
similarity index 100%
rename from hecl/lib/runtime/Vulkan/CMetalRuntimeObject.cpp
rename to hecl/lib/Runtime/Vulkan/CMetalRuntimeObject.cpp
diff --git a/hecl/lib/runtime/Vulkan/CMetalRuntimeSpec.cpp b/hecl/lib/Runtime/Vulkan/CMetalRuntimeSpec.cpp
similarity index 100%
rename from hecl/lib/runtime/Vulkan/CMetalRuntimeSpec.cpp
rename to hecl/lib/Runtime/Vulkan/CMetalRuntimeSpec.cpp