From a7c72081039ca1c6bee6b18db44fe4e9ffaf4fb5 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 10 Sep 2013 23:12:54 -0400
Subject: [PATCH] Put Plugins/ in Core/, rename to VideoBackends

---
 Source/CMakeLists.txt                              |  1 -
 Source/Core/CMakeLists.txt                         |  1 +
 Source/Core/VideoBackends/CMakeLists.txt           |  5 +++++
 .../VideoBackends/D3D/D3D.vcxproj}                 | 14 ++++----------
 .../VideoBackends/D3D/D3D.vcxproj.filters}         |  0
 .../VideoBackends/D3D}/Src/D3DBase.cpp             |  0
 .../VideoBackends/D3D}/Src/D3DBase.h               |  0
 .../VideoBackends/D3D}/Src/D3DBlob.cpp             |  0
 .../VideoBackends/D3D}/Src/D3DBlob.h               |  0
 .../VideoBackends/D3D}/Src/D3DShader.cpp           |  0
 .../VideoBackends/D3D}/Src/D3DShader.h             |  0
 .../VideoBackends/D3D}/Src/D3DTexture.cpp          |  0
 .../VideoBackends/D3D}/Src/D3DTexture.h            |  0
 .../VideoBackends/D3D}/Src/D3DUtil.cpp             |  0
 .../VideoBackends/D3D}/Src/D3DUtil.h               |  0
 .../VideoBackends/D3D}/Src/FramebufferManager.cpp  |  0
 .../VideoBackends/D3D}/Src/FramebufferManager.h    |  0
 .../VideoBackends/D3D}/Src/GfxState.cpp            |  0
 .../VideoBackends/D3D}/Src/GfxState.h              |  0
 .../VideoBackends/D3D}/Src/Globals.h               |  0
 .../VideoBackends/D3D}/Src/LineGeometryShader.cpp  |  0
 .../VideoBackends/D3D}/Src/LineGeometryShader.h    |  0
 .../VideoBackends/D3D}/Src/NativeVertexFormat.cpp  |  0
 .../VideoBackends/D3D}/Src/PSTextureEncoder.cpp    |  0
 .../VideoBackends/D3D}/Src/PSTextureEncoder.h      |  0
 .../VideoBackends/D3D}/Src/PerfQuery.cpp           |  0
 .../VideoBackends/D3D}/Src/PerfQuery.h             |  0
 .../VideoBackends/D3D}/Src/PixelShaderCache.cpp    |  0
 .../VideoBackends/D3D}/Src/PixelShaderCache.h      |  0
 .../VideoBackends/D3D}/Src/PointGeometryShader.cpp |  0
 .../VideoBackends/D3D}/Src/PointGeometryShader.h   |  0
 .../VideoBackends/D3D}/Src/Render.cpp              |  0
 .../VideoBackends/D3D}/Src/Render.h                |  0
 .../VideoBackends/D3D}/Src/Television.cpp          |  0
 .../VideoBackends/D3D}/Src/Television.h            |  0
 .../VideoBackends/D3D}/Src/TextureCache.cpp        |  0
 .../VideoBackends/D3D}/Src/TextureCache.h          |  0
 .../VideoBackends/D3D}/Src/TextureEncoder.h        |  0
 .../VideoBackends/D3D}/Src/VertexManager.cpp       |  0
 .../VideoBackends/D3D}/Src/VertexManager.h         |  0
 .../VideoBackends/D3D}/Src/VertexShaderCache.cpp   |  0
 .../VideoBackends/D3D}/Src/VertexShaderCache.h     |  0
 .../VideoBackends/D3D}/Src/VideoBackend.h          |  0
 .../VideoBackends/D3D}/Src/XFBEncoder.cpp          |  0
 .../VideoBackends/D3D}/Src/XFBEncoder.h            |  0
 .../VideoBackends/D3D}/Src/main.cpp                |  0
 .../VideoBackends/D3D}/Src/main.h                  |  0
 .../VideoBackends/D3D}/Src/stdafx.cpp              |  0
 .../VideoBackends/D3D}/Src/stdafx.h                |  0
 .../VideoBackends/OGL}/CMakeLists.txt              |  0
 .../VideoBackends/OGL/OGL.vcxproj}                 | 10 ++--------
 .../VideoBackends/OGL/OGL.vcxproj.filters}         |  0
 .../VideoBackends/OGL}/Src/FramebufferManager.cpp  |  0
 .../VideoBackends/OGL}/Src/FramebufferManager.h    |  0
 .../VideoBackends/OGL}/Src/GLFunctions.cpp         |  0
 .../VideoBackends/OGL}/Src/GLFunctions.h           |  0
 .../VideoBackends/OGL}/Src/GLUtil.cpp              |  0
 .../VideoBackends/OGL}/Src/GLUtil.h                |  0
 .../VideoBackends/OGL}/Src/Globals.h               |  0
 .../VideoBackends/OGL}/Src/NativeVertexFormat.cpp  |  0
 .../VideoBackends/OGL}/Src/PerfQuery.cpp           |  0
 .../VideoBackends/OGL}/Src/PerfQuery.h             |  0
 .../VideoBackends/OGL}/Src/PixelShaderCache.cpp    |  0
 .../VideoBackends/OGL}/Src/PostProcessing.cpp      |  0
 .../VideoBackends/OGL}/Src/PostProcessing.h        |  0
 .../VideoBackends/OGL}/Src/ProgramShaderCache.cpp  |  0
 .../VideoBackends/OGL}/Src/ProgramShaderCache.h    |  0
 .../VideoBackends/OGL}/Src/RasterFont.cpp          |  0
 .../VideoBackends/OGL}/Src/RasterFont.h            |  0
 .../VideoBackends/OGL}/Src/Render.cpp              |  0
 .../VideoBackends/OGL}/Src/Render.h                |  0
 .../VideoBackends/OGL}/Src/SamplerCache.cpp        |  0
 .../VideoBackends/OGL}/Src/SamplerCache.h          |  0
 .../VideoBackends/OGL}/Src/StreamBuffer.cpp        |  0
 .../VideoBackends/OGL}/Src/StreamBuffer.h          |  0
 .../VideoBackends/OGL}/Src/TextureCache.cpp        |  0
 .../VideoBackends/OGL}/Src/TextureCache.h          |  0
 .../VideoBackends/OGL}/Src/TextureConverter.cpp    |  0
 .../VideoBackends/OGL}/Src/TextureConverter.h      |  0
 .../VideoBackends/OGL}/Src/VertexManager.cpp       |  0
 .../VideoBackends/OGL}/Src/VertexManager.h         |  0
 .../VideoBackends/OGL}/Src/VertexShaderCache.cpp   |  0
 .../VideoBackends/OGL}/Src/VideoBackend.h          |  0
 .../VideoBackends/OGL}/Src/main.cpp                |  0
 .../VideoBackends/OGL}/Src/main.h                  |  0
 .../VideoBackends/OGL}/Src/stdafx.cpp              |  0
 .../VideoBackends/OGL}/Src/stdafx.h                |  0
 .../VideoBackends/Software}/CMakeLists.txt         |  2 +-
 .../VideoBackends/Software/Software.vcxproj}       | 10 +++-------
 .../Software/Software.vcxproj.filters}             |  0
 .../VideoBackends/Software}/Src/BPMemLoader.cpp    |  0
 .../VideoBackends/Software}/Src/BPMemLoader.h      |  0
 .../VideoBackends/Software}/Src/CPMemLoader.cpp    |  0
 .../VideoBackends/Software}/Src/CPMemLoader.h      |  0
 .../VideoBackends/Software}/Src/Clipper.cpp        |  0
 .../VideoBackends/Software}/Src/Clipper.h          |  0
 .../VideoBackends/Software}/Src/DebugUtil.cpp      |  0
 .../VideoBackends/Software}/Src/DebugUtil.h        |  0
 .../VideoBackends/Software}/Src/EfbCopy.cpp        |  0
 .../VideoBackends/Software}/Src/EfbCopy.h          |  0
 .../VideoBackends/Software}/Src/EfbInterface.cpp   |  0
 .../VideoBackends/Software}/Src/EfbInterface.h     |  0
 .../VideoBackends/Software}/Src/HwRasterizer.cpp   |  0
 .../VideoBackends/Software}/Src/HwRasterizer.h     |  2 +-
 .../Software}/Src/NativeVertexFormat.h             |  0
 .../VideoBackends/Software}/Src/OpcodeDecoder.cpp  |  0
 .../VideoBackends/Software}/Src/OpcodeDecoder.h    |  0
 .../VideoBackends/Software}/Src/RasterFont.cpp     |  2 +-
 .../VideoBackends/Software}/Src/RasterFont.h       |  0
 .../VideoBackends/Software}/Src/Rasterizer.cpp     |  0
 .../VideoBackends/Software}/Src/Rasterizer.h       |  0
 .../Software}/Src/SWCommandProcessor.cpp           |  0
 .../Software}/Src/SWCommandProcessor.h             |  0
 .../VideoBackends/Software}/Src/SWPixelEngine.cpp  |  0
 .../VideoBackends/Software}/Src/SWPixelEngine.h    |  0
 .../VideoBackends/Software}/Src/SWRenderer.cpp     |  2 +-
 .../VideoBackends/Software}/Src/SWRenderer.h       |  0
 .../VideoBackends/Software}/Src/SWStatistics.cpp   |  0
 .../VideoBackends/Software}/Src/SWStatistics.h     |  0
 .../VideoBackends/Software}/Src/SWVertexLoader.cpp |  0
 .../VideoBackends/Software}/Src/SWVertexLoader.h   |  0
 .../VideoBackends/Software}/Src/SWVideoConfig.cpp  |  0
 .../VideoBackends/Software}/Src/SWVideoConfig.h    |  0
 .../VideoBackends/Software}/Src/SWmain.cpp         |  0
 .../VideoBackends/Software}/Src/SetupUnit.cpp      |  0
 .../VideoBackends/Software}/Src/SetupUnit.h        |  0
 .../VideoBackends/Software}/Src/Tev.cpp            |  0
 .../VideoBackends/Software}/Src/Tev.h              |  0
 .../VideoBackends/Software}/Src/TextureEncoder.cpp |  0
 .../VideoBackends/Software}/Src/TextureEncoder.h   |  0
 .../VideoBackends/Software}/Src/TextureSampler.cpp |  0
 .../VideoBackends/Software}/Src/TextureSampler.h   |  0
 .../VideoBackends/Software}/Src/TransformUnit.cpp  |  0
 .../VideoBackends/Software}/Src/TransformUnit.h    |  0
 .../VideoBackends/Software}/Src/Vec3.h             |  0
 .../VideoBackends/Software}/Src/VideoBackend.h     |  0
 .../Software}/Src/VideoConfigDialog.cpp            |  0
 .../Software}/Src/VideoConfigDialog.h              |  0
 .../VideoBackends/Software}/Src/XFMemLoader.cpp    |  0
 .../VideoBackends/Software}/Src/XFMemLoader.h      |  0
 .../VideoBackends/Software}/Src/stdafx.cpp         |  0
 .../VideoBackends/Software}/Src/stdafx.h           |  0
 Source/Core/VideoCommon/Src/VideoBackendBase.cpp   |  6 +++---
 Source/Dolphin_2010.sln                            |  6 +++---
 Source/Plugins/CMakeLists.txt                      |  5 -----
 145 files changed, 25 insertions(+), 41 deletions(-)
 create mode 100644 Source/Core/VideoBackends/CMakeLists.txt
 rename Source/{Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj => Core/VideoBackends/D3D/D3D.vcxproj} (95%)
 rename Source/{Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj.filters => Core/VideoBackends/D3D/D3D.vcxproj.filters} (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DBase.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DBase.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DBlob.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DBlob.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DShader.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DShader.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DTexture.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DTexture.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DUtil.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/D3DUtil.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/FramebufferManager.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/FramebufferManager.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/GfxState.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/GfxState.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/Globals.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/LineGeometryShader.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/LineGeometryShader.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/NativeVertexFormat.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PSTextureEncoder.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PSTextureEncoder.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PerfQuery.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PerfQuery.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PixelShaderCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PixelShaderCache.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PointGeometryShader.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/PointGeometryShader.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/Render.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/Render.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/Television.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/Television.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/TextureCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/TextureCache.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/TextureEncoder.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/VertexManager.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/VertexManager.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/VertexShaderCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/VertexShaderCache.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/VideoBackend.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/XFBEncoder.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/XFBEncoder.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/main.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/main.h (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/stdafx.cpp (100%)
 rename Source/{Plugins/Plugin_VideoDX11 => Core/VideoBackends/D3D}/Src/stdafx.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/CMakeLists.txt (100%)
 rename Source/{Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj => Core/VideoBackends/OGL/OGL.vcxproj} (95%)
 rename Source/{Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters => Core/VideoBackends/OGL/OGL.vcxproj.filters} (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/FramebufferManager.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/FramebufferManager.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/GLFunctions.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/GLFunctions.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/GLUtil.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/GLUtil.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/Globals.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/NativeVertexFormat.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/PerfQuery.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/PerfQuery.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/PixelShaderCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/PostProcessing.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/PostProcessing.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/ProgramShaderCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/ProgramShaderCache.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/RasterFont.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/RasterFont.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/Render.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/Render.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/SamplerCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/SamplerCache.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/StreamBuffer.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/StreamBuffer.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/TextureCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/TextureCache.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/TextureConverter.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/TextureConverter.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/VertexManager.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/VertexManager.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/VertexShaderCache.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/VideoBackend.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/main.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/main.h (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/stdafx.cpp (100%)
 rename Source/{Plugins/Plugin_VideoOGL => Core/VideoBackends/OGL}/Src/stdafx.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/CMakeLists.txt (95%)
 rename Source/{Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj => Core/VideoBackends/Software/Software.vcxproj} (96%)
 rename Source/{Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters => Core/VideoBackends/Software/Software.vcxproj.filters} (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/BPMemLoader.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/BPMemLoader.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/CPMemLoader.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/CPMemLoader.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/Clipper.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/Clipper.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/DebugUtil.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/DebugUtil.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/EfbCopy.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/EfbCopy.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/EfbInterface.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/EfbInterface.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/HwRasterizer.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/HwRasterizer.h (94%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/NativeVertexFormat.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/OpcodeDecoder.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/OpcodeDecoder.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/RasterFont.cpp (99%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/RasterFont.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/Rasterizer.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/Rasterizer.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWCommandProcessor.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWCommandProcessor.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWPixelEngine.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWPixelEngine.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWRenderer.cpp (99%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWRenderer.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWStatistics.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWStatistics.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWVertexLoader.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWVertexLoader.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWVideoConfig.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWVideoConfig.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SWmain.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SetupUnit.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/SetupUnit.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/Tev.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/Tev.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/TextureEncoder.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/TextureEncoder.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/TextureSampler.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/TextureSampler.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/TransformUnit.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/TransformUnit.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/Vec3.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/VideoBackend.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/VideoConfigDialog.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/VideoConfigDialog.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/XFMemLoader.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/XFMemLoader.h (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/stdafx.cpp (100%)
 rename Source/{Plugins/Plugin_VideoSoftware => Core/VideoBackends/Software}/Src/stdafx.h (100%)
 delete mode 100644 Source/Plugins/CMakeLists.txt

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 97f8642fe1..6c962873a7 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(Core)
-add_subdirectory(Plugins)
 
 if (DSPTOOL)
 	add_subdirectory(DSPTool)
diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt
index eec0afa3e5..7b4042b604 100644
--- a/Source/Core/CMakeLists.txt
+++ b/Source/Core/CMakeLists.txt
@@ -5,3 +5,4 @@ add_subdirectory(DiscIO)
 add_subdirectory(DolphinWX)
 add_subdirectory(InputCommon)
 add_subdirectory(VideoCommon)
+add_subdirectory(VideoBackends)
diff --git a/Source/Core/VideoBackends/CMakeLists.txt b/Source/Core/VideoBackends/CMakeLists.txt
new file mode 100644
index 0000000000..cb12f5fe55
--- /dev/null
+++ b/Source/Core/VideoBackends/CMakeLists.txt
@@ -0,0 +1,5 @@
+if(NOT USE_GLES OR USE_GLES3)
+	add_subdirectory(OGL)
+endif()
+add_subdirectory(Software)
+# TODO: Add other backends here!
diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj
similarity index 95%
rename from Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj
rename to Source/Core/VideoBackends/D3D/D3D.vcxproj
index aab9345ef7..3da8a83e1a 100644
--- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugFast|Win32">
@@ -28,8 +28,8 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9A4C733C-BADE-4AC6-B58A-6E274395E90E}</ProjectGuid>
-    <RootNamespace>Plugin_VideoDX11</RootNamespace>
-    <ProjectName>VideoDX11</ProjectName>
+    <RootNamespace>VideoD3D</RootNamespace>
+    <ProjectName>VideoD3D</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -122,7 +122,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -132,7 +131,6 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -144,7 +142,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
@@ -156,7 +153,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -168,7 +164,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
@@ -180,7 +175,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -246,4 +240,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj.filters
rename to Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp b/Source/Core/VideoBackends/D3D/Src/D3DBase.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp
rename to Source/Core/VideoBackends/D3D/Src/D3DBase.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h b/Source/Core/VideoBackends/D3D/Src/D3DBase.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h
rename to Source/Core/VideoBackends/D3D/Src/D3DBase.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp b/Source/Core/VideoBackends/D3D/Src/D3DBlob.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp
rename to Source/Core/VideoBackends/D3D/Src/D3DBlob.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h b/Source/Core/VideoBackends/D3D/Src/D3DBlob.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h
rename to Source/Core/VideoBackends/D3D/Src/D3DBlob.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp b/Source/Core/VideoBackends/D3D/Src/D3DShader.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp
rename to Source/Core/VideoBackends/D3D/Src/D3DShader.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h b/Source/Core/VideoBackends/D3D/Src/D3DShader.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h
rename to Source/Core/VideoBackends/D3D/Src/D3DShader.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp b/Source/Core/VideoBackends/D3D/Src/D3DTexture.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp
rename to Source/Core/VideoBackends/D3D/Src/D3DTexture.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h b/Source/Core/VideoBackends/D3D/Src/D3DTexture.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h
rename to Source/Core/VideoBackends/D3D/Src/D3DTexture.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp b/Source/Core/VideoBackends/D3D/Src/D3DUtil.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp
rename to Source/Core/VideoBackends/D3D/Src/D3DUtil.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h b/Source/Core/VideoBackends/D3D/Src/D3DUtil.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h
rename to Source/Core/VideoBackends/D3D/Src/D3DUtil.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/Src/FramebufferManager.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp
rename to Source/Core/VideoBackends/D3D/Src/FramebufferManager.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h b/Source/Core/VideoBackends/D3D/Src/FramebufferManager.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h
rename to Source/Core/VideoBackends/D3D/Src/FramebufferManager.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp b/Source/Core/VideoBackends/D3D/Src/GfxState.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp
rename to Source/Core/VideoBackends/D3D/Src/GfxState.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/GfxState.h b/Source/Core/VideoBackends/D3D/Src/GfxState.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/GfxState.h
rename to Source/Core/VideoBackends/D3D/Src/GfxState.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Globals.h b/Source/Core/VideoBackends/D3D/Src/Globals.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/Globals.h
rename to Source/Core/VideoBackends/D3D/Src/Globals.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp b/Source/Core/VideoBackends/D3D/Src/LineGeometryShader.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
rename to Source/Core/VideoBackends/D3D/Src/LineGeometryShader.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h b/Source/Core/VideoBackends/D3D/Src/LineGeometryShader.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.h
rename to Source/Core/VideoBackends/D3D/Src/LineGeometryShader.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/Src/NativeVertexFormat.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp
rename to Source/Core/VideoBackends/D3D/Src/NativeVertexFormat.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/Src/PSTextureEncoder.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
rename to Source/Core/VideoBackends/D3D/Src/PSTextureEncoder.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/Src/PSTextureEncoder.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.h
rename to Source/Core/VideoBackends/D3D/Src/PSTextureEncoder.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp b/Source/Core/VideoBackends/D3D/Src/PerfQuery.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp
rename to Source/Core/VideoBackends/D3D/Src/PerfQuery.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.h b/Source/Core/VideoBackends/D3D/Src/PerfQuery.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.h
rename to Source/Core/VideoBackends/D3D/Src/PerfQuery.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/Src/PixelShaderCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
rename to Source/Core/VideoBackends/D3D/Src/PixelShaderCache.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Core/VideoBackends/D3D/Src/PixelShaderCache.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
rename to Source/Core/VideoBackends/D3D/Src/PixelShaderCache.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp b/Source/Core/VideoBackends/D3D/Src/PointGeometryShader.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
rename to Source/Core/VideoBackends/D3D/Src/PointGeometryShader.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h b/Source/Core/VideoBackends/D3D/Src/PointGeometryShader.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.h
rename to Source/Core/VideoBackends/D3D/Src/PointGeometryShader.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Core/VideoBackends/D3D/Src/Render.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
rename to Source/Core/VideoBackends/D3D/Src/Render.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.h b/Source/Core/VideoBackends/D3D/Src/Render.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/Render.h
rename to Source/Core/VideoBackends/D3D/Src/Render.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Television.cpp b/Source/Core/VideoBackends/D3D/Src/Television.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/Television.cpp
rename to Source/Core/VideoBackends/D3D/Src/Television.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Television.h b/Source/Core/VideoBackends/D3D/Src/Television.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/Television.h
rename to Source/Core/VideoBackends/D3D/Src/Television.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Core/VideoBackends/D3D/Src/TextureCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
rename to Source/Core/VideoBackends/D3D/Src/TextureCache.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h b/Source/Core/VideoBackends/D3D/Src/TextureCache.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
rename to Source/Core/VideoBackends/D3D/Src/TextureCache.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h b/Source/Core/VideoBackends/D3D/Src/TextureEncoder.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/TextureEncoder.h
rename to Source/Core/VideoBackends/D3D/Src/TextureEncoder.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Core/VideoBackends/D3D/Src/VertexManager.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
rename to Source/Core/VideoBackends/D3D/Src/VertexManager.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h b/Source/Core/VideoBackends/D3D/Src/VertexManager.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h
rename to Source/Core/VideoBackends/D3D/Src/VertexManager.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Core/VideoBackends/D3D/Src/VertexShaderCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
rename to Source/Core/VideoBackends/D3D/Src/VertexShaderCache.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Core/VideoBackends/D3D/Src/VertexShaderCache.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
rename to Source/Core/VideoBackends/D3D/Src/VertexShaderCache.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h b/Source/Core/VideoBackends/D3D/Src/VideoBackend.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
rename to Source/Core/VideoBackends/D3D/Src/VideoBackend.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp b/Source/Core/VideoBackends/D3D/Src/XFBEncoder.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.cpp
rename to Source/Core/VideoBackends/D3D/Src/XFBEncoder.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h b/Source/Core/VideoBackends/D3D/Src/XFBEncoder.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/XFBEncoder.h
rename to Source/Core/VideoBackends/D3D/Src/XFBEncoder.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Core/VideoBackends/D3D/Src/main.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/main.cpp
rename to Source/Core/VideoBackends/D3D/Src/main.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.h b/Source/Core/VideoBackends/D3D/Src/main.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/main.h
rename to Source/Core/VideoBackends/D3D/Src/main.h
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp b/Source/Core/VideoBackends/D3D/Src/stdafx.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/stdafx.cpp
rename to Source/Core/VideoBackends/D3D/Src/stdafx.cpp
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/stdafx.h b/Source/Core/VideoBackends/D3D/Src/stdafx.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoDX11/Src/stdafx.h
rename to Source/Core/VideoBackends/D3D/Src/stdafx.h
diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
rename to Source/Core/VideoBackends/OGL/CMakeLists.txt
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj
similarity index 95%
rename from Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
rename to Source/Core/VideoBackends/OGL/OGL.vcxproj
index 403aac2c30..ce2d6e5b01 100644
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugFast|Win32">
@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1909CD2D-1707-456F-86CA-0DF42A727C99}</ProjectGuid>
-    <RootNamespace>Plugin_VideoOGL</RootNamespace>
+    <RootNamespace>VideoOGL</RootNamespace>
     <ProjectName>VideoOGL</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -123,7 +123,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <Lib />
   </ItemDefinitionGroup>
@@ -135,7 +134,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <Lib />
   </ItemDefinitionGroup>
@@ -149,7 +147,6 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <Lib />
   </ItemDefinitionGroup>
@@ -163,7 +160,6 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <Lib />
   </ItemDefinitionGroup>
@@ -177,7 +173,6 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <Lib />
   </ItemDefinitionGroup>
@@ -191,7 +186,6 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <Lib />
   </ItemDefinitionGroup>
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
rename to Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
rename to Source/Core/VideoBackends/OGL/Src/FramebufferManager.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Core/VideoBackends/OGL/Src/FramebufferManager.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
rename to Source/Core/VideoBackends/OGL/Src/FramebufferManager.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp b/Source/Core/VideoBackends/OGL/Src/GLFunctions.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp
rename to Source/Core/VideoBackends/OGL/Src/GLFunctions.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h b/Source/Core/VideoBackends/OGL/Src/GLFunctions.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h
rename to Source/Core/VideoBackends/OGL/Src/GLFunctions.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Core/VideoBackends/OGL/Src/GLUtil.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
rename to Source/Core/VideoBackends/OGL/Src/GLUtil.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Core/VideoBackends/OGL/Src/GLUtil.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
rename to Source/Core/VideoBackends/OGL/Src/GLUtil.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.h b/Source/Core/VideoBackends/OGL/Src/Globals.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/Globals.h
rename to Source/Core/VideoBackends/OGL/Src/Globals.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
rename to Source/Core/VideoBackends/OGL/Src/NativeVertexFormat.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/Src/PerfQuery.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
rename to Source/Core/VideoBackends/OGL/Src/PerfQuery.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.h b/Source/Core/VideoBackends/OGL/Src/PerfQuery.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.h
rename to Source/Core/VideoBackends/OGL/Src/PerfQuery.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
rename to Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Core/VideoBackends/OGL/Src/PostProcessing.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
rename to Source/Core/VideoBackends/OGL/Src/PostProcessing.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h b/Source/Core/VideoBackends/OGL/Src/PostProcessing.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.h
rename to Source/Core/VideoBackends/OGL/Src/PostProcessing.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
rename to Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
rename to Source/Core/VideoBackends/OGL/Src/ProgramShaderCache.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Core/VideoBackends/OGL/Src/RasterFont.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
rename to Source/Core/VideoBackends/OGL/Src/RasterFont.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h b/Source/Core/VideoBackends/OGL/Src/RasterFont.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/RasterFont.h
rename to Source/Core/VideoBackends/OGL/Src/RasterFont.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Core/VideoBackends/OGL/Src/Render.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
rename to Source/Core/VideoBackends/OGL/Src/Render.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Core/VideoBackends/OGL/Src/Render.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/Render.h
rename to Source/Core/VideoBackends/OGL/Src/Render.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/Src/SamplerCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
rename to Source/Core/VideoBackends/OGL/Src/SamplerCache.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.h b/Source/Core/VideoBackends/OGL/Src/SamplerCache.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.h
rename to Source/Core/VideoBackends/OGL/Src/SamplerCache.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/Src/StreamBuffer.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
rename to Source/Core/VideoBackends/OGL/Src/StreamBuffer.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h b/Source/Core/VideoBackends/OGL/Src/StreamBuffer.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.h
rename to Source/Core/VideoBackends/OGL/Src/StreamBuffer.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Core/VideoBackends/OGL/Src/TextureCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
rename to Source/Core/VideoBackends/OGL/Src/TextureCache.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h b/Source/Core/VideoBackends/OGL/Src/TextureCache.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
rename to Source/Core/VideoBackends/OGL/Src/TextureCache.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
rename to Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h b/Source/Core/VideoBackends/OGL/Src/TextureConverter.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.h
rename to Source/Core/VideoBackends/OGL/Src/TextureConverter.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Core/VideoBackends/OGL/Src/VertexManager.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
rename to Source/Core/VideoBackends/OGL/Src/VertexManager.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h b/Source/Core/VideoBackends/OGL/Src/VertexManager.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/VertexManager.h
rename to Source/Core/VideoBackends/OGL/Src/VertexManager.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Core/VideoBackends/OGL/Src/VertexShaderCache.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
rename to Source/Core/VideoBackends/OGL/Src/VertexShaderCache.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h b/Source/Core/VideoBackends/OGL/Src/VideoBackend.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
rename to Source/Core/VideoBackends/OGL/Src/VideoBackend.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Core/VideoBackends/OGL/Src/main.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/main.cpp
rename to Source/Core/VideoBackends/OGL/Src/main.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.h b/Source/Core/VideoBackends/OGL/Src/main.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/main.h
rename to Source/Core/VideoBackends/OGL/Src/main.h
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp b/Source/Core/VideoBackends/OGL/Src/stdafx.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/stdafx.cpp
rename to Source/Core/VideoBackends/OGL/Src/stdafx.cpp
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/stdafx.h b/Source/Core/VideoBackends/OGL/Src/stdafx.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoOGL/Src/stdafx.h
rename to Source/Core/VideoBackends/OGL/Src/stdafx.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt
similarity index 95%
rename from Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
rename to Source/Core/VideoBackends/Software/CMakeLists.txt
index cda287f511..fd13be7f2e 100644
--- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
+++ b/Source/Core/VideoBackends/Software/CMakeLists.txt
@@ -36,7 +36,7 @@ if(USE_EGL)
 endif()
 
 if(USE_GLES)
-	set(SRCS ${SRCS} ../Plugin_VideoOGL/Src/GLUtil.cpp)
+	set(SRCS ${SRCS} ../OGL/Src/GLUtil.cpp)
 	set(LIBS ${LIBS}
 		GLESv2)
 else()
diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj
similarity index 96%
rename from Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
rename to Source/Core/VideoBackends/Software/Software.vcxproj
index 0f18d096f8..ba09c4a80e 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
+++ b/Source/Core/VideoBackends/Software/Software.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugFast|Win32">
@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9E9DA440-E9AD-413C-B648-91030E792211}</ProjectGuid>
-    <RootNamespace>Plugin_VideoSoftware</RootNamespace>
+    <RootNamespace>VideoSoftware</RootNamespace>
     <ProjectName>VideoSoftware</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -121,7 +121,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>opengl32.lib;glew32s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -132,7 +131,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>opengl32.lib;glew64s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -145,7 +143,6 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glew32s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -158,7 +155,6 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glew64s.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\Externals\GLew;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <OutputFile>..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
@@ -245,4 +241,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters b/Source/Core/VideoBackends/Software/Software.vcxproj.filters
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters
rename to Source/Core/VideoBackends/Software/Software.vcxproj.filters
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/Src/BPMemLoader.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
rename to Source/Core/VideoBackends/Software/Src/BPMemLoader.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h b/Source/Core/VideoBackends/Software/Src/BPMemLoader.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.h
rename to Source/Core/VideoBackends/Software/Src/BPMemLoader.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp b/Source/Core/VideoBackends/Software/Src/CPMemLoader.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp
rename to Source/Core/VideoBackends/Software/Src/CPMemLoader.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h b/Source/Core/VideoBackends/Software/Src/CPMemLoader.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.h
rename to Source/Core/VideoBackends/Software/Src/CPMemLoader.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp b/Source/Core/VideoBackends/Software/Src/Clipper.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
rename to Source/Core/VideoBackends/Software/Src/Clipper.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h b/Source/Core/VideoBackends/Software/Src/Clipper.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Clipper.h
rename to Source/Core/VideoBackends/Software/Src/Clipper.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp b/Source/Core/VideoBackends/Software/Src/DebugUtil.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
rename to Source/Core/VideoBackends/Software/Src/DebugUtil.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h b/Source/Core/VideoBackends/Software/Src/DebugUtil.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.h
rename to Source/Core/VideoBackends/Software/Src/DebugUtil.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Core/VideoBackends/Software/Src/EfbCopy.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
rename to Source/Core/VideoBackends/Software/Src/EfbCopy.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h b/Source/Core/VideoBackends/Software/Src/EfbCopy.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.h
rename to Source/Core/VideoBackends/Software/Src/EfbCopy.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp b/Source/Core/VideoBackends/Software/Src/EfbInterface.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.cpp
rename to Source/Core/VideoBackends/Software/Src/EfbInterface.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h b/Source/Core/VideoBackends/Software/Src/EfbInterface.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/EfbInterface.h
rename to Source/Core/VideoBackends/Software/Src/EfbInterface.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Core/VideoBackends/Software/Src/HwRasterizer.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp
rename to Source/Core/VideoBackends/Software/Src/HwRasterizer.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h b/Source/Core/VideoBackends/Software/Src/HwRasterizer.h
similarity index 94%
rename from Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h
rename to Source/Core/VideoBackends/Software/Src/HwRasterizer.h
index 250b951175..ac0892841f 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h
+++ b/Source/Core/VideoBackends/Software/Src/HwRasterizer.h
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "BPMemLoader.h"
-#include "../../Plugin_VideoOGL/Src/GLUtil.h"
+#include "../../OGL/Src/GLUtil.h"
 
 struct OutputVertexData;
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h b/Source/Core/VideoBackends/Software/Src/NativeVertexFormat.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/NativeVertexFormat.h
rename to Source/Core/VideoBackends/Software/Src/NativeVertexFormat.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/Src/OpcodeDecoder.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
rename to Source/Core/VideoBackends/Software/Src/OpcodeDecoder.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h b/Source/Core/VideoBackends/Software/Src/OpcodeDecoder.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h
rename to Source/Core/VideoBackends/Software/Src/OpcodeDecoder.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp b/Source/Core/VideoBackends/Software/Src/RasterFont.cpp
similarity index 99%
rename from Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp
rename to Source/Core/VideoBackends/Software/Src/RasterFont.cpp
index 2170d52137..77ac1cf077 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.cpp
+++ b/Source/Core/VideoBackends/Software/Src/RasterFont.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../../Plugin_VideoOGL/Src/GLUtil.h"
+#include "../../OGL/Src/GLUtil.h"
 
 #include <string.h>
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h b/Source/Core/VideoBackends/Software/Src/RasterFont.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/RasterFont.h
rename to Source/Core/VideoBackends/Software/Src/RasterFont.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Src/Rasterizer.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
rename to Source/Core/VideoBackends/Software/Src/Rasterizer.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h b/Source/Core/VideoBackends/Software/Src/Rasterizer.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.h
rename to Source/Core/VideoBackends/Software/Src/Rasterizer.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/Src/SWCommandProcessor.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.cpp
rename to Source/Core/VideoBackends/Software/Src/SWCommandProcessor.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/Src/SWCommandProcessor.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWCommandProcessor.h
rename to Source/Core/VideoBackends/Software/Src/SWCommandProcessor.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp b/Source/Core/VideoBackends/Software/Src/SWPixelEngine.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.cpp
rename to Source/Core/VideoBackends/Software/Src/SWPixelEngine.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h b/Source/Core/VideoBackends/Software/Src/SWPixelEngine.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWPixelEngine.h
rename to Source/Core/VideoBackends/Software/Src/SWPixelEngine.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp
similarity index 99%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
rename to Source/Core/VideoBackends/Software/Src/SWRenderer.cpp
index ad47a1a777..d9715481fc 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/Src/SWRenderer.cpp
@@ -5,7 +5,7 @@
 #include "Common.h"
 #include <math.h>
 
-#include "../../Plugin_VideoOGL/Src/GLUtil.h"
+#include "../../OGL/Src/GLUtil.h"
 #include "RasterFont.h"
 #include "SWRenderer.h"
 #include "SWStatistics.h"
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h b/Source/Core/VideoBackends/Software/Src/SWRenderer.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.h
rename to Source/Core/VideoBackends/Software/Src/SWRenderer.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp b/Source/Core/VideoBackends/Software/Src/SWStatistics.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.cpp
rename to Source/Core/VideoBackends/Software/Src/SWStatistics.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h b/Source/Core/VideoBackends/Software/Src/SWStatistics.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWStatistics.h
rename to Source/Core/VideoBackends/Software/Src/SWStatistics.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/Src/SWVertexLoader.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.cpp
rename to Source/Core/VideoBackends/Software/Src/SWVertexLoader.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h b/Source/Core/VideoBackends/Software/Src/SWVertexLoader.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWVertexLoader.h
rename to Source/Core/VideoBackends/Software/Src/SWVertexLoader.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
rename to Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h b/Source/Core/VideoBackends/Software/Src/SWVideoConfig.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
rename to Source/Core/VideoBackends/Software/Src/SWVideoConfig.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Core/VideoBackends/Software/Src/SWmain.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
rename to Source/Core/VideoBackends/Software/Src/SWmain.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp b/Source/Core/VideoBackends/Software/Src/SetupUnit.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.cpp
rename to Source/Core/VideoBackends/Software/Src/SetupUnit.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h b/Source/Core/VideoBackends/Software/Src/SetupUnit.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/SetupUnit.h
rename to Source/Core/VideoBackends/Software/Src/SetupUnit.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp b/Source/Core/VideoBackends/Software/Src/Tev.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
rename to Source/Core/VideoBackends/Software/Src/Tev.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Tev.h b/Source/Core/VideoBackends/Software/Src/Tev.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Tev.h
rename to Source/Core/VideoBackends/Software/Src/Tev.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/Src/TextureEncoder.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp
rename to Source/Core/VideoBackends/Software/Src/TextureEncoder.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h b/Source/Core/VideoBackends/Software/Src/TextureEncoder.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.h
rename to Source/Core/VideoBackends/Software/Src/TextureEncoder.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Core/VideoBackends/Software/Src/TextureSampler.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
rename to Source/Core/VideoBackends/Software/Src/TextureSampler.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h b/Source/Core/VideoBackends/Software/Src/TextureSampler.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.h
rename to Source/Core/VideoBackends/Software/Src/TextureSampler.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp b/Source/Core/VideoBackends/Software/Src/TransformUnit.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.cpp
rename to Source/Core/VideoBackends/Software/Src/TransformUnit.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h b/Source/Core/VideoBackends/Software/Src/TransformUnit.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/TransformUnit.h
rename to Source/Core/VideoBackends/Software/Src/TransformUnit.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h b/Source/Core/VideoBackends/Software/Src/Vec3.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/Vec3.h
rename to Source/Core/VideoBackends/Software/Src/Vec3.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Core/VideoBackends/Software/Src/VideoBackend.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
rename to Source/Core/VideoBackends/Software/Src/VideoBackend.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp b/Source/Core/VideoBackends/Software/Src/VideoConfigDialog.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.cpp
rename to Source/Core/VideoBackends/Software/Src/VideoConfigDialog.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h b/Source/Core/VideoBackends/Software/Src/VideoConfigDialog.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
rename to Source/Core/VideoBackends/Software/Src/VideoConfigDialog.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp b/Source/Core/VideoBackends/Software/Src/XFMemLoader.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp
rename to Source/Core/VideoBackends/Software/Src/XFMemLoader.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h b/Source/Core/VideoBackends/Software/Src/XFMemLoader.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
rename to Source/Core/VideoBackends/Software/Src/XFMemLoader.h
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp b/Source/Core/VideoBackends/Software/Src/stdafx.cpp
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/stdafx.cpp
rename to Source/Core/VideoBackends/Software/Src/stdafx.cpp
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h b/Source/Core/VideoBackends/Software/Src/stdafx.h
similarity index 100%
rename from Source/Plugins/Plugin_VideoSoftware/Src/stdafx.h
rename to Source/Core/VideoBackends/Software/Src/stdafx.h
diff --git a/Source/Core/VideoCommon/Src/VideoBackendBase.cpp b/Source/Core/VideoCommon/Src/VideoBackendBase.cpp
index 13d85c2e37..72947182fd 100644
--- a/Source/Core/VideoCommon/Src/VideoBackendBase.cpp
+++ b/Source/Core/VideoCommon/Src/VideoBackendBase.cpp
@@ -6,12 +6,12 @@
 
 // TODO: ugly
 #ifdef _WIN32
-#include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h"
+#include "../../VideoBackends/D3D/Src/VideoBackend.h"
 #endif
 #if !defined(USE_GLES) || USE_GLES3
-#include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h"
+#include "../../VideoBackends/OGL/Src/VideoBackend.h"
 #endif
-#include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h"
+#include "../../VideoBackends/Software/Src/VideoBackend.h"
 
 std::vector<VideoBackend*> g_available_video_backends;
 VideoBackend* g_video_backend = NULL;
diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln
index ffa7dee930..f5201ab56c 100644
--- a/Source/Dolphin_2010.sln
+++ b/Source/Dolphin_2010.sln
@@ -64,19 +64,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscI
 		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoD3D", "Core\VideoBackends\D3D\D3D.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
 		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Core\VideoBackends\OGL\OGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
 		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Core\VideoBackends\Software\Software.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
 	EndProjectSection
diff --git a/Source/Plugins/CMakeLists.txt b/Source/Plugins/CMakeLists.txt
deleted file mode 100644
index 3a58c3aab1..0000000000
--- a/Source/Plugins/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-if(NOT USE_GLES OR USE_GLES3)
-	add_subdirectory(Plugin_VideoOGL)
-endif()
-add_subdirectory(Plugin_VideoSoftware)
-# TODO: Add other backends here!