diff --git a/include/Nazara/Graphics/UberShader.hpp b/include/Nazara/Graphics/UberShader.hpp
index d400ade68..78b39e232 100644
--- a/include/Nazara/Graphics/UberShader.hpp
+++ b/include/Nazara/Graphics/UberShader.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Bitset.hpp>
 #include <Nazara/Graphics/Config.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <unordered_map>
 
 namespace Nz
diff --git a/include/Nazara/Renderer/RenderDevice.hpp b/include/Nazara/Renderer/RenderDevice.hpp
index 85cd03541..fd2531794 100644
--- a/include/Nazara/Renderer/RenderDevice.hpp
+++ b/include/Nazara/Renderer/RenderDevice.hpp
@@ -16,7 +16,7 @@
 #include <Nazara/Renderer/RenderPipelineLayout.hpp>
 #include <Nazara/Renderer/Texture.hpp>
 #include <Nazara/Renderer/TextureSampler.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
 #include <Nazara/Utility/AbstractBuffer.hpp>
 #include <memory>
diff --git a/include/Nazara/Shader.hpp b/include/Nazara/Shader.hpp
index 122296819..e86610fb0 100644
--- a/include/Nazara/Shader.hpp
+++ b/include/Nazara/Shader.hpp
@@ -32,25 +32,15 @@
 #include <Nazara/Shader/Config.hpp>
 #include <Nazara/Shader/GlslWriter.hpp>
 #include <Nazara/Shader/Shader.hpp>
-#include <Nazara/Shader/ShaderAstCloner.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp>
-#include <Nazara/Shader/ShaderAstOptimizer.hpp>
-#include <Nazara/Shader/ShaderAstRecursiveVisitor.hpp>
-#include <Nazara/Shader/ShaderAstSerializer.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitor.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitorExcept.hpp>
-#include <Nazara/Shader/ShaderAstUtils.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
-#include <Nazara/Shader/ShaderEnums.hpp>
 #include <Nazara/Shader/ShaderLangLexer.hpp>
 #include <Nazara/Shader/ShaderLangParser.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
 #include <Nazara/Shader/SpirvAstVisitor.hpp>
 #include <Nazara/Shader/SpirvBlock.hpp>
 #include <Nazara/Shader/SpirvConstantCache.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
+#include <Nazara/Shader/SpirvDecoder.hpp>
 #include <Nazara/Shader/SpirvExpressionLoad.hpp>
 #include <Nazara/Shader/SpirvExpressionStore.hpp>
 #include <Nazara/Shader/SpirvPrinter.hpp>
diff --git a/include/Nazara/Shader/ShaderAstCloner.hpp b/include/Nazara/Shader/Ast/AstCloner.hpp
similarity index 93%
rename from include/Nazara/Shader/ShaderAstCloner.hpp
rename to include/Nazara/Shader/Ast/AstCloner.hpp
index 0d034cab9..6feedc689 100644
--- a/include/Nazara/Shader/ShaderAstCloner.hpp
+++ b/include/Nazara/Shader/Ast/AstCloner.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitor.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
 #include <vector>
 
 namespace Nz::ShaderAst
@@ -61,7 +61,7 @@ namespace Nz::ShaderAst
 			virtual StatementPtr Clone(ReturnStatement& node);
 
 #define NAZARA_SHADERAST_NODE(NodeType) void Visit(NodeType& node) override;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 			void PushExpression(ExpressionPtr expression);
 			void PushStatement(StatementPtr statement);
@@ -78,6 +78,6 @@ namespace Nz::ShaderAst
 	inline StatementPtr Clone(StatementPtr& node);
 }
 
-#include <Nazara/Shader/ShaderAstCloner.inl>
+#include <Nazara/Shader/Ast/AstCloner.inl>
 
 #endif
diff --git a/include/Nazara/Shader/ShaderAstCloner.inl b/include/Nazara/Shader/Ast/AstCloner.inl
similarity index 94%
rename from include/Nazara/Shader/ShaderAstCloner.inl
rename to include/Nazara/Shader/Ast/AstCloner.inl
index 9d099bf63..d00b7365b 100644
--- a/include/Nazara/Shader/ShaderAstCloner.inl
+++ b/include/Nazara/Shader/Ast/AstCloner.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstCloner.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
diff --git a/include/Nazara/Shader/ShaderAstExpressionVisitor.hpp b/include/Nazara/Shader/Ast/AstExpressionVisitor.hpp
similarity index 72%
rename from include/Nazara/Shader/ShaderAstExpressionVisitor.hpp
rename to include/Nazara/Shader/Ast/AstExpressionVisitor.hpp
index 83e8b0271..1c72f88b0 100644
--- a/include/Nazara/Shader/ShaderAstExpressionVisitor.hpp
+++ b/include/Nazara/Shader/Ast/AstExpressionVisitor.hpp
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#ifndef NAZARA_SHADERASTEXPRESSIONVISITOR_HPP
-#define NAZARA_SHADERASTEXPRESSIONVISITOR_HPP
+#ifndef NAZARA_SHADER_AST_EXPRESSIONVISITOR_HPP
+#define NAZARA_SHADER_AST_EXPRESSIONVISITOR_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 
 namespace Nz::ShaderAst
 {
@@ -21,8 +21,8 @@ namespace Nz::ShaderAst
 			AstExpressionVisitor(AstExpressionVisitor&&) = delete;
 			virtual ~AstExpressionVisitor();
 
-#define NAZARA_SHADERAST_EXPRESSION(NodeType) virtual void Visit(NodeType& node) = 0;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#define NAZARA_SHADERAST_EXPRESSION(Node) virtual void Visit(Node& node) = 0;
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 			AstExpressionVisitor& operator=(const AstExpressionVisitor&) = delete;
 			AstExpressionVisitor& operator=(AstExpressionVisitor&&) = delete;
diff --git a/include/Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp b/include/Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp
similarity index 86%
rename from include/Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp
rename to include/Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp
index f28e98c78..40af7e695 100644
--- a/include/Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp
+++ b/include/Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
 
 namespace Nz::ShaderAst
 {
@@ -19,7 +19,7 @@ namespace Nz::ShaderAst
 			using AstExpressionVisitor::Visit;
 
 #define NAZARA_SHADERAST_EXPRESSION(Node) void Visit(ShaderAst::Node& node) override;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 	};
 }
 
diff --git a/include/Nazara/Shader/ShaderAstNodes.hpp b/include/Nazara/Shader/Ast/AstNodeList.hpp
similarity index 100%
rename from include/Nazara/Shader/ShaderAstNodes.hpp
rename to include/Nazara/Shader/Ast/AstNodeList.hpp
diff --git a/include/Nazara/Shader/ShaderAstOptimizer.hpp b/include/Nazara/Shader/Ast/AstOptimizer.hpp
similarity index 93%
rename from include/Nazara/Shader/ShaderAstOptimizer.hpp
rename to include/Nazara/Shader/Ast/AstOptimizer.hpp
index 83d5fa499..354fe86ba 100644
--- a/include/Nazara/Shader/ShaderAstOptimizer.hpp
+++ b/include/Nazara/Shader/Ast/AstOptimizer.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstCloner.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
 #include <vector>
 
 namespace Nz::ShaderAst
@@ -42,6 +42,6 @@ namespace Nz::ShaderAst
 	};
 }
 
