diff --git a/kraken/CMakeLists.txt b/kraken/CMakeLists.txt
index ea20cbf..06a9bfa 100644
--- a/kraken/CMakeLists.txt
+++ b/kraken/CMakeLists.txt
@@ -7,20 +7,37 @@ set(KRAKEN_PRIVATE_HEADERS "${KRAKEN_PRIVATE_HEADERS}" PARENT_SCOPE)
 add_sources(kraken.cpp)
 add_private_headers(KREngine-common.h)
 add_source_and_header(KRAmbientZone)
+add_sources(resources/KRResource+blend.cpp)
+# add_source(resources/KRResource+fbx.cpp) # TODO - Locate FBX SDK dependencies
+add_sources(resources/KRResource+obj.cpp)
+add_private_headers(resources/KRResource.h)
+add_source_and_header(resources/KRResource)
+add_source_and_header(resources/KRResourceManager)
 add_source_and_header(resources/animation/KRAnimation)
 add_source_and_header(resources/animation/KRAnimationAttribute)
 add_source_and_header(resources/animation/KRAnimationLayer)
 add_source_and_header(resources/animation/KRAnimationManager)
 add_source_and_header(resources/animation_curve/KRAnimationCurve)
 add_source_and_header(resources/animation_curve/KRAnimationCurveManager)
+add_source_and_header(resources/audio/KRAudioManager)
+add_source_and_header(resources/audio/KRAudioSample)
+add_source_and_header(resources/bundle/KRBundle)
+add_source_and_header(resources/bundle/KRBundleManager)
+add_source_and_header(resources/material/KRMaterial)
+add_source_and_header(resources/material/KRMaterialManager)
+add_source_and_header(resources/mesh/KRMesh)
+add_source_and_header(resources/mesh/KRMeshCube)
+add_source_and_header(resources/mesh/KRMeshManager)
+add_source_and_header(resources/mesh/KRMeshQuad)
+add_source_and_header(resources/mesh/KRMeshSphere)
+add_source_and_header(resources/source/KRSource)
+add_source_and_header(resources/source/KRSourceManager)
+add_source_and_header(resources/unknown/KRUnknown)
+add_source_and_header(resources/unknown/KRUnknownManager)
 add_source_and_header(KRAudioBuffer)
-add_source_and_header(KRAudioManager)
-add_source_and_header(KRAudioSample)
 add_source_and_header(KRAudioSource)
 add_source_and_header(KRBehavior)
 add_source_and_header(KRBone)
-add_source_and_header(resources/bundle/KRBundle)
-add_source_and_header(resources/bundle/KRBundleManager)
 add_source_and_header(KRCamera)
 add_source_and_header(KRCollider)
 add_source_and_header(KRContext)
@@ -40,13 +57,6 @@ add_source_and_header(KRLight)
 add_source_and_header(KRLocator)
 add_source_and_header(KRLODGroup)
 add_source_and_header(KRLODSet)
-add_source_and_header(resources/material/KRMaterial)
-add_source_and_header(resources/material/KRMaterialManager)
-add_source_and_header(KRMesh)
-add_source_and_header(KRMeshCube)
-add_source_and_header(KRMeshManager)
-add_source_and_header(KRMeshQuad)
-add_source_and_header(KRMeshSphere)
 add_source_and_header(KRModel)
 add_source_and_header(KRNode)
 add_source_and_header(KROctree)
@@ -58,19 +68,11 @@ add_source_and_header(KRPresentationThread)
 add_source_and_header(KRRenderGraph)
 add_source_and_header(KRRenderGraphBlackFrame)
 add_source_and_header(KRRenderSettings)
-add_sources(resources/KRResource+blend.cpp)
-# add_source(resources/KRResource+fbx.cpp) # TODO - Locate FBX SDK dependencies
-add_sources(resources/KRResource+obj.cpp)
-add_private_headers(resources/KRResource.h)
-add_source_and_header(resources/KRResource)
-add_source_and_header(resources/KRResourceManager)
 add_source_and_header(KRReverbZone)
 add_source_and_header(KRScene)
 add_source_and_header(KRSceneManager)
 add_source_and_header(KRShader)
 add_source_and_header(KRShaderManager)
-add_source_and_header(resources/source/KRSource)
-add_source_and_header(resources/source/KRSourceManager)
 add_source_and_header(KRPipeline)
 add_source_and_header(KRPipelineManager)
 add_source_and_header(KRSampler)
