diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fbe9b6..e47c1fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,9 +21,7 @@ project ("xna")
 
 # Include sub-projects.
 include_directories(${PROJECT_INCLUDES_DIR})
-add_subdirectory ("framework")
-add_subdirectory ("framework-dx")
-
+add_subdirectory ("sources")
 add_subdirectory ("samples")
 
 
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
new file mode 100644
index 0000000..b5a1cce
--- /dev/null
+++ b/sources/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory ("framework")
+add_subdirectory ("framework-dx")
diff --git a/framework-dx/CMakeLists.txt b/sources/framework-dx/CMakeLists.txt
similarity index 100%
rename from framework-dx/CMakeLists.txt
rename to sources/framework-dx/CMakeLists.txt
diff --git a/framework-dx/adapter.cpp b/sources/framework-dx/adapter.cpp
similarity index 100%
rename from framework-dx/adapter.cpp
rename to sources/framework-dx/adapter.cpp
diff --git a/framework-dx/audioengine.cpp b/sources/framework-dx/audioengine.cpp
similarity index 100%
rename from framework-dx/audioengine.cpp
rename to sources/framework-dx/audioengine.cpp
diff --git a/framework-dx/blendstate.cpp b/sources/framework-dx/blendstate.cpp
similarity index 100%
rename from framework-dx/blendstate.cpp
rename to sources/framework-dx/blendstate.cpp
diff --git a/framework-dx/depthstencilstate.cpp b/sources/framework-dx/depthstencilstate.cpp
similarity index 100%
rename from framework-dx/depthstencilstate.cpp
rename to sources/framework-dx/depthstencilstate.cpp
diff --git a/framework-dx/device.cpp b/sources/framework-dx/device.cpp
similarity index 100%
rename from framework-dx/device.cpp
rename to sources/framework-dx/device.cpp
diff --git a/framework-dx/displaymode.cpp b/sources/framework-dx/displaymode.cpp
similarity index 100%
rename from framework-dx/displaymode.cpp
rename to sources/framework-dx/displaymode.cpp
diff --git a/framework-dx/effect.cpp b/sources/framework-dx/effect.cpp
similarity index 100%
rename from framework-dx/effect.cpp
rename to sources/framework-dx/effect.cpp
diff --git a/framework-dx/game.cpp b/sources/framework-dx/game.cpp
similarity index 100%
rename from framework-dx/game.cpp
rename to sources/framework-dx/game.cpp
diff --git a/framework-dx/gamepad.cpp b/sources/framework-dx/gamepad.cpp
similarity index 100%
rename from framework-dx/gamepad.cpp
rename to sources/framework-dx/gamepad.cpp
diff --git a/framework-dx/gdevicemanager.cpp b/sources/framework-dx/gdevicemanager.cpp
similarity index 100%
rename from framework-dx/gdevicemanager.cpp
rename to sources/framework-dx/gdevicemanager.cpp
diff --git a/framework-dx/init.cpp b/sources/framework-dx/init.cpp
similarity index 100%
rename from framework-dx/init.cpp
rename to sources/framework-dx/init.cpp
diff --git a/framework-dx/keyboard.cpp b/sources/framework-dx/keyboard.cpp
similarity index 100%
rename from framework-dx/keyboard.cpp
rename to sources/framework-dx/keyboard.cpp
diff --git a/framework-dx/mouse.cpp b/sources/framework-dx/mouse.cpp
similarity index 100%
rename from framework-dx/mouse.cpp
rename to sources/framework-dx/mouse.cpp
diff --git a/framework-dx/rasterizerstate.cpp b/sources/framework-dx/rasterizerstate.cpp
similarity index 100%
rename from framework-dx/rasterizerstate.cpp
rename to sources/framework-dx/rasterizerstate.cpp
diff --git a/framework-dx/rendertarget.cpp b/sources/framework-dx/rendertarget.cpp
similarity index 100%
rename from framework-dx/rendertarget.cpp
rename to sources/framework-dx/rendertarget.cpp
diff --git a/framework-dx/samplerstate.cpp b/sources/framework-dx/samplerstate.cpp
similarity index 100%
rename from framework-dx/samplerstate.cpp
rename to sources/framework-dx/samplerstate.cpp
diff --git a/framework-dx/screen.cpp b/sources/framework-dx/screen.cpp
similarity index 100%
rename from framework-dx/screen.cpp
rename to sources/framework-dx/screen.cpp
diff --git a/framework-dx/soundeffect.cpp b/sources/framework-dx/soundeffect.cpp
similarity index 100%
rename from framework-dx/soundeffect.cpp
rename to sources/framework-dx/soundeffect.cpp
diff --git a/framework-dx/sprite.cpp b/sources/framework-dx/sprite.cpp
similarity index 100%
rename from framework-dx/sprite.cpp
rename to sources/framework-dx/sprite.cpp
diff --git a/framework-dx/swapchain.cpp b/sources/framework-dx/swapchain.cpp
similarity index 100%
rename from framework-dx/swapchain.cpp
rename to sources/framework-dx/swapchain.cpp
diff --git a/framework-dx/texture.cpp b/sources/framework-dx/texture.cpp
similarity index 100%
rename from framework-dx/texture.cpp
rename to sources/framework-dx/texture.cpp
diff --git a/framework-dx/window.cpp b/sources/framework-dx/window.cpp
similarity index 100%
rename from framework-dx/window.cpp
rename to sources/framework-dx/window.cpp
diff --git a/framework/CMakeLists.txt b/sources/framework/CMakeLists.txt
similarity index 100%
rename from framework/CMakeLists.txt
rename to sources/framework/CMakeLists.txt
diff --git a/framework/common/collision.cpp b/sources/framework/common/collision.cpp
similarity index 100%
rename from framework/common/collision.cpp
rename to sources/framework/common/collision.cpp
diff --git a/framework/common/color.cpp b/sources/framework/common/color.cpp
similarity index 100%
rename from framework/common/color.cpp
rename to sources/framework/common/color.cpp
diff --git a/framework/common/gjk.cpp b/sources/framework/common/gjk.cpp
similarity index 100%
rename from framework/common/gjk.cpp
rename to sources/framework/common/gjk.cpp
diff --git a/framework/common/numerics.cpp b/sources/framework/common/numerics.cpp
similarity index 100%
rename from framework/common/numerics.cpp
rename to sources/framework/common/numerics.cpp
diff --git a/framework/common/packedvalue.cpp b/sources/framework/common/packedvalue.cpp
similarity index 100%
rename from framework/common/packedvalue.cpp
rename to sources/framework/common/packedvalue.cpp
diff --git a/framework/content/lzx/decoder.cpp b/sources/framework/content/lzx/decoder.cpp
similarity index 100%
rename from framework/content/lzx/decoder.cpp
rename to sources/framework/content/lzx/decoder.cpp
diff --git a/framework/content/manager.cpp b/sources/framework/content/manager.cpp
similarity index 100%
rename from framework/content/manager.cpp
rename to sources/framework/content/manager.cpp
diff --git a/framework/content/reader.cpp b/sources/framework/content/reader.cpp
similarity index 100%
rename from framework/content/reader.cpp
rename to sources/framework/content/reader.cpp
diff --git a/framework/content/typereadermanager.cpp b/sources/framework/content/typereadermanager.cpp
similarity index 100%
rename from framework/content/typereadermanager.cpp
rename to sources/framework/content/typereadermanager.cpp
diff --git a/framework/csharp/binary.cpp b/sources/framework/csharp/binary.cpp
similarity index 100%
rename from framework/csharp/binary.cpp
rename to sources/framework/csharp/binary.cpp
diff --git a/framework/csharp/stream.cpp b/sources/framework/csharp/stream.cpp
similarity index 100%
rename from framework/csharp/stream.cpp
rename to sources/framework/csharp/stream.cpp
diff --git a/framework/csharp/type.cpp b/sources/framework/csharp/type.cpp
similarity index 100%
rename from framework/csharp/type.cpp
rename to sources/framework/csharp/type.cpp
diff --git a/framework/exception.cpp b/sources/framework/exception.cpp
similarity index 100%
rename from framework/exception.cpp
rename to sources/framework/exception.cpp
diff --git a/framework/game/component.cpp b/sources/framework/game/component.cpp
similarity index 100%
rename from framework/game/component.cpp
rename to sources/framework/game/component.cpp
diff --git a/framework/game/servicecontainer.cpp b/sources/framework/game/servicecontainer.cpp
similarity index 100%
rename from framework/game/servicecontainer.cpp
rename to sources/framework/game/servicecontainer.cpp
diff --git a/framework/graphics/gresource.cpp b/sources/framework/graphics/gresource.cpp
similarity index 100%
rename from framework/graphics/gresource.cpp
rename to sources/framework/graphics/gresource.cpp