diff --git a/Hydrogent/CMakeLists.txt b/Hydrogent/CMakeLists.txt
index bd7a082b..8d4edc3a 100644
--- a/Hydrogent/CMakeLists.txt
+++ b/Hydrogent/CMakeLists.txt
@@ -27,31 +27,31 @@ set(SOURCE
 )
 
 set(INCLUDE
-    include/HnMaterial.hpp
-    include/HnMaterialNetwork.hpp
-    include/HnMesh.hpp
-    include/HnBuffer.hpp
-    include/HnRenderBuffer.hpp
-    include/HnRenderDelegate.hpp
-    include/HnRendererImpl.hpp
-    include/HnRenderPass.hpp
     include/HnShaderSourceFactory.hpp
-    include/HnRenderPassState.hpp
-    include/HnTokens.hpp
-    include/HnTextureIdentifier.hpp
-    include/HnTextureRegistry.hpp
-    include/HnTextureUtils.hpp
     include/HnTypeConversions.hpp
-    include/Tasks/HnTask.hpp
-    include/Tasks/HnSetupRenderingTask.hpp
-    include/Tasks/HnRenderRprimsTask.hpp
-    include/Tasks/HnRenderEnvMapTask.hpp
-    include/Tasks/HnPostProcessTask.hpp
-    include/Tasks/HnReadRprimIdTask.hpp
-    include/Tasks/HnTaskManager.hpp
+    include/HnTextureUtils.hpp
 )
 
 set(INTERFACE
+    interface/HnMaterial.hpp
+    interface/HnMaterialNetwork.hpp
+    interface/HnMesh.hpp
+    interface/HnBuffer.hpp
+    interface/HnRenderBuffer.hpp
+    interface/HnRenderDelegate.hpp
+    interface/HnRendererImpl.hpp
+    interface/HnRenderPass.hpp
+    interface/HnRenderPassState.hpp
+    interface/HnTokens.hpp
+    interface/HnTextureIdentifier.hpp
+    interface/HnTextureRegistry.hpp
+    interface/Tasks/HnTask.hpp
+    interface/Tasks/HnSetupRenderingTask.hpp
+    interface/Tasks/HnRenderRprimsTask.hpp
+    interface/Tasks/HnRenderEnvMapTask.hpp
+    interface/Tasks/HnPostProcessTask.hpp
+    interface/Tasks/HnReadRprimIdTask.hpp
+    interface/Tasks/HnTaskManager.hpp
     interface/HnTypes.hpp
     interface/HnRenderer.hpp
 )