-#include <Nazara/Shader/ShaderAstOptimizer.inl>
+#include <Nazara/Shader/Ast/AstOptimizer.inl>
 
 #endif
diff --git a/include/Nazara/Shader/ShaderAstOptimizer.inl b/include/Nazara/Shader/Ast/AstOptimizer.inl
similarity index 85%
rename from include/Nazara/Shader/ShaderAstOptimizer.inl
rename to include/Nazara/Shader/Ast/AstOptimizer.inl
index 17cd14c12..9607f7af0 100644
--- a/include/Nazara/Shader/ShaderAstOptimizer.inl
+++ b/include/Nazara/Shader/Ast/AstOptimizer.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstOptimizer.hpp>
+#include <Nazara/Shader/Ast/AstOptimizer.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/Shader/ShaderAstRecursiveVisitor.hpp b/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp
similarity index 91%
rename from include/Nazara/Shader/ShaderAstRecursiveVisitor.hpp
rename to include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp
index f05a20d22..d131931d6 100644
--- a/include/Nazara/Shader/ShaderAstRecursiveVisitor.hpp
+++ b/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitor.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
 
 namespace Nz::ShaderAst
 {
@@ -46,6 +46,6 @@ namespace Nz::ShaderAst
 	};
 }
 
-#include <Nazara/Shader/ShaderAstRecursiveVisitor.inl>
+#include <Nazara/Shader/Ast/AstRecursiveVisitor.inl>
 
 #endif
diff --git a/include/Nazara/Shader/ShaderAstRecursiveVisitor.inl b/include/Nazara/Shader/Ast/AstRecursiveVisitor.inl
similarity index 83%
rename from include/Nazara/Shader/ShaderAstRecursiveVisitor.inl
rename to include/Nazara/Shader/Ast/AstRecursiveVisitor.inl
index 8de7f453c..1467b2ca2 100644
--- a/include/Nazara/Shader/ShaderAstRecursiveVisitor.inl
+++ b/include/Nazara/Shader/Ast/AstRecursiveVisitor.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstRecursiveVisitor.hpp>
+#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz
diff --git a/include/Nazara/Shader/ShaderAstSerializer.hpp b/include/Nazara/Shader/Ast/AstSerializer.hpp
similarity index 98%
rename from include/Nazara/Shader/ShaderAstSerializer.hpp
rename to include/Nazara/Shader/Ast/AstSerializer.hpp
index bb7e5f28b..8b726d19d 100644
--- a/include/Nazara/Shader/ShaderAstSerializer.hpp
+++ b/include/Nazara/Shader/Ast/AstSerializer.hpp
@@ -11,7 +11,7 @@
 #include <Nazara/Core/ByteArray.hpp>
 #include <Nazara/Core/ByteStream.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 
 namespace Nz::ShaderAst
 {
@@ -144,6 +144,6 @@ namespace Nz::ShaderAst
 	NAZARA_SHADER_API StatementPtr UnserializeShader(ByteStream& stream);
 }
 
-#include <Nazara/Shader/ShaderAstSerializer.inl>
+#include <Nazara/Shader/Ast/AstSerializer.inl>
 
 #endif
