diff --git a/src/Backends/GLFW3/Controller.cpp b/src/Backends/Controller/GLFW3.cpp
similarity index 100%
rename from src/Backends/GLFW3/Controller.cpp
rename to src/Backends/Controller/GLFW3.cpp
diff --git a/src/Backends/Null/Controller.cpp b/src/Backends/Controller/Null.cpp
similarity index 100%
rename from src/Backends/Null/Controller.cpp
rename to src/Backends/Controller/Null.cpp
diff --git a/src/Backends/SDL2/Controller.cpp b/src/Backends/Controller/SDL2.cpp
similarity index 100%
rename from src/Backends/SDL2/Controller.cpp
rename to src/Backends/Controller/SDL2.cpp
diff --git a/src/Backends/WiiU/Controller.cpp b/src/Backends/Controller/WiiU.cpp
similarity index 100%
rename from src/Backends/WiiU/Controller.cpp
rename to src/Backends/Controller/WiiU.cpp
diff --git a/src/Backends/GLFW3/Misc.cpp b/src/Backends/Platform/GLFW3.cpp
similarity index 100%
rename from src/Backends/GLFW3/Misc.cpp
rename to src/Backends/Platform/GLFW3.cpp
diff --git a/src/Backends/Null/Misc.cpp b/src/Backends/Platform/Null.cpp
similarity index 100%
rename from src/Backends/Null/Misc.cpp
rename to src/Backends/Platform/Null.cpp
diff --git a/src/Backends/SDL2/Misc.cpp b/src/Backends/Platform/SDL2.cpp
similarity index 100%
rename from src/Backends/SDL2/Misc.cpp
rename to src/Backends/Platform/SDL2.cpp
diff --git a/src/Backends/WiiU/Misc.cpp b/src/Backends/Platform/WiiU.cpp
similarity index 100%
rename from src/Backends/WiiU/Misc.cpp
rename to src/Backends/Platform/WiiU.cpp
diff --git a/src/Backends/WiiU/shaders/colour_fill.gsh.h b/src/Backends/Rendering/WiiUShaders/colour_fill.gsh.h
similarity index 100%
rename from src/Backends/WiiU/shaders/colour_fill.gsh.h
rename to src/Backends/Rendering/WiiUShaders/colour_fill.gsh.h
diff --git a/src/Backends/WiiU/shaders/glyph.gsh.h b/src/Backends/Rendering/WiiUShaders/glyph.gsh.h
similarity index 100%
rename from src/Backends/WiiU/shaders/glyph.gsh.h
rename to src/Backends/Rendering/WiiUShaders/glyph.gsh.h
diff --git a/src/Backends/WiiU/shaders/shader sources/colour_fill.frag b/src/Backends/Rendering/WiiUShaders/shader sources/colour_fill.frag
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/colour_fill.frag
rename to src/Backends/Rendering/WiiUShaders/shader sources/colour_fill.frag
diff --git a/src/Backends/WiiU/shaders/shader sources/colour_fill.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/colour_fill.gsh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/colour_fill.gsh
rename to src/Backends/Rendering/WiiUShaders/shader sources/colour_fill.gsh
diff --git a/src/Backends/WiiU/shaders/shader sources/colour_fill.psh b/src/Backends/Rendering/WiiUShaders/shader sources/colour_fill.psh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/colour_fill.psh
rename to src/Backends/Rendering/WiiUShaders/shader sources/colour_fill.psh
diff --git a/src/Backends/WiiU/shaders/shader sources/glyph.frag b/src/Backends/Rendering/WiiUShaders/shader sources/glyph.frag
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/glyph.frag
rename to src/Backends/Rendering/WiiUShaders/shader sources/glyph.frag
diff --git a/src/Backends/WiiU/shaders/shader sources/glyph.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/glyph.gsh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/glyph.gsh
rename to src/Backends/Rendering/WiiUShaders/shader sources/glyph.gsh
diff --git a/src/Backends/WiiU/shaders/shader sources/glyph.psh b/src/Backends/Rendering/WiiUShaders/shader sources/glyph.psh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/glyph.psh
rename to src/Backends/Rendering/WiiUShaders/shader sources/glyph.psh
diff --git a/src/Backends/WiiU/shaders/shader sources/plain.vert b/src/Backends/Rendering/WiiUShaders/shader sources/plain.vert
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/plain.vert
rename to src/Backends/Rendering/WiiUShaders/shader sources/plain.vert
diff --git a/src/Backends/WiiU/shaders/shader sources/plain.vsh b/src/Backends/Rendering/WiiUShaders/shader sources/plain.vsh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/plain.vsh
rename to src/Backends/Rendering/WiiUShaders/shader sources/plain.vsh
diff --git a/src/Backends/WiiU/shaders/shader sources/texture.frag b/src/Backends/Rendering/WiiUShaders/shader sources/texture.frag
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture.frag
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture.frag
diff --git a/src/Backends/WiiU/shaders/shader sources/texture.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture.gsh
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture.gsh
diff --git a/src/Backends/WiiU/shaders/shader sources/texture.psh b/src/Backends/Rendering/WiiUShaders/shader sources/texture.psh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture.psh
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture.psh
diff --git a/src/Backends/WiiU/shaders/shader sources/texture.vert b/src/Backends/Rendering/WiiUShaders/shader sources/texture.vert
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture.vert
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture.vert
diff --git a/src/Backends/WiiU/shaders/shader sources/texture.vsh b/src/Backends/Rendering/WiiUShaders/shader sources/texture.vsh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture.vsh
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture.vsh
diff --git a/src/Backends/WiiU/shaders/shader sources/texture_colour_key.frag b/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.frag
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture_colour_key.frag
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.frag
diff --git a/src/Backends/WiiU/shaders/shader sources/texture_colour_key.gsh b/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.gsh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture_colour_key.gsh
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.gsh
diff --git a/src/Backends/WiiU/shaders/shader sources/texture_colour_key.psh b/src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.psh
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/texture_colour_key.psh
rename to src/Backends/Rendering/WiiUShaders/shader sources/texture_colour_key.psh
diff --git a/src/Backends/WiiU/shaders/shader sources/wtf is this.txt b/src/Backends/Rendering/WiiUShaders/shader sources/wtf is this.txt
similarity index 100%
rename from src/Backends/WiiU/shaders/shader sources/wtf is this.txt
rename to src/Backends/Rendering/WiiUShaders/shader sources/wtf is this.txt
diff --git a/src/Backends/WiiU/shaders/texture.gsh.h b/src/Backends/Rendering/WiiUShaders/texture.gsh.h
similarity index 100%
rename from src/Backends/WiiU/shaders/texture.gsh.h
rename to src/Backends/Rendering/WiiUShaders/texture.gsh.h
diff --git a/src/Backends/WiiU/shaders/texture_colour_key.gsh.h b/src/Backends/Rendering/WiiUShaders/texture_colour_key.gsh.h
similarity index 100%
rename from src/Backends/WiiU/shaders/texture_colour_key.gsh.h
rename to src/Backends/Rendering/WiiUShaders/texture_colour_key.gsh.h
diff --git a/src/Backends/SDL2/Window.h b/src/Backends/SDL2/Window.h
deleted file mode 100644
index 31829946..00000000
--- a/src/Backends/SDL2/Window.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "SDL.h"
-
-extern SDL_Window *window;
diff --git a/src/Backends/GLFW3/Window.h b/src/Backends/Shared/GLFW3.h
similarity index 100%
rename from src/Backends/GLFW3/Window.h
rename to src/Backends/Shared/GLFW3.h
diff --git a/src/Backends/SDL2/Controller.h b/src/Backends/Shared/SDL2.h
similarity index 84%
rename from src/Backends/SDL2/Controller.h
rename to src/Backends/Shared/SDL2.h
index d0badba9..264c847c 100644
--- a/src/Backends/SDL2/Controller.h
+++ b/src/Backends/Shared/SDL2.h
@@ -2,5 +2,7 @@
 
 #include "SDL.h"
 
