diff --git a/BlockFile.cpp b/Src/BlockFile.cpp
similarity index 100%
rename from BlockFile.cpp
rename to Src/BlockFile.cpp
diff --git a/BlockFile.h b/Src/BlockFile.h
similarity index 100%
rename from BlockFile.h
rename to Src/BlockFile.h
diff --git a/CPU/68K/Make68K.c b/Src/CPU/68K/Make68K.c
similarity index 100%
rename from CPU/68K/Make68K.c
rename to Src/CPU/68K/Make68K.c
diff --git a/CPU/68K/README.TXT b/Src/CPU/68K/README.TXT
similarity index 100%
rename from CPU/68K/README.TXT
rename to Src/CPU/68K/README.TXT
diff --git a/CPU/68K/Turbo68K.h b/Src/CPU/68K/Turbo68K.h
similarity index 100%
rename from CPU/68K/Turbo68K.h
rename to Src/CPU/68K/Turbo68K.h
diff --git a/CPU/PowerPC/PPCDisasm.cpp b/Src/CPU/PowerPC/PPCDisasm.cpp
similarity index 100%
rename from CPU/PowerPC/PPCDisasm.cpp
rename to Src/CPU/PowerPC/PPCDisasm.cpp
diff --git a/CPU/PowerPC/PPCDisasm.h b/Src/CPU/PowerPC/PPCDisasm.h
similarity index 100%
rename from CPU/PowerPC/PPCDisasm.h
rename to Src/CPU/PowerPC/PPCDisasm.h
diff --git a/CPU/PowerPC/ppc.cpp b/Src/CPU/PowerPC/ppc.cpp
similarity index 100%
rename from CPU/PowerPC/ppc.cpp
rename to Src/CPU/PowerPC/ppc.cpp
diff --git a/CPU/PowerPC/ppc.h b/Src/CPU/PowerPC/ppc.h
similarity index 100%
rename from CPU/PowerPC/ppc.h
rename to Src/CPU/PowerPC/ppc.h
diff --git a/CPU/PowerPC/ppc603.c b/Src/CPU/PowerPC/ppc603.c
similarity index 100%
rename from CPU/PowerPC/ppc603.c
rename to Src/CPU/PowerPC/ppc603.c
diff --git a/CPU/PowerPC/ppc_ops.c b/Src/CPU/PowerPC/ppc_ops.c
similarity index 100%
rename from CPU/PowerPC/ppc_ops.c
rename to Src/CPU/PowerPC/ppc_ops.c
diff --git a/CPU/PowerPC/ppc_ops.h b/Src/CPU/PowerPC/ppc_ops.h
similarity index 100%
rename from CPU/PowerPC/ppc_ops.h
rename to Src/CPU/PowerPC/ppc_ops.h
diff --git a/Games.cpp b/Src/Games.cpp
similarity index 100%
rename from Games.cpp
rename to Src/Games.cpp
diff --git a/Games.h b/Src/Games.h
similarity index 100%
rename from Games.h
rename to Src/Games.h
diff --git a/Graphics/Error.cpp b/Src/Graphics/Error.cpp
similarity index 100%
rename from Graphics/Error.cpp
rename to Src/Graphics/Error.cpp
diff --git a/Graphics/Models.cpp b/Src/Graphics/Models.cpp
similarity index 100%
rename from Graphics/Models.cpp
rename to Src/Graphics/Models.cpp
diff --git a/Graphics/Render.h b/Src/Graphics/Render.h
similarity index 100%
rename from Graphics/Render.h
rename to Src/Graphics/Render.h
diff --git a/Graphics/Render2D.cpp b/Src/Graphics/Render2D.cpp
similarity index 100%
rename from Graphics/Render2D.cpp
rename to Src/Graphics/Render2D.cpp
diff --git a/Graphics/Render2D.h b/Src/Graphics/Render2D.h
similarity index 100%
rename from Graphics/Render2D.h
rename to Src/Graphics/Render2D.h
diff --git a/Graphics/Render3D.cpp b/Src/Graphics/Render3D.cpp
similarity index 100%
rename from Graphics/Render3D.cpp
rename to Src/Graphics/Render3D.cpp
diff --git a/Graphics/Render3D.h b/Src/Graphics/Render3D.h
similarity index 100%
rename from Graphics/Render3D.h
rename to Src/Graphics/Render3D.h
diff --git a/Graphics/Shader.cpp b/Src/Graphics/Shader.cpp
similarity index 100%
rename from Graphics/Shader.cpp
rename to Src/Graphics/Shader.cpp
diff --git a/Graphics/Shader.h b/Src/Graphics/Shader.h
similarity index 100%
rename from Graphics/Shader.h
rename to Src/Graphics/Shader.h
diff --git a/Graphics/Shaders/DIR.txt b/Src/Graphics/Shaders/DIR.txt
similarity index 100%
rename from Graphics/Shaders/DIR.txt
rename to Src/Graphics/Shaders/DIR.txt
diff --git a/Graphics/Shaders/Fragment.glsl b/Src/Graphics/Shaders/Fragment.glsl
similarity index 100%
rename from Graphics/Shaders/Fragment.glsl
rename to Src/Graphics/Shaders/Fragment.glsl
diff --git a/Graphics/Shaders/Fragment2D.glsl b/Src/Graphics/Shaders/Fragment2D.glsl
similarity index 100%
rename from Graphics/Shaders/Fragment2D.glsl
rename to Src/Graphics/Shaders/Fragment2D.glsl
diff --git a/Graphics/Shaders/Fragment_Flat.glsl b/Src/Graphics/Shaders/Fragment_Flat.glsl
similarity index 100%
rename from Graphics/Shaders/Fragment_Flat.glsl
rename to Src/Graphics/Shaders/Fragment_Flat.glsl
diff --git a/Graphics/Shaders/Fragment_NoSpotlight.glsl b/Src/Graphics/Shaders/Fragment_NoSpotlight.glsl
similarity index 100%
rename from Graphics/Shaders/Fragment_NoSpotlight.glsl
rename to Src/Graphics/Shaders/Fragment_NoSpotlight.glsl
diff --git a/Graphics/Shaders/Vertex.glsl b/Src/Graphics/Shaders/Vertex.glsl
similarity index 100%
rename from Graphics/Shaders/Vertex.glsl
rename to Src/Graphics/Shaders/Vertex.glsl
diff --git a/Graphics/Shaders/Vertex2D.glsl b/Src/Graphics/Shaders/Vertex2D.glsl
similarity index 100%
rename from Graphics/Shaders/Vertex2D.glsl
rename to Src/Graphics/Shaders/Vertex2D.glsl
diff --git a/Graphics/Shaders2D.h b/Src/Graphics/Shaders2D.h
similarity index 100%
rename from Graphics/Shaders2D.h
rename to Src/Graphics/Shaders2D.h
diff --git a/Graphics/Shaders3D.h b/Src/Graphics/Shaders3D.h
similarity index 100%
rename from Graphics/Shaders3D.h
rename to Src/Graphics/Shaders3D.h
diff --git a/INIFile.cpp b/Src/INIFile.cpp
similarity index 100%
rename from INIFile.cpp
rename to Src/INIFile.cpp
diff --git a/INIFile.h b/Src/INIFile.h
similarity index 100%
rename from INIFile.h
rename to Src/INIFile.h
diff --git a/Inputs/Input.cpp b/Src/Inputs/Input.cpp
similarity index 100%
rename from Inputs/Input.cpp
rename to Src/Inputs/Input.cpp
diff --git a/Inputs/Input.h b/Src/Inputs/Input.h
similarity index 100%
rename from Inputs/Input.h
rename to Src/Inputs/Input.h
diff --git a/Inputs/InputSource.cpp b/Src/Inputs/InputSource.cpp
similarity index 100%
rename from Inputs/InputSource.cpp
rename to Src/Inputs/InputSource.cpp
diff --git a/Inputs/InputSource.h b/Src/Inputs/InputSource.h
similarity index 100%
rename from Inputs/InputSource.h
rename to Src/Inputs/InputSource.h
diff --git a/Inputs/InputSystem.cpp b/Src/Inputs/InputSystem.cpp
similarity index 100%
rename from Inputs/InputSystem.cpp
rename to Src/Inputs/InputSystem.cpp
diff --git a/Inputs/InputSystem.h b/Src/Inputs/InputSystem.h
similarity index 100%
rename from Inputs/InputSystem.h
rename to Src/Inputs/InputSystem.h
diff --git a/Inputs/InputTypes.cpp b/Src/Inputs/InputTypes.cpp
similarity index 100%
rename from Inputs/InputTypes.cpp
rename to Src/Inputs/InputTypes.cpp
diff --git a/Inputs/InputTypes.h b/Src/Inputs/InputTypes.h
similarity index 100%
rename from Inputs/InputTypes.h
rename to Src/Inputs/InputTypes.h
diff --git a/Inputs/Inputs.cpp b/Src/Inputs/Inputs.cpp
similarity index 100%
rename from Inputs/Inputs.cpp
rename to Src/Inputs/Inputs.cpp
diff --git a/Inputs/Inputs.h b/Src/Inputs/Inputs.h
similarity index 100%
rename from Inputs/Inputs.h
rename to Src/Inputs/Inputs.h
diff --git a/Inputs/MultiInputSource.cpp b/Src/Inputs/MultiInputSource.cpp
similarity index 100%
rename from Inputs/MultiInputSource.cpp
rename to Src/Inputs/MultiInputSource.cpp
diff --git a/Inputs/MultiInputSource.h b/Src/Inputs/MultiInputSource.h
similarity index 100%
rename from Inputs/MultiInputSource.h
rename to Src/Inputs/MultiInputSource.h
diff --git a/Model3/53C810.cpp b/Src/Model3/53C810.cpp
similarity index 100%
rename from Model3/53C810.cpp
rename to Src/Model3/53C810.cpp
diff --git a/Model3/53C810.h b/Src/Model3/53C810.h
similarity index 100%
rename from Model3/53C810.h
rename to Src/Model3/53C810.h
diff --git a/Model3/53C810Disasm.cpp b/Src/Model3/53C810Disasm.cpp
similarity index 100%
rename from Model3/53C810Disasm.cpp
rename to Src/Model3/53C810Disasm.cpp
diff --git a/Model3/93C46.cpp b/Src/Model3/93C46.cpp
similarity index 100%
rename from Model3/93C46.cpp
rename to Src/Model3/93C46.cpp
diff --git a/Model3/93C46.h b/Src/Model3/93C46.h
similarity index 100%
rename from Model3/93C46.h
rename to Src/Model3/93C46.h
diff --git a/Model3/Bus.h b/Src/Model3/Bus.h
similarity index 100%
rename from Model3/Bus.h
rename to Src/Model3/Bus.h
diff --git a/Model3/IRQ.cpp b/Src/Model3/IRQ.cpp
similarity index 100%
rename from Model3/IRQ.cpp
rename to Src/Model3/IRQ.cpp
diff --git a/Model3/IRQ.h b/Src/Model3/IRQ.h
similarity index 100%
rename from Model3/IRQ.h
rename to Src/Model3/IRQ.h
diff --git a/Model3/MPC10x.cpp b/Src/Model3/MPC10x.cpp
similarity index 100%
rename from Model3/MPC10x.cpp
rename to Src/Model3/MPC10x.cpp
diff --git a/Model3/MPC10x.h b/Src/Model3/MPC10x.h
similarity index 100%
rename from Model3/MPC10x.h
rename to Src/Model3/MPC10x.h
diff --git a/Model3/Model3.cpp b/Src/Model3/Model3.cpp
similarity index 100%
rename from Model3/Model3.cpp
rename to Src/Model3/Model3.cpp
diff --git a/Model3/Model3.h b/Src/Model3/Model3.h
similarity index 100%
rename from Model3/Model3.h
rename to Src/Model3/Model3.h
diff --git a/Model3/PCI.cpp b/Src/Model3/PCI.cpp
similarity index 100%
rename from Model3/PCI.cpp
rename to Src/Model3/PCI.cpp
diff --git a/Model3/PCI.h b/Src/Model3/PCI.h
similarity index 100%
rename from Model3/PCI.h
rename to Src/Model3/PCI.h
diff --git a/Model3/RTC72421.cpp b/Src/Model3/RTC72421.cpp
similarity index 100%
rename from Model3/RTC72421.cpp
rename to Src/Model3/RTC72421.cpp
diff --git a/Model3/RTC72421.h b/Src/Model3/RTC72421.h
similarity index 100%
rename from Model3/RTC72421.h
rename to Src/Model3/RTC72421.h
diff --git a/Model3/Real3D.cpp b/Src/Model3/Real3D.cpp
similarity index 100%
rename from Model3/Real3D.cpp
rename to Src/Model3/Real3D.cpp
diff --git a/Model3/Real3D.h b/Src/Model3/Real3D.h
similarity index 100%
rename from Model3/Real3D.h
rename to Src/Model3/Real3D.h
diff --git a/Model3/SoundBoard.cpp b/Src/Model3/SoundBoard.cpp
similarity index 100%
rename from Model3/SoundBoard.cpp
rename to Src/Model3/SoundBoard.cpp
diff --git a/Model3/SoundBoard.h b/Src/Model3/SoundBoard.h
similarity index 100%
rename from Model3/SoundBoard.h
rename to Src/Model3/SoundBoard.h
diff --git a/Model3/TileGen.cpp b/Src/Model3/TileGen.cpp
similarity index 100%
rename from Model3/TileGen.cpp
rename to Src/Model3/TileGen.cpp
diff --git a/Model3/TileGen.h b/Src/Model3/TileGen.h
similarity index 100%
rename from Model3/TileGen.h
rename to Src/Model3/TileGen.h
diff --git a/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp
similarity index 100%
rename from OSD/SDL/Main.cpp
rename to Src/OSD/SDL/Main.cpp
diff --git a/OSD/SDL/SDLInputSystem.cpp b/Src/OSD/SDL/SDLInputSystem.cpp
similarity index 100%
rename from OSD/SDL/SDLInputSystem.cpp
rename to Src/OSD/SDL/SDLInputSystem.cpp
diff --git a/OSD/SDL/SDLInputSystem.h b/Src/OSD/SDL/SDLInputSystem.h
similarity index 100%
rename from OSD/SDL/SDLInputSystem.h
rename to Src/OSD/SDL/SDLInputSystem.h
diff --git a/OSD/SDL/SDLMain_tmpl.h b/Src/OSD/SDL/SDLMain_tmpl.h
similarity index 100%
rename from OSD/SDL/SDLMain_tmpl.h
rename to Src/OSD/SDL/SDLMain_tmpl.h
diff --git a/OSD/SDL/SDLMain_tmpl.m b/Src/OSD/SDL/SDLMain_tmpl.m
similarity index 100%
rename from OSD/SDL/SDLMain_tmpl.m
rename to Src/OSD/SDL/SDLMain_tmpl.m
diff --git a/OSD/SDL/Types.h b/Src/OSD/SDL/Types.h
similarity index 100%
rename from OSD/SDL/Types.h
rename to Src/OSD/SDL/Types.h
diff --git a/OSD/Windows/DirectInputSystem.cpp b/Src/OSD/Windows/DirectInputSystem.cpp
similarity index 100%
rename from OSD/Windows/DirectInputSystem.cpp
rename to Src/OSD/Windows/DirectInputSystem.cpp
diff --git a/OSD/Windows/DirectInputSystem.h b/Src/OSD/Windows/DirectInputSystem.h
similarity index 100%
rename from OSD/Windows/DirectInputSystem.h
rename to Src/OSD/Windows/DirectInputSystem.h
diff --git a/Pkgs/glew.c b/Src/Pkgs/glew.c
similarity index 100%
rename from Pkgs/glew.c
rename to Src/Pkgs/glew.c
diff --git a/Pkgs/glew.h b/Src/Pkgs/glew.h
similarity index 100%
rename from Pkgs/glew.h
rename to Src/Pkgs/glew.h
diff --git a/Pkgs/glxew.h b/Src/Pkgs/glxew.h
similarity index 100%
rename from Pkgs/glxew.h
rename to Src/Pkgs/glxew.h
diff --git a/Pkgs/ioapi.c b/Src/Pkgs/ioapi.c
similarity index 100%
rename from Pkgs/ioapi.c
rename to Src/Pkgs/ioapi.c
diff --git a/Pkgs/ioapi.h b/Src/Pkgs/ioapi.h
similarity index 100%
rename from Pkgs/ioapi.h
rename to Src/Pkgs/ioapi.h
diff --git a/Pkgs/unzip.c b/Src/Pkgs/unzip.c
similarity index 100%
rename from Pkgs/unzip.c
rename to Src/Pkgs/unzip.c
diff --git a/Pkgs/unzip.h b/Src/Pkgs/unzip.h
similarity index 100%
rename from Pkgs/unzip.h
rename to Src/Pkgs/unzip.h
diff --git a/Pkgs/wglew.h b/Src/Pkgs/wglew.h
similarity index 100%
rename from Pkgs/wglew.h
rename to Src/Pkgs/wglew.h
diff --git a/ROMLoad.cpp b/Src/ROMLoad.cpp
similarity index 100%
rename from ROMLoad.cpp
rename to Src/ROMLoad.cpp
diff --git a/ROMLoad.h b/Src/ROMLoad.h
similarity index 100%
rename from ROMLoad.h
rename to Src/ROMLoad.h
diff --git a/Sound/SCSP.cpp b/Src/Sound/SCSP.cpp
similarity index 100%
rename from Sound/SCSP.cpp
rename to Src/Sound/SCSP.cpp
diff --git a/Sound/SCSP.h b/Src/Sound/SCSP.h
similarity index 100%
rename from Sound/SCSP.h
rename to Src/Sound/SCSP.h
diff --git a/Sound/SCSPDSP.cpp b/Src/Sound/SCSPDSP.cpp
similarity index 100%
rename from Sound/SCSPDSP.cpp
rename to Src/Sound/SCSPDSP.cpp
diff --git a/Sound/SCSPDSP.h b/Src/Sound/SCSPDSP.h
similarity index 100%
rename from Sound/SCSPDSP.h
rename to Src/Sound/SCSPDSP.h
diff --git a/Sound/SCSPLFO.cpp b/Src/Sound/SCSPLFO.cpp
similarity index 100%
rename from Sound/SCSPLFO.cpp
rename to Src/Sound/SCSPLFO.cpp
diff --git a/Supermodel.h b/Src/Supermodel.h
similarity index 100%
rename from Supermodel.h
rename to Src/Supermodel.h