diff --git a/include/Nazara/Shader/ShaderAstSerializer.inl b/include/Nazara/Shader/Ast/AstSerializer.inl
similarity index 97%
rename from include/Nazara/Shader/ShaderAstSerializer.inl
rename to include/Nazara/Shader/Ast/AstSerializer.inl
index c1b2d41c6..025e869b9 100644
--- a/include/Nazara/Shader/ShaderAstSerializer.inl
+++ b/include/Nazara/Shader/Ast/AstSerializer.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstSerializer.hpp>
+#include <Nazara/Shader/Ast/AstSerializer.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
diff --git a/include/Nazara/Shader/ShaderAstStatementVisitor.hpp b/include/Nazara/Shader/Ast/AstStatementVisitor.hpp
similarity index 91%
rename from include/Nazara/Shader/ShaderAstStatementVisitor.hpp
rename to include/Nazara/Shader/Ast/AstStatementVisitor.hpp
index 2da7e28a1..d204e4e9f 100644
--- a/include/Nazara/Shader/ShaderAstStatementVisitor.hpp
+++ b/include/Nazara/Shader/Ast/AstStatementVisitor.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 
 namespace Nz::ShaderAst
 {
@@ -22,7 +22,7 @@ namespace Nz::ShaderAst
 			virtual ~AstStatementVisitor();
 
 #define NAZARA_SHADERAST_STATEMENT(NodeType) virtual void Visit(ShaderAst::NodeType& node) = 0;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 			AstStatementVisitor& operator=(const AstStatementVisitor&) = delete;
 			AstStatementVisitor& operator=(AstStatementVisitor&&) = delete;
diff --git a/include/Nazara/Shader/ShaderAstStatementVisitorExcept.hpp b/include/Nazara/Shader/Ast/AstStatementVisitorExcept.hpp
similarity index 86%
rename from include/Nazara/Shader/ShaderAstStatementVisitorExcept.hpp
rename to include/Nazara/Shader/Ast/AstStatementVisitorExcept.hpp
index d5a85416f..88199ddb2 100644
--- a/include/Nazara/Shader/ShaderAstStatementVisitorExcept.hpp
+++ b/include/Nazara/Shader/Ast/AstStatementVisitorExcept.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitor.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
 
 namespace Nz::ShaderAst
 {
@@ -19,7 +19,7 @@ namespace Nz::ShaderAst
 			using AstStatementVisitor::Visit;
 
 #define NAZARA_SHADERAST_STATEMENT(Node) void Visit(ShaderAst::Node& node) override;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 	};
 }
 
diff --git a/include/Nazara/Shader/ShaderAstUtils.hpp b/include/Nazara/Shader/Ast/AstUtils.hpp
similarity index 88%
rename from include/Nazara/Shader/ShaderAstUtils.hpp
rename to include/Nazara/Shader/Ast/AstUtils.hpp
index a560bb5b6..d27c41d49 100644
--- a/include/Nazara/Shader/ShaderAstUtils.hpp
+++ b/include/Nazara/Shader/Ast/AstUtils.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#ifndef NAZARA_SHADERASTUTILS_HPP
-#define NAZARA_SHADERASTUTILS_HPP
+#ifndef NAZARA_SHADER_AST_UTILS_HPP
+#define NAZARA_SHADER_AST_UTILS_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderEnums.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
 #include <vector>
 
 namespace Nz::ShaderAst
@@ -49,6 +49,6 @@ namespace Nz::ShaderAst
 	inline ExpressionCategory GetExpressionCategory(Expression& expression);
 }
 
-#include <Nazara/Shader/ShaderAstUtils.inl>
+#include <Nazara/Shader/Ast/AstUtils.inl>
 
 #endif
diff --git a/include/Nazara/Shader/ShaderAstUtils.inl b/include/Nazara/Shader/Ast/AstUtils.inl
similarity index 90%
rename from include/Nazara/Shader/ShaderAstUtils.inl
rename to include/Nazara/Shader/Ast/AstUtils.inl
index dec5ed3a9..b988f6fef 100644
--- a/include/Nazara/Shader/ShaderAstUtils.inl
+++ b/include/Nazara/Shader/Ast/AstUtils.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstUtils.hpp>
+#include <Nazara/Shader/Ast/AstUtils.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
diff --git a/include/Nazara/Shader/Ast/Attribute.hpp b/include/Nazara/Shader/Ast/Attribute.hpp
index 9c1e0dca5..fb7bc091d 100644
--- a/include/Nazara/Shader/Ast/Attribute.hpp
+++ b/include/Nazara/Shader/Ast/Attribute.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_SHADERAST_ATTRIBUTES_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Shader/ShaderEnums.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
 
 namespace Nz::ShaderAst
 {
diff --git a/include/Nazara/Shader/ShaderEnums.hpp b/include/Nazara/Shader/Ast/Enums.hpp
similarity index 83%
rename from include/Nazara/Shader/ShaderEnums.hpp
rename to include/Nazara/Shader/Ast/Enums.hpp
index a25ef4caa..21b1e91a0 100644
--- a/include/Nazara/Shader/ShaderEnums.hpp
+++ b/include/Nazara/Shader/Ast/Enums.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_SHADER_ENUMS_HPP
-#define NAZARA_SHADER_ENUMS_HPP
+#ifndef NAZARA_SHADER_AST_ENUMS_HPP
+#define NAZARA_SHADER_AST_ENUMS_HPP
 
 #include <Nazara/Prerequisites.hpp>
 
@@ -69,7 +69,7 @@ namespace Nz::ShaderAst
 
 #define NAZARA_SHADERAST_NODE(Node) Node,
 #define NAZARA_SHADERAST_STATEMENT_LAST(Node) Node, Max = Node
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 	};
 
 	enum class PrimitiveType
@@ -87,20 +87,6 @@ namespace Nz::ShaderAst
 		Third,
 		Fourth
 	};
-
-	enum class VariableType
-	{
-		None = -1,
-
-		BuiltinVariable,
-		InputVariable,
-		LocalVariable,
-		OutputVariable,
-		ParameterVariable,
-		UniformVariable
-	};
 }
 
-#include <Nazara/Shader/ShaderEnums.inl>
-
 #endif // NAZARA_SHADER_ENUMS_HPP
diff --git a/include/Nazara/Shader/Ast/ExpressionType.hpp b/include/Nazara/Shader/Ast/ExpressionType.hpp
index 2b436c7aa..aa6cd809e 100644
--- a/include/Nazara/Shader/Ast/ExpressionType.hpp
+++ b/include/Nazara/Shader/Ast/ExpressionType.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Utility/Enums.hpp>
-#include <Nazara/Shader/ShaderEnums.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
 #include <Nazara/Shader/Ast/Attribute.hpp>
 #include <optional>
 #include <string>
