diff --git a/hecl/blender/blender.pro b/hecl/blender/blender.pro
deleted file mode 100644
index 014a6beeb..000000000
--- a/hecl/blender/blender.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-TEMPLATE = lib
-CONFIG += staticlib
-TARGET = hecl-blender
-CONFIG -= Qt
-QT      =
-unix:QMAKE_CXXFLAGS += -std=c++11
-unix:QMAKE_CFLAGS += -std=c99
-unix:LIBS += -std=c++11
-clang:QMAKE_CXXFLAGS += -stdlib=libc++
-clang:LIBS += -stdlib=libc++ -lc++abi
-
-HEADERS += \
-    $$PWD/CBlenderConnection.hpp
-
-SOURCES += \
-    $$PWD/CBlenderConnection.cpp
-
-DISTFILES += \
-    $$PWD/blendershell.py \
-    $$PWD/addon/__init__.py \
-    $$PWD/addon/hmdl/__init__.py \
-    $$PWD/addon/hmdl/HMDLMesh.py \
-    $$PWD/addon/hmdl/HMDLShader.py \
-    $$PWD/addon/hmdl/HMDLSkin.py \
-    $$PWD/addon/hmdl/HMDLTxtr.py \
-    $$PWD/addon/sact/__init__.py \
-    $$PWD/addon/sact/SACTAction.py \
-    $$PWD/addon/sact/SACTEvent.py \
-    $$PWD/addon/sact/SACTSubtype.py \
-    $$PWD/addon/sact/ANIM.py
-
diff --git a/hecl/driver/CMakeLists.txt b/hecl/driver/CMakeLists.txt
index b9c959653..dc3bb1353 100644
--- a/hecl/driver/CMakeLists.txt
+++ b/hecl/driver/CMakeLists.txt
@@ -13,5 +13,5 @@ add_executable(hecl main.cpp
 )
 target_link_libraries(hecl HECL HECLDatabase
     "-Wl,-whole-archive" RetroDataSpec "-Wl,-no-whole-archive"
-    AthenaCore NOD LogVisor blowfish zlib lzo pthread
+    AthenaCore NOD LogVisor blowfish z lzo2 pthread
 )
