diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt
index b677c4769..7e043cb67 100644
--- a/Editor/CMakeLists.txt
+++ b/Editor/CMakeLists.txt
@@ -3,18 +3,11 @@ add_subdirectory(locale)
 
 atdna(atdna_Space.cpp Space.hpp)
 
-set(SPACE_HEADERS
-    SplashScreen/SplashScreen.hpp
-    ResourceOutliner/ResourceOutliner.hpp)
-
-set(SPACE_SOURCES
-    SplashScreen/SplashScreen.cpp
-    ResourceOutliner/ResourceOutliner.cpp)
-
 add_executable(rude WIN32
                main.cpp
                Space.hpp Space.cpp atdna_Space.cpp
-               ${SPACE_HEADERS} ${SPACE_SOURCES}
+               SplashScreen.hpp SplashScreen.cpp
+               ResourceOutliner.hpp ResourceOutliner.cpp
                ProjectManager.hpp ProjectManager.cpp
                ViewManager.hpp ViewManager.cpp)
 
diff --git a/Editor/ResourceOutliner/ResourceOutliner.cpp b/Editor/ResourceOutliner.cpp
similarity index 100%
rename from Editor/ResourceOutliner/ResourceOutliner.cpp
rename to Editor/ResourceOutliner.cpp
diff --git a/Editor/ResourceOutliner/ResourceOutliner.hpp b/Editor/ResourceOutliner.hpp
similarity index 100%
rename from Editor/ResourceOutliner/ResourceOutliner.hpp
rename to Editor/ResourceOutliner.hpp
diff --git a/Editor/SplashScreen/SplashScreen.cpp b/Editor/SplashScreen.cpp
similarity index 100%
rename from Editor/SplashScreen/SplashScreen.cpp
rename to Editor/SplashScreen.cpp
diff --git a/Editor/SplashScreen/SplashScreen.hpp b/Editor/SplashScreen.hpp
similarity index 100%
rename from Editor/SplashScreen/SplashScreen.hpp
rename to Editor/SplashScreen.hpp
diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp
index e76d15caf..06482192c 100644
--- a/Editor/ViewManager.cpp
+++ b/Editor/ViewManager.cpp
@@ -1,7 +1,7 @@
 #include "ViewManager.hpp"
 #include "Specter/Control.hpp"
 #include "Specter/Space.hpp"
-#include "SplashScreen/SplashScreen.hpp"
+#include "SplashScreen.hpp"
 
 using YAMLNode = Athena::io::YAMLNode;
 
diff --git a/hecl b/hecl
index 5ff76ea78..421216034 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 5ff76ea78b2ec75d01241cf4726cc5bdab4613af
+Subproject commit 4212160342a80de065af7e757f0846a974161de3
diff --git a/libSpecter b/libSpecter
index 30499d2dd..baff6525e 160000
--- a/libSpecter
+++ b/libSpecter
@@ -1 +1 @@
-Subproject commit 30499d2ddfed030c7ce4c091277813b59854a3b6
+Subproject commit baff6525ef06c14e55c82e43a3525f326488e5e5