diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e24e411..37dd651a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,24 +375,24 @@ elseif(BACKEND_PLATFORM MATCHES "Null")
 endif()
 
 if(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGL3")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGL3.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGL3/SDL2.cpp")
 elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "OpenGLES2")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-OpenGLES2.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp")
 elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "SDLTexture")
 elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "SDLSurface")
 elseif(BACKEND_PLATFORM MATCHES "SDL2" AND BACKEND_RENDERER MATCHES "Software")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/SDL2-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/SDL2.cpp")
 elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGL3")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGL3.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp")
 elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "OpenGLES2")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-OpenGLES2.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp")
 elseif(BACKEND_PLATFORM MATCHES "GLFW3" AND BACKEND_RENDERER MATCHES "Software")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/GLFW3-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/GLFW3.cpp")
 elseif(BACKEND_PLATFORM MATCHES "WiiU" AND BACKEND_RENDERER MATCHES "WiiU")
 elseif(BACKEND_PLATFORM MATCHES "WiiU" AND BACKEND_RENDERER MATCHES "Software")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/WiiU-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/WiiU.cpp")
 elseif(BACKEND_PLATFORM MATCHES "Null" AND BACKEND_RENDERER MATCHES "Software")
-	target_sources(CSE2 PRIVATE "src/Backends/Window/Null-Software.cpp")
+	target_sources(CSE2 PRIVATE "src/Backends/Rendering/Window/Software/Null.cpp")
 else()
 	message(FATAL_ERROR "Invalid BACKEND_PLATFORM/BACKEND_RENDERER combination")
 endif()
diff --git a/src/Backends/Rendering/OpenGL3.cpp b/src/Backends/Rendering/OpenGL3.cpp
index 656faaaf..1a6a95d9 100644
--- a/src/Backends/Rendering/OpenGL3.cpp
+++ b/src/Backends/Rendering/OpenGL3.cpp
@@ -18,7 +18,7 @@
 #include "../../WindowsWrapper.h"
 
 #include "../Misc.h"
-#include "../Window-OpenGL.h"
+#include "Window/OpenGL.h"
 #include "../../Resource.h"
 
 #define TOTAL_VBOS 8
diff --git a/src/Backends/Rendering/Software.cpp b/src/Backends/Rendering/Software.cpp
index f80685d5..2b522d63 100644
--- a/src/Backends/Rendering/Software.cpp
+++ b/src/Backends/Rendering/Software.cpp
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include "../Misc.h"
-#include "../Window-Software.h"
+#include "Window/Software.h"
 #include "../../Attributes.h"
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
diff --git a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
index fee7ca80..1fab4793 100644
--- a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
+++ b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
@@ -1,4 +1,4 @@
-#include "../Window-OpenGL.h"
+#include "../OpenGL.h"
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -10,8 +10,8 @@
 #endif
 #include <GLFW/glfw3.h>
 
-#include "../Misc.h"
-#include "../Shared/GLFW3.h"
+#include "../../../Misc.h"
+#include "../../../Shared/GLFW3.h"
 
 GLFWwindow *window;
 
diff --git a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
index 766de047..64c5dc77 100644
--- a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
+++ b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
@@ -1,4 +1,4 @@
-#include "../Window-OpenGL.h"
+#include "../OpenGL.h"
 
 #include <stddef.h>
 #include <string>
@@ -10,9 +10,8 @@
 #endif
 #include "SDL.h"
 
-#include "../Misc.h"
-#include "../Shared/SDL2.h"
-#include "../../Resource.h"
+#include "../../../Misc.h"
+#include "../../../Shared/SDL2.h"
 
 SDL_Window *window;
 
diff --git a/src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp b/src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
index 1144f8e9..b0204a5a 100644
--- a/src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
+++ b/src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
@@ -1,2 +1,2 @@
 #define USE_OPENGLES2
-#include "Window-OpenGL3.cpp"
+#include "../OpenGL3/GLFW3.cpp"
diff --git a/src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp b/src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
index 1144f8e9..c79532c6 100644
--- a/src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
+++ b/src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
@@ -1,2 +1,2 @@
 #define USE_OPENGLES2
-#include "Window-OpenGL3.cpp"
+#include "../OpenGL3/SDL2.cpp"
diff --git a/src/Backends/Rendering/Window/Software/GLFW3.cpp b/src/Backends/Rendering/Window/Software/GLFW3.cpp
index 923f80e6..1b13c1da 100644
--- a/src/Backends/Rendering/Window/Software/GLFW3.cpp
+++ b/src/Backends/Rendering/Window/Software/GLFW3.cpp
@@ -1,4 +1,4 @@
-#include "../Window-Software.h"
+#include "../Software.h"
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -10,8 +10,8 @@
 #endif
 #include <GLFW/glfw3.h>
 
-#include "../Misc.h"
-#include "../Shared/GLFW3.h"
+#include "../../../Misc.h"
+#include "../../../Shared/GLFW3.h"
 
 GLFWwindow *window;
 
diff --git a/src/Backends/Rendering/Window/Software/Null.cpp b/src/Backends/Rendering/Window/Software/Null.cpp
index 3b58955e..58b4edac 100644
--- a/src/Backends/Rendering/Window/Software/Null.cpp
+++ b/src/Backends/Rendering/Window/Software/Null.cpp
@@ -1,4 +1,4 @@
-#include "../Window-Software.h"
+#include "../Software.h"
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/src/Backends/Rendering/Window/Software/SDL2.cpp b/src/Backends/Rendering/Window/Software/SDL2.cpp
index efea72c6..27a02b1e 100644
--- a/src/Backends/Rendering/Window/Software/SDL2.cpp
+++ b/src/Backends/Rendering/Window/Software/SDL2.cpp
@@ -1,4 +1,4 @@
-#include "../Window-Software.h"
+#include "../Software.h"
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -6,8 +6,8 @@
 
 #include "SDL.h"
 
-#include "../Misc.h"
-#include "../Shared/SDL2.h"
+#include "../../../Misc.h"
+#include "../../../Shared/SDL2.h"
 
 SDL_Window *window;