@@ -86,6 +88,4 @@ add_source_and_header(KRTextureKTX2)
 add_source_and_header(KRTextureManager)
 add_source_and_header(KRTexturePVR)
 add_source_and_header(KRTextureTGA)
-add_source_and_header(KRUnknown)
-add_source_and_header(KRUnknownManager)
 add_source_and_header(KRViewport)
diff --git a/kraken/KRAudioBuffer.cpp b/kraken/KRAudioBuffer.cpp
index 0e9bd98..fb1db81 100755
--- a/kraken/KRAudioBuffer.cpp
+++ b/kraken/KRAudioBuffer.cpp
@@ -30,7 +30,7 @@
 //
 
 #include "KRAudioBuffer.h"
-#include "KRAudioManager.h"
+#include "resources/audio/KRAudioManager.h"
 
 
 KRAudioBuffer::KRAudioBuffer(KRAudioManager* manager, KRAudioSample* sound, int index, int frameCount, int frameRate, int bytesPerFrame, void (*fn_populate)(KRAudioSample*, int, void*))
@@ -76,4 +76,4 @@ signed short* KRAudioBuffer::getFrameData()
 int KRAudioBuffer::getIndex()
 {
   return m_index;
-}
\ No newline at end of file
+}
diff --git a/kraken/KRAudioSource.cpp b/kraken/KRAudioSource.cpp
index a64b212..eb9e1aa 100755
--- a/kraken/KRAudioSource.cpp
+++ b/kraken/KRAudioSource.cpp
@@ -31,8 +31,8 @@
 
 #include "KRAudioSource.h"
 #include "KRContext.h"
-#include "KRAudioManager.h"
-#include "KRAudioSample.h"
+#include "resources/audio/KRAudioManager.h"
+#include "resources/audio/KRAudioSample.h"
 #include "KRAudioBuffer.h"
 #include "KRRenderPass.h"
 
diff --git a/kraken/KRCamera.h b/kraken/KRCamera.h
index b17dd02..3a603e3 100755
--- a/kraken/KRCamera.h
+++ b/kraken/KRCamera.h
@@ -39,7 +39,7 @@
 #include "KRContext.h"
 #include "KRViewport.h"
 #include "KRRenderSettings.h"
-#include "KRMeshManager.h"
+#include "resources/mesh/KRMeshManager.h"
 
 #define KRAKEN_FPS_AVERAGE_FRAME_COUNT 30
 
diff --git a/kraken/KRCollider.cpp b/kraken/KRCollider.cpp
index 98bd6f9..378f0cd 100755
--- a/kraken/KRCollider.cpp
+++ b/kraken/KRCollider.cpp
@@ -32,7 +32,7 @@
 #include "KREngine-common.h"
 #include "KRCollider.h"
 #include "KRContext.h"
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRRenderPass.h"
 
 using namespace hydra;
diff --git a/kraken/KRCollider.h b/kraken/KRCollider.h
index 006b39c..64fb2db 100755
--- a/kraken/KRCollider.h
+++ b/kraken/KRCollider.h
@@ -37,13 +37,13 @@
 #define KRAKEN_COLLIDER_PHYSICS 1
 #define KRAKEN_COLLIDER_AUDIO 2
 
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRModel.h"
 #include "KRCamera.h"
-#include "KRMeshManager.h"
+#include "resources/mesh/KRMeshManager.h"
 #include "KRNode.h"
 #include "KRContext.h"
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRTexture.h"
 
 class KRCollider : public KRNode
diff --git a/kraken/KRContext.cpp b/kraken/KRContext.cpp
index 03c7dbe..09730ac 100755
--- a/kraken/KRContext.cpp
+++ b/kraken/KRContext.cpp
@@ -35,8 +35,8 @@
 
 #include "KRContext.h"
 #include "KRCamera.h"
-#include "KRAudioManager.h"
-#include "KRAudioSample.h"
+#include "resources/audio/KRAudioManager.h"
+#include "resources/audio/KRAudioSample.h"
 #include "resources/bundle/KRBundle.h"
 #include "KRPresentationThread.h"
 #include "KRStreamerThread.h"
diff --git a/kraken/KRContext.h b/kraken/KRContext.h
index 15e6c09..f44d4af 100755
--- a/kraken/KRContext.h
+++ b/kraken/KRContext.h
@@ -38,10 +38,10 @@
 #include "resources/material/KRMaterialManager.h"
 #include "KRPipelineManager.h"
 #include "KRSamplerManager.h"
