diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index d9bc8db..1d992ee 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -23,9 +23,9 @@ set(ENGINE_SRC
 	core/debug.cpp
 	drivers/dx12/render_driver.cpp
 	drivers/vulkan/render_driver.cpp
-	drivers/wayland/window_driver.cpp
-	drivers/win32/window_driver.cpp
-	drivers/x11/window_driver.cpp
+	platform/linux/wayland/window_driver.cpp
+	platform/linux/x11/window_driver.cpp
+	platform/windows/window_driver.cpp
 	platform/window_driver.cpp
 	render/renderer.cpp
 	render/render_device.cpp
diff --git a/engine/src/drivers/wayland/window_driver.cpp b/engine/src/platform/linux/wayland/window_driver.cpp
similarity index 92%
rename from engine/src/drivers/wayland/window_driver.cpp
rename to engine/src/platform/linux/wayland/window_driver.cpp
index 90a91bb..9fb2c50 100644
--- a/engine/src/drivers/wayland/window_driver.cpp
+++ b/engine/src/platform/linux/wayland/window_driver.cpp
@@ -6,7 +6,7 @@
 
 #ifdef NOVA_WAYLAND
 
-#include "drivers/wayland/window_driver.h"
+#include "platform/linux/wayland/window_driver.h"
 
 #ifdef NOVA_VULKAN
 #include <vulkan/vulkan.h>
diff --git a/engine/src/drivers/wayland/window_driver.h b/engine/src/platform/linux/wayland/window_driver.h
similarity index 100%
rename from engine/src/drivers/wayland/window_driver.h
rename to engine/src/platform/linux/wayland/window_driver.h
diff --git a/engine/src/drivers/x11/window_driver.cpp b/engine/src/platform/linux/x11/window_driver.cpp
similarity index 98%
rename from engine/src/drivers/x11/window_driver.cpp
rename to engine/src/platform/linux/x11/window_driver.cpp
index e14b15d..d20912d 100644
--- a/engine/src/drivers/x11/window_driver.cpp
+++ b/engine/src/platform/linux/x11/window_driver.cpp
@@ -6,7 +6,7 @@
 
 #ifdef NOVA_X11
 
-#include "drivers/x11/window_driver.h"
+#include "platform/linux/x11/window_driver.h"
 
 #ifdef NOVA_VULKAN
 #include "drivers/vulkan/render_driver.h"
diff --git a/engine/src/drivers/x11/window_driver.h b/engine/src/platform/linux/x11/window_driver.h
similarity index 100%
rename from engine/src/drivers/x11/window_driver.h
rename to engine/src/platform/linux/x11/window_driver.h
diff --git a/engine/src/platform/window_driver.cpp b/engine/src/platform/window_driver.cpp
index c6ba380..424fb5e 100644
--- a/engine/src/platform/window_driver.cpp
+++ b/engine/src/platform/window_driver.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "drivers/wayland/window_driver.h" // IWYU pragma: keep
-#include "drivers/win32/window_driver.h" // IWYU pragma: keep
-#include "drivers/x11/window_driver.h" // IWYU pragma: keep
+#include "platform/linux/wayland/window_driver.h" // IWYU pragma: keep
+#include "platform/linux/x11/window_driver.h" // IWYU pragma: keep
+#include "platform/windows/window_driver.h" // IWYU pragma: keep
 
 #include <nova/core/debug.h>
 #include <nova/platform/window_driver.h>
diff --git a/engine/src/drivers/win32/window_driver.cpp b/engine/src/platform/windows/window_driver.cpp
similarity index 93%
rename from engine/src/drivers/win32/window_driver.cpp
rename to engine/src/platform/windows/window_driver.cpp
index 34ccbf4..b84d822 100644
--- a/engine/src/drivers/win32/window_driver.cpp
+++ b/engine/src/platform/windows/window_driver.cpp
@@ -6,7 +6,7 @@
 
 #ifdef NOVA_WINDOWS
 
-#include "drivers/win32/window_driver.h"
+#include "platform/windows/window_driver.h"
 
 #ifdef NOVA_VULKAN
 #include <vulkan/vulkan.h>
diff --git a/engine/src/drivers/win32/window_driver.h b/engine/src/platform/windows/window_driver.h
similarity index 100%
rename from engine/src/drivers/win32/window_driver.h
rename to engine/src/platform/windows/window_driver.h