diff --git a/examples/DeferredShading/main.cpp b/examples/DeferredShading/main.cpp
index f6223fac2..b916eabdb 100644
--- a/examples/DeferredShading/main.cpp
+++ b/examples/DeferredShading/main.cpp
@@ -4,7 +4,7 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NZSL/FieldOffsets.hpp>
+#include <NZSL/Math/FieldOffsets.hpp>
 #include <NZSL/Parser.hpp>
 #include <array>
 #include <chrono>
diff --git a/examples/GraphicsTest/main.cpp b/examples/GraphicsTest/main.cpp
index 831bf8682..b48b9a362 100644
--- a/examples/GraphicsTest/main.cpp
+++ b/examples/GraphicsTest/main.cpp
@@ -2,8 +2,6 @@
 #include <Nazara/Platform.hpp>
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
-#include <NZSL/SpirvConstantCache.hpp>
-#include <NZSL/SpirvPrinter.hpp>
 #include <Nazara/Utility.hpp>
 #include <array>
 #include <chrono>
diff --git a/examples/Physics2DDemo/main.cpp b/examples/Physics2DDemo/main.cpp
index 0ce112334..83b1c5177 100644
--- a/examples/Physics2DDemo/main.cpp
+++ b/examples/Physics2DDemo/main.cpp
@@ -10,8 +10,6 @@
 #include <Nazara/Physics2D/Components.hpp>
 #include <Nazara/Physics2D/Systems.hpp>
 #include <Nazara/Renderer.hpp>
-#include <NZSL/SpirvConstantCache.hpp>
-#include <NZSL/SpirvPrinter.hpp>
 #include <Nazara/Utility.hpp>
 #include <Nazara/Utility/Components.hpp>
 #include <Nazara/Widgets.hpp>
diff --git a/examples/PhysicsDemo/main.cpp b/examples/PhysicsDemo/main.cpp
index 97c978542..24315711e 100644
--- a/examples/PhysicsDemo/main.cpp
+++ b/examples/PhysicsDemo/main.cpp
@@ -10,8 +10,6 @@
 #include <Nazara/Physics3D/Components.hpp>
 #include <Nazara/Physics3D/Systems.hpp>
 #include <Nazara/Renderer.hpp>
-#include <NZSL/SpirvConstantCache.hpp>
-#include <NZSL/SpirvPrinter.hpp>
 #include <Nazara/Utility.hpp>
 #include <Nazara/Utility/Components.hpp>
 #include <entt/entt.hpp>
diff --git a/examples/Std140Debug/main.cpp b/examples/Std140Debug/main.cpp
index d582d6c97..2eccaf09c 100644
--- a/examples/Std140Debug/main.cpp
+++ b/examples/Std140Debug/main.cpp
@@ -2,7 +2,7 @@
 #include <Nazara/OpenGLRenderer.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper.hpp>
 #include <Nazara/Renderer.hpp>
-#include <NZSL/FieldOffsets.hpp>
+#include <NZSL/Math/FieldOffsets.hpp>
 #include <iostream>
 #include <numeric>
 
diff --git a/examples/WidgetDemo/main.cpp b/examples/WidgetDemo/main.cpp
index ba2bd9e95..9a6351e32 100644
--- a/examples/WidgetDemo/main.cpp
+++ b/examples/WidgetDemo/main.cpp
@@ -10,8 +10,6 @@
 #include <Nazara/Physics3D/Components.hpp>
 #include <Nazara/Physics3D/Systems.hpp>
 #include <Nazara/Renderer.hpp>
-#include <NZSL/SpirvConstantCache.hpp>
-#include <NZSL/SpirvPrinter.hpp>
 #include <Nazara/Utility.hpp>
 #include <Nazara/Utility/Components.hpp>
 #include <Nazara/Widgets.hpp>
diff --git a/src/Nazara/Graphics/BasicMaterial.cpp b/src/Nazara/Graphics/BasicMaterial.cpp
index dad5a9fc8..7d7657075 100644
--- a/src/Nazara/Graphics/BasicMaterial.cpp
+++ b/src/Nazara/Graphics/BasicMaterial.cpp
@@ -10,8 +10,8 @@
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
-#include <NZSL/FieldOffsets.hpp>
 #include <NZSL/Parser.hpp>
+#include <NZSL/Math/FieldOffsets.hpp>
 #include <cassert>
 #include <Nazara/Graphics/Debug.hpp>
 
diff --git a/src/Nazara/Graphics/DepthMaterial.cpp b/src/Nazara/Graphics/DepthMaterial.cpp
index 40034e045..e679227dd 100644
--- a/src/Nazara/Graphics/DepthMaterial.cpp
+++ b/src/Nazara/Graphics/DepthMaterial.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/DepthMaterial.hpp>
-#include <NZSL/FieldOffsets.hpp>
 #include <NZSL/Parser.hpp>