-#include "KRMeshManager.h"
+#include "resources/mesh/KRMeshManager.h"
 #include "resources/animation/KRAnimationManager.h"
 #include "resources/animation_curve/KRAnimationCurveManager.h"
-#include "KRUnknownManager.h"
+#include "resources/unknown/KRUnknownManager.h"
 #include "KRShaderManager.h"
 #include "resources/source/KRSourceManager.h"
 #include "KRSurfaceManager.h"
diff --git a/kraken/KRModel.cpp b/kraken/KRModel.cpp
index 1ea01ac..fcfc5f6 100755
--- a/kraken/KRModel.cpp
+++ b/kraken/KRModel.cpp
@@ -33,7 +33,7 @@
 
 #include "KRModel.h"
 #include "KRContext.h"
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRNode.h"
 #include "KRRenderPass.h"
 
diff --git a/kraken/KRModel.h b/kraken/KRModel.h
index a77b1a8..211b002 100755
--- a/kraken/KRModel.h
+++ b/kraken/KRModel.h
@@ -33,13 +33,13 @@
 
 #include "KREngine-common.h"
 
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRModel.h"
 #include "KRCamera.h"
-#include "KRMeshManager.h"
+#include "resources/mesh/KRMeshManager.h"
 #include "KRNode.h"
 #include "KRContext.h"
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRTexture.h"
 #include "KRBone.h"
 
diff --git a/kraken/KRPipeline.h b/kraken/KRPipeline.h
index b983d8a..0625ff6 100644
--- a/kraken/KRPipeline.h
+++ b/kraken/KRPipeline.h
@@ -36,7 +36,7 @@
 #include "KRCamera.h"
 #include "KRNode.h"
 #include "KRViewport.h"
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRShader.h"
 
 class KRSampler;
diff --git a/kraken/KRPipelineManager.h b/kraken/KRPipelineManager.h
index d27d973..ab41f5e 100644
--- a/kraken/KRPipelineManager.h
+++ b/kraken/KRPipelineManager.h
@@ -37,7 +37,7 @@
 #include "block.h"
 #include "KRNode.h"
 #include "KRSurface.h"
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 
 using std::map;
 using std::vector;
diff --git a/kraken/KRScene.cpp b/kraken/KRScene.cpp
index 9332eab..66fbb84 100755
--- a/kraken/KRScene.cpp
+++ b/kraken/KRScene.cpp
@@ -38,7 +38,7 @@
 #include "KRDirectionalLight.h"
 #include "KRSpotLight.h"
 #include "KRPointLight.h"
-#include "KRAudioManager.h"
+#include "resources/audio/KRAudioManager.h"
 #include "KRRenderPass.h"
 
 using namespace mimir;
diff --git a/kraken/KRScene.h b/kraken/KRScene.h
index ed846cf..787d42f 100755
--- a/kraken/KRScene.h
+++ b/kraken/KRScene.h
@@ -34,9 +34,9 @@
 #include "KREngine-common.h"
 
 #include "KRModel.h"
-#include "KRMesh.h"
+#include "resources/mesh/KRMesh.h"
 #include "KRCamera.h"
-#include "KRMeshManager.h"
+#include "resources/mesh/KRMeshManager.h"
 #include "KRNode.h"
 #include "KRLocator.h"
 #include "KRAmbientZone.h"
diff --git a/kraken/KRShaderManager.cpp b/kraken/KRShaderManager.cpp
index f707aea..4a44883 100644
--- a/kraken/KRShaderManager.cpp
+++ b/kraken/KRShaderManager.cpp
@@ -33,8 +33,8 @@
 #include "KREngine-common.h"
 #include "KRContext.h"
 #include "resources/source/KRSourceManager.h"
-#include "KRUnknownManager.h"
-#include "KRUnknown.h"
+#include "resources/unknown/KRUnknownManager.h"
+#include "resources/unknown/KRUnknown.h"
 
 #include "mimir.h"
 
diff --git a/kraken/resources/KRResource+obj.cpp b/kraken/resources/KRResource+obj.cpp
index 1dbc8c1..80d6380 100755
--- a/kraken/resources/KRResource+obj.cpp
+++ b/kraken/resources/KRResource+obj.cpp
@@ -32,7 +32,7 @@
 #include "KREngine-common.h"
 
 #include "KRResource.h"
