diff --git a/framework/common/collision.cpp b/framework/common/collision.cpp
index b4ddf53..a1f1714 100644
--- a/framework/common/collision.cpp
+++ b/framework/common/collision.cpp
@@ -1,4 +1,4 @@
-#include "common/collision.hpp"
+#include "xna/common/collision.hpp"
 
 namespace xna {
 	Plane::Plane(Vector3 const& point1, Vector3 const& point2, Vector3 const& point3) {
diff --git a/framework/common/color.cpp b/framework/common/color.cpp
index b2c533a..9257296 100644
--- a/framework/common/color.cpp
+++ b/framework/common/color.cpp
@@ -1,4 +1,4 @@
-#include "common/color.hpp"
+#include "xna/common/color.hpp"
 
 namespace xna {
 	Color::Color(float r, float g, float b, float a) :
diff --git a/framework/common/gjk.cpp b/framework/common/gjk.cpp
index d4d3811..885a8b7 100644
--- a/framework/common/gjk.cpp
+++ b/framework/common/gjk.cpp
@@ -1,4 +1,4 @@
-#include "common/gjk.hpp"
+#include "xna/common/gjk.hpp"
 
 namespace xna {
 	Vector3 Gjk::ComputeClosestPoint() {
diff --git a/framework/common/numerics.cpp b/framework/common/numerics.cpp
index f0bd44c..07cd08f 100644
--- a/framework/common/numerics.cpp
+++ b/framework/common/numerics.cpp
@@ -1,4 +1,4 @@
-#include "common/numerics.hpp"
+#include "xna/common/numerics.hpp"
 
 namespace xna {
     bool Vector2::Transform(Vector2 const* sourceArray, size_t sourceArrayLength, Matrix const& matrix, Vector2* destinationArray, size_t destinationArrayLength) {
diff --git a/framework/common/packedvalue.cpp b/framework/common/packedvalue.cpp
index 170888e..8af9a28 100644
--- a/framework/common/packedvalue.cpp
+++ b/framework/common/packedvalue.cpp
@@ -1,4 +1,4 @@
-#include "common/packedvalue.hpp"
+#include "xna/common/packedvalue.hpp"
 
 namespace xna {
 	Uint PackUtils::PackUnsigned(float bitmask, float value) {
diff --git a/framework/content/lzx/decoder.cpp b/framework/content/lzx/decoder.cpp
index 1929a4b..cbf3128 100644
--- a/framework/content/lzx/decoder.cpp
+++ b/framework/content/lzx/decoder.cpp
@@ -1,4 +1,4 @@
-#include "content/lzx/decoder.hpp"
+#include "xna/content/lzx/decoder.hpp"
 
 namespace xna {
 
diff --git a/framework/content/lzx/decoderstream.cpp b/framework/content/lzx/decoderstream.cpp
index c75e2f0..55c8530 100644
--- a/framework/content/lzx/decoderstream.cpp
+++ b/framework/content/lzx/decoderstream.cpp
@@ -1,4 +1,4 @@
-#include "content/lzx/decoderstream.hpp"
+#include "xna/content/lzx/decoderstream.hpp"
 
 namespace xna {
 	Int LzxDecoderStream::Length()
diff --git a/framework/content/manager.cpp b/framework/content/manager.cpp
index ce6b668..350c8e3 100644
--- a/framework/content/manager.cpp
+++ b/framework/content/manager.cpp
@@ -1,4 +1,4 @@
-#include "content/manager.hpp"
+#include "xna/content/manager.hpp"
 
 namespace xna {
 	sptr<Stream> ContentManager::OpenStream(String const& assetName) const {
diff --git a/framework/content/reader.cpp b/framework/content/reader.cpp
index 8009752..b14f135 100644
--- a/framework/content/reader.cpp
+++ b/framework/content/reader.cpp
@@ -1,7 +1,7 @@
-#include "content/reader.hpp"
-#include "content/manager.hpp"
-#include "content/lzx/decoderstream.hpp"
-#include "content/typereadermanager.hpp"
+#include "xna/content/reader.hpp"
+#include "xna/content/manager.hpp"
+#include "xna/content/lzx/decoderstream.hpp"
+#include "xna/content/typereadermanager.hpp"
 
 namespace xna {
 	sptr<ContentReader> ContentReader::Create(sptr<xna::ContentManager> const& contentManager, sptr<Stream>& input, String const& assetName)
diff --git a/framework/content/typereadermanager.cpp b/framework/content/typereadermanager.cpp
index 433e700..cb5277b 100644
--- a/framework/content/typereadermanager.cpp
+++ b/framework/content/typereadermanager.cpp
@@ -1,6 +1,6 @@
-#include "content/typereadermanager.hpp"
-#include "content/reader.hpp"
-#include "content/readers/default.hpp"
+#include "xna/content/typereadermanager.hpp"
+#include "xna/content/reader.hpp"
+#include "xna/content/readers/default.hpp"
 
 namespace xna {
 
diff --git a/framework/csharp/binary.cpp b/framework/csharp/binary.cpp
index af83b76..c5639a7 100644
--- a/framework/csharp/binary.cpp
+++ b/framework/csharp/binary.cpp
@@ -1,5 +1,5 @@
-#include "csharp/binary.hpp"
-#include "csharp/buffer.hpp"
+#include "xna/csharp/binary.hpp"
+#include "xna/csharp/buffer.hpp"
 
 namespace xna {
 	Int BinaryReader::PeekChar()
diff --git a/framework/csharp/object.cpp b/framework/csharp/object.cpp
index 7a79f93..ed87573 100644
--- a/framework/csharp/object.cpp
+++ b/framework/csharp/object.cpp
@@ -1,5 +1,5 @@
-#include "csharp/object.hpp"
-#include "csharp/type.hpp"
+#include "xna/csharp/object.hpp"
+#include "xna/csharp/type.hpp"
 
 namespace xna {
 	size_t Object::GetHashCode() const
diff --git a/framework/csharp/stream.cpp b/framework/csharp/stream.cpp
index a850f46..17782e0 100644
--- a/framework/csharp/stream.cpp
+++ b/framework/csharp/stream.cpp
@@ -1,5 +1,5 @@
-#include "csharp/stream.hpp"
-#include "csharp/buffer.hpp"
+#include "xna/csharp/stream.hpp"
+#include "xna/csharp/buffer.hpp"
 
 namespace xna {
 	Long MemoryStream::Seek(Long offset, SeekOrigin const& origin) {
diff --git a/framework/csharp/type.cpp b/framework/csharp/type.cpp
index da90c2b..c7922c8 100644
--- a/framework/csharp/type.cpp
+++ b/framework/csharp/type.cpp
@@ -1,4 +1,4 @@
-#include "csharp/type.hpp"
+#include "xna/csharp/type.hpp"
 
 namespace xna {
 	size_t Type::GetHashCode() const
diff --git a/framework/game/component.cpp b/framework/game/component.cpp
index d386dbf..5755a9c 100644
--- a/framework/game/component.cpp
+++ b/framework/game/component.cpp
@@ -1,4 +1,4 @@
-#include "game/component.hpp"
+#include "xna/game/component.hpp"
 
 namespace xna {
 	sptr<IGameComponent> GameComponentCollection::operator[](size_t index) const
diff --git a/framework/game/servicecontainer.cpp b/framework/game/servicecontainer.cpp
index d63e3db..3673966 100644
--- a/framework/game/servicecontainer.cpp
+++ b/framework/game/servicecontainer.cpp
@@ -1,4 +1,4 @@
-#include "game/servicecontainer.hpp"
+#include "xna/game/servicecontainer.hpp"
 
 namespace xna {
 	void GameServiceContainer::AddService(Type& type, std::any& provider)
diff --git a/framework/platform-dx/adapter.cpp b/framework/platform-dx/adapter.cpp
index 9833ef4..964bf66 100644
--- a/framework/platform-dx/adapter.cpp
+++ b/framework/platform-dx/adapter.cpp
@@ -1,9 +1,9 @@
-#include "graphics/adapter.hpp"
-#include "graphics/displaymode.hpp"
-#include "platform-dx/headers.hpp"
-#include "platform-dx/helpers.hpp"
-#include "platform-dx/implementations.hpp"
-#include "game/gdevicemanager.hpp"
+#include "xna/graphics/adapter.hpp"
+#include "xna/graphics/displaymode.hpp"
+#include "xna/platform-dx/headers.hpp"
+#include "xna/platform-dx/helpers.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/game/gdevicemanager.hpp"
 
 namespace xna {
 	static size_t getDisplayModesCount(IDXGIAdapter* adapter);
diff --git a/framework/platform-dx/audioengine.cpp b/framework/platform-dx/audioengine.cpp
index 9765914..4e5cbce 100644
--- a/framework/platform-dx/audioengine.cpp
+++ b/framework/platform-dx/audioengine.cpp
@@ -1,4 +1,4 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	void AudioEngine::Initialize() {
diff --git a/framework/platform-dx/blendstate.cpp b/framework/platform-dx/blendstate.cpp
index e72ae10..d4ce0a3 100644
--- a/framework/platform-dx/blendstate.cpp
+++ b/framework/platform-dx/blendstate.cpp
@@ -1,9 +1,9 @@
-#include "graphics/blendstate.hpp"
-#include "graphics/gresource.hpp"
-#include "platform-dx/headers.hpp"
-#include "platform-dx/helpers.hpp"
-#include "graphics/blendstate.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/graphics/blendstate.hpp"
+#include "xna/graphics/gresource.hpp"
+#include "xna/platform-dx/headers.hpp"
+#include "xna/platform-dx/helpers.hpp"
+#include "xna/graphics/blendstate.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	BlendState::BlendState() : GraphicsResource(nullptr) {
diff --git a/framework/platform-dx/buffer.cpp b/framework/platform-dx/buffer.cpp
index 0da00a5..c3e5c5a 100644
--- a/framework/platform-dx/buffer.cpp
+++ b/framework/platform-dx/buffer.cpp
@@ -1,7 +1,7 @@
-#include "graphics/buffer.hpp"
-#include "common/numerics.hpp"
-#include "platform-dx/headers.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/graphics/buffer.hpp"
+#include "xna/common/numerics.hpp"
+#include "xna/platform-dx/headers.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	ConstantBuffer::ConstantBuffer() : GraphicsResource(nullptr){
diff --git a/framework/platform-dx/depthstencilstate.cpp b/framework/platform-dx/depthstencilstate.cpp
index fd9d604..9d8f573 100644
--- a/framework/platform-dx/depthstencilstate.cpp
+++ b/framework/platform-dx/depthstencilstate.cpp
@@ -1,6 +1,6 @@
-#include "graphics/depthstencilstate.hpp"
-#include "platform-dx/headers.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/graphics/depthstencilstate.hpp"
+#include "xna/platform-dx/headers.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	static D3D11_DEPTH_STENCIL_DESC defaultDesc() {
diff --git a/framework/platform-dx/device.cpp b/framework/platform-dx/device.cpp
index cf5bfa9..3619c6d 100644
--- a/framework/platform-dx/device.cpp
+++ b/framework/platform-dx/device.cpp
@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
-#include "game/gdevicemanager.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/game/gdevicemanager.hpp"
 
 namespace xna {
 	void reset(GraphicsDevice::PlatformImplementation& impl)
diff --git a/framework/platform-dx/displaymode.cpp b/framework/platform-dx/displaymode.cpp
index b8195ba..a80659f 100644
--- a/framework/platform-dx/displaymode.cpp
+++ b/framework/platform-dx/displaymode.cpp
@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
-#include "graphics/displaymode.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/graphics/displaymode.hpp"
 
 namespace xna {
 	DisplayMode::DisplayMode() {
diff --git a/framework/platform-dx/game.cpp b/framework/platform-dx/game.cpp
index 21e9a23..7c74c26 100644
--- a/framework/platform-dx/game.cpp
+++ b/framework/platform-dx/game.cpp
@@ -1,10 +1,10 @@
-#include "csharp/type.hpp"
-#include "game/time.hpp"
-#include "game/component.hpp"
-#include "game/servicecontainer.hpp"
-#include "platform-dx/implementations.hpp"
-#include "game/gdevicemanager.hpp"
-#include "content/manager.hpp"
+#include "xna/csharp/type.hpp"
+#include "xna/game/time.hpp"
+#include "xna/game/component.hpp"
+#include "xna/game/servicecontainer.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/game/gdevicemanager.hpp"
+#include "xna/content/manager.hpp"
 
 namespace xna {
 	Game::Game() {
diff --git a/framework/platform-dx/gamepad.cpp b/framework/platform-dx/gamepad.cpp
index 95fd9ab..de6655f 100644
--- a/framework/platform-dx/gamepad.cpp
+++ b/framework/platform-dx/gamepad.cpp
@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
-#include "input/gamepad.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/input/gamepad.hpp"
 
 namespace xna {
 	void GamePad::Initialize() {
diff --git a/framework/platform-dx/gdevicemanager.cpp b/framework/platform-dx/gdevicemanager.cpp
index 621586c..489fe75 100644
--- a/framework/platform-dx/gdevicemanager.cpp
+++ b/framework/platform-dx/gdevicemanager.cpp
@@ -1,7 +1,7 @@
-#include "game/gdevicemanager.hpp"
-#include "graphics/presentparams.hpp"
-#include "graphics/swapchain.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/game/gdevicemanager.hpp"
+#include "xna/graphics/presentparams.hpp"
+#include "xna/graphics/swapchain.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	GraphicsDeviceManager::GraphicsDeviceManager(sptr<Game> const& game) : _game(game)
diff --git a/framework/platform-dx/init.cpp b/framework/platform-dx/init.cpp
index 150cd09..a7b9c35 100644
--- a/framework/platform-dx/init.cpp
+++ b/framework/platform-dx/init.cpp
@@ -1,10 +1,10 @@
-#include "platform-dx/init.hpp"
-#include "csharp/type.hpp"
-#include "content/readers/graphics.hpp"
-#include "content/readers/audio.hpp"
-#include "content/typereadermanager.hpp"
-#include "content/readers/default.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/init.hpp"
+#include "xna/csharp/type.hpp"
+#include "xna/content/readers/graphics.hpp"
+#include "xna/content/readers/audio.hpp"
+#include "xna/content/typereadermanager.hpp"
+#include "xna/content/readers/default.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	void Platform::Init() {		
diff --git a/framework/platform-dx/keyboard.cpp b/framework/platform-dx/keyboard.cpp
index 9bd9615..c11a070 100644
--- a/framework/platform-dx/keyboard.cpp
+++ b/framework/platform-dx/keyboard.cpp
@@ -1,5 +1,5 @@
-#include "input/keyboard.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/input/keyboard.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	KeyboardState Keyboard::GetState() {
diff --git a/framework/platform-dx/mouse.cpp b/framework/platform-dx/mouse.cpp
index 4052703..310f30e 100644
--- a/framework/platform-dx/mouse.cpp
+++ b/framework/platform-dx/mouse.cpp
@@ -1,5 +1,5 @@
-#include "input/mouse.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/input/mouse.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	MouseState Mouse::GetState() {
diff --git a/framework/platform-dx/rasterizerstate.cpp b/framework/platform-dx/rasterizerstate.cpp
index 70e1ebc..aec633c 100644
--- a/framework/platform-dx/rasterizerstate.cpp
+++ b/framework/platform-dx/rasterizerstate.cpp
@@ -1,5 +1,5 @@
-#include "graphics/rasterizerstate.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/graphics/rasterizerstate.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 
diff --git a/framework/platform-dx/rendertarget.cpp b/framework/platform-dx/rendertarget.cpp
index 5363663..12fe883 100644
--- a/framework/platform-dx/rendertarget.cpp
+++ b/framework/platform-dx/rendertarget.cpp
@@ -1,4 +1,4 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	RenderTarget2D::RenderTarget2D() : Texture2D() {
diff --git a/framework/platform-dx/samplerstate.cpp b/framework/platform-dx/samplerstate.cpp
index 6e1c1d7..6d61ddc 100644
--- a/framework/platform-dx/samplerstate.cpp
+++ b/framework/platform-dx/samplerstate.cpp
@@ -1,7 +1,7 @@
-#include "graphics/samplerstate.hpp"
-#include "graphics/samplerstate.hpp"
-#include "platform-dx/implementations.hpp"
-#include "platform-dx/helpers.hpp"
+#include "xna/graphics/samplerstate.hpp"
+#include "xna/graphics/samplerstate.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/platform-dx/helpers.hpp"
 
 namespace xna {
 	SamplerState::SamplerState() : GraphicsResource(nullptr) {
diff --git a/framework/platform-dx/shader.cpp b/framework/platform-dx/shader.cpp
index 70f8111..b243fe8 100644
--- a/framework/platform-dx/shader.cpp
+++ b/framework/platform-dx/shader.cpp
@@ -1,6 +1,6 @@
-#include "graphics/buffer.hpp"
-#include "platform-dx/implementations.hpp"
-#include "graphics/shader.hpp"
+#include "xna/graphics/buffer.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/graphics/shader.hpp"
 
 namespace xna {
     static HRESULT shaderCompileFromFile(_In_ LPCWSTR srcFile, _In_ LPCSTR entryPoint, _In_ LPCSTR profile, _Outptr_ ID3DBlob** blob)
diff --git a/framework/platform-dx/soundeffect.cpp b/framework/platform-dx/soundeffect.cpp
index f521c66..b5cb1b4 100644
--- a/framework/platform-dx/soundeffect.cpp
+++ b/framework/platform-dx/soundeffect.cpp
@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
-#include "csharp/stream.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/csharp/stream.hpp"
 
 using DxSoundEffect = DirectX::SoundEffect;
 
diff --git a/framework/platform-dx/sprite.cpp b/framework/platform-dx/sprite.cpp
index afa4352..c6657a0 100644
--- a/framework/platform-dx/sprite.cpp
+++ b/framework/platform-dx/sprite.cpp
@@ -1,12 +1,12 @@
-#include "graphics/rasterizerstate.hpp"
-#include "graphics/samplerstate.hpp"
-#include "common/color.hpp"
-#include "common/numerics.hpp"
-#include "graphics/sprite.hpp"
-#include "graphics/viewport.hpp"
-#include "graphics/blendstate.hpp"
-#include "graphics/depthstencilstate.hpp"
-#include "platform-dx/implementations.hpp"
+#include "xna/graphics/rasterizerstate.hpp"
+#include "xna/graphics/samplerstate.hpp"
+#include "xna/common/color.hpp"
+#include "xna/common/numerics.hpp"
+#include "xna/graphics/sprite.hpp"
+#include "xna/graphics/viewport.hpp"
+#include "xna/graphics/blendstate.hpp"
+#include "xna/graphics/depthstencilstate.hpp"
+#include "xna/platform-dx/implementations.hpp"
 #include <stdexcept>
 
 using DxSpriteBatch = DirectX::SpriteBatch;
diff --git a/framework/platform-dx/swapchain.cpp b/framework/platform-dx/swapchain.cpp
index 1a00d6d..73586c5 100644
--- a/framework/platform-dx/swapchain.cpp
+++ b/framework/platform-dx/swapchain.cpp
@@ -1,8 +1,8 @@
-#include "platform-dx/helpers.hpp"
-#include "graphics/adapter.hpp"
-#include "graphics/swapchain.hpp"
-#include "platform-dx/implementations.hpp"
-#include "graphics/device.hpp"
+#include "xna/platform-dx/helpers.hpp"
+#include "xna/graphics/adapter.hpp"
+#include "xna/graphics/swapchain.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/graphics/device.hpp"
 
 namespace xna {
     SwapChain::SwapChain() : GraphicsResource(nullptr) {
diff --git a/framework/platform-dx/texture.cpp b/framework/platform-dx/texture.cpp
index 218ef70..f2960fd 100644
--- a/framework/platform-dx/texture.cpp
+++ b/framework/platform-dx/texture.cpp
@@ -1,5 +1,5 @@
-#include "platform-dx/implementations.hpp"
-#include "platform-dx/helpers.hpp"
+#include "xna/platform-dx/implementations.hpp"
+#include "xna/platform-dx/helpers.hpp"
 
 namespace xna {	
 	Texture2D::~Texture2D() {
diff --git a/framework/platform-dx/window.cpp b/framework/platform-dx/window.cpp
index f365ae4..66cdc97 100644
--- a/framework/platform-dx/window.cpp
+++ b/framework/platform-dx/window.cpp
@@ -1,4 +1,4 @@
-#include "platform-dx/implementations.hpp"
+#include "xna/platform-dx/implementations.hpp"
 
 namespace xna {
 	GameWindow::GameWindow() {
diff --git a/inc/audio/audioengine.hpp b/inc/xna/audio/audioengine.hpp
similarity index 100%
rename from inc/audio/audioengine.hpp
rename to inc/xna/audio/audioengine.hpp
diff --git a/inc/audio/soundeffect.hpp b/inc/xna/audio/soundeffect.hpp
similarity index 100%
rename from inc/audio/soundeffect.hpp
rename to inc/xna/audio/soundeffect.hpp
diff --git a/inc/common/collision.hpp b/inc/xna/common/collision.hpp
similarity index 99%
rename from inc/common/collision.hpp
rename to inc/xna/common/collision.hpp
index 586e2bc..e43d24c 100644
--- a/inc/common/collision.hpp
+++ b/inc/xna/common/collision.hpp
@@ -1,7 +1,7 @@
 #ifndef XNA_COMMON_SHAPES_HPP
 #define XNA_COMMON_SHAPES_HPP
 
-#include "default.hpp"
+#include "../default.hpp"
 #include "numerics.hpp"
 #include "gjk.hpp"
 #include <optional>
diff --git a/inc/common/color.hpp b/inc/xna/common/color.hpp
similarity index 100%
rename from inc/common/color.hpp
rename to inc/xna/common/color.hpp
diff --git a/inc/common/curve.hpp b/inc/xna/common/curve.hpp
similarity index 100%
rename from inc/common/curve.hpp
rename to inc/xna/common/curve.hpp
diff --git a/inc/common/gjk.hpp b/inc/xna/common/gjk.hpp
similarity index 98%
rename from inc/common/gjk.hpp
rename to inc/xna/common/gjk.hpp
index 4bba55b..deaae30 100644
--- a/inc/common/gjk.hpp
+++ b/inc/xna/common/gjk.hpp
@@ -1,7 +1,7 @@
 #ifndef XNA_COMMON_GDK_HPP
 #define XNA_COMMON_GDK_HPP
 
-#include "default.hpp"
+#include "../default.hpp"
 #include "numerics.hpp"
 #include "math.hpp"
 
diff --git a/inc/common/math.hpp b/inc/xna/common/math.hpp
similarity index 100%
rename from inc/common/math.hpp
rename to inc/xna/common/math.hpp
diff --git a/inc/common/numerics.hpp b/inc/xna/common/numerics.hpp
similarity index 100%
rename from inc/common/numerics.hpp
rename to inc/xna/common/numerics.hpp
diff --git a/inc/common/packedvalue.hpp b/inc/xna/common/packedvalue.hpp
similarity index 100%
rename from inc/common/packedvalue.hpp
rename to inc/xna/common/packedvalue.hpp
diff --git a/inc/content/lzx/decoder.hpp b/inc/xna/content/lzx/decoder.hpp
similarity index 100%
rename from inc/content/lzx/decoder.hpp
rename to inc/xna/content/lzx/decoder.hpp
diff --git a/inc/content/lzx/decoderstream.hpp b/inc/xna/content/lzx/decoderstream.hpp
similarity index 100%
rename from inc/content/lzx/decoderstream.hpp
rename to inc/xna/content/lzx/decoderstream.hpp
diff --git a/inc/content/manager.hpp b/inc/xna/content/manager.hpp
similarity index 96%
rename from inc/content/manager.hpp
rename to inc/xna/content/manager.hpp
index df7b2cc..810a12a 100644
--- a/inc/content/manager.hpp
+++ b/inc/xna/content/manager.hpp
@@ -1,9 +1,9 @@
 #ifndef XNA_CONTENT_MANAGER_HPP
 #define XNA_CONTENT_MANAGER_HPP
 
-#include "csharp/stream.hpp"
-#include "default.hpp"
-#include "csharp/service.hpp"
+#include "../csharp/service.hpp"
+#include "../csharp/stream.hpp"
+#include "../default.hpp"
 #include "reader.hpp"
 #include <map>
 
diff --git a/inc/content/reader.hpp b/inc/xna/content/reader.hpp
similarity index 96%
rename from inc/content/reader.hpp
rename to inc/xna/content/reader.hpp
index 855376e..7a71182 100644
--- a/inc/content/reader.hpp
+++ b/inc/xna/content/reader.hpp
@@ -1,11 +1,11 @@
 #ifndef XNA_CONTENT_READER_HPP
 #define XNA_CONTENT_READER_HPP
 
-#include "common/color.hpp"
-#include "common/numerics.hpp"
-#include "csharp/binary.hpp"
-#include "csharp/type.hpp"
-#include "default.hpp"
+#include "../common/color.hpp"
+#include "../common/numerics.hpp"
+#include "../csharp/binary.hpp"
+#include "../csharp/type.hpp"
+#include "../default.hpp"
 #include "typereadermanager.hpp"
 #include <any>
 
diff --git a/inc/content/readers/audio.hpp b/inc/xna/content/readers/audio.hpp
similarity index 83%
rename from inc/content/readers/audio.hpp
rename to inc/xna/content/readers/audio.hpp
index d60e565..cc31952 100644
--- a/inc/content/readers/audio.hpp
+++ b/inc/xna/content/readers/audio.hpp
@@ -1,11 +1,11 @@
 #ifndef XNA_CONTENT_READERS_AUDIO_HPP
 #define XNA_CONTENT_READERS_AUDIO_HPP
 
-#include "content/manager.hpp"
-#include "content/reader.hpp"
-#include "csharp/type.hpp"
-#include "audio/soundeffect.hpp"
-#include "csharp/timespan.hpp"
+#include "../../audio/soundeffect.hpp"
+#include "../../csharp/timespan.hpp"
+#include "../../csharp/type.hpp"
+#include "../manager.hpp"
+#include "../reader.hpp"
 
 namespace xna {
 	class SoundEffectReader : public ContentTypeReaderT<PSoundEffect> {
diff --git a/inc/content/readers/default.hpp b/inc/xna/content/readers/default.hpp
similarity index 97%
rename from inc/content/readers/default.hpp
rename to inc/xna/content/readers/default.hpp
index 3d42d16..8f820f7 100644
--- a/inc/content/readers/default.hpp
+++ b/inc/xna/content/readers/default.hpp
@@ -1,11 +1,11 @@
 #ifndef XNA_CONTENT_READERS_DEFAULT_HPP
 #define XNA_CONTENT_READERS_DEFAULT_HPP
 
-#include "content/reader.hpp"
-#include "default.hpp"
-#include "common/color.hpp"
-#include "common/numerics.hpp"
-#include "csharp/timespan.hpp"
+#include "../../common/color.hpp"
+#include "../../common/numerics.hpp"
+#include "../../csharp/timespan.hpp"
+#include "../../default.hpp"
+#include "../reader.hpp"
 
 namespace xna {
 	class ObjectReader : public ContentTypeReaderT<Object> {
diff --git a/inc/content/readers/graphics.hpp b/inc/xna/content/readers/graphics.hpp
similarity index 89%
rename from inc/content/readers/graphics.hpp
rename to inc/xna/content/readers/graphics.hpp
index e4cd884..6c4194c 100644
--- a/inc/content/readers/graphics.hpp
+++ b/inc/xna/content/readers/graphics.hpp
@@ -1,13 +1,13 @@
 #ifndef XNA_CONTENT_READERS_GRAPHICS_HPP
 #define XNA_CONTENT_READERS_GRAPHICS_HPP
 
-#include "content/manager.hpp"
-#include "content/reader.hpp"
-#include "csharp/type.hpp"
-#include "graphics/texture.hpp"
-#include "common/numerics.hpp"
-#include "csharp/timespan.hpp"
-#include "graphics/sprite.hpp"
+#include "../../common/numerics.hpp"
+#include "../../csharp/timespan.hpp"
+#include "../../csharp/type.hpp"
+#include "../../graphics/sprite.hpp"
+#include "../../graphics/texture.hpp"
+#include "../manager.hpp"
+#include "../reader.hpp"
 
 namespace xna {
 	class Texture2DReader : public ContentTypeReaderT<PTexture2D> {
diff --git a/inc/content/typereadermanager.hpp b/inc/xna/content/typereadermanager.hpp
similarity index 100%
rename from inc/content/typereadermanager.hpp
rename to inc/xna/content/typereadermanager.hpp
diff --git a/inc/csharp/binary.hpp b/inc/xna/csharp/binary.hpp
similarity index 100%
rename from inc/csharp/binary.hpp
rename to inc/xna/csharp/binary.hpp
diff --git a/inc/csharp/buffer.hpp b/inc/xna/csharp/buffer.hpp
similarity index 100%
rename from inc/csharp/buffer.hpp
rename to inc/xna/csharp/buffer.hpp
diff --git a/inc/csharp/object.hpp b/inc/xna/csharp/object.hpp
similarity index 100%
rename from inc/csharp/object.hpp
rename to inc/xna/csharp/object.hpp
diff --git a/inc/csharp/service.hpp b/inc/xna/csharp/service.hpp
similarity index 100%
rename from inc/csharp/service.hpp
rename to inc/xna/csharp/service.hpp
diff --git a/inc/csharp/stream.hpp b/inc/xna/csharp/stream.hpp
similarity index 100%
rename from inc/csharp/stream.hpp
rename to inc/xna/csharp/stream.hpp
diff --git a/inc/csharp/timespan.hpp b/inc/xna/csharp/timespan.hpp
similarity index 100%
rename from inc/csharp/timespan.hpp
rename to inc/xna/csharp/timespan.hpp
diff --git a/inc/csharp/type.hpp b/inc/xna/csharp/type.hpp
similarity index 100%
rename from inc/csharp/type.hpp
rename to inc/xna/csharp/type.hpp
diff --git a/inc/default.hpp b/inc/xna/default.hpp
similarity index 100%
rename from inc/default.hpp
rename to inc/xna/default.hpp
diff --git a/inc/enums.hpp b/inc/xna/enums.hpp
similarity index 100%
rename from inc/enums.hpp
rename to inc/xna/enums.hpp
diff --git a/inc/forward.hpp b/inc/xna/forward.hpp
similarity index 100%
rename from inc/forward.hpp
rename to inc/xna/forward.hpp
diff --git a/inc/game/component.hpp b/inc/xna/game/component.hpp
similarity index 100%
rename from inc/game/component.hpp
rename to inc/xna/game/component.hpp
diff --git a/inc/game/game.hpp b/inc/xna/game/game.hpp
similarity index 97%
rename from inc/game/game.hpp
rename to inc/xna/game/game.hpp
index 091de3f..01d74c5 100644
--- a/inc/game/game.hpp
+++ b/inc/xna/game/game.hpp
@@ -2,7 +2,7 @@
 #define XNA_GAME_GAME_HPP
 
 #include "../default.hpp"
-#include "game/time.hpp"
+#include "time.hpp"
 
 namespace xna {
 	class Game : public std::enable_shared_from_this<Game> {
diff --git a/inc/game/gdeviceinfo.hpp b/inc/xna/game/gdeviceinfo.hpp
similarity index 100%
rename from inc/game/gdeviceinfo.hpp
rename to inc/xna/game/gdeviceinfo.hpp
diff --git a/inc/game/gdevicemanager.hpp b/inc/xna/game/gdevicemanager.hpp
similarity index 100%
rename from inc/game/gdevicemanager.hpp
rename to inc/xna/game/gdevicemanager.hpp
diff --git a/inc/game/servicecontainer.hpp b/inc/xna/game/servicecontainer.hpp
similarity index 100%
rename from inc/game/servicecontainer.hpp
rename to inc/xna/game/servicecontainer.hpp
diff --git a/inc/game/time.hpp b/inc/xna/game/time.hpp
similarity index 100%
rename from inc/game/time.hpp
rename to inc/xna/game/time.hpp
diff --git a/inc/game/window.hpp b/inc/xna/game/window.hpp
similarity index 100%
rename from inc/game/window.hpp
rename to inc/xna/game/window.hpp
diff --git a/inc/graphics/adapter.hpp b/inc/xna/graphics/adapter.hpp
similarity index 100%
rename from inc/graphics/adapter.hpp
rename to inc/xna/graphics/adapter.hpp
diff --git a/inc/graphics/blendstate.hpp b/inc/xna/graphics/blendstate.hpp
similarity index 100%
rename from inc/graphics/blendstate.hpp
rename to inc/xna/graphics/blendstate.hpp
diff --git a/inc/graphics/buffer.hpp b/inc/xna/graphics/buffer.hpp
similarity index 100%
rename from inc/graphics/buffer.hpp
rename to inc/xna/graphics/buffer.hpp
diff --git a/inc/graphics/depthstencilstate.hpp b/inc/xna/graphics/depthstencilstate.hpp
similarity index 100%
rename from inc/graphics/depthstencilstate.hpp
rename to inc/xna/graphics/depthstencilstate.hpp
diff --git a/inc/graphics/device.hpp b/inc/xna/graphics/device.hpp
similarity index 100%
rename from inc/graphics/device.hpp
rename to inc/xna/graphics/device.hpp
diff --git a/inc/graphics/displaymode.hpp b/inc/xna/graphics/displaymode.hpp
similarity index 100%
rename from inc/graphics/displaymode.hpp
rename to inc/xna/graphics/displaymode.hpp
diff --git a/inc/graphics/gresource.hpp b/inc/xna/graphics/gresource.hpp
similarity index 100%
rename from inc/graphics/gresource.hpp
rename to inc/xna/graphics/gresource.hpp
diff --git a/inc/graphics/presentparams.hpp b/inc/xna/graphics/presentparams.hpp
similarity index 100%
rename from inc/graphics/presentparams.hpp
rename to inc/xna/graphics/presentparams.hpp
diff --git a/inc/graphics/rasterizerstate.hpp b/inc/xna/graphics/rasterizerstate.hpp
similarity index 100%
rename from inc/graphics/rasterizerstate.hpp
rename to inc/xna/graphics/rasterizerstate.hpp
diff --git a/inc/graphics/rendertarget.hpp b/inc/xna/graphics/rendertarget.hpp
similarity index 100%
rename from inc/graphics/rendertarget.hpp
rename to inc/xna/graphics/rendertarget.hpp
diff --git a/inc/graphics/samplerstate.hpp b/inc/xna/graphics/samplerstate.hpp
similarity index 100%
rename from inc/graphics/samplerstate.hpp
rename to inc/xna/graphics/samplerstate.hpp
diff --git a/inc/graphics/shader.hpp b/inc/xna/graphics/shader.hpp
similarity index 100%
rename from inc/graphics/shader.hpp
rename to inc/xna/graphics/shader.hpp
diff --git a/inc/graphics/sprite.hpp b/inc/xna/graphics/sprite.hpp
similarity index 98%
rename from inc/graphics/sprite.hpp
rename to inc/xna/graphics/sprite.hpp
index 943dc0d..039733b 100644
--- a/inc/graphics/sprite.hpp
+++ b/inc/xna/graphics/sprite.hpp
@@ -2,8 +2,8 @@
 #define XNA_GRAPHICS_SPRITE_HPP
 
 #include "../default.hpp"
-#include "common/numerics.hpp"
-#include "common/color.hpp"
+#include "../common/numerics.hpp"
+#include "../common/color.hpp"
 #include <optional>
 
 namespace xna {
diff --git a/inc/graphics/swapchain.hpp b/inc/xna/graphics/swapchain.hpp
similarity index 100%
rename from inc/graphics/swapchain.hpp
rename to inc/xna/graphics/swapchain.hpp
diff --git a/inc/graphics/texture.hpp b/inc/xna/graphics/texture.hpp
similarity index 100%
rename from inc/graphics/texture.hpp
rename to inc/xna/graphics/texture.hpp
diff --git a/inc/graphics/vertexposition.hpp b/inc/xna/graphics/vertexposition.hpp
similarity index 100%
rename from inc/graphics/vertexposition.hpp
rename to inc/xna/graphics/vertexposition.hpp
diff --git a/inc/graphics/viewport.hpp b/inc/xna/graphics/viewport.hpp
similarity index 95%
rename from inc/graphics/viewport.hpp
rename to inc/xna/graphics/viewport.hpp
index 91280d6..882eb0a 100644
--- a/inc/graphics/viewport.hpp
+++ b/inc/xna/graphics/viewport.hpp
@@ -1,7 +1,7 @@
 #ifndef XNA_GRAPHICS_VIEWPORT
 #define XNA_GRAPHICS_VIEWPORT
 
-#include "common/numerics.hpp"
+#include "../common/numerics.hpp"
 
 namespace xna {
 	struct Viewport {
diff --git a/inc/helpers.hpp b/inc/xna/helpers.hpp
similarity index 100%
rename from inc/helpers.hpp
rename to inc/xna/helpers.hpp
diff --git a/inc/input/gamepad.hpp b/inc/xna/input/gamepad.hpp
similarity index 100%
rename from inc/input/gamepad.hpp
rename to inc/xna/input/gamepad.hpp
diff --git a/inc/input/keyboard.hpp b/inc/xna/input/keyboard.hpp
similarity index 100%
rename from inc/input/keyboard.hpp
rename to inc/xna/input/keyboard.hpp
diff --git a/inc/input/mouse.hpp b/inc/xna/input/mouse.hpp
similarity index 100%
rename from inc/input/mouse.hpp
rename to inc/xna/input/mouse.hpp
diff --git a/inc/platform-dx/headers.hpp b/inc/xna/platform-dx/headers.hpp
similarity index 100%
rename from inc/platform-dx/headers.hpp
rename to inc/xna/platform-dx/headers.hpp
diff --git a/inc/platform-dx/helpers.hpp b/inc/xna/platform-dx/helpers.hpp
similarity index 98%
rename from inc/platform-dx/helpers.hpp
rename to inc/xna/platform-dx/helpers.hpp
index 55cf53a..9d564c0 100644
--- a/inc/platform-dx/helpers.hpp
+++ b/inc/xna/platform-dx/helpers.hpp
@@ -1,6 +1,6 @@
 #include "headers.hpp"
-#include "graphics/blendstate.hpp"
-#include "graphics/adapter.hpp"
+#include "../graphics/blendstate.hpp"
+#include "../graphics/adapter.hpp"
 
 namespace xna {
 	struct DxHelpers {
diff --git a/inc/platform-dx/implementations.hpp b/inc/xna/platform-dx/implementations.hpp
similarity index 93%
rename from inc/platform-dx/implementations.hpp
rename to inc/xna/platform-dx/implementations.hpp
index 65b395c..2d1eefd 100644
--- a/inc/platform-dx/implementations.hpp
+++ b/inc/xna/platform-dx/implementations.hpp
@@ -3,29 +3,29 @@
 
 #include "headers.hpp"
 #include "stepTimer.hpp"
-#include "graphics/device.hpp"
-#include "graphics/adapter.hpp"
-#include "graphics/blendstate.hpp"
-#include "graphics/buffer.hpp"
-#include "graphics/depthstencilstate.hpp"
-#include "graphics/displaymode.hpp"
-#include "graphics/sprite.hpp"
-#include "graphics/samplerstate.hpp"
-#include "input/gamepad.hpp"
-#include "input/keyboard.hpp"
-#include "input/mouse.hpp"
-#include "graphics/rasterizerstate.hpp"
-#include "graphics/presentparams.hpp"
-#include "graphics/shader.hpp"
-#include "graphics/swapchain.hpp"
-#include "graphics/texture.hpp"
-#include "graphics/rendertarget.hpp"
-#include "game/window.hpp"
-#include "audio/audioengine.hpp"
-#include "audio/soundeffect.hpp"
-#include "graphics/viewport.hpp"
-#include "common/color.hpp"
-#include "game/game.hpp"
+#include "../graphics/device.hpp"
+#include "../graphics/adapter.hpp"
+#include "../graphics/blendstate.hpp"
+#include "../graphics/buffer.hpp"
+#include "../graphics/depthstencilstate.hpp"
+#include "../graphics/displaymode.hpp"
+#include "../graphics/sprite.hpp"
+#include "../graphics/samplerstate.hpp"
+#include "../input/gamepad.hpp"
+#include "../input/keyboard.hpp"
+#include "../input/mouse.hpp"
+#include "../graphics/rasterizerstate.hpp"
+#include "../graphics/presentparams.hpp"
+#include "../graphics/shader.hpp"
+#include "../graphics/swapchain.hpp"
+#include "../graphics/texture.hpp"
+#include "../graphics/rendertarget.hpp"
+#include "../game/window.hpp"
+#include "../audio/audioengine.hpp"
+#include "../audio/soundeffect.hpp"
+#include "../graphics/viewport.hpp"
+#include "../common/color.hpp"
+#include "../game/game.hpp"
 
 namespace xna {
 	struct SpriteFont::PlatformImplementation {
diff --git a/inc/platform-dx/init.hpp b/inc/xna/platform-dx/init.hpp
similarity index 100%
rename from inc/platform-dx/init.hpp
rename to inc/xna/platform-dx/init.hpp
diff --git a/inc/platform-dx/steptimer.hpp b/inc/xna/platform-dx/steptimer.hpp
similarity index 100%
rename from inc/platform-dx/steptimer.hpp
rename to inc/xna/platform-dx/steptimer.hpp
diff --git a/inc/platform-dx/xna-dx.hpp b/inc/xna/platform-dx/xna-dx.hpp
similarity index 100%
rename from inc/platform-dx/xna-dx.hpp
rename to inc/xna/platform-dx/xna-dx.hpp
diff --git a/inc/platforminit.hpp b/inc/xna/platforminit.hpp
similarity index 100%
rename from inc/platforminit.hpp
rename to inc/xna/platforminit.hpp
diff --git a/inc/types.hpp b/inc/xna/types.hpp
similarity index 100%
rename from inc/types.hpp
rename to inc/xna/types.hpp
diff --git a/inc/xna.hpp b/inc/xna/xna.hpp
similarity index 100%
rename from inc/xna.hpp
rename to inc/xna/xna.hpp
diff --git a/inc/xnaerror.hpp b/inc/xna/xnaerror.hpp
similarity index 100%
rename from inc/xnaerror.hpp
rename to inc/xna/xnaerror.hpp
diff --git a/samples/01_blank/xna.cpp b/samples/01_blank/xna.cpp
index 509bbbc..3ed637b 100644
--- a/samples/01_blank/xna.cpp
+++ b/samples/01_blank/xna.cpp
@@ -1,7 +1,7 @@
 // xna.cpp : Defines the entry point for the application.
 //
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 
 using namespace std;
 using namespace xna;
diff --git a/samples/02_PlatfformerStarterKit/animation.hpp b/samples/02_PlatfformerStarterKit/animation.hpp
index e1e001d..6dc2209 100644
--- a/samples/02_PlatfformerStarterKit/animation.hpp
+++ b/samples/02_PlatfformerStarterKit/animation.hpp
@@ -1,7 +1,7 @@
 #ifndef PLATFORMSTARTERKIT_ANIMATION_HPP
 #define PLATFORMSTARTERKIT_ANIMATION_HPP
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 
 namespace PlatformerStarterKit {
 	/*
diff --git a/samples/02_PlatfformerStarterKit/circle.hpp b/samples/02_PlatfformerStarterKit/circle.hpp
index 1f9953b..d3146fa 100644
--- a/samples/02_PlatfformerStarterKit/circle.hpp
+++ b/samples/02_PlatfformerStarterKit/circle.hpp
@@ -1,7 +1,7 @@
 #ifndef PLATFORMSTARTERKIT_CIRCLE_HPP
 #define PLATFORMSTARTERKIT_CIRCLE_HPP
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 
 namespace PlatformerStarterKit {
 	//Represents a 2D circle.
diff --git a/samples/02_PlatfformerStarterKit/enemy.hpp b/samples/02_PlatfformerStarterKit/enemy.hpp
index 20514eb..9a1aef9 100644
--- a/samples/02_PlatfformerStarterKit/enemy.hpp
+++ b/samples/02_PlatfformerStarterKit/enemy.hpp
@@ -1,7 +1,7 @@
 #ifndef PLATFORMSTARTERKIT_ENEMY_HPP
 #define PLATFORMSTARTERKIT_ENEMY_HPP
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 #include "animation.hpp"
 
 namespace PlatformerStarterKit {
diff --git a/samples/02_PlatfformerStarterKit/extensions.hpp b/samples/02_PlatfformerStarterKit/extensions.hpp
index d0dc982..d578bd4 100644
--- a/samples/02_PlatfformerStarterKit/extensions.hpp
+++ b/samples/02_PlatfformerStarterKit/extensions.hpp
@@ -1,7 +1,7 @@
 #ifndef PLATFORMSTARTERKIT_EXTENSIONS_HPP
 #define PLATFORMSTARTERKIT_EXTENSIONS_HPP
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 
 namespace PlatformerStarterKit {
 	struct RectangleExtensions {
diff --git a/samples/02_PlatfformerStarterKit/game.cpp b/samples/02_PlatfformerStarterKit/game.cpp
index 01e954f..dfcc7a5 100644
--- a/samples/02_PlatfformerStarterKit/game.cpp
+++ b/samples/02_PlatfformerStarterKit/game.cpp
@@ -1,7 +1,7 @@
 // xna.cpp : Defines the entry point for the application.
 //
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 #include "player.hpp"
 #include "enemy.hpp"
 #include "level.hpp"
diff --git a/samples/02_PlatfformerStarterKit/gem.hpp b/samples/02_PlatfformerStarterKit/gem.hpp
index 23ee1e0..949a31b 100644
--- a/samples/02_PlatfformerStarterKit/gem.hpp
+++ b/samples/02_PlatfformerStarterKit/gem.hpp
@@ -1,7 +1,7 @@
 #ifndef PLATFORMSTARTERKIT_GEM_HPP
 #define PLATFORMSTARTERKIT_GEM_HPP
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 #include "circle.hpp"
 #include "tile.hpp"
 
diff --git a/samples/02_PlatfformerStarterKit/level.hpp b/samples/02_PlatfformerStarterKit/level.hpp
index 5ee0ffe..4261614 100644
--- a/samples/02_PlatfformerStarterKit/level.hpp
+++ b/samples/02_PlatfformerStarterKit/level.hpp
@@ -1,7 +1,7 @@
 #ifndef PLATFORMSTARTERKIT_LEVEL_HPP
 #define PLATFORMSTARTERKIT_LEVEL_HPP
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 #include "tile.hpp"
 
 namespace PlatformerStarterKit {
diff --git a/samples/02_PlatfformerStarterKit/player.hpp b/samples/02_PlatfformerStarterKit/player.hpp
index b8db4df..684efd6 100644
--- a/samples/02_PlatfformerStarterKit/player.hpp
+++ b/samples/02_PlatfformerStarterKit/player.hpp
@@ -1,7 +1,7 @@
 #ifndef PLATFORMSTARTERKIT_PLAYER_HPP
 #define PLATFORMSTARTERKIT_PLAYER_HPP
 
-#include "xna.hpp"
+#include "xna/xna.hpp"
 #include "animation.hpp"
 
 namespace PlatformerStarterKit {