diff --git a/TrueCraft.Client.Linux/BMFont.cs b/TrueCraft.Client/BMFont.cs
similarity index 99%
rename from TrueCraft.Client.Linux/BMFont.cs
rename to TrueCraft.Client/BMFont.cs
index a705748..459e41c 100644
--- a/TrueCraft.Client.Linux/BMFont.cs
+++ b/TrueCraft.Client/BMFont.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     [Serializable]
     [XmlRoot ( "font" )]
diff --git a/TrueCraft.Client.Linux/ChunkConverter.cs b/TrueCraft.Client/ChunkConverter.cs
similarity index 98%
rename from TrueCraft.Client.Linux/ChunkConverter.cs
rename to TrueCraft.Client/ChunkConverter.cs
index 5f86f2d..8ef3cda 100644
--- a/TrueCraft.Client.Linux/ChunkConverter.cs
+++ b/TrueCraft.Client/ChunkConverter.cs
@@ -2,7 +2,7 @@
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Linq;
-using TrueCraft.Client.Linux.Rendering;
+using TrueCraft.Client.Rendering;
 using TrueCraft.Core.World;
 using TrueCraft.API;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ using Vector2 = Microsoft.Xna.Framework.Vector2;
 using Vector3 = Microsoft.Xna.Framework.Vector3;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     /// <summary>
     /// A daemon of sorts that creates meshes from chunks.
