diff --git a/build/scripts/tools/openglrenderer.lua b/build/scripts/tools/openglrenderer.lua
index 2638de56d..fde7dcba1 100644
--- a/build/scripts/tools/openglrenderer.lua
+++ b/build/scripts/tools/openglrenderer.lua
@@ -33,6 +33,8 @@ TOOL.Libraries = {
 }
 
 TOOL.OsFiles.Windows = {
-	"../src/Nazara/OpenGLRenderer/Win32/**.hpp",
-	"../src/Nazara/OpenGLRenderer/Win32/**.cpp"
+	"../include/Nazara/OpenGLRenderer/Wrapper/WGL/**.hpp",
+	"../include/Nazara/OpenGLRenderer/Wrapper/WGL/**.inl",
+	"../src/Nazara/OpenGLRenderer/Wrapper/WGL/**.hpp",
+	"../src/Nazara/OpenGLRenderer/Wrapper/WGL/**.cpp"
 }
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp
similarity index 93%
rename from include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp
rename to include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp
index 7f684af03..e974ddc39 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp
+++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp
@@ -11,13 +11,13 @@
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/Platform/WindowHandle.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Context.hpp>
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/Win32Helper.hpp>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
 
 #undef WIN32_LEAN_AND_MEAN //< Redefined by OpenGL header (ty Khronos)
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLFunctions.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp>
 
 namespace Nz::GL
 {
@@ -80,6 +80,6 @@ namespace Nz::GL
 	};
 }
 
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.inl>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.inl>
 
 #endif
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.inl b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.inl
similarity index 90%
rename from include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.inl
rename to include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.inl
index 5dc6e0b31..d6ca768d4 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.inl
+++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - OpenGL Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
 
 namespace Nz::GL
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLFunctions.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp
similarity index 100%
rename from include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLFunctions.hpp
rename to include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp
similarity index 89%
rename from include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp
rename to include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp
index e5ad9395d..e9130544a 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp
+++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp
@@ -10,11 +10,11 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/OpenGLRenderer/Wrapper/Loader.hpp>
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
 #include <string>
 
 #undef WIN32_LEAN_AND_MEAN //< Redefined by OpenGL header (ty Khronos)
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLFunctions.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLFunctions.hpp>
 
 namespace Nz::GL
 {
@@ -47,6 +47,6 @@ namespace Nz::GL
 	};
 }
 
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.inl>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.inl>
 
 #endif
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.inl b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.inl
similarity index 82%
rename from include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.inl
rename to include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.inl
index bd8092bb7..80df1608d 100644
--- a/include/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.inl
+++ b/include/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.inl
@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - OpenGL Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
 
 namespace Nz::Vk
diff --git a/include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp b/include/Nazara/OpenGLRenderer/Wrapper/WGL/Win32Helper.hpp
similarity index 100%
rename from include/Nazara/OpenGLRenderer/Wrapper/Win32/Win32Helper.hpp
rename to include/Nazara/OpenGLRenderer/Wrapper/WGL/Win32Helper.hpp
diff --git a/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp b/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
index e41eed2e8..67ae261e0 100644
--- a/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
+++ b/src/Nazara/OpenGLRenderer/OpenGLRenderer.cpp
@@ -13,7 +13,7 @@
 #include <sstream>
 
 #ifdef NAZARA_PLATFORM_WINDOWS
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
 #endif
 
 #include <Nazara/OpenGLRenderer/Debug.hpp>
diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.cpp b/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp
similarity index 98%
rename from src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.cpp
rename to src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp
index c904a42d4..39be657eb 100644
--- a/src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp
@@ -2,10 +2,10 @@
 // This file is part of the "Nazara Engine - OpenGL Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
 #include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/StringExt.hpp>
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
 #include <array>
 #include <cassert>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.cpp b/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.cpp
similarity index 96%
rename from src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.cpp
rename to src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.cpp
index e30bde76b..eb7534e4e 100644
--- a/src/Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.cpp
+++ b/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Engine - OpenGL Renderer"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLLoader.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLLoader.hpp>
 #include <Nazara/Core/Error.hpp>
-#include <Nazara/OpenGLRenderer/Wrapper/Win32/WGLContext.hpp>
+#include <Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.hpp>
 #include <Nazara/OpenGLRenderer/Debug.hpp>
 
 namespace Nz::GL