diff --git a/src/Backends/Window-OpenGL.h b/src/Backends/Rendering/Window/OpenGL.h
similarity index 100%
rename from src/Backends/Window-OpenGL.h
rename to src/Backends/Rendering/Window/OpenGL.h
diff --git a/src/Backends/Window/GLFW3-OpenGL3.cpp b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
similarity index 100%
rename from src/Backends/Window/GLFW3-OpenGL3.cpp
rename to src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
diff --git a/src/Backends/Window/SDL2-OpenGL3.cpp b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
similarity index 100%
rename from src/Backends/Window/SDL2-OpenGL3.cpp
rename to src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
diff --git a/src/Backends/Window/GLFW3-OpenGLES2.cpp b/src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
similarity index 100%
rename from src/Backends/Window/GLFW3-OpenGLES2.cpp
rename to src/Backends/Rendering/Window/OpenGLES2/GLFW3.cpp
diff --git a/src/Backends/Window/SDL2-OpenGLES2.cpp b/src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
similarity index 100%
rename from src/Backends/Window/SDL2-OpenGLES2.cpp
rename to src/Backends/Rendering/Window/OpenGLES2/SDL2.cpp
diff --git a/src/Backends/Window-Software.h b/src/Backends/Rendering/Window/Software.h
similarity index 100%
rename from src/Backends/Window-Software.h
rename to src/Backends/Rendering/Window/Software.h
diff --git a/src/Backends/Window/GLFW3-Software.cpp b/src/Backends/Rendering/Window/Software/GLFW3.cpp
similarity index 100%
rename from src/Backends/Window/GLFW3-Software.cpp
rename to src/Backends/Rendering/Window/Software/GLFW3.cpp
diff --git a/src/Backends/Window/Null-Software.cpp b/src/Backends/Rendering/Window/Software/Null.cpp
similarity index 100%
rename from src/Backends/Window/Null-Software.cpp
rename to src/Backends/Rendering/Window/Software/Null.cpp
diff --git a/src/Backends/Window/SDL2-Software.cpp b/src/Backends/Rendering/Window/Software/SDL2.cpp
similarity index 100%
rename from src/Backends/Window/SDL2-Software.cpp
rename to src/Backends/Rendering/Window/Software/SDL2.cpp
diff --git a/src/Backends/Window/WiiU-Software.cpp b/src/Backends/Rendering/Window/Software/WiiU.cpp
similarity index 100%
rename from src/Backends/Window/WiiU-Software.cpp
rename to src/Backends/Rendering/Window/Software/WiiU.cpp