diff --git a/Hydrogent/include/HnBuffer.hpp b/Hydrogent/interface/HnBuffer.hpp
similarity index 100%
rename from Hydrogent/include/HnBuffer.hpp
rename to Hydrogent/interface/HnBuffer.hpp
diff --git a/Hydrogent/include/HnMaterial.hpp b/Hydrogent/interface/HnMaterial.hpp
similarity index 100%
rename from Hydrogent/include/HnMaterial.hpp
rename to Hydrogent/interface/HnMaterial.hpp
diff --git a/Hydrogent/include/HnMaterialNetwork.hpp b/Hydrogent/interface/HnMaterialNetwork.hpp
similarity index 100%
rename from Hydrogent/include/HnMaterialNetwork.hpp
rename to Hydrogent/interface/HnMaterialNetwork.hpp
diff --git a/Hydrogent/include/HnMesh.hpp b/Hydrogent/interface/HnMesh.hpp
similarity index 100%
rename from Hydrogent/include/HnMesh.hpp
rename to Hydrogent/interface/HnMesh.hpp
diff --git a/Hydrogent/include/HnRenderBuffer.hpp b/Hydrogent/interface/HnRenderBuffer.hpp
similarity index 100%
rename from Hydrogent/include/HnRenderBuffer.hpp
rename to Hydrogent/interface/HnRenderBuffer.hpp
diff --git a/Hydrogent/include/HnRenderDelegate.hpp b/Hydrogent/interface/HnRenderDelegate.hpp
similarity index 100%
rename from Hydrogent/include/HnRenderDelegate.hpp
rename to Hydrogent/interface/HnRenderDelegate.hpp
diff --git a/Hydrogent/include/HnRenderPass.hpp b/Hydrogent/interface/HnRenderPass.hpp
similarity index 100%
rename from Hydrogent/include/HnRenderPass.hpp
rename to Hydrogent/interface/HnRenderPass.hpp
diff --git a/Hydrogent/include/HnRenderPassState.hpp b/Hydrogent/interface/HnRenderPassState.hpp
similarity index 100%
rename from Hydrogent/include/HnRenderPassState.hpp
rename to Hydrogent/interface/HnRenderPassState.hpp
diff --git a/Hydrogent/include/HnRendererImpl.hpp b/Hydrogent/interface/HnRendererImpl.hpp
similarity index 100%
rename from Hydrogent/include/HnRendererImpl.hpp
rename to Hydrogent/interface/HnRendererImpl.hpp
diff --git a/Hydrogent/include/HnTextureIdentifier.hpp b/Hydrogent/interface/HnTextureIdentifier.hpp
similarity index 100%
rename from Hydrogent/include/HnTextureIdentifier.hpp
rename to Hydrogent/interface/HnTextureIdentifier.hpp
diff --git a/Hydrogent/include/HnTextureRegistry.hpp b/Hydrogent/interface/HnTextureRegistry.hpp
similarity index 100%
rename from Hydrogent/include/HnTextureRegistry.hpp
rename to Hydrogent/interface/HnTextureRegistry.hpp
diff --git a/Hydrogent/include/HnTokens.hpp b/Hydrogent/interface/HnTokens.hpp
similarity index 100%
rename from Hydrogent/include/HnTokens.hpp
rename to Hydrogent/interface/HnTokens.hpp
diff --git a/Hydrogent/include/Tasks/HnPostProcessTask.hpp b/Hydrogent/interface/Tasks/HnPostProcessTask.hpp
similarity index 100%
rename from Hydrogent/include/Tasks/HnPostProcessTask.hpp
rename to Hydrogent/interface/Tasks/HnPostProcessTask.hpp
diff --git a/Hydrogent/include/Tasks/HnReadRprimIdTask.hpp b/Hydrogent/interface/Tasks/HnReadRprimIdTask.hpp
similarity index 100%
rename from Hydrogent/include/Tasks/HnReadRprimIdTask.hpp
rename to Hydrogent/interface/Tasks/HnReadRprimIdTask.hpp
diff --git a/Hydrogent/include/Tasks/HnRenderEnvMapTask.hpp b/Hydrogent/interface/Tasks/HnRenderEnvMapTask.hpp
similarity index 100%
rename from Hydrogent/include/Tasks/HnRenderEnvMapTask.hpp
rename to Hydrogent/interface/Tasks/HnRenderEnvMapTask.hpp
diff --git a/Hydrogent/include/Tasks/HnRenderRprimsTask.hpp b/Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp
similarity index 100%
rename from Hydrogent/include/Tasks/HnRenderRprimsTask.hpp
rename to Hydrogent/interface/Tasks/HnRenderRprimsTask.hpp
diff --git a/Hydrogent/include/Tasks/HnSetupRenderingTask.hpp b/Hydrogent/interface/Tasks/HnSetupRenderingTask.hpp
similarity index 100%
rename from Hydrogent/include/Tasks/HnSetupRenderingTask.hpp
rename to Hydrogent/interface/Tasks/HnSetupRenderingTask.hpp
diff --git a/Hydrogent/include/Tasks/HnTask.hpp b/Hydrogent/interface/Tasks/HnTask.hpp
similarity index 100%
rename from Hydrogent/include/Tasks/HnTask.hpp
rename to Hydrogent/interface/Tasks/HnTask.hpp
diff --git a/Hydrogent/include/Tasks/HnTaskManager.hpp b/Hydrogent/interface/Tasks/HnTaskManager.hpp
similarity index 100%
rename from Hydrogent/include/Tasks/HnTaskManager.hpp
rename to Hydrogent/interface/Tasks/HnTaskManager.hpp