diff --git a/TrueCraft.Client.Linux/Content/dejavu.fnt b/TrueCraft.Client/Content/dejavu.fnt
similarity index 100%
rename from TrueCraft.Client.Linux/Content/dejavu.fnt
rename to TrueCraft.Client/Content/dejavu.fnt
diff --git a/TrueCraft.Client.Linux/Content/dejavu_0.png b/TrueCraft.Client/Content/dejavu_0.png
similarity index 100%
rename from TrueCraft.Client.Linux/Content/dejavu_0.png
rename to TrueCraft.Client/Content/dejavu_0.png
diff --git a/TrueCraft.Client.Linux/Content/items.png b/TrueCraft.Client/Content/items.png
similarity index 100%
rename from TrueCraft.Client.Linux/Content/items.png
rename to TrueCraft.Client/Content/items.png
diff --git a/TrueCraft.Client.Linux/Content/pack.png b/TrueCraft.Client/Content/pack.png
similarity index 100%
rename from TrueCraft.Client.Linux/Content/pack.png
rename to TrueCraft.Client/Content/pack.png
diff --git a/TrueCraft.Client.Linux/Content/terrain.png b/TrueCraft.Client/Content/terrain.png
similarity index 100%
rename from TrueCraft.Client.Linux/Content/terrain.png
rename to TrueCraft.Client/Content/terrain.png
diff --git a/TrueCraft.Client.Linux/Events/ChatMessageEventArgs.cs b/TrueCraft.Client/Events/ChatMessageEventArgs.cs
similarity index 85%
rename from TrueCraft.Client.Linux/Events/ChatMessageEventArgs.cs
rename to TrueCraft.Client/Events/ChatMessageEventArgs.cs
index f53895e..e54fd71 100644
--- a/TrueCraft.Client.Linux/Events/ChatMessageEventArgs.cs
+++ b/TrueCraft.Client/Events/ChatMessageEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace TrueCraft.Client.Linux.Events
+namespace TrueCraft.Client.Events
 {
     public class ChatMessageEventArgs : EventArgs
     {
diff --git a/TrueCraft.Client.Linux/Events/ChunkEventArgs.cs b/TrueCraft.Client/Events/ChunkEventArgs.cs
similarity index 84%
rename from TrueCraft.Client.Linux/Events/ChunkEventArgs.cs
rename to TrueCraft.Client/Events/ChunkEventArgs.cs
index c823fc8..92ac37c 100644
--- a/TrueCraft.Client.Linux/Events/ChunkEventArgs.cs
+++ b/TrueCraft.Client/Events/ChunkEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace TrueCraft.Client.Linux.Events
+namespace TrueCraft.Client.Events
 {
     public class ChunkEventArgs
     {
diff --git a/TrueCraft.Client.Linux/FontRenderer.cs b/TrueCraft.Client/FontRenderer.cs
similarity index 97%
rename from TrueCraft.Client.Linux/FontRenderer.cs
rename to TrueCraft.Client/FontRenderer.cs
index 19d48f8..9dc8c36 100644
--- a/TrueCraft.Client.Linux/FontRenderer.cs
+++ b/TrueCraft.Client/FontRenderer.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public class FontRenderer
     {
diff --git a/TrueCraft.Client.Linux/Handlers/ChunkHandler.cs b/TrueCraft.Client/Handlers/ChunkHandler.cs
similarity index 94%
rename from TrueCraft.Client.Linux/Handlers/ChunkHandler.cs
rename to TrueCraft.Client/Handlers/ChunkHandler.cs
index b771acb..23543ea 100644
--- a/TrueCraft.Client.Linux/Handlers/ChunkHandler.cs
+++ b/TrueCraft.Client/Handlers/ChunkHandler.cs
@@ -4,9 +4,9 @@ using TrueCraft.Core.Networking.Packets;
 using TrueCraft.API;
 using TrueCraft.Core.World;
 using MonoGame.Utilities;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 
-namespace TrueCraft.Client.Linux.Handlers
+namespace TrueCraft.Client.Handlers
 {
     internal static class ChunkHandler
     {
diff --git a/TrueCraft.Client.Linux/Handlers/PacketHandlers.cs b/TrueCraft.Client/Handlers/PacketHandlers.cs
similarity index 95%
rename from TrueCraft.Client.Linux/Handlers/PacketHandlers.cs
rename to TrueCraft.Client/Handlers/PacketHandlers.cs
index 2f31f32..4df5d62 100644
--- a/TrueCraft.Client.Linux/Handlers/PacketHandlers.cs
+++ b/TrueCraft.Client/Handlers/PacketHandlers.cs
@@ -2,10 +2,10 @@
 using TrueCraft.API.Networking;
 using TrueCraft.Core.Networking.Packets;
 using TrueCraft.Core.Networking;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 using TrueCraft.API;
 
-namespace TrueCraft.Client.Linux.Handlers
+namespace TrueCraft.Client.Handlers
 {
     internal static class PacketHandlers
     {
diff --git a/TrueCraft.Client.Linux/Interface/ChatInterface.cs b/TrueCraft.Client/Interface/ChatInterface.cs
similarity index 96%
rename from TrueCraft.Client.Linux/Interface/ChatInterface.cs
rename to TrueCraft.Client/Interface/ChatInterface.cs
index a11659e..d6b5117 100644
--- a/TrueCraft.Client.Linux/Interface/ChatInterface.cs
+++ b/TrueCraft.Client/Interface/ChatInterface.cs
@@ -1,10 +1,10 @@
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 using System.Collections.Generic;
 
-namespace TrueCraft.Client.Linux.Interface
+namespace TrueCraft.Client.Interface
 {
     public class ChatInterface : IGameInterface
     {
diff --git a/TrueCraft.Client.Linux/Interface/IGameInterface.cs b/TrueCraft.Client/Interface/IGameInterface.cs
similarity index 85%
rename from TrueCraft.Client.Linux/Interface/IGameInterface.cs
rename to TrueCraft.Client/Interface/IGameInterface.cs
index e29a43a..8f32498 100644
--- a/TrueCraft.Client.Linux/Interface/IGameInterface.cs
+++ b/TrueCraft.Client/Interface/IGameInterface.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace TrueCraft.Client.Linux.Interface
+namespace TrueCraft.Client.Interface
 {
     public interface IGameInterface
     {
diff --git a/TrueCraft.Client.Linux/MultiplayerClient.cs b/TrueCraft.Client/MultiplayerClient.cs
similarity index 98%
rename from TrueCraft.Client.Linux/MultiplayerClient.cs
rename to TrueCraft.Client/MultiplayerClient.cs
index 66904df..128217e 100644
--- a/TrueCraft.Client.Linux/MultiplayerClient.cs
+++ b/TrueCraft.Client/MultiplayerClient.cs
@@ -7,13 +7,13 @@ using System.Threading;
 using TrueCraft.Core.Networking;
 using System.Linq;
 using TrueCraft.Core.Networking.Packets;
-using TrueCraft.Client.Linux.Events;
+using TrueCraft.Client.Events;
 using TrueCraft.Core.Logic;
 using TrueCraft.API.Entities;
 using TrueCraft.API;
 using System.ComponentModel;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public delegate void PacketHandler(IPacket packet, MultiplayerClient client);
 
diff --git a/TrueCraft.Client.Linux/OpenTK.dll.config b/TrueCraft.Client/OpenTK.dll.config
similarity index 100%
rename from TrueCraft.Client.Linux/OpenTK.dll.config
rename to TrueCraft.Client/OpenTK.dll.config
diff --git a/TrueCraft.Client.Linux/PhysicsEngine.cs b/TrueCraft.Client/PhysicsEngine.cs
similarity index 99%
rename from TrueCraft.Client.Linux/PhysicsEngine.cs
rename to TrueCraft.Client/PhysicsEngine.cs
index ac3b210..1f2016c 100644
--- a/TrueCraft.Client.Linux/PhysicsEngine.cs
+++ b/TrueCraft.Client/PhysicsEngine.cs
@@ -6,9 +6,8 @@ using TrueCraft.Core.World;
 using TrueCraft.API.Entities;
 using TrueCraft.API.World;
 using TrueCraft.API;
-using TrueCraft.Client.Linux;
 
-namespace TrueCraft
+namespace TrueCraft.Client
 {
     // This is a stripped down version of the physics engine that the server uses
     // The only thing we use it for is our own movement
diff --git a/TrueCraft.Client.Linux/Program.cs b/TrueCraft.Client/Program.cs
similarity index 97%
rename from TrueCraft.Client.Linux/Program.cs
rename to TrueCraft.Client/Program.cs
index cb7e980..629c5f2 100644
--- a/TrueCraft.Client.Linux/Program.cs
+++ b/TrueCraft.Client/Program.cs
@@ -3,7 +3,7 @@ using System.Net;
 using System.Linq;
 using System.Net.Sockets;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public static class Program
     {
diff --git a/TrueCraft.Client.Linux/Properties/AssemblyInfo.cs b/TrueCraft.Client/Properties/AssemblyInfo.cs
similarity index 94%
rename from TrueCraft.Client.Linux/Properties/AssemblyInfo.cs
rename to TrueCraft.Client/Properties/AssemblyInfo.cs
index 6dff654..cd206ed 100644
--- a/TrueCraft.Client.Linux/Properties/AssemblyInfo.cs
+++ b/TrueCraft.Client/Properties/AssemblyInfo.cs
@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
 
-[assembly: AssemblyTitle("TrueCraft.Client.Linux")]
+[assembly: AssemblyTitle("TrueCraft.Client")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
diff --git a/TrueCraft.Client.Linux/ReadOnlyWorld.cs b/TrueCraft.Client/ReadOnlyWorld.cs
similarity index 98%
rename from TrueCraft.Client.Linux/ReadOnlyWorld.cs
rename to TrueCraft.Client/ReadOnlyWorld.cs
index e7a082d..db654e3 100644
--- a/TrueCraft.Client.Linux/ReadOnlyWorld.cs
+++ b/TrueCraft.Client/ReadOnlyWorld.cs
@@ -7,7 +7,7 @@ using TrueCraft.API.World;
 using TrueCraft.Core.World;
 using TrueCraft.API;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public class ReadOnlyWorld
     {
diff --git a/TrueCraft.Client.Linux/Rendering/BlockRenderer.cs b/TrueCraft.Client/Rendering/BlockRenderer.cs
similarity index 99%
rename from TrueCraft.Client.Linux/Rendering/BlockRenderer.cs
rename to TrueCraft.Client/Rendering/BlockRenderer.cs
index 09098eb..28374e2 100644
--- a/TrueCraft.Client.Linux/Rendering/BlockRenderer.cs
+++ b/TrueCraft.Client/Rendering/BlockRenderer.cs
@@ -5,7 +5,7 @@ using TrueCraft.Core.Logic;
 using TrueCraft.API.Logic;
 using System.Linq;
 
-namespace TrueCraft.Client.Linux.Rendering
+namespace TrueCraft.Client.Rendering
 {
     public class BlockRenderer
     {
diff --git a/TrueCraft.Client.Linux/Rendering/Blocks/CraftingTableRenderer.cs b/TrueCraft.Client/Rendering/Blocks/CraftingTableRenderer.cs
similarity index 97%
rename from TrueCraft.Client.Linux/Rendering/Blocks/CraftingTableRenderer.cs
rename to TrueCraft.Client/Rendering/Blocks/CraftingTableRenderer.cs
index f03195e..2897898 100644
--- a/TrueCraft.Client.Linux/Rendering/Blocks/CraftingTableRenderer.cs
+++ b/TrueCraft.Client/Rendering/Blocks/CraftingTableRenderer.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class CraftingTableRenderer : BlockRenderer
     {
diff --git a/TrueCraft.Client.Linux/Rendering/Blocks/GrassRenderer.cs b/TrueCraft.Client/Rendering/Blocks/GrassRenderer.cs
similarity index 97%
rename from TrueCraft.Client.Linux/Rendering/Blocks/GrassRenderer.cs
rename to TrueCraft.Client/Rendering/Blocks/GrassRenderer.cs
index 50e7c1e..8ebca76 100644
--- a/TrueCraft.Client.Linux/Rendering/Blocks/GrassRenderer.cs
+++ b/TrueCraft.Client/Rendering/Blocks/GrassRenderer.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using TrueCraft.Core.Logic.Blocks;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class GrassRenderer : BlockRenderer
     {
diff --git a/TrueCraft.Client.Linux/Rendering/Blocks/SnowRenderer.cs b/TrueCraft.Client/Rendering/Blocks/SnowRenderer.cs
similarity index 96%
rename from TrueCraft.Client.Linux/Rendering/Blocks/SnowRenderer.cs
rename to TrueCraft.Client/Rendering/Blocks/SnowRenderer.cs
index 74ddbc3..e159ed9 100644
--- a/TrueCraft.Client.Linux/Rendering/Blocks/SnowRenderer.cs
+++ b/TrueCraft.Client/Rendering/Blocks/SnowRenderer.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using TrueCraft.Core.Logic.Blocks;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class SnowRenderer : BlockRenderer
     {
diff --git a/TrueCraft.Client.Linux/Rendering/Blocks/TNTRenderer.cs b/TrueCraft.Client/Rendering/Blocks/TNTRenderer.cs
similarity index 97%
rename from TrueCraft.Client.Linux/Rendering/Blocks/TNTRenderer.cs
rename to TrueCraft.Client/Rendering/Blocks/TNTRenderer.cs
index 87d42fe..50648e5 100644
--- a/TrueCraft.Client.Linux/Rendering/Blocks/TNTRenderer.cs
+++ b/TrueCraft.Client/Rendering/Blocks/TNTRenderer.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class TNTRenderer : BlockRenderer
     {
diff --git a/TrueCraft.Client.Linux/Rendering/Blocks/TorchRenderer.cs b/TrueCraft.Client/Rendering/Blocks/TorchRenderer.cs
similarity index 98%
rename from TrueCraft.Client.Linux/Rendering/Blocks/TorchRenderer.cs
rename to TrueCraft.Client/Rendering/Blocks/TorchRenderer.cs
index 34838b1..9fbcf93 100644
--- a/TrueCraft.Client.Linux/Rendering/Blocks/TorchRenderer.cs
+++ b/TrueCraft.Client/Rendering/Blocks/TorchRenderer.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework;
 using TrueCraft.Core.Logic.Blocks;
 using TrueCraft.API.Logic;
 
-namespace TrueCraft.Client.Linux.Rendering.Blocks
+namespace TrueCraft.Client.Rendering.Blocks
 {
     public class TorchRenderer : BlockRenderer
     {
diff --git a/TrueCraft.Client.Linux/Rendering/Mesh.cs b/TrueCraft.Client/Rendering/Mesh.cs
similarity index 97%
rename from TrueCraft.Client.Linux/Rendering/Mesh.cs
rename to TrueCraft.Client/Rendering/Mesh.cs
index 41a2cc8..396ea45 100644
--- a/TrueCraft.Client.Linux/Rendering/Mesh.cs
+++ b/TrueCraft.Client/Rendering/Mesh.cs
@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework;
 using System.Linq;
 
-namespace TrueCraft.Client.Linux.Rendering
+namespace TrueCraft.Client.Rendering
 {
     public class Mesh
     {
diff --git a/TrueCraft.Client.Linux/Tao.Sdl.dll.config b/TrueCraft.Client/Tao.Sdl.dll.config
similarity index 100%
rename from TrueCraft.Client.Linux/Tao.Sdl.dll.config
rename to TrueCraft.Client/Tao.Sdl.dll.config
diff --git a/TrueCraft.Client.Linux/TrueCraft.Client.Linux.csproj b/TrueCraft.Client/TrueCraft.Client.csproj
similarity index 98%
rename from TrueCraft.Client.Linux/TrueCraft.Client.Linux.csproj
rename to TrueCraft.Client/TrueCraft.Client.csproj
index a444170..9fe1e3f 100644
--- a/TrueCraft.Client.Linux/TrueCraft.Client.Linux.csproj
+++ b/TrueCraft.Client/TrueCraft.Client.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6516869-A2FB-4E31-85C8-2285490CB32C}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>TrueCraft.Client.Linux</RootNamespace>
-    <AssemblyName>TrueCraft.Client.Linux</AssemblyName>
+    <RootNamespace>TrueCraft.Client</RootNamespace>
+    <AssemblyName>TrueCraft.Client</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -143,4 +143,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/TrueCraft.Client.Linux/TrueCraftGame.cs b/TrueCraft.Client/TrueCraftGame.cs
similarity index 98%
rename from TrueCraft.Client.Linux/TrueCraftGame.cs
rename to TrueCraft.Client/TrueCraftGame.cs
index 113b89a..045ae12 100644
--- a/TrueCraft.Client.Linux/TrueCraftGame.cs
+++ b/TrueCraft.Client/TrueCraftGame.cs
@@ -3,15 +3,15 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Graphics;
 using System.Collections.Generic;
-using TrueCraft.Client.Linux.Interface;
+using TrueCraft.Client.Interface;
 using System.IO;
 using System.Net;
 using TrueCraft.API;
-using TrueCraft.Client.Linux.Rendering;
+using TrueCraft.Client.Rendering;
 using System.Linq;
 using System.ComponentModel;
 
-namespace TrueCraft.Client.Linux
+namespace TrueCraft.Client
 {
     public class TrueCraftGame : Game
     {
diff --git a/TrueCraft.Client.Linux/packages.config b/TrueCraft.Client/packages.config
similarity index 100%
rename from TrueCraft.Client.Linux/packages.config
rename to TrueCraft.Client/packages.config
diff --git a/TrueCraft.Launcher/LauncherWindow.cs b/TrueCraft.Launcher/LauncherWindow.cs
index 4c5d34d..d899a7a 100644
--- a/TrueCraft.Launcher/LauncherWindow.cs
+++ b/TrueCraft.Launcher/LauncherWindow.cs
@@ -47,9 +47,9 @@ namespace TrueCraft.Launcher
         {
             var process = new Process();
             if (RuntimeInfo.IsMono)
-                process.StartInfo = new ProcessStartInfo("mono", "TrueCraft.Client.Linux.exe " + ServerIPText.Text);
+                process.StartInfo = new ProcessStartInfo("mono", "TrueCraft.Client.exe " + ServerIPText.Text);
             else
-                process.StartInfo = new ProcessStartInfo("TrueCraft.Client.Linux.exe", ServerIPText.Text);
+                process.StartInfo = new ProcessStartInfo("TrueCraft.Client.exe", ServerIPText.Text);
             process.EnableRaisingEvents = true;
             process.Exited += (s, a) => Application.Invoke(ClientExited);
             process.Start();
@@ -63,4 +63,4 @@ namespace TrueCraft.Launcher
             this.ShowInTaskbar = true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/TrueCraft.Launcher/TrueCraft.Launcher.csproj b/TrueCraft.Launcher/TrueCraft.Launcher.csproj
index a0b1aee..0f4b01f 100644
--- a/TrueCraft.Launcher/TrueCraft.Launcher.csproj
+++ b/TrueCraft.Launcher/TrueCraft.Launcher.csproj
@@ -58,10 +58,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\TrueCraft.Client.Linux\TrueCraft.Client.Linux.csproj">
-      <Project>{A6516869-A2FB-4E31-85C8-2285490CB32C}</Project>
-      <Name>TrueCraft.Client.Linux</Name>
-    </ProjectReference>
     <ProjectReference Include="..\TrueCraft.API\TrueCraft.API.csproj">
       <Project>{FEE55B54-91B0-4325-A2C3-D576C0B7A81F}</Project>
       <Name>TrueCraft.API</Name>
@@ -78,8 +74,12 @@
       <Project>{4488498D-976D-4DA3-BF72-109531AF0488}</Project>
       <Name>fNbt</Name>
     </ProjectReference>
+    <ProjectReference Include="..\TrueCraft.Client\TrueCraft.Client.csproj">
+      <Project>{A6516869-A2FB-4E31-85C8-2285490CB32C}</Project>
+      <Name>TrueCraft.Client</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/TrueCraft.sln b/TrueCraft.sln
index aa5218f..5d8cd72 100644
--- a/TrueCraft.sln
+++ b/TrueCraft.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Core", "TrueCraft
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fNbt", "externals\fNbt\fNbt\fNbt.csproj", "{4488498D-976D-4DA3-BF72-109531AF0488}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Client.Linux", "TrueCraft.Client.Linux\TrueCraft.Client.Linux.csproj", "{A6516869-A2FB-4E31-85C8-2285490CB32C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Client", "TrueCraft.Client\TrueCraft.Client.csproj", "{A6516869-A2FB-4E31-85C8-2285490CB32C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrueCraft.Launcher", "TrueCraft.Launcher\TrueCraft.Launcher.csproj", "{6604F17A-552E-405D-B327-37C8B1648C86}"
 EndProject