diff --git a/include/Nazara/Shader/ShaderNodes.hpp b/include/Nazara/Shader/Ast/Nodes.hpp
similarity index 98%
rename from include/Nazara/Shader/ShaderNodes.hpp
rename to include/Nazara/Shader/Ast/Nodes.hpp
index 5a6a2bae7..0d9f67067 100644
--- a/include/Nazara/Shader/ShaderNodes.hpp
+++ b/include/Nazara/Shader/Ast/Nodes.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef NAZARA_SHADER_NODES_HPP
-#define NAZARA_SHADER_NODES_HPP
+#ifndef NAZARA_SHADER_AST_NODES_HPP
+#define NAZARA_SHADER_AST_NODES_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Math/Vector2.hpp>
@@ -13,7 +13,7 @@
 #include <Nazara/Math/Vector4.hpp>
 #include <Nazara/Shader/Config.hpp>
 #include <Nazara/Shader/Ast/ConstantValue.hpp>
-#include <Nazara/Shader/ShaderEnums.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
 #include <Nazara/Shader/Ast/Attribute.hpp>
 #include <Nazara/Shader/Ast/ExpressionType.hpp>
 #include <array>
@@ -304,6 +304,6 @@ namespace Nz::ShaderAst
 	inline bool IsStatement(NodeType nodeType);
 }
 
-#include <Nazara/Shader/ShaderNodes.inl>
+#include <Nazara/Shader/Ast/Nodes.inl>
 
 #endif
