diff --git a/.gitignore b/.gitignore
index d4bc1a7d6..927548016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,13 +23,13 @@ bld/
 [Oo]bj/
 [Oo]utput/
 [Pp]rofilingSessions/
-[sS]rc/Client/audio
-[sS]rc/Client/texpacks
-[sS]rc/Client/maps
-[sS]rc/Client/texturecache
-[sS]rc/Client/logs
-[sS]rc/Client/options.txt
-[sS]rc/Client/screenshots
+[sS]rc/audio
+[sS]rc/texpacks
+[sS]rc/maps
+[sS]rc/texturecache
+[sS]rc/logs
+[sS]rc/options.txt
+[sS]rc/screenshots
 
 # Roslyn cache directories
 *.ide/
diff --git a/src/Client/2DStructs.c b/src/2DStructs.c
similarity index 100%
rename from src/Client/2DStructs.c
rename to src/2DStructs.c
diff --git a/src/Client/2DStructs.h b/src/2DStructs.h
similarity index 100%
rename from src/Client/2DStructs.h
rename to src/2DStructs.h
diff --git a/src/Client/Animations.c b/src/Animations.c
similarity index 100%
rename from src/Client/Animations.c
rename to src/Animations.c
diff --git a/src/Client/Animations.h b/src/Animations.h
similarity index 100%
rename from src/Client/Animations.h
rename to src/Animations.h
diff --git a/src/Client/AsyncDownloader.c b/src/AsyncDownloader.c
similarity index 100%
rename from src/Client/AsyncDownloader.c
rename to src/AsyncDownloader.c
diff --git a/src/Client/AsyncDownloader.h b/src/AsyncDownloader.h
similarity index 100%
rename from src/Client/AsyncDownloader.h
rename to src/AsyncDownloader.h
diff --git a/src/Client/Audio.c b/src/Audio.c
similarity index 100%
rename from src/Client/Audio.c
rename to src/Audio.c
diff --git a/src/Client/Audio.h b/src/Audio.h
similarity index 100%
rename from src/Client/Audio.h
rename to src/Audio.h
diff --git a/src/Client/AxisLinesRenderer.c b/src/AxisLinesRenderer.c
similarity index 100%
rename from src/Client/AxisLinesRenderer.c
rename to src/AxisLinesRenderer.c
diff --git a/src/Client/AxisLinesRenderer.h b/src/AxisLinesRenderer.h
similarity index 100%
rename from src/Client/AxisLinesRenderer.h
rename to src/AxisLinesRenderer.h
diff --git a/src/Client/Bitmap.c b/src/Bitmap.c
similarity index 100%
rename from src/Client/Bitmap.c
rename to src/Bitmap.c
diff --git a/src/Client/Bitmap.h b/src/Bitmap.h
similarity index 100%
rename from src/Client/Bitmap.h
rename to src/Bitmap.h
diff --git a/src/Client/Block.c b/src/Block.c
similarity index 100%
rename from src/Client/Block.c
rename to src/Block.c
diff --git a/src/Client/Block.h b/src/Block.h
similarity index 100%
rename from src/Client/Block.h
rename to src/Block.h
diff --git a/src/Client/BlockID.h b/src/BlockID.h
similarity index 100%
rename from src/Client/BlockID.h
rename to src/BlockID.h
diff --git a/src/Client/BlockPhysics.c b/src/BlockPhysics.c
similarity index 100%
rename from src/Client/BlockPhysics.c
rename to src/BlockPhysics.c
diff --git a/src/Client/BlockPhysics.h b/src/BlockPhysics.h
similarity index 100%
rename from src/Client/BlockPhysics.h
rename to src/BlockPhysics.h
diff --git a/src/Client/Builder.c b/src/Builder.c
similarity index 100%
rename from src/Client/Builder.c
rename to src/Builder.c
diff --git a/src/Client/Builder.h b/src/Builder.h
similarity index 100%
rename from src/Client/Builder.h
rename to src/Builder.h
diff --git a/src/Client/Camera.c b/src/Camera.c
similarity index 100%
rename from src/Client/Camera.c
rename to src/Camera.c
diff --git a/src/Client/Camera.h b/src/Camera.h
similarity index 100%
rename from src/Client/Camera.h
rename to src/Camera.h
diff --git a/src/Client/Chat.c b/src/Chat.c
similarity index 100%
rename from src/Client/Chat.c
rename to src/Chat.c
diff --git a/src/Client/Chat.h b/src/Chat.h
similarity index 100%
rename from src/Client/Chat.h
rename to src/Chat.h
diff --git a/src/Client/ChunkUpdater.c b/src/ChunkUpdater.c
similarity index 100%
rename from src/Client/ChunkUpdater.c
rename to src/ChunkUpdater.c
diff --git a/src/Client/ChunkUpdater.h b/src/ChunkUpdater.h
similarity index 100%
rename from src/Client/ChunkUpdater.h
rename to src/ChunkUpdater.h
diff --git a/src/ClassicalSharp.sln b/src/ClassiCube.sln
similarity index 87%
rename from src/ClassicalSharp.sln
rename to src/ClassiCube.sln
index daafd912c..d6e40a7cb 100644
--- a/src/ClassicalSharp.sln
+++ b/src/ClassiCube.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Client", "Client\Client.vcxproj", "{8A7D82BD-178A-4785-B41B-70EDE998920A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClassiCube", "ClassiCube.vcxproj", "{8A7D82BD-178A-4785-B41B-70EDE998920A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Client/Client.vcxproj b/src/ClassiCube.vcxproj
similarity index 94%
rename from src/Client/Client.vcxproj
rename to src/ClassiCube.vcxproj
index 37567f49f..44157f599 100644
--- a/src/Client/Client.vcxproj
+++ b/src/ClassiCube.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8A7D82BD-178A-4785-B41B-70EDE998920A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>Client</RootNamespace>
+    <RootNamespace>ClassiCube</RootNamespace>
     <WindowsTargetPlatformVersion>5.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -93,6 +93,8 @@
       <PrecompiledHeaderFile />
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <OutputPath>..\x86\Debug\</OutputPath>
+      <IntermediateOutputPath>..\x86\Debug\obj\</IntermediateOutputPath>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -114,6 +116,8 @@
       <PrecompiledHeaderFile />
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <OutputPath>..\x64\Debug\</OutputPath>
+      <IntermediateOutputPath>..\x64\Debug\obj\</IntermediateOutputPath>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -136,6 +140,8 @@
       <PrecompiledHeaderFile />
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <OutputPath>..\x86\Release\</OutputPath>
+      <IntermediateOutputPath>..\x86\Release\obj\</IntermediateOutputPath>
       <AdditionalOptions>
       </AdditionalOptions>
       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
@@ -165,6 +171,8 @@
       <PrecompiledHeaderFile />
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
+      <OutputPath>..\x64\Release\</OutputPath>
+      <IntermediateOutputPath>..\x64\Release\obj\</IntermediateOutputPath>
       <AdditionalOptions>
       </AdditionalOptions>
       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
diff --git a/src/Client/Client.vcxproj.filters b/src/ClassiCube.vcxproj.filters
similarity index 100%
rename from src/Client/Client.vcxproj.filters
rename to src/ClassiCube.vcxproj.filters
diff --git a/src/Client/Compiler.h b/src/Compiler.h
similarity index 100%
rename from src/Client/Compiler.h
rename to src/Compiler.h
diff --git a/src/Client/Constants.h b/src/Constants.h
similarity index 100%
rename from src/Client/Constants.h
rename to src/Constants.h
diff --git a/src/Client/D3D9Api.c b/src/D3D9Api.c
similarity index 100%
rename from src/Client/D3D9Api.c
rename to src/D3D9Api.c
diff --git a/src/Client/Deflate.c b/src/Deflate.c
similarity index 100%
rename from src/Client/Deflate.c
rename to src/Deflate.c
diff --git a/src/Client/Deflate.h b/src/Deflate.h
similarity index 100%
rename from src/Client/Deflate.h
rename to src/Deflate.h
diff --git a/src/Client/DisplayDevice.c b/src/DisplayDevice.c
similarity index 100%
rename from src/Client/DisplayDevice.c
rename to src/DisplayDevice.c
diff --git a/src/Client/DisplayDevice.h b/src/DisplayDevice.h
similarity index 100%
rename from src/Client/DisplayDevice.h
rename to src/DisplayDevice.h
diff --git a/src/Client/Drawer.c b/src/Drawer.c
similarity index 100%
rename from src/Client/Drawer.c
rename to src/Drawer.c
diff --git a/src/Client/Drawer.h b/src/Drawer.h
similarity index 100%
rename from src/Client/Drawer.h
rename to src/Drawer.h
diff --git a/src/Client/Drawer2D.c b/src/Drawer2D.c
similarity index 100%
rename from src/Client/Drawer2D.c
rename to src/Drawer2D.c
diff --git a/src/Client/Drawer2D.h b/src/Drawer2D.h
similarity index 100%
rename from src/Client/Drawer2D.h
rename to src/Drawer2D.h
diff --git a/src/Client/Entity.c b/src/Entity.c
similarity index 100%
rename from src/Client/Entity.c
rename to src/Entity.c
diff --git a/src/Client/Entity.h b/src/Entity.h
similarity index 100%
rename from src/Client/Entity.h
rename to src/Entity.h
diff --git a/src/Client/EntityComponents.c b/src/EntityComponents.c
similarity index 100%
rename from src/Client/EntityComponents.c
rename to src/EntityComponents.c
diff --git a/src/Client/EntityComponents.h b/src/EntityComponents.h
similarity index 100%
rename from src/Client/EntityComponents.h
rename to src/EntityComponents.h
diff --git a/src/Client/EnvRenderer.c b/src/EnvRenderer.c
similarity index 100%
rename from src/Client/EnvRenderer.c
rename to src/EnvRenderer.c
diff --git a/src/Client/EnvRenderer.h b/src/EnvRenderer.h
similarity index 100%
rename from src/Client/EnvRenderer.h
rename to src/EnvRenderer.h
diff --git a/src/Client/ErrorHandler.c b/src/ErrorHandler.c
similarity index 100%
rename from src/Client/ErrorHandler.c
rename to src/ErrorHandler.c
diff --git a/src/Client/ErrorHandler.h b/src/ErrorHandler.h
similarity index 100%
rename from src/Client/ErrorHandler.h
rename to src/ErrorHandler.h
diff --git a/src/Client/Errors.h b/src/Errors.h
similarity index 100%
rename from src/Client/Errors.h
rename to src/Errors.h
diff --git a/src/Client/Event.c b/src/Event.c
similarity index 100%
rename from src/Client/Event.c
rename to src/Event.c
diff --git a/src/Client/Event.h b/src/Event.h
similarity index 100%
rename from src/Client/Event.h
rename to src/Event.h
diff --git a/src/Client/ExtMath.c b/src/ExtMath.c
similarity index 100%
rename from src/Client/ExtMath.c
rename to src/ExtMath.c
diff --git a/src/Client/ExtMath.h b/src/ExtMath.h
similarity index 100%
rename from src/Client/ExtMath.h
rename to src/ExtMath.h
diff --git a/src/Client/Formats.c b/src/Formats.c
similarity index 100%
rename from src/Client/Formats.c
rename to src/Formats.c
diff --git a/src/Client/Formats.h b/src/Formats.h
similarity index 100%
rename from src/Client/Formats.h
rename to src/Formats.h
diff --git a/src/Client/Funcs.h b/src/Funcs.h
similarity index 100%
rename from src/Client/Funcs.h
rename to src/Funcs.h
diff --git a/src/Client/Game.c b/src/Game.c
similarity index 100%
rename from src/Client/Game.c
rename to src/Game.c
diff --git a/src/Client/Game.h b/src/Game.h
similarity index 100%
rename from src/Client/Game.h
rename to src/Game.h
diff --git a/src/Client/GameStructs.h b/src/GameStructs.h
similarity index 100%
rename from src/Client/GameStructs.h
rename to src/GameStructs.h
diff --git a/src/Client/GraphicsAPI.h b/src/GraphicsAPI.h
similarity index 100%
rename from src/Client/GraphicsAPI.h
rename to src/GraphicsAPI.h
diff --git a/src/Client/GraphicsCommon.c b/src/GraphicsCommon.c
similarity index 100%
rename from src/Client/GraphicsCommon.c
rename to src/GraphicsCommon.c
diff --git a/src/Client/GraphicsCommon.h b/src/GraphicsCommon.h
similarity index 100%
rename from src/Client/GraphicsCommon.h
rename to src/GraphicsCommon.h
diff --git a/src/Client/Gui.c b/src/Gui.c
similarity index 100%
rename from src/Client/Gui.c
rename to src/Gui.c
diff --git a/src/Client/Gui.h b/src/Gui.h
similarity index 100%
rename from src/Client/Gui.h
rename to src/Gui.h
diff --git a/src/Client/HeldBlockRenderer.c b/src/HeldBlockRenderer.c
similarity index 100%
rename from src/Client/HeldBlockRenderer.c
rename to src/HeldBlockRenderer.c
diff --git a/src/Client/HeldBlockRenderer.h b/src/HeldBlockRenderer.h
similarity index 100%
rename from src/Client/HeldBlockRenderer.h
rename to src/HeldBlockRenderer.h
diff --git a/src/Client/IModel.c b/src/IModel.c
similarity index 100%
rename from src/Client/IModel.c
rename to src/IModel.c
diff --git a/src/Client/IModel.h b/src/IModel.h
similarity index 100%
rename from src/Client/IModel.h
rename to src/IModel.h
diff --git a/src/Client/Input.c b/src/Input.c
similarity index 100%
rename from src/Client/Input.c
rename to src/Input.c
diff --git a/src/Client/Input.h b/src/Input.h
similarity index 100%
rename from src/Client/Input.h
rename to src/Input.h
diff --git a/src/Client/InputHandler.c b/src/InputHandler.c
similarity index 100%
rename from src/Client/InputHandler.c
rename to src/InputHandler.c
diff --git a/src/Client/InputHandler.h b/src/InputHandler.h
similarity index 100%
rename from src/Client/InputHandler.h
rename to src/InputHandler.h
diff --git a/src/Client/Inventory.c b/src/Inventory.c
similarity index 100%
rename from src/Client/Inventory.c
rename to src/Inventory.c
diff --git a/src/Client/Inventory.h b/src/Inventory.h
similarity index 100%
rename from src/Client/Inventory.h
rename to src/Inventory.h
diff --git a/src/Client/IsometricDrawer.c b/src/IsometricDrawer.c
similarity index 100%
rename from src/Client/IsometricDrawer.c
rename to src/IsometricDrawer.c
diff --git a/src/Client/IsometricDrawer.h b/src/IsometricDrawer.h
similarity index 100%
rename from src/Client/IsometricDrawer.h
rename to src/IsometricDrawer.h
diff --git a/src/Client/Lighting.c b/src/Lighting.c
similarity index 100%
rename from src/Client/Lighting.c
rename to src/Lighting.c
diff --git a/src/Client/Lighting.h b/src/Lighting.h
similarity index 100%
rename from src/Client/Lighting.h
rename to src/Lighting.h
diff --git a/src/Client/MapGenerator.c b/src/MapGenerator.c
similarity index 100%
rename from src/Client/MapGenerator.c
rename to src/MapGenerator.c
diff --git a/src/Client/MapGenerator.h b/src/MapGenerator.h
similarity index 100%
rename from src/Client/MapGenerator.h
rename to src/MapGenerator.h
diff --git a/src/Client/MapRenderer.c b/src/MapRenderer.c
similarity index 100%
rename from src/Client/MapRenderer.c
rename to src/MapRenderer.c
diff --git a/src/Client/MapRenderer.h b/src/MapRenderer.h
similarity index 100%
rename from src/Client/MapRenderer.h
rename to src/MapRenderer.h
diff --git a/src/Client/Menus.c b/src/Menus.c
similarity index 100%
rename from src/Client/Menus.c
rename to src/Menus.c
diff --git a/src/Client/Menus.h b/src/Menus.h
similarity index 100%
rename from src/Client/Menus.h
rename to src/Menus.h
diff --git a/src/Client/ModelCache.c b/src/ModelCache.c
similarity index 100%
rename from src/Client/ModelCache.c
rename to src/ModelCache.c
diff --git a/src/Client/ModelCache.h b/src/ModelCache.h
similarity index 100%
rename from src/Client/ModelCache.h
rename to src/ModelCache.h
diff --git a/src/Client/NixWindow.c b/src/NixWindow.c
similarity index 100%
rename from src/Client/NixWindow.c
rename to src/NixWindow.c
diff --git a/src/Client/OpenGLApi.c b/src/OpenGLApi.c
similarity index 100%
rename from src/Client/OpenGLApi.c
rename to src/OpenGLApi.c
diff --git a/src/Client/Options.c b/src/Options.c
similarity index 100%
rename from src/Client/Options.c
rename to src/Options.c
diff --git a/src/Client/Options.h b/src/Options.h
similarity index 100%
rename from src/Client/Options.h
rename to src/Options.h
diff --git a/src/Client/PackedCol.c b/src/PackedCol.c
similarity index 100%
rename from src/Client/PackedCol.c
rename to src/PackedCol.c
diff --git a/src/Client/PackedCol.h b/src/PackedCol.h
similarity index 100%
rename from src/Client/PackedCol.h
rename to src/PackedCol.h
diff --git a/src/Client/PacketHandlers.c b/src/PacketHandlers.c
similarity index 100%
rename from src/Client/PacketHandlers.c
rename to src/PacketHandlers.c
diff --git a/src/Client/PacketHandlers.h b/src/PacketHandlers.h
similarity index 100%
rename from src/Client/PacketHandlers.h
rename to src/PacketHandlers.h
diff --git a/src/Client/Particle.c b/src/Particle.c
similarity index 100%
rename from src/Client/Particle.c
rename to src/Particle.c
diff --git a/src/Client/Particle.h b/src/Particle.h
similarity index 100%
rename from src/Client/Particle.h
rename to src/Particle.h
diff --git a/src/Client/Physics.c b/src/Physics.c
similarity index 100%
rename from src/Client/Physics.c
rename to src/Physics.c
diff --git a/src/Client/Physics.h b/src/Physics.h
similarity index 100%
rename from src/Client/Physics.h
rename to src/Physics.h
diff --git a/src/Client/PickedPosRenderer.c b/src/PickedPosRenderer.c
similarity index 100%
rename from src/Client/PickedPosRenderer.c
rename to src/PickedPosRenderer.c
diff --git a/src/Client/PickedPosRenderer.h b/src/PickedPosRenderer.h
similarity index 100%
rename from src/Client/PickedPosRenderer.h
rename to src/PickedPosRenderer.h
diff --git a/src/Client/Picking.c b/src/Picking.c
similarity index 100%
rename from src/Client/Picking.c
rename to src/Picking.c
diff --git a/src/Client/Picking.h b/src/Picking.h
similarity index 100%
rename from src/Client/Picking.h
rename to src/Picking.h
diff --git a/src/Client/Platform.c b/src/Platform.c
similarity index 100%
rename from src/Client/Platform.c
rename to src/Platform.c
diff --git a/src/Client/Platform.h b/src/Platform.h
similarity index 100%
rename from src/Client/Platform.h
rename to src/Platform.h
diff --git a/src/Client/Program.c b/src/Program.c
similarity index 100%
rename from src/Client/Program.c
rename to src/Program.c
diff --git a/src/Client/Screens.c b/src/Screens.c
similarity index 100%
rename from src/Client/Screens.c
rename to src/Screens.c
diff --git a/src/Client/Screens.h b/src/Screens.h
similarity index 100%
rename from src/Client/Screens.h
rename to src/Screens.h
diff --git a/src/Client/SelectionBox.c b/src/SelectionBox.c
similarity index 100%
rename from src/Client/SelectionBox.c
rename to src/SelectionBox.c
diff --git a/src/Client/SelectionBox.h b/src/SelectionBox.h
similarity index 100%
rename from src/Client/SelectionBox.h
rename to src/SelectionBox.h
diff --git a/src/Client/ServerConnection.c b/src/ServerConnection.c
similarity index 100%
rename from src/Client/ServerConnection.c
rename to src/ServerConnection.c
diff --git a/src/Client/ServerConnection.h b/src/ServerConnection.h
similarity index 100%
rename from src/Client/ServerConnection.h
rename to src/ServerConnection.h
diff --git a/src/Client/Stream.c b/src/Stream.c
similarity index 100%
rename from src/Client/Stream.c
rename to src/Stream.c
diff --git a/src/Client/Stream.h b/src/Stream.h
similarity index 100%
rename from src/Client/Stream.h
rename to src/Stream.h
diff --git a/src/Client/String.c b/src/String.c
similarity index 100%
rename from src/Client/String.c
rename to src/String.c
diff --git a/src/Client/String.h b/src/String.h
similarity index 100%
rename from src/Client/String.h
rename to src/String.h
diff --git a/src/Client/TerrainAtlas.c b/src/TerrainAtlas.c
similarity index 100%
rename from src/Client/TerrainAtlas.c
rename to src/TerrainAtlas.c
diff --git a/src/Client/TerrainAtlas.h b/src/TerrainAtlas.h
similarity index 100%
rename from src/Client/TerrainAtlas.h
rename to src/TerrainAtlas.h
diff --git a/src/Client/TexturePack.c b/src/TexturePack.c
similarity index 100%
rename from src/Client/TexturePack.c
rename to src/TexturePack.c
diff --git a/src/Client/TexturePack.h b/src/TexturePack.h
similarity index 100%
rename from src/Client/TexturePack.h
rename to src/TexturePack.h
diff --git a/src/Client/Typedefs.h b/src/Typedefs.h
similarity index 100%
rename from src/Client/Typedefs.h
rename to src/Typedefs.h
diff --git a/src/Client/Utils.c b/src/Utils.c
similarity index 100%
rename from src/Client/Utils.c
rename to src/Utils.c
diff --git a/src/Client/Utils.h b/src/Utils.h
similarity index 100%
rename from src/Client/Utils.h
rename to src/Utils.h
diff --git a/src/Client/Vectors.c b/src/Vectors.c
similarity index 100%
rename from src/Client/Vectors.c
rename to src/Vectors.c
diff --git a/src/Client/Vectors.h b/src/Vectors.h
similarity index 100%
rename from src/Client/Vectors.h
rename to src/Vectors.h
diff --git a/src/Client/VertexStructs.h b/src/VertexStructs.h
similarity index 100%
rename from src/Client/VertexStructs.h
rename to src/VertexStructs.h
diff --git a/src/Client/Vorbis.c b/src/Vorbis.c
similarity index 100%
rename from src/Client/Vorbis.c
rename to src/Vorbis.c
diff --git a/src/Client/Vorbis.h b/src/Vorbis.h
similarity index 100%
rename from src/Client/Vorbis.h
rename to src/Vorbis.h
diff --git a/src/Client/Widgets.c b/src/Widgets.c
similarity index 100%
rename from src/Client/Widgets.c
rename to src/Widgets.c
diff --git a/src/Client/Widgets.h b/src/Widgets.h
similarity index 100%
rename from src/Client/Widgets.h
rename to src/Widgets.h
diff --git a/src/Client/WinWindow.c b/src/WinWindow.c
similarity index 100%
rename from src/Client/WinWindow.c
rename to src/WinWindow.c
diff --git a/src/Client/Window.h b/src/Window.h
similarity index 100%
rename from src/Client/Window.h
rename to src/Window.h
diff --git a/src/Client/World.c b/src/World.c
similarity index 100%
rename from src/Client/World.c
rename to src/World.c
diff --git a/src/Client/World.h b/src/World.h
similarity index 100%
rename from src/Client/World.h
rename to src/World.h