-#include "KRMesh.h"
+#include "mesh/KRMesh.h"
 
 #include "mimir.h"
 
diff --git a/kraken/KRAudioManager.cpp b/kraken/resources/audio/KRAudioManager.cpp
similarity index 100%
rename from kraken/KRAudioManager.cpp
rename to kraken/resources/audio/KRAudioManager.cpp
diff --git a/kraken/KRAudioManager.h b/kraken/resources/audio/KRAudioManager.h
similarity index 100%
rename from kraken/KRAudioManager.h
rename to kraken/resources/audio/KRAudioManager.h
diff --git a/kraken/KRAudioSample.cpp b/kraken/resources/audio/KRAudioSample.cpp
similarity index 100%
rename from kraken/KRAudioSample.cpp
rename to kraken/resources/audio/KRAudioSample.cpp
diff --git a/kraken/KRAudioSample.h b/kraken/resources/audio/KRAudioSample.h
similarity index 100%
rename from kraken/KRAudioSample.h
rename to kraken/resources/audio/KRAudioSample.h
diff --git a/kraken/KRMesh.cpp b/kraken/resources/mesh/KRMesh.cpp
similarity index 100%
rename from kraken/KRMesh.cpp
rename to kraken/resources/mesh/KRMesh.cpp
diff --git a/kraken/KRMesh.h b/kraken/resources/mesh/KRMesh.h
similarity index 100%
rename from kraken/KRMesh.h
rename to kraken/resources/mesh/KRMesh.h
diff --git a/kraken/KRMeshCube.cpp b/kraken/resources/mesh/KRMeshCube.cpp
similarity index 100%
rename from kraken/KRMeshCube.cpp
rename to kraken/resources/mesh/KRMeshCube.cpp
diff --git a/kraken/KRMeshCube.h b/kraken/resources/mesh/KRMeshCube.h
similarity index 100%
rename from kraken/KRMeshCube.h
rename to kraken/resources/mesh/KRMeshCube.h
diff --git a/kraken/KRMeshManager.cpp b/kraken/resources/mesh/KRMeshManager.cpp
similarity index 100%
rename from kraken/KRMeshManager.cpp
rename to kraken/resources/mesh/KRMeshManager.cpp
diff --git a/kraken/KRMeshManager.h b/kraken/resources/mesh/KRMeshManager.h
similarity index 100%
rename from kraken/KRMeshManager.h
rename to kraken/resources/mesh/KRMeshManager.h
diff --git a/kraken/KRMeshQuad.cpp b/kraken/resources/mesh/KRMeshQuad.cpp
similarity index 100%
rename from kraken/KRMeshQuad.cpp
rename to kraken/resources/mesh/KRMeshQuad.cpp
diff --git a/kraken/KRMeshQuad.h b/kraken/resources/mesh/KRMeshQuad.h
similarity index 100%
rename from kraken/KRMeshQuad.h
rename to kraken/resources/mesh/KRMeshQuad.h
diff --git a/kraken/KRMeshSphere.cpp b/kraken/resources/mesh/KRMeshSphere.cpp
similarity index 100%
rename from kraken/KRMeshSphere.cpp
rename to kraken/resources/mesh/KRMeshSphere.cpp
diff --git a/kraken/KRMeshSphere.h b/kraken/resources/mesh/KRMeshSphere.h
similarity index 100%
rename from kraken/KRMeshSphere.h
rename to kraken/resources/mesh/KRMeshSphere.h
diff --git a/kraken/KRUnknown.cpp b/kraken/resources/unknown/KRUnknown.cpp
similarity index 100%
rename from kraken/KRUnknown.cpp
rename to kraken/resources/unknown/KRUnknown.cpp
diff --git a/kraken/KRUnknown.h b/kraken/resources/unknown/KRUnknown.h
similarity index 100%
rename from kraken/KRUnknown.h
rename to kraken/resources/unknown/KRUnknown.h
diff --git a/kraken/KRUnknownManager.cpp b/kraken/resources/unknown/KRUnknownManager.cpp
similarity index 100%
rename from kraken/KRUnknownManager.cpp
rename to kraken/resources/unknown/KRUnknownManager.cpp
diff --git a/kraken/KRUnknownManager.h b/kraken/resources/unknown/KRUnknownManager.h
similarity index 100%
rename from kraken/KRUnknownManager.h
rename to kraken/resources/unknown/KRUnknownManager.h