diff --git a/ClassicalSharp/ClassicalSharp.sln b/ClassicalSharp.sln
similarity index 100%
rename from ClassicalSharp/ClassicalSharp.sln
rename to ClassicalSharp.sln
diff --git a/ClassicalSharp/ClassicalSharp/2D/Drawing/CanvasDrawer2D.cs b/ClassicalSharp/2D/Drawing/CanvasDrawer2D.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Drawing/CanvasDrawer2D.cs
rename to ClassicalSharp/2D/Drawing/CanvasDrawer2D.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Drawing/GdiPlusDrawer2D.cs b/ClassicalSharp/2D/Drawing/GdiPlusDrawer2D.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Drawing/GdiPlusDrawer2D.cs
rename to ClassicalSharp/2D/Drawing/GdiPlusDrawer2D.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Drawing/IDrawer2D.TextMC.cs b/ClassicalSharp/2D/Drawing/IDrawer2D.TextMC.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Drawing/IDrawer2D.TextMC.cs
rename to ClassicalSharp/2D/Drawing/IDrawer2D.TextMC.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Drawing/IDrawer2D.cs b/ClassicalSharp/2D/Drawing/IDrawer2D.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Drawing/IDrawer2D.cs
rename to ClassicalSharp/2D/Drawing/IDrawer2D.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/GuiElement.cs b/ClassicalSharp/2D/GuiElement.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/GuiElement.cs
rename to ClassicalSharp/2D/GuiElement.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/IsometricBlockDrawer.cs b/ClassicalSharp/2D/IsometricBlockDrawer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/IsometricBlockDrawer.cs
rename to ClassicalSharp/2D/IsometricBlockDrawer.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/ChatScreen.cs b/ClassicalSharp/2D/Screens/ChatScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/ChatScreen.cs
rename to ClassicalSharp/2D/Screens/ChatScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/DeathScreen.cs b/ClassicalSharp/2D/Screens/DeathScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/DeathScreen.cs
rename to ClassicalSharp/2D/Screens/DeathScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/DisconnectScreen.cs b/ClassicalSharp/2D/Screens/DisconnectScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/DisconnectScreen.cs
rename to ClassicalSharp/2D/Screens/DisconnectScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/HudScreen.cs b/ClassicalSharp/2D/Screens/HudScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/HudScreen.cs
rename to ClassicalSharp/2D/Screens/HudScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/InventoryScreen.cs b/ClassicalSharp/2D/Screens/InventoryScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/InventoryScreen.cs
rename to ClassicalSharp/2D/Screens/InventoryScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/LoadingMapScreen.cs b/ClassicalSharp/2D/Screens/LoadingMapScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/LoadingMapScreen.cs
rename to ClassicalSharp/2D/Screens/LoadingMapScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/ClassicOptionsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/ClickableScreen.cs b/ClassicalSharp/2D/Screens/Menu/ClickableScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/ClickableScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/ClickableScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/EditHotkeyScreen.cs b/ClassicalSharp/2D/Screens/Menu/EditHotkeyScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/EditHotkeyScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/EditHotkeyScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/EnvSettingsScreen.cs b/ClassicalSharp/2D/Screens/Menu/EnvSettingsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/EnvSettingsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/EnvSettingsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/FontListScreen.cs b/ClassicalSharp/2D/Screens/Menu/FontListScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/FontListScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/FontListScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/GenLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/GenLevelScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/GenLevelScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/GenLevelScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/GraphicsOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/GraphicsOptionsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/GraphicsOptionsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/GraphicsOptionsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/GuiOptionsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs b/ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/HacksSettingsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/HotkeyListScreen.cs b/ClassicalSharp/2D/Screens/Menu/HotkeyListScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/HotkeyListScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/HotkeyListScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/KeyBindingsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs b/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs
rename to ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/ListScreen.cs b/ClassicalSharp/2D/Screens/Menu/ListScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/ListScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/ListScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/MenuOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/MenuOptionsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/MenuOptionsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/MenuOptionsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/MenuScreen.cs b/ClassicalSharp/2D/Screens/Menu/MenuScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/MenuScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/MenuScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs b/ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/MiscOptionsScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/NostalgiaScreen.cs b/ClassicalSharp/2D/Screens/Menu/NostalgiaScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/NostalgiaScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/NostalgiaScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/OptionsGroupScreen.cs b/ClassicalSharp/2D/Screens/Menu/OptionsGroupScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/OptionsGroupScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/OptionsGroupScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs b/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/PauseScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/PauseScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/SaveLevelScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs b/ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs
rename to ClassicalSharp/2D/Screens/Menu/TexturePackScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Overlays/Overlay.cs b/ClassicalSharp/2D/Screens/Overlays/Overlay.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Overlays/Overlay.cs
rename to ClassicalSharp/2D/Screens/Overlays/Overlay.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Overlays/TexIdsOverlay.cs b/ClassicalSharp/2D/Screens/Overlays/TexIdsOverlay.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Overlays/TexIdsOverlay.cs
rename to ClassicalSharp/2D/Screens/Overlays/TexIdsOverlay.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/Overlays/WarningOverlays.cs b/ClassicalSharp/2D/Screens/Overlays/WarningOverlays.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/Overlays/WarningOverlays.cs
rename to ClassicalSharp/2D/Screens/Overlays/WarningOverlays.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Screens/StatusScreen.cs b/ClassicalSharp/2D/Screens/StatusScreen.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Screens/StatusScreen.cs
rename to ClassicalSharp/2D/Screens/StatusScreen.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Texture.cs b/ClassicalSharp/2D/Texture.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Texture.cs
rename to ClassicalSharp/2D/Texture.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Utils/FastBitmap.cs b/ClassicalSharp/2D/Utils/FastBitmap.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Utils/FastBitmap.cs
rename to ClassicalSharp/2D/Utils/FastBitmap.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Utils/PackedCol.cs b/ClassicalSharp/2D/Utils/PackedCol.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Utils/PackedCol.cs
rename to ClassicalSharp/2D/Utils/PackedCol.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Utils/TextAtlas.cs b/ClassicalSharp/2D/Utils/TextAtlas.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Utils/TextAtlas.cs
rename to ClassicalSharp/2D/Utils/TextAtlas.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/ButtonWidget.cs b/ClassicalSharp/2D/Widgets/ButtonWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/ButtonWidget.cs
rename to ClassicalSharp/2D/Widgets/ButtonWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/Chat/ChatInputWidget.cs b/ClassicalSharp/2D/Widgets/Chat/ChatInputWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/Chat/ChatInputWidget.cs
rename to ClassicalSharp/2D/Widgets/Chat/ChatInputWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/Chat/SpecialInputWidget.cs b/ClassicalSharp/2D/Widgets/Chat/SpecialInputWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/Chat/SpecialInputWidget.cs
rename to ClassicalSharp/2D/Widgets/Chat/SpecialInputWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/Chat/TextGroupWidget.cs b/ClassicalSharp/2D/Widgets/Chat/TextGroupWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/Chat/TextGroupWidget.cs
rename to ClassicalSharp/2D/Widgets/Chat/TextGroupWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/HotbarWidget.cs b/ClassicalSharp/2D/Widgets/HotbarWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/HotbarWidget.cs
rename to ClassicalSharp/2D/Widgets/HotbarWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/InputWidget.cs b/ClassicalSharp/2D/Widgets/InputWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/InputWidget.cs
rename to ClassicalSharp/2D/Widgets/InputWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs b/ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs
rename to ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs b/ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs
rename to ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/PlayerListWidget.cs b/ClassicalSharp/2D/Widgets/PlayerListWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/PlayerListWidget.cs
rename to ClassicalSharp/2D/Widgets/PlayerListWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/ScrollbarWidget.cs b/ClassicalSharp/2D/Widgets/ScrollbarWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/ScrollbarWidget.cs
rename to ClassicalSharp/2D/Widgets/ScrollbarWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/SurvivalHotbarWidget.cs b/ClassicalSharp/2D/Widgets/SurvivalHotbarWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/SurvivalHotbarWidget.cs
rename to ClassicalSharp/2D/Widgets/SurvivalHotbarWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/TableWidget.cs b/ClassicalSharp/2D/Widgets/TableWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/TableWidget.cs
rename to ClassicalSharp/2D/Widgets/TableWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/2D/Widgets/TextWidget.cs b/ClassicalSharp/2D/Widgets/TextWidget.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/2D/Widgets/TextWidget.cs
rename to ClassicalSharp/2D/Widgets/TextWidget.cs
diff --git a/ClassicalSharp/ClassicalSharp/Audio/AudioPlayer.Sounds.cs b/ClassicalSharp/Audio/AudioPlayer.Sounds.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Audio/AudioPlayer.Sounds.cs
rename to ClassicalSharp/Audio/AudioPlayer.Sounds.cs
diff --git a/ClassicalSharp/ClassicalSharp/Audio/AudioPlayer.cs b/ClassicalSharp/Audio/AudioPlayer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Audio/AudioPlayer.cs
rename to ClassicalSharp/Audio/AudioPlayer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Audio/Soundboard.cs b/ClassicalSharp/Audio/Soundboard.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Audio/Soundboard.cs
rename to ClassicalSharp/Audio/Soundboard.cs
diff --git a/ClassicalSharp/ClassicalSharp/Blocks/AutoRotate.cs b/ClassicalSharp/Blocks/AutoRotate.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Blocks/AutoRotate.cs
rename to ClassicalSharp/Blocks/AutoRotate.cs
diff --git a/ClassicalSharp/ClassicalSharp/Blocks/Block.cs b/ClassicalSharp/Blocks/Block.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Blocks/Block.cs
rename to ClassicalSharp/Blocks/Block.cs
diff --git a/ClassicalSharp/ClassicalSharp/Blocks/BlockInfo.BoundsBox.cs b/ClassicalSharp/Blocks/BlockInfo.BoundsBox.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Blocks/BlockInfo.BoundsBox.cs
rename to ClassicalSharp/Blocks/BlockInfo.BoundsBox.cs
diff --git a/ClassicalSharp/ClassicalSharp/Blocks/BlockInfo.cs b/ClassicalSharp/Blocks/BlockInfo.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Blocks/BlockInfo.cs
rename to ClassicalSharp/Blocks/BlockInfo.cs
diff --git a/ClassicalSharp/ClassicalSharp/Blocks/DefaultSet.cs b/ClassicalSharp/Blocks/DefaultSet.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Blocks/DefaultSet.cs
rename to ClassicalSharp/Blocks/DefaultSet.cs
diff --git a/ClassicalSharp/ClassicalSharp/Blocks/aaa.cs b/ClassicalSharp/Blocks/aaa.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Blocks/aaa.cs
rename to ClassicalSharp/Blocks/aaa.cs
diff --git a/ClassicalSharp/ClassicalSharp/ClassicalSharp.csproj b/ClassicalSharp/ClassicalSharp.csproj
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/ClassicalSharp.csproj
rename to ClassicalSharp/ClassicalSharp.csproj
diff --git a/ClassicalSharp/ClassicalSharp/Commands/CommandList.cs b/ClassicalSharp/Commands/CommandList.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Commands/CommandList.cs
rename to ClassicalSharp/Commands/CommandList.cs
diff --git a/ClassicalSharp/ClassicalSharp/Commands/Commands.cs b/ClassicalSharp/Commands/Commands.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Commands/Commands.cs
rename to ClassicalSharp/Commands/Commands.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/AnimatedComponent.cs b/ClassicalSharp/Entities/Components/AnimatedComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/AnimatedComponent.cs
rename to ClassicalSharp/Entities/Components/AnimatedComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/CollisionsComponent.cs b/ClassicalSharp/Entities/Components/CollisionsComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/CollisionsComponent.cs
rename to ClassicalSharp/Entities/Components/CollisionsComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/HacksComponent.cs b/ClassicalSharp/Entities/Components/HacksComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/HacksComponent.cs
rename to ClassicalSharp/Entities/Components/HacksComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/IInterpComponent.cs b/ClassicalSharp/Entities/Components/IInterpComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/IInterpComponent.cs
rename to ClassicalSharp/Entities/Components/IInterpComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/NewCollisionsComponent.cs b/ClassicalSharp/Entities/Components/NewCollisionsComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/NewCollisionsComponent.cs
rename to ClassicalSharp/Entities/Components/NewCollisionsComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/PhysicsComponent.cs b/ClassicalSharp/Entities/Components/PhysicsComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/PhysicsComponent.cs
rename to ClassicalSharp/Entities/Components/PhysicsComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/ShadowComponent.cs b/ClassicalSharp/Entities/Components/ShadowComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/ShadowComponent.cs
rename to ClassicalSharp/Entities/Components/ShadowComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Components/SoundComponent.cs b/ClassicalSharp/Entities/Components/SoundComponent.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Components/SoundComponent.cs
rename to ClassicalSharp/Entities/Components/SoundComponent.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Entity.cs b/ClassicalSharp/Entities/Entity.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Entity.cs
rename to ClassicalSharp/Entities/Entity.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/EntityList.cs b/ClassicalSharp/Entities/EntityList.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/EntityList.cs
rename to ClassicalSharp/Entities/EntityList.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/LocalPlayer.cs b/ClassicalSharp/Entities/LocalPlayer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/LocalPlayer.cs
rename to ClassicalSharp/Entities/LocalPlayer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/LocationUpdate.cs b/ClassicalSharp/Entities/LocationUpdate.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/LocationUpdate.cs
rename to ClassicalSharp/Entities/LocationUpdate.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Mobs/AI.cs b/ClassicalSharp/Entities/Mobs/AI.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Mobs/AI.cs
rename to ClassicalSharp/Entities/Mobs/AI.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Mobs/MobEntity.cs b/ClassicalSharp/Entities/Mobs/MobEntity.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Mobs/MobEntity.cs
rename to ClassicalSharp/Entities/Mobs/MobEntity.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/BlockModel.cs b/ClassicalSharp/Entities/Model/BlockModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/BlockModel.cs
rename to ClassicalSharp/Entities/Model/BlockModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/ChickenModel.cs b/ClassicalSharp/Entities/Model/ChickenModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/ChickenModel.cs
rename to ClassicalSharp/Entities/Model/ChickenModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/CreeperModel.cs b/ClassicalSharp/Entities/Model/CreeperModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/CreeperModel.cs
rename to ClassicalSharp/Entities/Model/CreeperModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/CustomModel.cs b/ClassicalSharp/Entities/Model/CustomModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/CustomModel.cs
rename to ClassicalSharp/Entities/Model/CustomModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/HumanModels.cs b/ClassicalSharp/Entities/Model/HumanModels.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/HumanModels.cs
rename to ClassicalSharp/Entities/Model/HumanModels.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/HumanoidModel.cs b/ClassicalSharp/Entities/Model/HumanoidModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/HumanoidModel.cs
rename to ClassicalSharp/Entities/Model/HumanoidModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/IModel.cs b/ClassicalSharp/Entities/Model/IModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/IModel.cs
rename to ClassicalSharp/Entities/Model/IModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/ModelBuilder.cs b/ClassicalSharp/Entities/Model/ModelBuilder.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/ModelBuilder.cs
rename to ClassicalSharp/Entities/Model/ModelBuilder.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/ModelCache.cs b/ClassicalSharp/Entities/Model/ModelCache.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/ModelCache.cs
rename to ClassicalSharp/Entities/Model/ModelCache.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/ModelPart.cs b/ClassicalSharp/Entities/Model/ModelPart.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/ModelPart.cs
rename to ClassicalSharp/Entities/Model/ModelPart.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/PigModel.cs b/ClassicalSharp/Entities/Model/PigModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/PigModel.cs
rename to ClassicalSharp/Entities/Model/PigModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/SheepModel.cs b/ClassicalSharp/Entities/Model/SheepModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/SheepModel.cs
rename to ClassicalSharp/Entities/Model/SheepModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/SkeletonModel.cs b/ClassicalSharp/Entities/Model/SkeletonModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/SkeletonModel.cs
rename to ClassicalSharp/Entities/Model/SkeletonModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/SpiderModel.cs b/ClassicalSharp/Entities/Model/SpiderModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/SpiderModel.cs
rename to ClassicalSharp/Entities/Model/SpiderModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Model/ZombieModel.cs b/ClassicalSharp/Entities/Model/ZombieModel.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Model/ZombieModel.cs
rename to ClassicalSharp/Entities/Model/ZombieModel.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/NetPlayer.cs b/ClassicalSharp/Entities/NetPlayer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/NetPlayer.cs
rename to ClassicalSharp/Entities/NetPlayer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/Player.cs b/ClassicalSharp/Entities/Player.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/Player.cs
rename to ClassicalSharp/Entities/Player.cs
diff --git a/ClassicalSharp/ClassicalSharp/Entities/TabList.cs b/ClassicalSharp/Entities/TabList.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Entities/TabList.cs
rename to ClassicalSharp/Entities/TabList.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/ChatLog.cs b/ClassicalSharp/Game/ChatLog.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/ChatLog.cs
rename to ClassicalSharp/Game/ChatLog.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/Events.cs b/ClassicalSharp/Game/Events.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/Events.cs
rename to ClassicalSharp/Game/Events.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/Game.Init.cs b/ClassicalSharp/Game/Game.Init.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/Game.Init.cs
rename to ClassicalSharp/Game/Game.Init.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/Game.Properties.cs b/ClassicalSharp/Game/Game.Properties.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/Game.Properties.cs
rename to ClassicalSharp/Game/Game.Properties.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/Game.cs b/ClassicalSharp/Game/Game.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/Game.cs
rename to ClassicalSharp/Game/Game.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/GuiInterface.cs b/ClassicalSharp/Game/GuiInterface.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/GuiInterface.cs
rename to ClassicalSharp/Game/GuiInterface.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/InputHandler.cs b/ClassicalSharp/Game/InputHandler.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/InputHandler.cs
rename to ClassicalSharp/Game/InputHandler.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/Inventory.cs b/ClassicalSharp/Game/Inventory.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/Inventory.cs
rename to ClassicalSharp/Game/Inventory.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/KeyMap.cs b/ClassicalSharp/Game/KeyMap.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/KeyMap.cs
rename to ClassicalSharp/Game/KeyMap.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/PickingHandler.cs b/ClassicalSharp/Game/PickingHandler.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/PickingHandler.cs
rename to ClassicalSharp/Game/PickingHandler.cs
diff --git a/ClassicalSharp/ClassicalSharp/Game/Plugin.cs b/ClassicalSharp/Game/Plugin.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Game/Plugin.cs
rename to ClassicalSharp/Game/Plugin.cs
diff --git a/ClassicalSharp/ClassicalSharp/Generator/FlatGrassGenerator.cs b/ClassicalSharp/Generator/FlatGrassGenerator.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Generator/FlatGrassGenerator.cs
rename to ClassicalSharp/Generator/FlatGrassGenerator.cs
diff --git a/ClassicalSharp/ClassicalSharp/Generator/IMapGenerator.cs b/ClassicalSharp/Generator/IMapGenerator.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Generator/IMapGenerator.cs
rename to ClassicalSharp/Generator/IMapGenerator.cs
diff --git a/ClassicalSharp/ClassicalSharp/Generator/Noise.cs b/ClassicalSharp/Generator/Noise.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Generator/Noise.cs
rename to ClassicalSharp/Generator/Noise.cs
diff --git a/ClassicalSharp/ClassicalSharp/Generator/NotchyGenerator.Utils.cs b/ClassicalSharp/Generator/NotchyGenerator.Utils.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Generator/NotchyGenerator.Utils.cs
rename to ClassicalSharp/Generator/NotchyGenerator.Utils.cs
diff --git a/ClassicalSharp/ClassicalSharp/Generator/NotchyGenerator.cs b/ClassicalSharp/Generator/NotchyGenerator.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Generator/NotchyGenerator.cs
rename to ClassicalSharp/Generator/NotchyGenerator.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/D3D9.cs b/ClassicalSharp/GraphicsAPI/D3D9.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/D3D9.cs
rename to ClassicalSharp/GraphicsAPI/D3D9.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/Direct3D9Api.cs b/ClassicalSharp/GraphicsAPI/Direct3D9Api.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/Direct3D9Api.cs
rename to ClassicalSharp/GraphicsAPI/Direct3D9Api.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/GL.cs b/ClassicalSharp/GraphicsAPI/GL.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/GL.cs
rename to ClassicalSharp/GraphicsAPI/GL.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/IGraphicsAPI.Core.cs b/ClassicalSharp/GraphicsAPI/IGraphicsAPI.Core.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/IGraphicsAPI.Core.cs
rename to ClassicalSharp/GraphicsAPI/IGraphicsAPI.Core.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/IGraphicsApi.cs b/ClassicalSharp/GraphicsAPI/IGraphicsApi.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/IGraphicsApi.cs
rename to ClassicalSharp/GraphicsAPI/IGraphicsApi.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/Interop.cs b/ClassicalSharp/GraphicsAPI/Interop.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/Interop.cs
rename to ClassicalSharp/GraphicsAPI/Interop.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/OpenGLApi.cs b/ClassicalSharp/GraphicsAPI/OpenGLApi.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/OpenGLApi.cs
rename to ClassicalSharp/GraphicsAPI/OpenGLApi.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/OpenGLESApi.cs b/ClassicalSharp/GraphicsAPI/OpenGLESApi.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/OpenGLESApi.cs
rename to ClassicalSharp/GraphicsAPI/OpenGLESApi.cs
diff --git a/ClassicalSharp/ClassicalSharp/GraphicsAPI/VertexFormats.cs b/ClassicalSharp/GraphicsAPI/VertexFormats.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/GraphicsAPI/VertexFormats.cs
rename to ClassicalSharp/GraphicsAPI/VertexFormats.cs
diff --git a/ClassicalSharp/ClassicalSharp/Hotkeys/HotkeyList.cs b/ClassicalSharp/Hotkeys/HotkeyList.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Hotkeys/HotkeyList.cs
rename to ClassicalSharp/Hotkeys/HotkeyList.cs
diff --git a/ClassicalSharp/ClassicalSharp/Hotkeys/LwjglToKey.cs b/ClassicalSharp/Hotkeys/LwjglToKey.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Hotkeys/LwjglToKey.cs
rename to ClassicalSharp/Hotkeys/LwjglToKey.cs
diff --git a/ClassicalSharp/ClassicalSharp/Ionic.Zlib/DeflateStream.cs b/ClassicalSharp/Ionic.Zlib/DeflateStream.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Ionic.Zlib/DeflateStream.cs
rename to ClassicalSharp/Ionic.Zlib/DeflateStream.cs
diff --git a/ClassicalSharp/ClassicalSharp/Ionic.Zlib/InfTree.cs b/ClassicalSharp/Ionic.Zlib/InfTree.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Ionic.Zlib/InfTree.cs
rename to ClassicalSharp/Ionic.Zlib/InfTree.cs
diff --git a/ClassicalSharp/ClassicalSharp/Ionic.Zlib/Inflate.cs b/ClassicalSharp/Ionic.Zlib/Inflate.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Ionic.Zlib/Inflate.cs
rename to ClassicalSharp/Ionic.Zlib/Inflate.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/IMapFormat.cs b/ClassicalSharp/Map/Formats/IMapFormat.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/IMapFormat.cs
rename to ClassicalSharp/Map/Formats/IMapFormat.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/MapCw.Exporter.cs b/ClassicalSharp/Map/Formats/MapCw.Exporter.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/MapCw.Exporter.cs
rename to ClassicalSharp/Map/Formats/MapCw.Exporter.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/MapCw.Importer.cs b/ClassicalSharp/Map/Formats/MapCw.Importer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/MapCw.Importer.cs
rename to ClassicalSharp/Map/Formats/MapCw.Importer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/MapDat.Importer.cs b/ClassicalSharp/Map/Formats/MapDat.Importer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/MapDat.Importer.cs
rename to ClassicalSharp/Map/Formats/MapDat.Importer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/MapDat2.Importer.cs b/ClassicalSharp/Map/Formats/MapDat2.Importer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/MapDat2.Importer.cs
rename to ClassicalSharp/Map/Formats/MapDat2.Importer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/MapFcm3.Importer.cs b/ClassicalSharp/Map/Formats/MapFcm3.Importer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/MapFcm3.Importer.cs
rename to ClassicalSharp/Map/Formats/MapFcm3.Importer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/MapLvl.Importer.cs b/ClassicalSharp/Map/Formats/MapLvl.Importer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/MapLvl.Importer.cs
rename to ClassicalSharp/Map/Formats/MapLvl.Importer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/MapSchematic.Exporter.cs b/ClassicalSharp/Map/Formats/MapSchematic.Exporter.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/MapSchematic.Exporter.cs
rename to ClassicalSharp/Map/Formats/MapSchematic.Exporter.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Formats/NbtFile.cs b/ClassicalSharp/Map/Formats/NbtFile.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Formats/NbtFile.cs
rename to ClassicalSharp/Map/Formats/NbtFile.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Lighting/BasicLighting.Heightmap.cs b/ClassicalSharp/Map/Lighting/BasicLighting.Heightmap.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Lighting/BasicLighting.Heightmap.cs
rename to ClassicalSharp/Map/Lighting/BasicLighting.Heightmap.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Lighting/BasicLighting.Updater.cs b/ClassicalSharp/Map/Lighting/BasicLighting.Updater.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Lighting/BasicLighting.Updater.cs
rename to ClassicalSharp/Map/Lighting/BasicLighting.Updater.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Lighting/BasicLighting.cs b/ClassicalSharp/Map/Lighting/BasicLighting.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Lighting/BasicLighting.cs
rename to ClassicalSharp/Map/Lighting/BasicLighting.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/Lighting/IWorldLighting.cs b/ClassicalSharp/Map/Lighting/IWorldLighting.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/Lighting/IWorldLighting.cs
rename to ClassicalSharp/Map/Lighting/IWorldLighting.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/World.cs b/ClassicalSharp/Map/World.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/World.cs
rename to ClassicalSharp/Map/World.cs
diff --git a/ClassicalSharp/ClassicalSharp/Map/WorldEnv.cs b/ClassicalSharp/Map/WorldEnv.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Map/WorldEnv.cs
rename to ClassicalSharp/Map/WorldEnv.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/Matrix4.cs b/ClassicalSharp/Math/Matrix4.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/Matrix4.cs
rename to ClassicalSharp/Math/Matrix4.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/Physics/AABB.cs b/ClassicalSharp/Math/Physics/AABB.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/Physics/AABB.cs
rename to ClassicalSharp/Math/Physics/AABB.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/Physics/IntersectionUtils.cs b/ClassicalSharp/Math/Physics/IntersectionUtils.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/Physics/IntersectionUtils.cs
rename to ClassicalSharp/Math/Physics/IntersectionUtils.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/Physics/Searcher.cs b/ClassicalSharp/Math/Physics/Searcher.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/Physics/Searcher.cs
rename to ClassicalSharp/Math/Physics/Searcher.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/PickedPos.cs b/ClassicalSharp/Math/PickedPos.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/PickedPos.cs
rename to ClassicalSharp/Math/PickedPos.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/Picking.cs b/ClassicalSharp/Math/Picking.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/Picking.cs
rename to ClassicalSharp/Math/Picking.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/RayTracer.cs b/ClassicalSharp/Math/RayTracer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/RayTracer.cs
rename to ClassicalSharp/Math/RayTracer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/Vector3.cs b/ClassicalSharp/Math/Vector3.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/Vector3.cs
rename to ClassicalSharp/Math/Vector3.cs
diff --git a/ClassicalSharp/ClassicalSharp/Math/Vector4.cs b/ClassicalSharp/Math/Vector4.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Math/Vector4.cs
rename to ClassicalSharp/Math/Vector4.cs
diff --git a/ClassicalSharp/ClassicalSharp/MeshBuilder/AdvLightingBuilder.cs b/ClassicalSharp/MeshBuilder/AdvLightingBuilder.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/MeshBuilder/AdvLightingBuilder.cs
rename to ClassicalSharp/MeshBuilder/AdvLightingBuilder.cs
diff --git a/ClassicalSharp/ClassicalSharp/MeshBuilder/Builder.cs b/ClassicalSharp/MeshBuilder/Builder.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/MeshBuilder/Builder.cs
rename to ClassicalSharp/MeshBuilder/Builder.cs
diff --git a/ClassicalSharp/ClassicalSharp/MeshBuilder/CuboidDrawer.cs b/ClassicalSharp/MeshBuilder/CuboidDrawer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/MeshBuilder/CuboidDrawer.cs
rename to ClassicalSharp/MeshBuilder/CuboidDrawer.cs
diff --git a/ClassicalSharp/ClassicalSharp/MeshBuilder/FloodFill.cs b/ClassicalSharp/MeshBuilder/FloodFill.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/MeshBuilder/FloodFill.cs
rename to ClassicalSharp/MeshBuilder/FloodFill.cs
diff --git a/ClassicalSharp/ClassicalSharp/MeshBuilder/NormalBuilder.cs b/ClassicalSharp/MeshBuilder/NormalBuilder.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/MeshBuilder/NormalBuilder.cs
rename to ClassicalSharp/MeshBuilder/NormalBuilder.cs
diff --git a/ClassicalSharp/ClassicalSharp/MeshBuilder/TileDrawer.cs b/ClassicalSharp/MeshBuilder/TileDrawer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/MeshBuilder/TileDrawer.cs
rename to ClassicalSharp/MeshBuilder/TileDrawer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Mode/Survival.cs b/ClassicalSharp/Mode/Survival.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Mode/Survival.cs
rename to ClassicalSharp/Mode/Survival.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/CPESupport.cs b/ClassicalSharp/Network/CPESupport.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/CPESupport.cs
rename to ClassicalSharp/Network/CPESupport.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Enums.cs b/ClassicalSharp/Network/Enums.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Enums.cs
rename to ClassicalSharp/Network/Enums.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/IServerConnection.cs b/ClassicalSharp/Network/IServerConnection.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/IServerConnection.cs
rename to ClassicalSharp/Network/IServerConnection.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/NetworkProcessor.cs b/ClassicalSharp/Network/NetworkProcessor.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/NetworkProcessor.cs
rename to ClassicalSharp/Network/NetworkProcessor.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Protocols/BlockDefs.cs b/ClassicalSharp/Network/Protocols/BlockDefs.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Protocols/BlockDefs.cs
rename to ClassicalSharp/Network/Protocols/BlockDefs.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Protocols/CPE.cs b/ClassicalSharp/Network/Protocols/CPE.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Protocols/CPE.cs
rename to ClassicalSharp/Network/Protocols/CPE.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Protocols/Classic.cs b/ClassicalSharp/Network/Protocols/Classic.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Protocols/Classic.cs
rename to ClassicalSharp/Network/Protocols/Classic.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Protocols/IProtocol.cs b/ClassicalSharp/Network/Protocols/IProtocol.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Protocols/IProtocol.cs
rename to ClassicalSharp/Network/Protocols/IProtocol.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Protocols/WoM.cs b/ClassicalSharp/Network/Protocols/WoM.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Protocols/WoM.cs
rename to ClassicalSharp/Network/Protocols/WoM.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Utils/AsyncDownloader.cs b/ClassicalSharp/Network/Utils/AsyncDownloader.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Utils/AsyncDownloader.cs
rename to ClassicalSharp/Network/Utils/AsyncDownloader.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Utils/FixedBufferStream.cs b/ClassicalSharp/Network/Utils/FixedBufferStream.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Utils/FixedBufferStream.cs
rename to ClassicalSharp/Network/Utils/FixedBufferStream.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Utils/GZipHeaderReader.cs b/ClassicalSharp/Network/Utils/GZipHeaderReader.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Utils/GZipHeaderReader.cs
rename to ClassicalSharp/Network/Utils/GZipHeaderReader.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Utils/NetReader.cs b/ClassicalSharp/Network/Utils/NetReader.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Utils/NetReader.cs
rename to ClassicalSharp/Network/Utils/NetReader.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Utils/NetWriter.cs b/ClassicalSharp/Network/Utils/NetWriter.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Utils/NetWriter.cs
rename to ClassicalSharp/Network/Utils/NetWriter.cs
diff --git a/ClassicalSharp/ClassicalSharp/Network/Utils/PingList.cs b/ClassicalSharp/Network/Utils/PingList.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Network/Utils/PingList.cs
rename to ClassicalSharp/Network/Utils/PingList.cs
diff --git a/ClassicalSharp/ClassicalSharp/Particles/Particle.cs b/ClassicalSharp/Particles/Particle.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Particles/Particle.cs
rename to ClassicalSharp/Particles/Particle.cs
diff --git a/ClassicalSharp/ClassicalSharp/Particles/ParticleManager.cs b/ClassicalSharp/Particles/ParticleManager.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Particles/ParticleManager.cs
rename to ClassicalSharp/Particles/ParticleManager.cs
diff --git a/ClassicalSharp/ClassicalSharp/Platform/Platform.cs b/ClassicalSharp/Platform/Platform.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Platform/Platform.cs
rename to ClassicalSharp/Platform/Platform.cs
diff --git a/ClassicalSharp/ClassicalSharp/Program.cs b/ClassicalSharp/Program.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Program.cs
rename to ClassicalSharp/Program.cs
diff --git a/ClassicalSharp/ClassicalSharp/Properties/AssemblyInfo.cs b/ClassicalSharp/Properties/AssemblyInfo.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Properties/AssemblyInfo.cs
rename to ClassicalSharp/Properties/AssemblyInfo.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/ChunkUpdater.cs b/ClassicalSharp/Rendering/ChunkUpdater.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/ChunkUpdater.cs
rename to ClassicalSharp/Rendering/ChunkUpdater.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/Env/EnvRenderer.cs b/ClassicalSharp/Rendering/Env/EnvRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/Env/EnvRenderer.cs
rename to ClassicalSharp/Rendering/Env/EnvRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/Env/MapBordersRenderer.cs b/ClassicalSharp/Rendering/Env/MapBordersRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/Env/MapBordersRenderer.cs
rename to ClassicalSharp/Rendering/Env/MapBordersRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/Env/SkyboxRenderer.cs b/ClassicalSharp/Rendering/Env/SkyboxRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/Env/SkyboxRenderer.cs
rename to ClassicalSharp/Rendering/Env/SkyboxRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/Env/WeatherRenderer.cs b/ClassicalSharp/Rendering/Env/WeatherRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/Env/WeatherRenderer.cs
rename to ClassicalSharp/Rendering/Env/WeatherRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/FrustumCulling.cs b/ClassicalSharp/Rendering/FrustumCulling.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/FrustumCulling.cs
rename to ClassicalSharp/Rendering/FrustumCulling.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/HeldBlockRenderer.cs b/ClassicalSharp/Rendering/HeldBlockRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/HeldBlockRenderer.cs
rename to ClassicalSharp/Rendering/HeldBlockRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/MapRenderer.Occlusion.cs b/ClassicalSharp/Rendering/MapRenderer.Occlusion.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/MapRenderer.Occlusion.cs
rename to ClassicalSharp/Rendering/MapRenderer.Occlusion.cs
diff --git a/ClassicalSharp/ClassicalSharp/Rendering/MapRenderer.cs b/ClassicalSharp/Rendering/MapRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Rendering/MapRenderer.cs
rename to ClassicalSharp/Rendering/MapRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Selections/AxisLinesRenderer.cs b/ClassicalSharp/Selections/AxisLinesRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Selections/AxisLinesRenderer.cs
rename to ClassicalSharp/Selections/AxisLinesRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Selections/PickedPosRenderer.cs b/ClassicalSharp/Selections/PickedPosRenderer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Selections/PickedPosRenderer.cs
rename to ClassicalSharp/Selections/PickedPosRenderer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Selections/SelectionBox.cs b/ClassicalSharp/Selections/SelectionBox.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Selections/SelectionBox.cs
rename to ClassicalSharp/Selections/SelectionBox.cs
diff --git a/ClassicalSharp/ClassicalSharp/Selections/SelectionManager.cs b/ClassicalSharp/Selections/SelectionManager.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Selections/SelectionManager.cs
rename to ClassicalSharp/Selections/SelectionManager.cs
diff --git a/ClassicalSharp/ClassicalSharp/SharpWave.dll b/ClassicalSharp/SharpWave.dll
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/SharpWave.dll
rename to ClassicalSharp/SharpWave.dll
diff --git a/ClassicalSharp/ClassicalSharp/SharpWave.dll.config b/ClassicalSharp/SharpWave.dll.config
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/SharpWave.dll.config
rename to ClassicalSharp/SharpWave.dll.config
diff --git a/ClassicalSharp/ClassicalSharp/Singleplayer/FallingPhysics.cs b/ClassicalSharp/Singleplayer/FallingPhysics.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Singleplayer/FallingPhysics.cs
rename to ClassicalSharp/Singleplayer/FallingPhysics.cs
diff --git a/ClassicalSharp/ClassicalSharp/Singleplayer/FoliagePhysics.cs b/ClassicalSharp/Singleplayer/FoliagePhysics.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Singleplayer/FoliagePhysics.cs
rename to ClassicalSharp/Singleplayer/FoliagePhysics.cs
diff --git a/ClassicalSharp/ClassicalSharp/Singleplayer/LiquidPhysics.cs b/ClassicalSharp/Singleplayer/LiquidPhysics.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Singleplayer/LiquidPhysics.cs
rename to ClassicalSharp/Singleplayer/LiquidPhysics.cs
diff --git a/ClassicalSharp/ClassicalSharp/Singleplayer/OtherPhysics.cs b/ClassicalSharp/Singleplayer/OtherPhysics.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Singleplayer/OtherPhysics.cs
rename to ClassicalSharp/Singleplayer/OtherPhysics.cs
diff --git a/ClassicalSharp/ClassicalSharp/Singleplayer/Physics.cs b/ClassicalSharp/Singleplayer/Physics.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Singleplayer/Physics.cs
rename to ClassicalSharp/Singleplayer/Physics.cs
diff --git a/ClassicalSharp/ClassicalSharp/Singleplayer/Server.cs b/ClassicalSharp/Singleplayer/Server.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Singleplayer/Server.cs
rename to ClassicalSharp/Singleplayer/Server.cs
diff --git a/ClassicalSharp/ClassicalSharp/Singleplayer/TNTPhysics.cs b/ClassicalSharp/Singleplayer/TNTPhysics.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Singleplayer/TNTPhysics.cs
rename to ClassicalSharp/Singleplayer/TNTPhysics.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/Animations.cs b/ClassicalSharp/TexturePack/Animations.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/Animations.cs
rename to ClassicalSharp/TexturePack/Animations.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/EntryList.cs b/ClassicalSharp/TexturePack/EntryList.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/EntryList.cs
rename to ClassicalSharp/TexturePack/EntryList.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/LiquidAnimations.cs b/ClassicalSharp/TexturePack/LiquidAnimations.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/LiquidAnimations.cs
rename to ClassicalSharp/TexturePack/LiquidAnimations.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/Side.cs b/ClassicalSharp/TexturePack/Side.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/Side.cs
rename to ClassicalSharp/TexturePack/Side.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/TerrainAtlas.cs b/ClassicalSharp/TexturePack/TerrainAtlas.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/TerrainAtlas.cs
rename to ClassicalSharp/TexturePack/TerrainAtlas.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/TextureCache.cs b/ClassicalSharp/TexturePack/TextureCache.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/TextureCache.cs
rename to ClassicalSharp/TexturePack/TextureCache.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/TexturePack.cs b/ClassicalSharp/TexturePack/TexturePack.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/TexturePack.cs
rename to ClassicalSharp/TexturePack/TexturePack.cs
diff --git a/ClassicalSharp/ClassicalSharp/TexturePack/ZipReader.cs b/ClassicalSharp/TexturePack/ZipReader.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/TexturePack/ZipReader.cs
rename to ClassicalSharp/TexturePack/ZipReader.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/Camera.cs b/ClassicalSharp/Utils/Camera.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/Camera.cs
rename to ClassicalSharp/Utils/Camera.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/ErrorHandler.cs b/ClassicalSharp/Utils/ErrorHandler.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/ErrorHandler.cs
rename to ClassicalSharp/Utils/ErrorHandler.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/MathUtils.cs b/ClassicalSharp/Utils/MathUtils.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/MathUtils.cs
rename to ClassicalSharp/Utils/MathUtils.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/Options.cs b/ClassicalSharp/Utils/Options.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/Options.cs
rename to ClassicalSharp/Utils/Options.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/ReadOnlyStream.cs b/ClassicalSharp/Utils/ReadOnlyStream.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/ReadOnlyStream.cs
rename to ClassicalSharp/Utils/ReadOnlyStream.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/Respawn.cs b/ClassicalSharp/Utils/Respawn.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/Respawn.cs
rename to ClassicalSharp/Utils/Respawn.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/StringBuffer.cs b/ClassicalSharp/Utils/StringBuffer.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/StringBuffer.cs
rename to ClassicalSharp/Utils/StringBuffer.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/Utils.Math.cs b/ClassicalSharp/Utils/Utils.Math.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/Utils.Math.cs
rename to ClassicalSharp/Utils/Utils.Math.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/Utils.cs b/ClassicalSharp/Utils/Utils.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/Utils.cs
rename to ClassicalSharp/Utils/Utils.cs
diff --git a/ClassicalSharp/ClassicalSharp/Utils/Vector3I.cs b/ClassicalSharp/Utils/Vector3I.cs
similarity index 100%
rename from ClassicalSharp/ClassicalSharp/Utils/Vector3I.cs
rename to ClassicalSharp/Utils/Vector3I.cs
diff --git a/ClassicalSharp/InteropPatcher/InteropPatcher.csproj b/InteropPatcher/InteropPatcher.csproj
similarity index 100%
rename from ClassicalSharp/InteropPatcher/InteropPatcher.csproj
rename to InteropPatcher/InteropPatcher.csproj
diff --git a/ClassicalSharp/InteropPatcher/Mono.Cecil.Mdb.dll b/InteropPatcher/Mono.Cecil.Mdb.dll
similarity index 100%
rename from ClassicalSharp/InteropPatcher/Mono.Cecil.Mdb.dll
rename to InteropPatcher/Mono.Cecil.Mdb.dll
diff --git a/ClassicalSharp/InteropPatcher/Mono.Cecil.Pdb.dll b/InteropPatcher/Mono.Cecil.Pdb.dll
similarity index 100%
rename from ClassicalSharp/InteropPatcher/Mono.Cecil.Pdb.dll
rename to InteropPatcher/Mono.Cecil.Pdb.dll
diff --git a/ClassicalSharp/InteropPatcher/Mono.Cecil.dll b/InteropPatcher/Mono.Cecil.dll
similarity index 100%
rename from ClassicalSharp/InteropPatcher/Mono.Cecil.dll
rename to InteropPatcher/Mono.Cecil.dll
diff --git a/ClassicalSharp/InteropPatcher/Program.cs b/InteropPatcher/Program.cs
similarity index 100%
rename from ClassicalSharp/InteropPatcher/Program.cs
rename to InteropPatcher/Program.cs
diff --git a/ClassicalSharp/InteropPatcher/Properties/AssemblyInfo.cs b/InteropPatcher/Properties/AssemblyInfo.cs
similarity index 100%
rename from ClassicalSharp/InteropPatcher/Properties/AssemblyInfo.cs
rename to InteropPatcher/Properties/AssemblyInfo.cs
diff --git a/ClassicalSharp/Launcher2/Drawing/BitmapDrawer.cs b/Launcher2/Drawing/BitmapDrawer.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Drawing/BitmapDrawer.cs
rename to Launcher2/Drawing/BitmapDrawer.cs
diff --git a/ClassicalSharp/Launcher2/Drawing/Drawer2DExt.cs b/Launcher2/Drawing/Drawer2DExt.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Drawing/Drawer2DExt.cs
rename to Launcher2/Drawing/Drawer2DExt.cs
diff --git a/ClassicalSharp/Launcher2/Drawing/Gradient.cs b/Launcher2/Drawing/Gradient.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Drawing/Gradient.cs
rename to Launcher2/Drawing/Gradient.cs
diff --git a/ClassicalSharp/Launcher2/Drawing/Platform/OSXDrawer.cs b/Launcher2/Drawing/Platform/OSXDrawer.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Drawing/Platform/OSXDrawer.cs
rename to Launcher2/Drawing/Platform/OSXDrawer.cs
diff --git a/ClassicalSharp/Launcher2/Drawing/Platform/PlatformDrawer.cs b/Launcher2/Drawing/Platform/PlatformDrawer.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Drawing/Platform/PlatformDrawer.cs
rename to Launcher2/Drawing/Platform/PlatformDrawer.cs
diff --git a/ClassicalSharp/Launcher2/Drawing/Platform/WindowsDrawer.cs b/Launcher2/Drawing/Platform/WindowsDrawer.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Drawing/Platform/WindowsDrawer.cs
rename to Launcher2/Drawing/Platform/WindowsDrawer.cs
diff --git a/ClassicalSharp/Launcher2/Drawing/Platform/X11Drawer.cs b/Launcher2/Drawing/Platform/X11Drawer.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Drawing/Platform/X11Drawer.cs
rename to Launcher2/Drawing/Platform/X11Drawer.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/ChooseModeScreen.cs b/Launcher2/Gui/Screens/ChooseModeScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/ChooseModeScreen.cs
rename to Launcher2/Gui/Screens/ChooseModeScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/ColoursScreen.cs b/Launcher2/Gui/Screens/ColoursScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/ColoursScreen.cs
rename to Launcher2/Gui/Screens/ColoursScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/DirectConnectScreen.cs b/Launcher2/Gui/Screens/DirectConnectScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/DirectConnectScreen.cs
rename to Launcher2/Gui/Screens/DirectConnectScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/InputScreen.cs b/Launcher2/Gui/Screens/InputScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/InputScreen.cs
rename to Launcher2/Gui/Screens/InputScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/MainScreen.Classicube.cs b/Launcher2/Gui/Screens/MainScreen.Classicube.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/MainScreen.Classicube.cs
rename to Launcher2/Gui/Screens/MainScreen.Classicube.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/MainScreen.cs b/Launcher2/Gui/Screens/MainScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/MainScreen.cs
rename to Launcher2/Gui/Screens/MainScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/ResourcesScreen.cs b/Launcher2/Gui/Screens/ResourcesScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/ResourcesScreen.cs
rename to Launcher2/Gui/Screens/ResourcesScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/Screen.cs b/Launcher2/Gui/Screens/Screen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/Screen.cs
rename to Launcher2/Gui/Screens/Screen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/ServersScreen.cs b/Launcher2/Gui/Screens/ServersScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/ServersScreen.cs
rename to Launcher2/Gui/Screens/ServersScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/SettingsScreen.cs b/Launcher2/Gui/Screens/SettingsScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/SettingsScreen.cs
rename to Launcher2/Gui/Screens/SettingsScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Screens/UpdatesScreen.cs b/Launcher2/Gui/Screens/UpdatesScreen.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Screens/UpdatesScreen.cs
rename to Launcher2/Gui/Screens/UpdatesScreen.cs
diff --git a/ClassicalSharp/Launcher2/Gui/TableWidget/Comparers.cs b/Launcher2/Gui/TableWidget/Comparers.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/TableWidget/Comparers.cs
rename to Launcher2/Gui/TableWidget/Comparers.cs
diff --git a/ClassicalSharp/Launcher2/Gui/TableWidget/TableView.cs b/Launcher2/Gui/TableWidget/TableView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/TableWidget/TableView.cs
rename to Launcher2/Gui/TableWidget/TableView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/TableWidget/TableWidget.cs b/Launcher2/Gui/TableWidget/TableWidget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/TableWidget/TableWidget.cs
rename to Launcher2/Gui/TableWidget/TableWidget.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/ChooseModeView.cs b/Launcher2/Gui/Views/ChooseModeView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/ChooseModeView.cs
rename to Launcher2/Gui/Views/ChooseModeView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/ColoursView.cs b/Launcher2/Gui/Views/ColoursView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/ColoursView.cs
rename to Launcher2/Gui/Views/ColoursView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/DirectConnectView.cs b/Launcher2/Gui/Views/DirectConnectView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/DirectConnectView.cs
rename to Launcher2/Gui/Views/DirectConnectView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/IView.cs b/Launcher2/Gui/Views/IView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/IView.cs
rename to Launcher2/Gui/Views/IView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/MainView.cs b/Launcher2/Gui/Views/MainView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/MainView.cs
rename to Launcher2/Gui/Views/MainView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/ResourcesView.cs b/Launcher2/Gui/Views/ResourcesView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/ResourcesView.cs
rename to Launcher2/Gui/Views/ResourcesView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/ServersView.cs b/Launcher2/Gui/Views/ServersView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/ServersView.cs
rename to Launcher2/Gui/Views/ServersView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/SettingsView.cs b/Launcher2/Gui/Views/SettingsView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/SettingsView.cs
rename to Launcher2/Gui/Views/SettingsView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Views/UpdatesView.cs b/Launcher2/Gui/Views/UpdatesView.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Views/UpdatesView.cs
rename to Launcher2/Gui/Views/UpdatesView.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/BitmapWidget.cs b/Launcher2/Gui/Widgets/BitmapWidget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/BitmapWidget.cs
rename to Launcher2/Gui/Widgets/BitmapWidget.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/ButtonWidget.cs b/Launcher2/Gui/Widgets/ButtonWidget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/ButtonWidget.cs
rename to Launcher2/Gui/Widgets/ButtonWidget.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/CheckboxWidget.cs b/Launcher2/Gui/Widgets/CheckboxWidget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/CheckboxWidget.cs
rename to Launcher2/Gui/Widgets/CheckboxWidget.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/InputText.cs b/Launcher2/Gui/Widgets/InputText.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/InputText.cs
rename to Launcher2/Gui/Widgets/InputText.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/InputWidget.cs b/Launcher2/Gui/Widgets/InputWidget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/InputWidget.cs
rename to Launcher2/Gui/Widgets/InputWidget.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/LabelWidget.cs b/Launcher2/Gui/Widgets/LabelWidget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/LabelWidget.cs
rename to Launcher2/Gui/Widgets/LabelWidget.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/Makers.cs b/Launcher2/Gui/Widgets/Makers.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/Makers.cs
rename to Launcher2/Gui/Widgets/Makers.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/SliderWidget.cs b/Launcher2/Gui/Widgets/SliderWidget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/SliderWidget.cs
rename to Launcher2/Gui/Widgets/SliderWidget.cs
diff --git a/ClassicalSharp/Launcher2/Gui/Widgets/Widget.cs b/Launcher2/Gui/Widgets/Widget.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Gui/Widgets/Widget.cs
rename to Launcher2/Gui/Widgets/Widget.cs
diff --git a/ClassicalSharp/Launcher2/Launcher2.csproj b/Launcher2/Launcher2.csproj
similarity index 100%
rename from ClassicalSharp/Launcher2/Launcher2.csproj
rename to Launcher2/Launcher2.csproj
diff --git a/ClassicalSharp/Launcher2/LauncherWindow.Background.cs b/Launcher2/LauncherWindow.Background.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/LauncherWindow.Background.cs
rename to Launcher2/LauncherWindow.Background.cs
diff --git a/ClassicalSharp/Launcher2/LauncherWindow.cs b/Launcher2/LauncherWindow.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/LauncherWindow.cs
rename to Launcher2/LauncherWindow.cs
diff --git a/ClassicalSharp/Launcher2/Patcher/ResourceChecker.cs b/Launcher2/Patcher/ResourceChecker.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Patcher/ResourceChecker.cs
rename to Launcher2/Patcher/ResourceChecker.cs
diff --git a/ClassicalSharp/Launcher2/Patcher/ResourceFetcher.cs b/Launcher2/Patcher/ResourceFetcher.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Patcher/ResourceFetcher.cs
rename to Launcher2/Patcher/ResourceFetcher.cs
diff --git a/ClassicalSharp/Launcher2/Patcher/ResourcePatcher.cs b/Launcher2/Patcher/ResourcePatcher.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Patcher/ResourcePatcher.cs
rename to Launcher2/Patcher/ResourcePatcher.cs
diff --git a/ClassicalSharp/Launcher2/Patcher/ResourcesList.cs b/Launcher2/Patcher/ResourcesList.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Patcher/ResourcesList.cs
rename to Launcher2/Patcher/ResourcesList.cs
diff --git a/ClassicalSharp/Launcher2/Patcher/SoundPatcher.cs b/Launcher2/Patcher/SoundPatcher.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Patcher/SoundPatcher.cs
rename to Launcher2/Patcher/SoundPatcher.cs
diff --git a/ClassicalSharp/Launcher2/Patcher/ZipWriter.cs b/Launcher2/Patcher/ZipWriter.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Patcher/ZipWriter.cs
rename to Launcher2/Patcher/ZipWriter.cs
diff --git a/ClassicalSharp/Launcher2/Program.cs b/Launcher2/Program.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Program.cs
rename to Launcher2/Program.cs
diff --git a/ClassicalSharp/Launcher2/Properties/AssemblyInfo.cs b/Launcher2/Properties/AssemblyInfo.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Properties/AssemblyInfo.cs
rename to Launcher2/Properties/AssemblyInfo.cs
diff --git a/ClassicalSharp/Launcher2/Updater/Applier.cs b/Launcher2/Updater/Applier.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Updater/Applier.cs
rename to Launcher2/Updater/Applier.cs
diff --git a/ClassicalSharp/Launcher2/Updater/Scripts.cs b/Launcher2/Updater/Scripts.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Updater/Scripts.cs
rename to Launcher2/Updater/Scripts.cs
diff --git a/ClassicalSharp/Launcher2/Utils/Client.cs b/Launcher2/Utils/Client.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Utils/Client.cs
rename to Launcher2/Utils/Client.cs
diff --git a/ClassicalSharp/Launcher2/Utils/JSON.cs b/Launcher2/Utils/JSON.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Utils/JSON.cs
rename to Launcher2/Utils/JSON.cs
diff --git a/ClassicalSharp/Launcher2/Utils/LauncherSkin.cs b/Launcher2/Utils/LauncherSkin.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Utils/LauncherSkin.cs
rename to Launcher2/Utils/LauncherSkin.cs
diff --git a/ClassicalSharp/Launcher2/Utils/Secure.cs b/Launcher2/Utils/Secure.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/Utils/Secure.cs
rename to Launcher2/Utils/Secure.cs
diff --git a/ClassicalSharp/Launcher2/WebTasks.cs b/Launcher2/WebTasks.cs
similarity index 100%
rename from ClassicalSharp/Launcher2/WebTasks.cs
rename to Launcher2/WebTasks.cs
diff --git a/ClassicalSharp/Launcher2/icon.ico b/Launcher2/icon.ico
similarity index 100%
rename from ClassicalSharp/Launcher2/icon.ico
rename to Launcher2/icon.ico
diff --git a/ClassicalSharp/OpenTK/AutoGeneratedAttribute.cs b/OpenTK/AutoGeneratedAttribute.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/AutoGeneratedAttribute.cs
rename to OpenTK/AutoGeneratedAttribute.cs
diff --git a/ClassicalSharp/OpenTK/DisplayDevice.cs b/OpenTK/DisplayDevice.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/DisplayDevice.cs
rename to OpenTK/DisplayDevice.cs
diff --git a/ClassicalSharp/OpenTK/Graphics/ColorFormat.cs b/OpenTK/Graphics/ColorFormat.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Graphics/ColorFormat.cs
rename to OpenTK/Graphics/ColorFormat.cs
diff --git a/ClassicalSharp/OpenTK/Graphics/GraphicsExceptions.cs b/OpenTK/Graphics/GraphicsExceptions.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Graphics/GraphicsExceptions.cs
rename to OpenTK/Graphics/GraphicsExceptions.cs
diff --git a/ClassicalSharp/OpenTK/Graphics/GraphicsMode.cs b/OpenTK/Graphics/GraphicsMode.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Graphics/GraphicsMode.cs
rename to OpenTK/Graphics/GraphicsMode.cs
diff --git a/ClassicalSharp/OpenTK/Graphics/IGraphicsContext.cs b/OpenTK/Graphics/IGraphicsContext.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Graphics/IGraphicsContext.cs
rename to OpenTK/Graphics/IGraphicsContext.cs
diff --git a/ClassicalSharp/OpenTK/INativeWindow.cs b/OpenTK/INativeWindow.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/INativeWindow.cs
rename to OpenTK/INativeWindow.cs
diff --git a/ClassicalSharp/OpenTK/Keyboard.cs b/OpenTK/Keyboard.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Keyboard.cs
rename to OpenTK/Keyboard.cs
diff --git a/ClassicalSharp/OpenTK/Mouse.cs b/OpenTK/Mouse.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Mouse.cs
rename to OpenTK/Mouse.cs
diff --git a/ClassicalSharp/OpenTK/OpenTK.csproj b/OpenTK/OpenTK.csproj
similarity index 100%
rename from ClassicalSharp/OpenTK/OpenTK.csproj
rename to OpenTK/OpenTK.csproj
diff --git a/ClassicalSharp/OpenTK/Platform/Configuration.cs b/OpenTK/Platform/Configuration.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/Configuration.cs
rename to OpenTK/Platform/Configuration.cs
diff --git a/ClassicalSharp/OpenTK/Platform/IPlatformFactory.cs b/OpenTK/Platform/IPlatformFactory.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/IPlatformFactory.cs
rename to OpenTK/Platform/IPlatformFactory.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/AglContext.cs b/OpenTK/Platform/MacOS/AglContext.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/AglContext.cs
rename to OpenTK/Platform/MacOS/AglContext.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/Application.cs b/OpenTK/Platform/MacOS/Application.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/Application.cs
rename to OpenTK/Platform/MacOS/Application.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/API.cs b/OpenTK/Platform/MacOS/CarbonBindings/API.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/API.cs
rename to OpenTK/Platform/MacOS/CarbonBindings/API.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/Agl.cs b/OpenTK/Platform/MacOS/CarbonBindings/Agl.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/Agl.cs
rename to OpenTK/Platform/MacOS/CarbonBindings/Agl.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs b/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs
rename to OpenTK/Platform/MacOS/CarbonBindings/CarbonAPI.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/MacOSKeys.cs b/OpenTK/Platform/MacOS/CarbonBindings/MacOSKeys.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/CarbonBindings/MacOSKeys.cs
rename to OpenTK/Platform/MacOS/CarbonBindings/MacOSKeys.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/CarbonWindow.cs b/OpenTK/Platform/MacOS/CarbonWindow.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/CarbonWindow.cs
rename to OpenTK/Platform/MacOS/CarbonWindow.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/MacOSException.cs b/OpenTK/Platform/MacOS/MacOSException.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/MacOSException.cs
rename to OpenTK/Platform/MacOS/MacOSException.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/MacOSKeyMap.cs b/OpenTK/Platform/MacOS/MacOSKeyMap.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/MacOSKeyMap.cs
rename to OpenTK/Platform/MacOS/MacOSKeyMap.cs
diff --git a/ClassicalSharp/OpenTK/Platform/MacOS/QuartzDisplayDevice.cs b/OpenTK/Platform/MacOS/QuartzDisplayDevice.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/MacOS/QuartzDisplayDevice.cs
rename to OpenTK/Platform/MacOS/QuartzDisplayDevice.cs
diff --git a/ClassicalSharp/OpenTK/Platform/Windows/API.cs b/OpenTK/Platform/Windows/API.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/Windows/API.cs
rename to OpenTK/Platform/Windows/API.cs
diff --git a/ClassicalSharp/OpenTK/Platform/Windows/Wgl.cs b/OpenTK/Platform/Windows/Wgl.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/Windows/Wgl.cs
rename to OpenTK/Platform/Windows/Wgl.cs
diff --git a/ClassicalSharp/OpenTK/Platform/Windows/WinDisplayDevice.cs b/OpenTK/Platform/Windows/WinDisplayDevice.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/Windows/WinDisplayDevice.cs
rename to OpenTK/Platform/Windows/WinDisplayDevice.cs
diff --git a/ClassicalSharp/OpenTK/Platform/Windows/WinGLContext.cs b/OpenTK/Platform/Windows/WinGLContext.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/Windows/WinGLContext.cs
rename to OpenTK/Platform/Windows/WinGLContext.cs
diff --git a/ClassicalSharp/OpenTK/Platform/Windows/WinKeyMap.cs b/OpenTK/Platform/Windows/WinKeyMap.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/Windows/WinKeyMap.cs
rename to OpenTK/Platform/Windows/WinKeyMap.cs
diff --git a/ClassicalSharp/OpenTK/Platform/Windows/WinWindow.cs b/OpenTK/Platform/Windows/WinWindow.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/Windows/WinWindow.cs
rename to OpenTK/Platform/Windows/WinWindow.cs
diff --git a/ClassicalSharp/OpenTK/Platform/X11/API.cs b/OpenTK/Platform/X11/API.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/X11/API.cs
rename to OpenTK/Platform/X11/API.cs
diff --git a/ClassicalSharp/OpenTK/Platform/X11/Glx.cs b/OpenTK/Platform/X11/Glx.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/X11/Glx.cs
rename to OpenTK/Platform/X11/Glx.cs
diff --git a/ClassicalSharp/OpenTK/Platform/X11/Structs.cs b/OpenTK/Platform/X11/Structs.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/X11/Structs.cs
rename to OpenTK/Platform/X11/Structs.cs
diff --git a/ClassicalSharp/OpenTK/Platform/X11/X11DisplayDevice.cs b/OpenTK/Platform/X11/X11DisplayDevice.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/X11/X11DisplayDevice.cs
rename to OpenTK/Platform/X11/X11DisplayDevice.cs
diff --git a/ClassicalSharp/OpenTK/Platform/X11/X11GLContext.cs b/OpenTK/Platform/X11/X11GLContext.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/X11/X11GLContext.cs
rename to OpenTK/Platform/X11/X11GLContext.cs
diff --git a/ClassicalSharp/OpenTK/Platform/X11/X11KeyMap.cs b/OpenTK/Platform/X11/X11KeyMap.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/X11/X11KeyMap.cs
rename to OpenTK/Platform/X11/X11KeyMap.cs
diff --git a/ClassicalSharp/OpenTK/Platform/X11/X11Window.cs b/OpenTK/Platform/X11/X11Window.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Platform/X11/X11Window.cs
rename to OpenTK/Platform/X11/X11Window.cs
diff --git a/ClassicalSharp/OpenTK/Properties/AssemblyInfo.cs b/OpenTK/Properties/AssemblyInfo.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Properties/AssemblyInfo.cs
rename to OpenTK/Properties/AssemblyInfo.cs
diff --git a/ClassicalSharp/OpenTK/Utils.cs b/OpenTK/Utils.cs
similarity index 100%
rename from ClassicalSharp/OpenTK/Utils.cs
rename to OpenTK/Utils.cs
diff --git a/ClassicalSharp/SharpWave/Backends/AL.cs b/SharpWave/Backends/AL.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/Backends/AL.cs
rename to SharpWave/Backends/AL.cs
diff --git a/ClassicalSharp/SharpWave/Backends/IAudioOutput.cs b/SharpWave/Backends/IAudioOutput.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/Backends/IAudioOutput.cs
rename to SharpWave/Backends/IAudioOutput.cs
diff --git a/ClassicalSharp/SharpWave/Backends/OpenALOut.cs b/SharpWave/Backends/OpenALOut.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/Backends/OpenALOut.cs
rename to SharpWave/Backends/OpenALOut.cs
diff --git a/ClassicalSharp/SharpWave/Backends/WinMM.cs b/SharpWave/Backends/WinMM.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/Backends/WinMM.cs
rename to SharpWave/Backends/WinMM.cs
diff --git a/ClassicalSharp/SharpWave/Backends/WinMmOut.cs b/SharpWave/Backends/WinMmOut.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/Backends/WinMmOut.cs
rename to SharpWave/Backends/WinMmOut.cs
diff --git a/ClassicalSharp/SharpWave/Properties/AssemblyInfo.cs b/SharpWave/Properties/AssemblyInfo.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/Properties/AssemblyInfo.cs
rename to SharpWave/Properties/AssemblyInfo.cs
diff --git a/ClassicalSharp/SharpWave/SharpWave.csproj b/SharpWave/SharpWave.csproj
similarity index 100%
rename from ClassicalSharp/SharpWave/SharpWave.csproj
rename to SharpWave/SharpWave.csproj
diff --git a/ClassicalSharp/SharpWave/SharpWave.dll.config b/SharpWave/SharpWave.dll.config
similarity index 100%
rename from ClassicalSharp/SharpWave/SharpWave.dll.config
rename to SharpWave/SharpWave.dll.config
diff --git a/ClassicalSharp/SharpWave/Utils.cs b/SharpWave/Utils.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/Utils.cs
rename to SharpWave/Utils.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Block.cs b/SharpWave/csvorbis/Block.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Block.cs
rename to SharpWave/csvorbis/Block.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/CodeBook.cs b/SharpWave/csvorbis/CodeBook.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/CodeBook.cs
rename to SharpWave/csvorbis/CodeBook.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Comment.cs b/SharpWave/csvorbis/Comment.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Comment.cs
rename to SharpWave/csvorbis/Comment.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/DspState.cs b/SharpWave/csvorbis/DspState.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/DspState.cs
rename to SharpWave/csvorbis/DspState.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/FuncFloor.cs b/SharpWave/csvorbis/FuncFloor.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/FuncFloor.cs
rename to SharpWave/csvorbis/FuncFloor.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/FuncMapping.cs b/SharpWave/csvorbis/FuncMapping.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/FuncMapping.cs
rename to SharpWave/csvorbis/FuncMapping.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/FuncResidue.cs b/SharpWave/csvorbis/FuncResidue.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/FuncResidue.cs
rename to SharpWave/csvorbis/FuncResidue.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Info.cs b/SharpWave/csvorbis/Info.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Info.cs
rename to SharpWave/csvorbis/Info.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Mdct.cs b/SharpWave/csvorbis/Mdct.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Mdct.cs
rename to SharpWave/csvorbis/Mdct.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Ogg/Buffer.cs b/SharpWave/csvorbis/Ogg/Buffer.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Ogg/Buffer.cs
rename to SharpWave/csvorbis/Ogg/Buffer.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Ogg/Packet.cs b/SharpWave/csvorbis/Ogg/Packet.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Ogg/Packet.cs
rename to SharpWave/csvorbis/Ogg/Packet.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Ogg/Page.cs b/SharpWave/csvorbis/Ogg/Page.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Ogg/Page.cs
rename to SharpWave/csvorbis/Ogg/Page.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Ogg/StreamState.cs b/SharpWave/csvorbis/Ogg/StreamState.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Ogg/StreamState.cs
rename to SharpWave/csvorbis/Ogg/StreamState.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/Ogg/SyncState.cs b/SharpWave/csvorbis/Ogg/SyncState.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/Ogg/SyncState.cs
rename to SharpWave/csvorbis/Ogg/SyncState.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/StaticCodeBook.cs b/SharpWave/csvorbis/StaticCodeBook.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/StaticCodeBook.cs
rename to SharpWave/csvorbis/StaticCodeBook.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/VUtils.cs b/SharpWave/csvorbis/VUtils.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/VUtils.cs
rename to SharpWave/csvorbis/VUtils.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/VorbisCodec.cs b/SharpWave/csvorbis/VorbisCodec.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/VorbisCodec.cs
rename to SharpWave/csvorbis/VorbisCodec.cs
diff --git a/ClassicalSharp/SharpWave/csvorbis/csorbisException.cs b/SharpWave/csvorbis/csorbisException.cs
similarity index 100%
rename from ClassicalSharp/SharpWave/csvorbis/csorbisException.cs
rename to SharpWave/csvorbis/csorbisException.cs