+#include <NZSL/Math/FieldOffsets.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/Graphics/PhongLightingMaterial.cpp b/src/Nazara/Graphics/PhongLightingMaterial.cpp
index 5ffd2bd35..2a1610c5b 100644
--- a/src/Nazara/Graphics/PhongLightingMaterial.cpp
+++ b/src/Nazara/Graphics/PhongLightingMaterial.cpp
@@ -9,8 +9,8 @@
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
 #include <Nazara/Utility/MaterialData.hpp>
-#include <NZSL/FieldOffsets.hpp>
 #include <NZSL/Parser.hpp>
+#include <NZSL/Math/FieldOffsets.hpp>
 #include <cassert>
 #include <filesystem>
 #include <Nazara/Graphics/Debug.hpp>
diff --git a/src/Nazara/Graphics/PredefinedShaderStructs.cpp b/src/Nazara/Graphics/PredefinedShaderStructs.cpp
index a1d03bf13..7518670e5 100644
--- a/src/Nazara/Graphics/PredefinedShaderStructs.cpp
+++ b/src/Nazara/Graphics/PredefinedShaderStructs.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Graphics/PredefinedShaderStructs.hpp>
-#include <NZSL/FieldOffsets.hpp>
+#include <NZSL/Math/FieldOffsets.hpp>
 #include <Nazara/Graphics/Debug.hpp>
 
 namespace Nz
diff --git a/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp b/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp
index 1f44c6d3d..a1ae50670 100644
--- a/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanShaderModule.cpp
@@ -5,9 +5,9 @@
 #include <Nazara/VulkanRenderer/VulkanShaderModule.hpp>
 #include <NZSL/Lexer.hpp>
 #include <NZSL/Parser.hpp>
-#include <NZSL/SpirvDecoder.hpp>
 #include <NZSL/SpirvWriter.hpp>
 #include <NZSL/Ast/AstSerializer.hpp>
+#include <NZSL/SpirV/SpirvDecoder.hpp>
 #include <Nazara/VulkanRenderer/Debug.hpp>
 
 namespace Nz
diff --git a/src/ShaderNode/Previews/PreviewValues.hpp b/src/ShaderNode/Previews/PreviewValues.hpp
index 84b322411..ecb7387bf 100644
--- a/src/ShaderNode/Previews/PreviewValues.hpp
+++ b/src/ShaderNode/Previews/PreviewValues.hpp
@@ -5,7 +5,7 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <ShaderNode/Enums.hpp>
-#include <NZSL/Vector.hpp>
+#include <NZSL/Math/Vector.hpp>
 #include <array>
 #include <vector>
 
diff --git a/src/ShaderNode/Widgets/CodeOutputWidget.cpp b/src/ShaderNode/Widgets/CodeOutputWidget.cpp
index f7a3a7261..82c86392d 100644
--- a/src/ShaderNode/Widgets/CodeOutputWidget.cpp
+++ b/src/ShaderNode/Widgets/CodeOutputWidget.cpp
@@ -4,8 +4,8 @@
 #include <NZSL/Ast/ConstantPropagationVisitor.hpp>
 #include <NZSL/Ast/EliminateUnusedPassVisitor.hpp>
 #include <NZSL/Ast/SanitizeVisitor.hpp>
-#include <NZSL/SpirvPrinter.hpp>
 #include <NZSL/SpirvWriter.hpp>
+#include <NZSL/SpirV/SpirvPrinter.hpp>
 #include <ShaderNode/ShaderGraph.hpp>
 #include <QtWidgets/QCheckBox>
 #include <QtWidgets/QComboBox>
@@ -36,7 +36,7 @@ m_shaderGraph(shaderGraph)
 	});
 
 	m_optimisationCheckbox = new QCheckBox;
-	m_optimisationCheckbox->setText("Enable optimisation");
+	m_optimisationCheckbox->setText("Enable optimization");
 	connect(m_optimisationCheckbox, &QCheckBox::stateChanged, [this](int)
 	{
 		Refresh();
diff --git a/xmake.lua b/xmake.lua
index 8e6bc2251..c44cb3a07 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -147,7 +147,8 @@ add_requires("openal-soft", { configs = { shared = true }})
 add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux
 
 add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
-add_requires("nazarautils", "nzsl", { debug = is_mode("debug") })
+add_requires("nazarautils")
+add_requires("nzsl", { debug = is_mode("debug"), configs = { with_symbols = not is_mode("release"), shared = true } })
 
 if is_plat("macosx") then
 	add_requires("libx11")