diff --git a/ClassicalSharp.sln b/ClassicalSharp.sln
index eac9a4b55..9eb19f36c 100644
--- a/ClassicalSharp.sln
+++ b/ClassicalSharp.sln
@@ -2,7 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 # SharpDevelop 4.4
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassicalSharp", "ClassicalSharp.csproj", "{BEB1C785-5CAD-48FF-A886-876BF0A318D4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassicalSharp", "ClassicalSharp\ClassicalSharp.csproj", "{BEB1C785-5CAD-48FF-A886-876BF0A318D4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launcher", "Launcher\Launcher.csproj", "{23B9BDA8-4330-46AB-9012-08D87430391A}"
 EndProject
diff --git a/2D/DrawTextArgs.cs b/ClassicalSharp/2D/DrawTextArgs.cs
similarity index 100%
rename from 2D/DrawTextArgs.cs
rename to ClassicalSharp/2D/DrawTextArgs.cs
diff --git a/2D/Screens/BlockSelectScreen.cs b/ClassicalSharp/2D/Screens/BlockSelectScreen.cs
similarity index 100%
rename from 2D/Screens/BlockSelectScreen.cs
rename to ClassicalSharp/2D/Screens/BlockSelectScreen.cs
diff --git a/2D/Screens/ChatScreen.cs b/ClassicalSharp/2D/Screens/ChatScreen.cs
similarity index 100%
rename from 2D/Screens/ChatScreen.cs
rename to ClassicalSharp/2D/Screens/ChatScreen.cs
diff --git a/2D/Screens/ErrorScreen.cs b/ClassicalSharp/2D/Screens/ErrorScreen.cs
similarity index 100%
rename from 2D/Screens/ErrorScreen.cs
rename to ClassicalSharp/2D/Screens/ErrorScreen.cs
diff --git a/2D/Screens/FpsScreen.cs b/ClassicalSharp/2D/Screens/FpsScreen.cs
similarity index 100%
rename from 2D/Screens/FpsScreen.cs
rename to ClassicalSharp/2D/Screens/FpsScreen.cs
diff --git a/2D/Screens/LoadingMapScreen.cs b/ClassicalSharp/2D/Screens/LoadingMapScreen.cs
similarity index 100%
rename from 2D/Screens/LoadingMapScreen.cs
rename to ClassicalSharp/2D/Screens/LoadingMapScreen.cs
diff --git a/2D/Screens/NormalScreen.cs b/ClassicalSharp/2D/Screens/NormalScreen.cs
similarity index 100%
rename from 2D/Screens/NormalScreen.cs
rename to ClassicalSharp/2D/Screens/NormalScreen.cs
diff --git a/2D/Screens/PauseScreen.cs b/ClassicalSharp/2D/Screens/PauseScreen.cs
similarity index 100%
rename from 2D/Screens/PauseScreen.cs
rename to ClassicalSharp/2D/Screens/PauseScreen.cs
diff --git a/2D/Screens/Screen.cs b/ClassicalSharp/2D/Screens/Screen.cs
similarity index 100%
rename from 2D/Screens/Screen.cs
rename to ClassicalSharp/2D/Screens/Screen.cs
diff --git a/2D/Texture.cs b/ClassicalSharp/2D/Texture.cs
similarity index 100%
rename from 2D/Texture.cs
rename to ClassicalSharp/2D/Texture.cs
diff --git a/2D/Utils2D.cs b/ClassicalSharp/2D/Utils2D.cs
similarity index 100%
rename from 2D/Utils2D.cs
rename to ClassicalSharp/2D/Utils2D.cs
diff --git a/2D/Widgets/BlockHotbarWidget.cs b/ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs
similarity index 100%
rename from 2D/Widgets/BlockHotbarWidget.cs
rename to ClassicalSharp/2D/Widgets/BlockHotbarWidget.cs
diff --git a/2D/Widgets/ExtPlayerListWidget.cs b/ClassicalSharp/2D/Widgets/ExtPlayerListWidget.cs
similarity index 100%
rename from 2D/Widgets/ExtPlayerListWidget.cs
rename to ClassicalSharp/2D/Widgets/ExtPlayerListWidget.cs
diff --git a/2D/Widgets/NormalPlayerListWidget.cs b/ClassicalSharp/2D/Widgets/NormalPlayerListWidget.cs
similarity index 100%
rename from 2D/Widgets/NormalPlayerListWidget.cs
rename to ClassicalSharp/2D/Widgets/NormalPlayerListWidget.cs
diff --git a/2D/Widgets/PlayerListWidget.cs b/ClassicalSharp/2D/Widgets/PlayerListWidget.cs
similarity index 100%
rename from 2D/Widgets/PlayerListWidget.cs
rename to ClassicalSharp/2D/Widgets/PlayerListWidget.cs
diff --git a/2D/Widgets/TextGroupWidget.cs b/ClassicalSharp/2D/Widgets/TextGroupWidget.cs
similarity index 100%
rename from 2D/Widgets/TextGroupWidget.cs
rename to ClassicalSharp/2D/Widgets/TextGroupWidget.cs
diff --git a/2D/Widgets/TextInputWidget.cs b/ClassicalSharp/2D/Widgets/TextInputWidget.cs
similarity index 100%
rename from 2D/Widgets/TextInputWidget.cs
rename to ClassicalSharp/2D/Widgets/TextInputWidget.cs
diff --git a/2D/Widgets/TextWidget.cs b/ClassicalSharp/2D/Widgets/TextWidget.cs
similarity index 100%
rename from 2D/Widgets/TextWidget.cs
rename to ClassicalSharp/2D/Widgets/TextWidget.cs
diff --git a/2D/Widgets/Widget.cs b/ClassicalSharp/2D/Widgets/Widget.cs
similarity index 100%
rename from 2D/Widgets/Widget.cs
rename to ClassicalSharp/2D/Widgets/Widget.cs
diff --git a/Blocks/Block.cs b/ClassicalSharp/Blocks/Block.cs
similarity index 100%
rename from Blocks/Block.cs
rename to ClassicalSharp/Blocks/Block.cs
diff --git a/Blocks/BlockInfo.Culling.cs b/ClassicalSharp/Blocks/BlockInfo.Culling.cs
similarity index 100%
rename from Blocks/BlockInfo.Culling.cs
rename to ClassicalSharp/Blocks/BlockInfo.Culling.cs
diff --git a/Blocks/BlockInfo.Optimised.cs b/ClassicalSharp/Blocks/BlockInfo.Optimised.cs
similarity index 100%
rename from Blocks/BlockInfo.Optimised.cs
rename to ClassicalSharp/Blocks/BlockInfo.Optimised.cs
diff --git a/Blocks/BlockInfo.cs b/ClassicalSharp/Blocks/BlockInfo.cs
similarity index 100%
rename from Blocks/BlockInfo.cs
rename to ClassicalSharp/Blocks/BlockInfo.cs
diff --git a/ClassicalSharp.csproj b/ClassicalSharp/ClassicalSharp.csproj
similarity index 79%
rename from ClassicalSharp.csproj
rename to ClassicalSharp/ClassicalSharp.csproj
index 2cb712921..2b895a4ac 100644
--- a/ClassicalSharp.csproj
+++ b/ClassicalSharp/ClassicalSharp.csproj
@@ -8,45 +8,25 @@
     <RootNamespace>ClassicalSharp</RootNamespace>
     <AssemblyName>ClassicalSharp</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <AppDesignerFolder>Properties</AppDesignerFolder>
+    <NoWin32Manifest>False</NoWin32Manifest>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <NoStdLib>False</NoStdLib>
-    <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <TargetFrameworkProfile />
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <RunCodeAnalysis>False</RunCodeAnalysis>
-    <NoWin32Manifest>False</NoWin32Manifest>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <BaseAddress>4194304</BaseAddress>
     <RegisterForComInterop>False</RegisterForComInterop>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
     <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>output\debug\</OutputPath>
+    <OutputPath>..\output\debug\</OutputPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
@@ -57,7 +37,7 @@
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>output\release\</OutputPath>
+    <OutputPath>..\output\release\</OutputPath>
     <DebugSymbols>false</DebugSymbols>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
@@ -67,7 +47,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug_DX32' ">
     <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>output\debug\</OutputPath>
+    <OutputPath>..\output\debug\</OutputPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
@@ -184,34 +164,12 @@
     <Compile Include="Utils\Utils.cs" />
     <Compile Include="Utils\Vector3I.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="launcher instructions.txt">
+    <None Include="..\launcher instructions.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="readme.md">
+    <None Include="..\readme.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -230,7 +188,7 @@
     <Folder Include="Physics" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="OpenTK\OpenTK.csproj">
+    <ProjectReference Include="..\OpenTK\OpenTK.csproj">
       <Project>{35FEE071-2DE6-48A1-9343-B5C1F202A12B}</Project>
       <Name>OpenTK</Name>
     </ProjectReference>
diff --git a/Commands/Command.cs b/ClassicalSharp/Commands/Command.cs
similarity index 100%
rename from Commands/Command.cs
rename to ClassicalSharp/Commands/Command.cs
diff --git a/Commands/CommandManager.cs b/ClassicalSharp/Commands/CommandManager.cs
similarity index 100%
rename from Commands/CommandManager.cs
rename to ClassicalSharp/Commands/CommandManager.cs
diff --git a/Commands/CommandReader.cs b/ClassicalSharp/Commands/CommandReader.cs
similarity index 100%
rename from Commands/CommandReader.cs
rename to ClassicalSharp/Commands/CommandReader.cs
diff --git a/Commands/DefaultCommands.cs b/ClassicalSharp/Commands/DefaultCommands.cs
similarity index 100%
rename from Commands/DefaultCommands.cs
rename to ClassicalSharp/Commands/DefaultCommands.cs
diff --git a/Entities/Entity.cs b/ClassicalSharp/Entities/Entity.cs
similarity index 100%
rename from Entities/Entity.cs
rename to ClassicalSharp/Entities/Entity.cs
diff --git a/Entities/EntityList.cs b/ClassicalSharp/Entities/EntityList.cs
similarity index 100%
rename from Entities/EntityList.cs
rename to ClassicalSharp/Entities/EntityList.cs
diff --git a/Entities/LocalPlayer.cs b/ClassicalSharp/Entities/LocalPlayer.cs
similarity index 100%
rename from Entities/LocalPlayer.cs
rename to ClassicalSharp/Entities/LocalPlayer.cs
diff --git a/Entities/LocationUpdate.cs b/ClassicalSharp/Entities/LocationUpdate.cs
similarity index 100%
rename from Entities/LocationUpdate.cs
rename to ClassicalSharp/Entities/LocationUpdate.cs
diff --git a/Entities/NetPlayer.cs b/ClassicalSharp/Entities/NetPlayer.cs
similarity index 100%
rename from Entities/NetPlayer.cs
rename to ClassicalSharp/Entities/NetPlayer.cs
diff --git a/Entities/Particles/Particle.cs b/ClassicalSharp/Entities/Particles/Particle.cs
similarity index 100%
rename from Entities/Particles/Particle.cs
rename to ClassicalSharp/Entities/Particles/Particle.cs
diff --git a/Entities/Particles/ParticleManager.cs b/ClassicalSharp/Entities/Particles/ParticleManager.cs
similarity index 100%
rename from Entities/Particles/ParticleManager.cs
rename to ClassicalSharp/Entities/Particles/ParticleManager.cs
diff --git a/Entities/Particles/TerrainParticle.cs b/ClassicalSharp/Entities/Particles/TerrainParticle.cs
similarity index 100%
rename from Entities/Particles/TerrainParticle.cs
rename to ClassicalSharp/Entities/Particles/TerrainParticle.cs
diff --git a/Entities/Player.Rendering.cs b/ClassicalSharp/Entities/Player.Rendering.cs
similarity index 100%
rename from Entities/Player.Rendering.cs
rename to ClassicalSharp/Entities/Player.Rendering.cs
diff --git a/Entities/Player.cs b/ClassicalSharp/Entities/Player.cs
similarity index 100%
rename from Entities/Player.cs
rename to ClassicalSharp/Entities/Player.cs
diff --git a/Game/Game.Chat.cs b/ClassicalSharp/Game/Game.Chat.cs
similarity index 100%
rename from Game/Game.Chat.cs
rename to ClassicalSharp/Game/Game.Chat.cs
diff --git a/Game/Game.Events.cs b/ClassicalSharp/Game/Game.Events.cs
similarity index 100%
rename from Game/Game.Events.cs
rename to ClassicalSharp/Game/Game.Events.cs
diff --git a/Game/Game.InputHandling.cs b/ClassicalSharp/Game/Game.InputHandling.cs
similarity index 100%
rename from Game/Game.InputHandling.cs
rename to ClassicalSharp/Game/Game.InputHandling.cs
diff --git a/Game/Game.cs b/ClassicalSharp/Game/Game.cs
similarity index 100%
rename from Game/Game.cs
rename to ClassicalSharp/Game/Game.cs
diff --git a/GraphicsAPI/DirectXApi.cs b/ClassicalSharp/GraphicsAPI/DirectXApi.cs
similarity index 100%
rename from GraphicsAPI/DirectXApi.cs
rename to ClassicalSharp/GraphicsAPI/DirectXApi.cs
diff --git a/GraphicsAPI/IGraphicsApi.cs b/ClassicalSharp/GraphicsAPI/IGraphicsApi.cs
similarity index 100%
rename from GraphicsAPI/IGraphicsApi.cs
rename to ClassicalSharp/GraphicsAPI/IGraphicsApi.cs
diff --git a/GraphicsAPI/OpenGLApi.cs b/ClassicalSharp/GraphicsAPI/OpenGLApi.cs
similarity index 100%
rename from GraphicsAPI/OpenGLApi.cs
rename to ClassicalSharp/GraphicsAPI/OpenGLApi.cs
diff --git a/GraphicsAPI/VertexFormats.cs b/ClassicalSharp/GraphicsAPI/VertexFormats.cs
similarity index 100%
rename from GraphicsAPI/VertexFormats.cs
rename to ClassicalSharp/GraphicsAPI/VertexFormats.cs
diff --git a/Ionic.Zlib/DeflateStream.cs b/ClassicalSharp/Ionic.Zlib/DeflateStream.cs
similarity index 100%
rename from Ionic.Zlib/DeflateStream.cs
rename to ClassicalSharp/Ionic.Zlib/DeflateStream.cs
diff --git a/Ionic.Zlib/InfTree.cs b/ClassicalSharp/Ionic.Zlib/InfTree.cs
similarity index 100%
rename from Ionic.Zlib/InfTree.cs
rename to ClassicalSharp/Ionic.Zlib/InfTree.cs
diff --git a/Ionic.Zlib/Inflate.cs b/ClassicalSharp/Ionic.Zlib/Inflate.cs
similarity index 100%
rename from Ionic.Zlib/Inflate.cs
rename to ClassicalSharp/Ionic.Zlib/Inflate.cs
diff --git a/Ionic.Zlib/ZlibCodec.cs b/ClassicalSharp/Ionic.Zlib/ZlibCodec.cs
similarity index 100%
rename from Ionic.Zlib/ZlibCodec.cs
rename to ClassicalSharp/Ionic.Zlib/ZlibCodec.cs
diff --git a/Map/ChunkMeshBuilder.cs b/ClassicalSharp/Map/ChunkMeshBuilder.cs
similarity index 100%
rename from Map/ChunkMeshBuilder.cs
rename to ClassicalSharp/Map/ChunkMeshBuilder.cs
diff --git a/Map/ChunkMeshBuilderTex2Col4.cs b/ClassicalSharp/Map/ChunkMeshBuilderTex2Col4.cs
similarity index 100%
rename from Map/ChunkMeshBuilderTex2Col4.cs
rename to ClassicalSharp/Map/ChunkMeshBuilderTex2Col4.cs
diff --git a/Map/Map.cs b/ClassicalSharp/Map/Map.cs
similarity index 100%
rename from Map/Map.cs
rename to ClassicalSharp/Map/Map.cs
diff --git a/Model/BlockModel.cs b/ClassicalSharp/Model/BlockModel.cs
similarity index 100%
rename from Model/BlockModel.cs
rename to ClassicalSharp/Model/BlockModel.cs
diff --git a/Model/ChickenModel.cs b/ClassicalSharp/Model/ChickenModel.cs
similarity index 100%
rename from Model/ChickenModel.cs
rename to ClassicalSharp/Model/ChickenModel.cs
diff --git a/Model/CreeperModel.cs b/ClassicalSharp/Model/CreeperModel.cs
similarity index 100%
rename from Model/CreeperModel.cs
rename to ClassicalSharp/Model/CreeperModel.cs
diff --git a/Model/IModel.cs b/ClassicalSharp/Model/IModel.cs
similarity index 100%
rename from Model/IModel.cs
rename to ClassicalSharp/Model/IModel.cs
diff --git a/Model/ModelCache.cs b/ClassicalSharp/Model/ModelCache.cs
similarity index 100%
rename from Model/ModelCache.cs
rename to ClassicalSharp/Model/ModelCache.cs
diff --git a/Model/ModelPart.cs b/ClassicalSharp/Model/ModelPart.cs
similarity index 100%
rename from Model/ModelPart.cs
rename to ClassicalSharp/Model/ModelPart.cs
diff --git a/Model/PigModel.cs b/ClassicalSharp/Model/PigModel.cs
similarity index 100%
rename from Model/PigModel.cs
rename to ClassicalSharp/Model/PigModel.cs
diff --git a/Model/PlayerModel.cs b/ClassicalSharp/Model/PlayerModel.cs
similarity index 100%
rename from Model/PlayerModel.cs
rename to ClassicalSharp/Model/PlayerModel.cs
diff --git a/Model/SheepModel.cs b/ClassicalSharp/Model/SheepModel.cs
similarity index 100%
rename from Model/SheepModel.cs
rename to ClassicalSharp/Model/SheepModel.cs
diff --git a/Model/SkeletonModel.cs b/ClassicalSharp/Model/SkeletonModel.cs
similarity index 100%
rename from Model/SkeletonModel.cs
rename to ClassicalSharp/Model/SkeletonModel.cs
diff --git a/Model/SpiderModel.cs b/ClassicalSharp/Model/SpiderModel.cs
similarity index 100%
rename from Model/SpiderModel.cs
rename to ClassicalSharp/Model/SpiderModel.cs
diff --git a/Model/ZombieModel.cs b/ClassicalSharp/Model/ZombieModel.cs
similarity index 100%
rename from Model/ZombieModel.cs
rename to ClassicalSharp/Model/ZombieModel.cs
diff --git a/Network/AsyncDownloader.cs b/ClassicalSharp/Network/AsyncDownloader.cs
similarity index 100%
rename from Network/AsyncDownloader.cs
rename to ClassicalSharp/Network/AsyncDownloader.cs
diff --git a/Network/Enums.cs b/ClassicalSharp/Network/Enums.cs
similarity index 100%
rename from Network/Enums.cs
rename to ClassicalSharp/Network/Enums.cs
diff --git a/Network/FastNetReader.cs b/ClassicalSharp/Network/FastNetReader.cs
similarity index 100%
rename from Network/FastNetReader.cs
rename to ClassicalSharp/Network/FastNetReader.cs
diff --git a/Network/FixedBufferStream.cs b/ClassicalSharp/Network/FixedBufferStream.cs
similarity index 100%
rename from Network/FixedBufferStream.cs
rename to ClassicalSharp/Network/FixedBufferStream.cs
diff --git a/Network/GZipHeaderReader.cs b/ClassicalSharp/Network/GZipHeaderReader.cs
similarity index 100%
rename from Network/GZipHeaderReader.cs
rename to ClassicalSharp/Network/GZipHeaderReader.cs
diff --git a/Network/NetworkProcessor.cs b/ClassicalSharp/Network/NetworkProcessor.cs
similarity index 100%
rename from Network/NetworkProcessor.cs
rename to ClassicalSharp/Network/NetworkProcessor.cs
diff --git a/Network/WomConfigHandler.cs b/ClassicalSharp/Network/WomConfigHandler.cs
similarity index 100%
rename from Network/WomConfigHandler.cs
rename to ClassicalSharp/Network/WomConfigHandler.cs
diff --git a/Physics/BoundingBox.cs b/ClassicalSharp/Physics/BoundingBox.cs
similarity index 100%
rename from Physics/BoundingBox.cs
rename to ClassicalSharp/Physics/BoundingBox.cs
diff --git a/Physics/Entity.Physics.cs b/ClassicalSharp/Physics/Entity.Physics.cs
similarity index 100%
rename from Physics/Entity.Physics.cs
rename to ClassicalSharp/Physics/Entity.Physics.cs
diff --git a/Physics/IntersectionUtils.cs b/ClassicalSharp/Physics/IntersectionUtils.cs
similarity index 100%
rename from Physics/IntersectionUtils.cs
rename to ClassicalSharp/Physics/IntersectionUtils.cs
diff --git a/Physics/Picking.cs b/ClassicalSharp/Physics/Picking.cs
similarity index 100%
rename from Physics/Picking.cs
rename to ClassicalSharp/Physics/Picking.cs
diff --git a/Program.cs b/ClassicalSharp/Program.cs
similarity index 100%
rename from Program.cs
rename to ClassicalSharp/Program.cs
diff --git a/Properties/AssemblyInfo.cs b/ClassicalSharp/Properties/AssemblyInfo.cs
similarity index 100%
rename from Properties/AssemblyInfo.cs
rename to ClassicalSharp/Properties/AssemblyInfo.cs
diff --git a/Rendering/EnvRenderer.cs b/ClassicalSharp/Rendering/EnvRenderer.cs
similarity index 100%
rename from Rendering/EnvRenderer.cs
rename to ClassicalSharp/Rendering/EnvRenderer.cs
diff --git a/Rendering/FrustumCulling.cs b/ClassicalSharp/Rendering/FrustumCulling.cs
similarity index 100%
rename from Rendering/FrustumCulling.cs
rename to ClassicalSharp/Rendering/FrustumCulling.cs
diff --git a/Rendering/MapEnvRenderer.cs b/ClassicalSharp/Rendering/MapEnvRenderer.cs
similarity index 100%
rename from Rendering/MapEnvRenderer.cs
rename to ClassicalSharp/Rendering/MapEnvRenderer.cs
diff --git a/Rendering/MapRenderer.cs b/ClassicalSharp/Rendering/MapRenderer.cs
similarity index 100%
rename from Rendering/MapRenderer.cs
rename to ClassicalSharp/Rendering/MapRenderer.cs
diff --git a/Rendering/MinimalEnvRenderer.cs b/ClassicalSharp/Rendering/MinimalEnvRenderer.cs
similarity index 100%
rename from Rendering/MinimalEnvRenderer.cs
rename to ClassicalSharp/Rendering/MinimalEnvRenderer.cs
diff --git a/Rendering/PickingRenderer.cs b/ClassicalSharp/Rendering/PickingRenderer.cs
similarity index 100%
rename from Rendering/PickingRenderer.cs
rename to ClassicalSharp/Rendering/PickingRenderer.cs
diff --git a/Rendering/StandardEnvRenderer.cs b/ClassicalSharp/Rendering/StandardEnvRenderer.cs
similarity index 100%
rename from Rendering/StandardEnvRenderer.cs
rename to ClassicalSharp/Rendering/StandardEnvRenderer.cs
diff --git a/Rendering/WeatherRenderer.cs b/ClassicalSharp/Rendering/WeatherRenderer.cs
similarity index 100%
rename from Rendering/WeatherRenderer.cs
rename to ClassicalSharp/Rendering/WeatherRenderer.cs
diff --git a/Selections/SelectionBox.cs b/ClassicalSharp/Selections/SelectionBox.cs
similarity index 100%
rename from Selections/SelectionBox.cs
rename to ClassicalSharp/Selections/SelectionBox.cs
diff --git a/Selections/SelectionBoxComparer.cs b/ClassicalSharp/Selections/SelectionBoxComparer.cs
similarity index 100%
rename from Selections/SelectionBoxComparer.cs
rename to ClassicalSharp/Selections/SelectionBoxComparer.cs
diff --git a/Selections/SelectionManager.cs b/ClassicalSharp/Selections/SelectionManager.cs
similarity index 100%
rename from Selections/SelectionManager.cs
rename to ClassicalSharp/Selections/SelectionManager.cs
diff --git a/Utils/Camera.cs b/ClassicalSharp/Utils/Camera.cs
similarity index 100%
rename from Utils/Camera.cs
rename to ClassicalSharp/Utils/Camera.cs
diff --git a/Utils/FastBitmap.cs b/ClassicalSharp/Utils/FastBitmap.cs
similarity index 100%
rename from Utils/FastBitmap.cs
rename to ClassicalSharp/Utils/FastBitmap.cs
diff --git a/Utils/FastColour.cs b/ClassicalSharp/Utils/FastColour.cs
similarity index 100%
rename from Utils/FastColour.cs
rename to ClassicalSharp/Utils/FastColour.cs
diff --git a/Utils/TerrainAtlas1D.cs b/ClassicalSharp/Utils/TerrainAtlas1D.cs
similarity index 100%
rename from Utils/TerrainAtlas1D.cs
rename to ClassicalSharp/Utils/TerrainAtlas1D.cs
diff --git a/Utils/TerrainAtlas2D.cs b/ClassicalSharp/Utils/TerrainAtlas2D.cs
similarity index 100%
rename from Utils/TerrainAtlas2D.cs
rename to ClassicalSharp/Utils/TerrainAtlas2D.cs
diff --git a/Utils/TextureRectangle.cs b/ClassicalSharp/Utils/TextureRectangle.cs
similarity index 100%
rename from Utils/TextureRectangle.cs
rename to ClassicalSharp/Utils/TextureRectangle.cs
diff --git a/Utils/UnsafeString.cs b/ClassicalSharp/Utils/UnsafeString.cs
similarity index 100%
rename from Utils/UnsafeString.cs
rename to ClassicalSharp/Utils/UnsafeString.cs
diff --git a/Utils/Utils.cs b/ClassicalSharp/Utils/Utils.cs
similarity index 100%
rename from Utils/Utils.cs
rename to ClassicalSharp/Utils/Utils.cs
diff --git a/Utils/Vector3I.cs b/ClassicalSharp/Utils/Vector3I.cs
similarity index 100%
rename from Utils/Vector3I.cs
rename to ClassicalSharp/Utils/Vector3I.cs
diff --git a/app.config b/ClassicalSharp/app.config
similarity index 100%
rename from app.config
rename to ClassicalSharp/app.config