+extern SDL_Window *window;
+
 void ControllerBackend_JoystickConnect(Sint32 joystick_id);
 void ControllerBackend_JoystickDisconnect(Sint32 joystick_id);
diff --git a/src/Backends/GLFW3/Window-OpenGL3.cpp b/src/Backends/Window/GLFW3-OpenGL3.cpp
similarity index 100%
rename from src/Backends/GLFW3/Window-OpenGL3.cpp
rename to src/Backends/Window/GLFW3-OpenGL3.cpp
diff --git a/src/Backends/GLFW3/Window-OpenGLES2.cpp b/src/Backends/Window/GLFW3-OpenGLES2.cpp
similarity index 100%
rename from src/Backends/GLFW3/Window-OpenGLES2.cpp
rename to src/Backends/Window/GLFW3-OpenGLES2.cpp
diff --git a/src/Backends/GLFW3/Window-Software.cpp b/src/Backends/Window/GLFW3-Software.cpp
similarity index 100%
rename from src/Backends/GLFW3/Window-Software.cpp
rename to src/Backends/Window/GLFW3-Software.cpp
diff --git a/src/Backends/Null/Window-Software.cpp b/src/Backends/Window/Null-Software.cpp
similarity index 100%
rename from src/Backends/Null/Window-Software.cpp
rename to src/Backends/Window/Null-Software.cpp
diff --git a/src/Backends/SDL2/Window-OpenGL3.cpp b/src/Backends/Window/SDL2-OpenGL3.cpp
similarity index 100%
rename from src/Backends/SDL2/Window-OpenGL3.cpp
rename to src/Backends/Window/SDL2-OpenGL3.cpp
diff --git a/src/Backends/SDL2/Window-OpenGLES2.cpp b/src/Backends/Window/SDL2-OpenGLES2.cpp
similarity index 100%
rename from src/Backends/SDL2/Window-OpenGLES2.cpp
rename to src/Backends/Window/SDL2-OpenGLES2.cpp
diff --git a/src/Backends/SDL2/Window-Software.cpp b/src/Backends/Window/SDL2-Software.cpp
similarity index 100%
rename from src/Backends/SDL2/Window-Software.cpp
rename to src/Backends/Window/SDL2-Software.cpp
diff --git a/src/Backends/WiiU/Window-Software.cpp b/src/Backends/Window/WiiU-Software.cpp
similarity index 100%
rename from src/Backends/WiiU/Window-Software.cpp
rename to src/Backends/Window/WiiU-Software.cpp