diff --git a/hecl/driver/driver.pri b/hecl/driver/driver.pri
deleted file mode 100644
index 48d1274ca..000000000
--- a/hecl/driver/driver.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES += \
-    $$PWD/CDriver.cpp \
-    $$PWD/COptionsParser.cpp \
-    $$PWD/main.cpp
diff --git a/hecl/driver/driver.pro b/hecl/driver/driver.pro
deleted file mode 100644
index 18e0a2c97..000000000
--- a/hecl/driver/driver.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-TEMPLATE = app
-TARGET = hecl
-CONFIG -= Qt
-CONFIG += c++11
-QT      =
-LIBS   -= -lQtGui -lQtCore
-
-INCLUDEPATH += ../include \
-    ../extern/Athena/include \
-    ../extern/LogVisor/include \
-    ../extern
-
-LIBPATH += $$OUT_PWD/../lib \
-    $$OUT_PWD/../blender \
-    $$OUT_PWD/../extern/LogVisor \
-    $$OUT_PWD/../extern/blowfish \
-    $$OUT_PWD/../extern/libpng \
-    $$OUT_PWD/../extern/Athena/lib \
-    $$OUT_PWD/../extern/RetroCommon/DataSpec \
-    $$OUT_PWD/../extern/RetroCommon/NODLib/lib
-
-LIBS += -lhecl -lhecl-blender -lblowfish -lpng -lpthread
-LIBS += -Wl,--whole-archive -lRetroDataSpec -Wl,--no-whole-archive -lNOD -lLogVisor
-CONFIG(debug, debug|release) {
-    LIBS += -lAthena-d
-} else {
-    LIBS += -lAthena
-}
-
-SOURCES += \
-    $$PWD/main.cpp
-
-HEADERS += \
-    ToolBase.hpp \
-    ToolPackage.hpp \
-    ToolExtract.hpp \
-    ToolInit.hpp \
-    ToolHelp.hpp \
-    ToolGroup.hpp \
-    ToolCook.hpp \
-    ToolClean.hpp \
-    ToolAdd.hpp \
-    ToolRemove.hpp \
-    ToolSpec.hpp
-
diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index 8a397a162..3ce206268 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit 8a397a16229e6642088ad1790f18015fca506744
+Subproject commit 3ce20626864d396b45dc6345adbabe7c9873f614
diff --git a/hecl/extern/LogVisor b/hecl/extern/LogVisor
index 9e31e9e2b..c1f226b4d 160000
--- a/hecl/extern/LogVisor
+++ b/hecl/extern/LogVisor
@@ -1 +1 @@
-Subproject commit 9e31e9e2b971290d6a9725a81e35c423dd4fd719
+Subproject commit c1f226b4dca45bb822b6a96c8571250a9e991e21
diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon
index 74b970c34..fc6b61a63 160000
--- a/hecl/extern/RetroCommon
+++ b/hecl/extern/RetroCommon
@@ -1 +1 @@
-Subproject commit 74b970c347d02d12b104166bd37827f7868fe642
+Subproject commit fc6b61a63ee30ad3aa6a6cecb3848732b514e54b
diff --git a/hecl/extern/blowfish/blowfish.pro b/hecl/extern/blowfish/blowfish.pro
deleted file mode 100644
index 85b647aa5..000000000
--- a/hecl/extern/blowfish/blowfish.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = lib
-CONFIG += staticlib
-TARGET = blowfish
-CONFIG -= Qt
-QT      =
-
-HEADERS += blowfish.h
-SOURCES += blowfish.c blowfish.dat.c
-
diff --git a/hecl/extern/libpng/libpng.pro b/hecl/extern/libpng/libpng.pro
deleted file mode 100644
index f4309bd12..000000000
--- a/hecl/extern/libpng/libpng.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-TEMPLATE = lib
-CONFIG += staticlib
-TARGET = png
-CONFIG -= Qt
-QT      =
-
-HEADERS += \
-    png.h \
-    pngconf.h \
-    pngdebug.h \
-    pnginfo.h \
-    pngpriv.h \
-    pngstruct.h \
-    pnglibconf.h
-    
-SOURCES += \
-    png.c \
-    pngerror.c \
-    pngget.c \
-    pngmem.c \
-    pngpread.c \
-    pngread.c \
-    pngrio.c \
-    pngrtran.c \
-    pngrutil.c \
-    pngset.c \
-    pngtrans.c \
-    pngwio.c \
-    pngwrite.c \
-    pngwtran.c \
-    pngwutil.c
-
diff --git a/hecl/hecl.pro b/hecl/hecl.pro
deleted file mode 100644
index 8bbe35af5..000000000
--- a/hecl/hecl.pro
+++ /dev/null
@@ -1,40 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += c++11
-
-# Enable building with LLVM dependencies
-exists ($$PWD/llvm) {
-    LLVMROOT = $$PWD/llvm
-}
-!isEmpty(LLVMROOT) {
-    message("Configuring for LLVM backends using '$$LLVMROOT'")
-    DEFINES += HECL_LLVM=1
-}
-
-# Make LogVisor headers global
-LOGVISOR_INCLUDE = $$PWD/extern/LogVisor/include
-
-HEADERS += \
-    include/HECL/HECL.hpp \
-    include/HECL/Backend.hpp \
-    include/HECL/Database.hpp \
-    include/HECL/Frontend.hpp \
-    include/HECL/Runtime.hpp
-
-SUBDIRS += \
-    extern/LogVisor \
-    extern/blowfish \
-    extern/libpng \
-    extern/libSquish \
-    extern/Athena \
-    extern/RetroCommon \
-    blender \
-    lib \
-    driver
-
-driver.depends = extern/blowfish
-driver.depends = extern/libpng
-driver.depends = extern/libSquish
-driver.depends = extern/Athena
-driver.depends = extern/RetroCommon
-driver.depends = blender
-driver.depends = lib
diff --git a/hecl/lib/backend/backend.pri b/hecl/lib/backend/backend.pri
deleted file mode 100644
index b06ad2e8e..000000000
--- a/hecl/lib/backend/backend.pri
+++ /dev/null
@@ -1,33 +0,0 @@
-HEADERS += \
-    $$PWD/IBackendFragEmitter.hpp \
-    $$PWD/IBackendObject.hpp \
-    $$PWD/IBackendSpec.hpp \
-    $$PWD/IBackendVertEmitter.hpp
-
-SOURCES += \
-    $$PWD/GLSL/CGLSLFragEmitter.cpp \
-    $$PWD/GLSL/CGLSLObject.cpp \
-    $$PWD/GLSL/CGLSLSpec.cpp \
-    $$PWD/GLSL/CGLSLVertEmitter.cpp \
-    $$PWD/GX/CGXFragEmitter.cpp \
-    $$PWD/GX/CGXObject.cpp \
-    $$PWD/GX/CGXSpec.cpp \
-    $$PWD/GX/CGXVertEmitter.cpp \
-    $$PWD/HLSL/CHLSLFragEmitter.cpp \
-    $$PWD/HLSL/CHLSLObject.cpp \
-    $$PWD/HLSL/CHLSLSpec.cpp \
-    $$PWD/HLSL/CHLSLVertEmitter.cpp \
-    $$PWD/SPIRV/CSPIRVFragEmitter.cpp \
-    $$PWD/SPIRV/CSPIRVObject.cpp \
-    $$PWD/SPIRV/CSPIRVSpec.cpp \
-    $$PWD/SPIRV/CSPIRVVertEmitter.cpp \
-    $$PWD/HECLBackend.cpp
-
-!isEmpty(LLVMROOT) {
-    message("Added GX2 Backend")
-SOURCES += \
-    $$PWD/GX2LLVM/CGX2LLVMFragEmitter.cpp \
-    $$PWD/GX2LLVM/CGX2LLVMObject.cpp \
-    $$PWD/GX2LLVM/CGX2LLVMSpec.cpp \
-    $$PWD/GX2LLVM/CGX2LLVMVertEmitter.cpp
-}
diff --git a/hecl/lib/database/database.pri b/hecl/lib/database/database.pri
deleted file mode 100644
index 39cd984df..000000000
--- a/hecl/lib/database/database.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-HEADERS +=
-
-SOURCES += \
-    $$PWD/Project.cpp \
-    $$PWD/Registry.cpp
diff --git a/hecl/lib/frontend/frontend.pri b/hecl/lib/frontend/frontend.pri
deleted file mode 100644
index 9656a1067..000000000
--- a/hecl/lib/frontend/frontend.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-HEADERS += \
-    $$PWD/expr/CExprAdd.hpp \
-    $$PWD/expr/CExprBase.hpp \
-    $$PWD/expr/CExprCall.hpp \
-    $$PWD/expr/CExprGroup.hpp \
-    $$PWD/expr/CExprLighting.hpp \
-    $$PWD/expr/CExprMul.hpp \
-    $$PWD/expr/CExprRoot.hpp \
-    $$PWD/expr/CExprSub.hpp \
-    $$PWD/expr/CExprTexture.hpp \
-    $$PWD/expr/CExprTextureGather.hpp \
-    $$PWD/expr/expr.hpp
-
-SOURCES += \
-    $$PWD/CHECLIR.cpp \
-    $$PWD/CHECLLexer.cpp
diff --git a/hecl/lib/lib.pro b/hecl/lib/lib.pro
deleted file mode 100644
index 72240b865..000000000
--- a/hecl/lib/lib.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = lib
-CONFIG += staticlib c++11
-TARGET = hecl
-CONFIG -= Qt
-QT      =
-
-INCLUDEPATH += $$PWD \
-    ../include \
-    ../extern \
-    ../extern/Athena/include \
-    ../extern/LogVisor/include
-
-include (frontend/frontend.pri)
-include (backend/backend.pri)
-include (database/database.pri)
-include (runtime/runtime.pri)
-
-SOURCES += \
-    HECL.cpp \
-    ProjectPath.cpp \
-    WideStringConvert.cpp
diff --git a/hecl/lib/runtime/runtime.pri b/hecl/lib/runtime/runtime.pri
deleted file mode 100644
index 1a2daf0a3..000000000
--- a/hecl/lib/runtime/runtime.pri
+++ /dev/null
@@ -1,25 +0,0 @@
-HEADERS += \
-    $$PWD/IRuntimeCache.hpp \
-    $$PWD/IRuntimeObject.hpp \
-    $$PWD/IRuntimeSpec.hpp
-
-SOURCES += \
-    $$PWD/D3D11/CD3D11RuntimeCache.cpp \
-    $$PWD/D3D11/CD3D11RuntimeObject.cpp \
-    $$PWD/D3D11/CD3D11RuntimeSpec.cpp \
-    $$PWD/GX/CGXRuntimeCache.cpp \
-    $$PWD/GX/CGXRuntimeObject.cpp \
-    $$PWD/GX/CGXRuntimeSpec.cpp \
-    $$PWD/GX2/CGX2RuntimeCache.cpp \
-    $$PWD/GX2/CGX2RuntimeObject.cpp \
-    $$PWD/GX2/CGX2RuntimeSpec.cpp \
-    $$PWD/Metal/CMetalRuntimeCache.cpp \
-    $$PWD/Metal/CMetalRuntimeObject.cpp \
-    $$PWD/Metal/CMetalRuntimeSpec.cpp \
-    $$PWD/OGL3/COGL3RuntimeCache.cpp \
-    $$PWD/OGL3/COGL3RuntimeObject.cpp \
-    $$PWD/OGL3/COGL3RuntimeSpec.cpp \
-    $$PWD/Vulkan/CMetalRuntimeCache.cpp \
-    $$PWD/Vulkan/CMetalRuntimeObject.cpp \
-    $$PWD/Vulkan/CMetalRuntimeSpec.cpp \
-    $$PWD/HECLRuntime.cpp