diff --git a/include/Nazara/Shader/ShaderNodes.inl b/include/Nazara/Shader/Ast/Nodes.inl
similarity index 86%
rename from include/Nazara/Shader/ShaderNodes.inl
rename to include/Nazara/Shader/Ast/Nodes.inl
index c9c3b875b..7484f2ac4 100644
--- a/include/Nazara/Shader/ShaderNodes.inl
+++ b/include/Nazara/Shader/Ast/Nodes.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
@@ -18,7 +18,7 @@ namespace Nz::ShaderAst
 		switch (nodeType)
 		{
 #define NAZARA_SHADERAST_EXPRESSION(Node) case NodeType::Node: return true;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 		default:
 			return false;
@@ -30,7 +30,7 @@ namespace Nz::ShaderAst
 		switch (nodeType)
 		{
 #define NAZARA_SHADERAST_STATEMENT(Node) case NodeType::Node: return true;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 		default:
 			return false;
diff --git a/include/Nazara/Shader/Ast/SanitizeVisitor.hpp b/include/Nazara/Shader/Ast/SanitizeVisitor.hpp
index 43167a7f8..e3e541ba5 100644
--- a/include/Nazara/Shader/Ast/SanitizeVisitor.hpp
+++ b/include/Nazara/Shader/Ast/SanitizeVisitor.hpp
@@ -9,7 +9,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstCloner.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
 #include <vector>
 
 namespace Nz::ShaderAst
diff --git a/include/Nazara/Shader/GlslWriter.hpp b/include/Nazara/Shader/GlslWriter.hpp
index faea46ef7..a0530230c 100644
--- a/include/Nazara/Shader/GlslWriter.hpp
+++ b/include/Nazara/Shader/GlslWriter.hpp
@@ -9,9 +9,9 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitorExcept.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitorExcept.hpp>
 #include <set>
 #include <sstream>
 #include <string>
diff --git a/include/Nazara/Shader/ShaderBuilder.hpp b/include/Nazara/Shader/ShaderBuilder.hpp
index 9394624b1..0d5e44021 100644
--- a/include/Nazara/Shader/ShaderBuilder.hpp
+++ b/include/Nazara/Shader/ShaderBuilder.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_SHADER_BUILDER_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <memory>
 #include <optional>
 
diff --git a/include/Nazara/Shader/ShaderEnums.inl b/include/Nazara/Shader/ShaderEnums.inl
deleted file mode 100644
index a24138a6e..000000000
--- a/include/Nazara/Shader/ShaderEnums.inl
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (C) 2020 Jérôme Leclercq
-// This file is part of the "Nazara Engine - Shader generator"
-// For conditions of distribution and use, see copyright notice in Config.hpp
-
-#include <Nazara/Shader/ShaderEnums.hpp>
-#include <Nazara/Shader/Debug.hpp>
-
-namespace Nz::ShaderAst
-{
-}
-
-#include <Nazara/Shader/DebugOff.hpp>
diff --git a/include/Nazara/Shader/ShaderLangParser.hpp b/include/Nazara/Shader/ShaderLangParser.hpp
index 1fa385c9f..6cea99202 100644
--- a/include/Nazara/Shader/ShaderLangParser.hpp
+++ b/include/Nazara/Shader/ShaderLangParser.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
 #include <Nazara/Shader/ShaderLangLexer.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 
 namespace Nz::ShaderLang
 {
diff --git a/include/Nazara/Shader/SpirvAstVisitor.hpp b/include/Nazara/Shader/SpirvAstVisitor.hpp
index 0f2d06495..10eb271e2 100644
--- a/include/Nazara/Shader/SpirvAstVisitor.hpp
+++ b/include/Nazara/Shader/SpirvAstVisitor.hpp
@@ -9,10 +9,10 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitorExcept.hpp>
-#include <Nazara/Shader/Ast/ExpressionType.hpp>
 #include <Nazara/Shader/SpirvBlock.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitorExcept.hpp>
+#include <Nazara/Shader/Ast/ExpressionType.hpp>
 #include <unordered_map>
 #include <vector>
 
diff --git a/include/Nazara/Shader/SpirvConstantCache.hpp b/include/Nazara/Shader/SpirvConstantCache.hpp
index 3025c013d..44e8a1652 100644
--- a/include/Nazara/Shader/SpirvConstantCache.hpp
+++ b/include/Nazara/Shader/SpirvConstantCache.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_SPIRVCONSTANTCACHE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Shader/ShaderEnums.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
 #include <Nazara/Shader/Ast/ConstantValue.hpp>
 #include <Nazara/Shader/Ast/ExpressionType.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
diff --git a/include/Nazara/Shader/SpirvExpressionLoad.hpp b/include/Nazara/Shader/SpirvExpressionLoad.hpp
index bff0047cf..b85ccc471 100644
--- a/include/Nazara/Shader/SpirvExpressionLoad.hpp
+++ b/include/Nazara/Shader/SpirvExpressionLoad.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp>
 #include <vector>
 
 namespace Nz
diff --git a/include/Nazara/Shader/SpirvExpressionStore.hpp b/include/Nazara/Shader/SpirvExpressionStore.hpp
index e66d545d3..097c78560 100644
--- a/include/Nazara/Shader/SpirvExpressionStore.hpp
+++ b/include/Nazara/Shader/SpirvExpressionStore.hpp
@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp>
 
 namespace Nz
 {
diff --git a/include/Nazara/Shader/SpirvSectionBase.hpp b/include/Nazara/Shader/SpirvSectionBase.hpp
index 4783fd80b..8c16f773b 100644
--- a/include/Nazara/Shader/SpirvSectionBase.hpp
+++ b/include/Nazara/Shader/SpirvSectionBase.hpp
@@ -8,7 +8,7 @@
 #define NAZARA_SPIRVSECTIONBASE_HPP
 
 #include <Nazara/Prerequisites.hpp>
-#include <Nazara/Shader/ShaderEnums.hpp>
+#include <Nazara/Shader/Ast/Enums.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
 #include <string>
 #include <vector>
diff --git a/include/Nazara/Shader/SpirvWriter.hpp b/include/Nazara/Shader/SpirvWriter.hpp
index 2bab892ca..284e76a94 100644
--- a/include/Nazara/Shader/SpirvWriter.hpp
+++ b/include/Nazara/Shader/SpirvWriter.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
 #include <Nazara/Shader/Ast/ConstantValue.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
 #include <Nazara/Shader/SpirvConstantCache.hpp>
 #include <string>
diff --git a/include/Nazara/VulkanRenderer.hpp b/include/Nazara/VulkanRenderer.hpp
index 7b52637fc..633e24ee4 100644
--- a/include/Nazara/VulkanRenderer.hpp
+++ b/include/Nazara/VulkanRenderer.hpp
@@ -47,7 +47,7 @@
 #include <Nazara/VulkanRenderer/VulkanRenderPipeline.hpp>
 #include <Nazara/VulkanRenderer/VulkanRenderPipelineLayout.hpp>
 #include <Nazara/VulkanRenderer/VulkanShaderBinding.hpp>
-#include <Nazara/VulkanRenderer/VulkanShaderStage.hpp>
+#include <Nazara/VulkanRenderer/VulkanShaderModule.hpp>
 #include <Nazara/VulkanRenderer/VulkanSingleFramebuffer.hpp>
 #include <Nazara/VulkanRenderer/VulkanSurface.hpp>
 #include <Nazara/VulkanRenderer/VulkanTexture.hpp>
diff --git a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
index 8813eac54..4017cbfe3 100644
--- a/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
+++ b/include/Nazara/VulkanRenderer/VulkanShaderModule.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Renderer/ShaderModule.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Shader/ShaderWriter.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp>
 #include <vector>
diff --git a/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp b/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp
index 86b043877..4486a07e6 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLShaderModule.cpp
@@ -6,10 +6,10 @@
 #include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/OpenGLRenderer/Utils.hpp>
 #include <Nazara/Shader/GlslWriter.hpp>
-#include <Nazara/Shader/ShaderAstCloner.hpp>
-#include <Nazara/Shader/ShaderAstSerializer.hpp>
 #include <Nazara/Shader/ShaderLangLexer.hpp>
 #include <Nazara/Shader/ShaderLangParser.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
+#include <Nazara/Shader/Ast/AstSerializer.hpp>
 #include <stdexcept>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
 
diff --git a/src/Nazara/Shader/ShaderAstCloner.cpp b/src/Nazara/Shader/Ast/AstCloner.cpp
similarity index 98%
rename from src/Nazara/Shader/ShaderAstCloner.cpp
rename to src/Nazara/Shader/Ast/AstCloner.cpp
index af1348c72..602ddcd94 100644
--- a/src/Nazara/Shader/ShaderAstCloner.cpp
+++ b/src/Nazara/Shader/Ast/AstCloner.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstCloner.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
 #include <stdexcept>
 #include <Nazara/Shader/Debug.hpp>
 
@@ -287,7 +287,7 @@ namespace Nz::ShaderAst
 		PushStatement(Clone(node)); \
 	}
 
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 	void AstCloner::PushExpression(ExpressionPtr expression)
 	{
diff --git a/src/Nazara/Shader/ShaderAstExpressionVisitor.cpp b/src/Nazara/Shader/Ast/AstExpressionVisitor.cpp
similarity index 84%
rename from src/Nazara/Shader/ShaderAstExpressionVisitor.cpp
rename to src/Nazara/Shader/Ast/AstExpressionVisitor.cpp
index 44beed045..671b0c306 100644
--- a/src/Nazara/Shader/ShaderAstExpressionVisitor.cpp
+++ b/src/Nazara/Shader/Ast/AstExpressionVisitor.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
diff --git a/src/Nazara/Shader/ShaderAstExpressionVisitorExcept.cpp b/src/Nazara/Shader/Ast/AstExpressionVisitorExcept.cpp
similarity index 79%
rename from src/Nazara/Shader/ShaderAstExpressionVisitorExcept.cpp
rename to src/Nazara/Shader/Ast/AstExpressionVisitorExcept.cpp
index 1fddc0e78..954f8693f 100644
--- a/src/Nazara/Shader/ShaderAstExpressionVisitorExcept.cpp
+++ b/src/Nazara/Shader/Ast/AstExpressionVisitorExcept.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstExpressionVisitorExcept.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitorExcept.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
@@ -11,5 +11,5 @@ namespace Nz::ShaderAst
 	{ \
 		throw std::runtime_error("unexpected " #Node " node"); \
 	}
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 }
diff --git a/src/Nazara/Shader/ShaderAstOptimizer.cpp b/src/Nazara/Shader/Ast/AstOptimizer.cpp
similarity index 99%
rename from src/Nazara/Shader/ShaderAstOptimizer.cpp
rename to src/Nazara/Shader/Ast/AstOptimizer.cpp
index 3c67240a7..8f948778d 100644
--- a/src/Nazara/Shader/ShaderAstOptimizer.cpp
+++ b/src/Nazara/Shader/Ast/AstOptimizer.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstOptimizer.hpp>
+#include <Nazara/Shader/Ast/AstOptimizer.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
 #include <cassert>
 #include <stdexcept>
diff --git a/src/Nazara/Shader/ShaderAstRecursiveVisitor.cpp b/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp
similarity index 98%
rename from src/Nazara/Shader/ShaderAstRecursiveVisitor.cpp
rename to src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp
index 52e6dc3eb..7e33c9590 100644
--- a/src/Nazara/Shader/ShaderAstRecursiveVisitor.cpp
+++ b/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstRecursiveVisitor.hpp>
+#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
diff --git a/src/Nazara/Shader/ShaderAstSerializer.cpp b/src/Nazara/Shader/Ast/AstSerializer.cpp
similarity index 97%
rename from src/Nazara/Shader/ShaderAstSerializer.cpp
rename to src/Nazara/Shader/Ast/AstSerializer.cpp
index 73ed6db60..1c79e7600 100644
--- a/src/Nazara/Shader/ShaderAstSerializer.cpp
+++ b/src/Nazara/Shader/Ast/AstSerializer.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstSerializer.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitor.hpp>
+#include <Nazara/Shader/Ast/AstSerializer.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
@@ -26,7 +26,7 @@ namespace Nz::ShaderAst
 				{ \
 					m_serializer.Serialize(node); \
 				}
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 			private:
 				AstSerializerBase& m_serializer;
@@ -444,7 +444,7 @@ namespace Nz::ShaderAst
 			case NodeType::None: break;
 
 #define NAZARA_SHADERAST_EXPRESSION(Node) case NodeType:: Node : node = std::make_unique<Node>(); break;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 			default: throw std::runtime_error("unexpected node type");
 		}
@@ -470,7 +470,7 @@ namespace Nz::ShaderAst
 			case NodeType::None: break;
 
 #define NAZARA_SHADERAST_STATEMENT(Node) case NodeType:: Node : node = std::make_unique<Node>(); break;
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 			default: throw std::runtime_error("unexpected node type");
 		}
diff --git a/src/Nazara/Shader/ShaderAstStatementVisitor.cpp b/src/Nazara/Shader/Ast/AstStatementVisitor.cpp
similarity index 84%
rename from src/Nazara/Shader/ShaderAstStatementVisitor.cpp
rename to src/Nazara/Shader/Ast/AstStatementVisitor.cpp
index 6ee90504e..8d1cca01f 100644
--- a/src/Nazara/Shader/ShaderAstStatementVisitor.cpp
+++ b/src/Nazara/Shader/Ast/AstStatementVisitor.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstStatementVisitor.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
diff --git a/src/Nazara/Shader/ShaderAstStatementVisitorExcept.cpp b/src/Nazara/Shader/Ast/AstStatementVisitorExcept.cpp
similarity index 79%
rename from src/Nazara/Shader/ShaderAstStatementVisitorExcept.cpp
rename to src/Nazara/Shader/Ast/AstStatementVisitorExcept.cpp
index ef4204ce6..9a4e36783 100644
--- a/src/Nazara/Shader/ShaderAstStatementVisitorExcept.cpp
+++ b/src/Nazara/Shader/Ast/AstStatementVisitorExcept.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstStatementVisitorExcept.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitorExcept.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
@@ -11,5 +11,5 @@ namespace Nz::ShaderAst
 	{ \
 		throw std::runtime_error("unexpected " #Node " node"); \
 	}
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 }
diff --git a/src/Nazara/Shader/ShaderAstUtils.cpp b/src/Nazara/Shader/Ast/AstUtils.cpp
similarity index 97%
rename from src/Nazara/Shader/ShaderAstUtils.cpp
rename to src/Nazara/Shader/Ast/AstUtils.cpp
index 47f73cdeb..a6895177a 100644
--- a/src/Nazara/Shader/ShaderAstUtils.cpp
+++ b/src/Nazara/Shader/Ast/AstUtils.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderAstUtils.hpp>
+#include <Nazara/Shader/Ast/AstUtils.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
diff --git a/src/Nazara/Shader/ShaderNodes.cpp b/src/Nazara/Shader/Ast/Nodes.cpp
similarity index 73%
rename from src/Nazara/Shader/ShaderNodes.cpp
rename to src/Nazara/Shader/Ast/Nodes.cpp
index d4510fcfc..aed845fc5 100644
--- a/src/Nazara/Shader/ShaderNodes.cpp
+++ b/src/Nazara/Shader/Ast/Nodes.cpp
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Engine - Shader generator"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <Nazara/Core/Algorithm.hpp>
-#include <Nazara/Shader/ShaderAstExpressionVisitor.hpp>
-#include <Nazara/Shader/ShaderAstStatementVisitor.hpp>
+#include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
+#include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
 #include <Nazara/Shader/Debug.hpp>
 
 namespace Nz::ShaderAst
@@ -16,7 +16,7 @@ namespace Nz::ShaderAst
 	{ \
 		return NodeType:: Node; \
 	}
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 
 #define NAZARA_SHADERAST_EXPRESSION(Node) void Node::Visit(AstExpressionVisitor& visitor) \
 	{\
@@ -28,5 +28,5 @@ namespace Nz::ShaderAst
 		visitor.Visit(*this); \
 	}
 
-#include <Nazara/Shader/ShaderAstNodes.hpp>
+#include <Nazara/Shader/Ast/AstNodeList.hpp>
 }
diff --git a/src/Nazara/Shader/Ast/SanitizeVisitor.cpp b/src/Nazara/Shader/Ast/SanitizeVisitor.cpp
index 6da7ef18a..57a3cd8cd 100644
--- a/src/Nazara/Shader/Ast/SanitizeVisitor.cpp
+++ b/src/Nazara/Shader/Ast/SanitizeVisitor.cpp
@@ -5,7 +5,7 @@
 #include <Nazara/Shader/Ast/SanitizeVisitor.hpp>
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/StackArray.hpp>
-#include <Nazara/Shader/ShaderAstUtils.hpp>
+#include <Nazara/Shader/Ast/AstUtils.hpp>
 #include <stdexcept>
 #include <unordered_set>
 #include <Nazara/Shader/Debug.hpp>
diff --git a/src/Nazara/Shader/GlslWriter.cpp b/src/Nazara/Shader/GlslWriter.cpp
index c354ffbd1..c6e4a983f 100644
--- a/src/Nazara/Shader/GlslWriter.cpp
+++ b/src/Nazara/Shader/GlslWriter.cpp
@@ -7,9 +7,9 @@
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Math/Algorithm.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
-#include <Nazara/Shader/ShaderAstCloner.hpp>
-#include <Nazara/Shader/ShaderAstRecursiveVisitor.hpp>
-#include <Nazara/Shader/ShaderAstUtils.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
+#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
+#include <Nazara/Shader/Ast/AstUtils.hpp>
 #include <Nazara/Shader/Ast/SanitizeVisitor.hpp>
 #include <optional>
 #include <stdexcept>
diff --git a/src/Nazara/Shader/SpirvWriter.cpp b/src/Nazara/Shader/SpirvWriter.cpp
index 61e3be2f2..5e2caca18 100644
--- a/src/Nazara/Shader/SpirvWriter.cpp
+++ b/src/Nazara/Shader/SpirvWriter.cpp
@@ -5,13 +5,13 @@
 #include <Nazara/Shader/SpirvWriter.hpp>
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/StackVector.hpp>
-#include <Nazara/Shader/ShaderAstCloner.hpp>
-#include <Nazara/Shader/ShaderAstRecursiveVisitor.hpp>
 #include <Nazara/Shader/SpirvAstVisitor.hpp>
 #include <Nazara/Shader/SpirvBlock.hpp>
 #include <Nazara/Shader/SpirvConstantCache.hpp>
 #include <Nazara/Shader/SpirvData.hpp>
 #include <Nazara/Shader/SpirvSection.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
+#include <Nazara/Shader/Ast/AstRecursiveVisitor.hpp>
 #include <Nazara/Shader/Ast/SanitizeVisitor.hpp>
 #include <tsl/ordered_map.h>
 #include <tsl/ordered_set.h>
diff --git a/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp b/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp
index a6e585123..acbb9f8bf 100644
--- a/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp
@@ -3,11 +3,11 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/VulkanRenderer/VulkanShaderModule.hpp>
-#include <Nazara/Shader/ShaderAstSerializer.hpp>
 #include <Nazara/Shader/ShaderLangLexer.hpp>
 #include <Nazara/Shader/ShaderLangParser.hpp>
 #include <Nazara/Shader/SpirvDecoder.hpp>
 #include <Nazara/Shader/SpirvWriter.hpp>
+#include <Nazara/Shader/Ast/AstSerializer.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/ShaderNode/DataModels/Mat4VecMul.cpp b/src/ShaderNode/DataModels/Mat4VecMul.cpp
index f859166c1..0e723584d 100644
--- a/src/ShaderNode/DataModels/Mat4VecMul.cpp
+++ b/src/ShaderNode/DataModels/Mat4VecMul.cpp
@@ -1,6 +1,6 @@
 #include <ShaderNode/DataModels/Mat4VecMul.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 
 Mat4VecMul::Mat4VecMul(ShaderGraph& graph) :
 ShaderNode(graph)
diff --git a/src/ShaderNode/DataModels/ShaderNode.hpp b/src/ShaderNode/DataModels/ShaderNode.hpp
index eeb8d0b3e..c0aa8afcf 100644
--- a/src/ShaderNode/DataModels/ShaderNode.hpp
+++ b/src/ShaderNode/DataModels/ShaderNode.hpp
@@ -4,7 +4,7 @@
 #define NAZARA_SHADERNODES_SHADERNODE_HPP
 
 #include <Nazara/Math/Vector2.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <nodes/NodeDataModel>
 #include <QtGui/QPixmap>
 #include <optional>
diff --git a/src/ShaderNode/DataModels/VecDot.cpp b/src/ShaderNode/DataModels/VecDot.cpp
index 0a6e7f0ce..21849ec03 100644
--- a/src/ShaderNode/DataModels/VecDot.cpp
+++ b/src/ShaderNode/DataModels/VecDot.cpp
@@ -1,6 +1,6 @@
 #include <ShaderNode/DataModels/VecDot.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 
 VecDot::VecDot(ShaderGraph& graph) :
 ShaderNode(graph)
diff --git a/src/ShaderNode/DataModels/VecFloatMul.cpp b/src/ShaderNode/DataModels/VecFloatMul.cpp
index 62abd27e8..9ddcb8bc0 100644
--- a/src/ShaderNode/DataModels/VecFloatMul.cpp
+++ b/src/ShaderNode/DataModels/VecFloatMul.cpp
@@ -1,6 +1,6 @@
 #include <ShaderNode/DataModels/VecFloatMul.hpp>
 #include <Nazara/Shader/ShaderBuilder.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 
 VecFloatMul::VecFloatMul(ShaderGraph& graph) :
 ShaderNode(graph)
diff --git a/src/ShaderNode/DataTypes/Matrix4Data.hpp b/src/ShaderNode/DataTypes/Matrix4Data.hpp
index 4eb63f136..bd2e9e978 100644
--- a/src/ShaderNode/DataTypes/Matrix4Data.hpp
+++ b/src/ShaderNode/DataTypes/Matrix4Data.hpp
@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_MATRIXDATA_HPP
 #define NAZARA_SHADERNODES_MATRIXDATA_HPP
 
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <ShaderNode/Previews/PreviewValues.hpp>
 #include <nodes/NodeData>
 
diff --git a/src/ShaderNode/DataTypes/TextureData.hpp b/src/ShaderNode/DataTypes/TextureData.hpp
index 28b2b73d0..ab3bba1f2 100644
--- a/src/ShaderNode/DataTypes/TextureData.hpp
+++ b/src/ShaderNode/DataTypes/TextureData.hpp
@@ -4,7 +4,7 @@
 #define NAZARA_SHADERNODES_TEXTUREDATA_HPP
 
 #include <ShaderNode/Previews/PreviewValues.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <nodes/NodeData>
 
 struct TextureData : public QtNodes::NodeData
diff --git a/src/ShaderNode/DataTypes/VecData.hpp b/src/ShaderNode/DataTypes/VecData.hpp
index 44ef84e67..1dcd265d5 100644
--- a/src/ShaderNode/DataTypes/VecData.hpp
+++ b/src/ShaderNode/DataTypes/VecData.hpp
@@ -3,7 +3,7 @@
 #ifndef NAZARA_SHADERNODES_VECDATA_HPP
 #define NAZARA_SHADERNODES_VECDATA_HPP
 
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <ShaderNode/Previews/PreviewValues.hpp>
 #include <nodes/NodeData>
 
diff --git a/src/ShaderNode/ShaderGraph.cpp b/src/ShaderNode/ShaderGraph.cpp
index 3e3fa273c..64abc3891 100644
--- a/src/ShaderNode/ShaderGraph.cpp
+++ b/src/ShaderNode/ShaderGraph.cpp
@@ -1,8 +1,8 @@
 #include <ShaderNode/ShaderGraph.hpp>
 #include <Nazara/Core/StackArray.hpp>
+#include <Nazara/Shader/Ast/AstCloner.hpp>
+#include <Nazara/Shader/Ast/AstUtils.hpp>
 #include <Nazara/Shader/Ast/ExpressionType.hpp>
-#include <Nazara/Shader/ShaderAstCloner.hpp>
-#include <Nazara/Shader/ShaderAstUtils.hpp>
 #include <ShaderNode/DataModels/BinOp.hpp>
 #include <ShaderNode/DataModels/BoolValue.hpp>
 #include <ShaderNode/DataModels/BufferField.hpp>
diff --git a/src/ShaderNode/ShaderGraph.hpp b/src/ShaderNode/ShaderGraph.hpp
index 19dcb6813..b8187c5d1 100644
--- a/src/ShaderNode/ShaderGraph.hpp
+++ b/src/ShaderNode/ShaderGraph.hpp
@@ -5,7 +5,7 @@
 
 #include <Nazara/Core/Signal.hpp>
 #include <Nazara/Utility/Enums.hpp>
-#include <Nazara/Shader/ShaderNodes.hpp>
+#include <Nazara/Shader/Ast/Nodes.hpp>
 #include <nodes/FlowScene>
 #include <ShaderNode/Enums.hpp>
 #include <ShaderNode/Previews/PreviewModel.hpp>
diff --git a/src/ShaderNode/Widgets/CodeOutputWidget.cpp b/src/ShaderNode/Widgets/CodeOutputWidget.cpp
index 9e20057e1..f92a23d2f 100644
--- a/src/ShaderNode/Widgets/CodeOutputWidget.cpp
+++ b/src/ShaderNode/Widgets/CodeOutputWidget.cpp
@@ -1,6 +1,6 @@
 #include <ShaderNode/Widgets/CodeOutputWidget.hpp>
 #include <Nazara/Shader/GlslWriter.hpp>
-#include <Nazara/Shader/ShaderAstOptimizer.hpp>
+#include <Nazara/Shader/Ast/AstOptimizer.hpp>
 #include <Nazara/Shader/SpirvPrinter.hpp>
 #include <Nazara/Shader/SpirvWriter.hpp>
 #include <ShaderNode/ShaderGraph.hpp>
diff --git a/src/ShaderNode/Widgets/MainWindow.cpp b/src/ShaderNode/Widgets/MainWindow.cpp
index 5777964b2..54678eb23 100644
--- a/src/ShaderNode/Widgets/MainWindow.cpp
+++ b/src/ShaderNode/Widgets/MainWindow.cpp
@@ -1,7 +1,7 @@
 #include <ShaderNode/Widgets/MainWindow.hpp>
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Shader/GlslWriter.hpp>
-#include <Nazara/Shader/ShaderAstSerializer.hpp>
+#include <Nazara/Shader/Ast/AstSerializer.hpp>
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/Widgets/BufferEditor.hpp>
 #include <ShaderNode/Widgets/CodeOutputWidget.hpp>