diff --git a/Server/Lib/ENet.dll b/Server/Lib/ENet.dll
deleted file mode 100644
index b455da746cca7574e306bc45bdea6a6300dccfa8..0000000000000000000000000000000000000000
Binary files a/Server/Lib/ENet.dll and /dev/null differ
diff --git a/Server/Server.App/Server.App.csproj b/Server/Server.App/Server.App.csproj
index 2a2c4feb4d34b22b619db1d35d409f34aa0a6c76..8088e23e9c158854469288177423342e1b24a5ef 100644
--- a/Server/Server.App/Server.App.csproj
+++ b/Server/Server.App/Server.App.csproj
@@ -50,20 +50,20 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Base\Server.Base.csproj">
+    <None Include="NLog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Server.Base\Server.Base.csproj">
       <Project>{afbad3d5-c827-4ba6-9940-7060b6c39306}</Project>
       <Name>Server.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Model\Server.Model.csproj">
+    <ProjectReference Include="..\Server.Model\Server.Model.csproj">
       <Project>{e997a298-c1e1-4dc7-85a3-4b0e2a6e196d}</Project>
       <Name>Server.Model</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Server/Base/Config/ACategory.cs b/Server/Server.Base/Config/ACategory.cs
similarity index 100%
rename from Server/Base/Config/ACategory.cs
rename to Server/Server.Base/Config/ACategory.cs
diff --git a/Server/Base/Config/AConfig.cs b/Server/Server.Base/Config/AConfig.cs
similarity index 100%
rename from Server/Base/Config/AConfig.cs
rename to Server/Server.Base/Config/AConfig.cs
diff --git a/Server/Base/Config/ConfigAttribute.cs b/Server/Server.Base/Config/ConfigAttribute.cs
similarity index 100%
rename from Server/Base/Config/ConfigAttribute.cs
rename to Server/Server.Base/Config/ConfigAttribute.cs
diff --git a/Server/Base/Config/ICategory.cs b/Server/Server.Base/Config/ICategory.cs
similarity index 100%
rename from Server/Base/Config/ICategory.cs
rename to Server/Server.Base/Config/ICategory.cs
diff --git a/Server/Base/DoubleMap.cs b/Server/Server.Base/DoubleMap.cs
similarity index 100%
rename from Server/Base/DoubleMap.cs
rename to Server/Server.Base/DoubleMap.cs
diff --git a/Server/Base/Helper/ArrayHelper.cs b/Server/Server.Base/Helper/ArrayHelper.cs
similarity index 100%
rename from Server/Base/Helper/ArrayHelper.cs
rename to Server/Server.Base/Helper/ArrayHelper.cs
diff --git a/Server/Base/Helper/ByteHelper.cs b/Server/Server.Base/Helper/ByteHelper.cs
similarity index 100%
rename from Server/Base/Helper/ByteHelper.cs
rename to Server/Server.Base/Helper/ByteHelper.cs
diff --git a/Server/Base/Helper/EnumHelper.cs b/Server/Server.Base/Helper/EnumHelper.cs
similarity index 100%
rename from Server/Base/Helper/EnumHelper.cs
rename to Server/Server.Base/Helper/EnumHelper.cs
diff --git a/Server/Base/Helper/FileHelper.cs b/Server/Server.Base/Helper/FileHelper.cs
similarity index 100%
rename from Server/Base/Helper/FileHelper.cs
rename to Server/Server.Base/Helper/FileHelper.cs
diff --git a/Server/Base/Helper/IdGenerater.cs b/Server/Server.Base/Helper/IdGenerater.cs
similarity index 100%
rename from Server/Base/Helper/IdGenerater.cs
rename to Server/Server.Base/Helper/IdGenerater.cs
diff --git a/Server/Base/Helper/MD5Helper.cs b/Server/Server.Base/Helper/MD5Helper.cs
similarity index 100%
rename from Server/Base/Helper/MD5Helper.cs
rename to Server/Server.Base/Helper/MD5Helper.cs
diff --git a/Server/Base/Helper/MongoHelper.cs b/Server/Server.Base/Helper/MongoHelper.cs
similarity index 100%
rename from Server/Base/Helper/MongoHelper.cs
rename to Server/Server.Base/Helper/MongoHelper.cs
diff --git a/Server/Base/Helper/ProtobufHelper.cs b/Server/Server.Base/Helper/ProtobufHelper.cs
similarity index 100%
rename from Server/Base/Helper/ProtobufHelper.cs
rename to Server/Server.Base/Helper/ProtobufHelper.cs
diff --git a/Server/Base/Helper/RandomHelper.cs b/Server/Server.Base/Helper/RandomHelper.cs
similarity index 100%
rename from Server/Base/Helper/RandomHelper.cs
rename to Server/Server.Base/Helper/RandomHelper.cs
diff --git a/Server/Base/Helper/StringHelper.cs b/Server/Server.Base/Helper/StringHelper.cs
similarity index 100%
rename from Server/Base/Helper/StringHelper.cs
rename to Server/Server.Base/Helper/StringHelper.cs
diff --git a/Server/Base/Helper/TimeHelper.cs b/Server/Server.Base/Helper/TimeHelper.cs
similarity index 100%
rename from Server/Base/Helper/TimeHelper.cs
rename to Server/Server.Base/Helper/TimeHelper.cs
diff --git a/Server/Base/Helper/ZipHelper.cs b/Server/Server.Base/Helper/ZipHelper.cs
similarity index 100%
rename from Server/Base/Helper/ZipHelper.cs
rename to Server/Server.Base/Helper/ZipHelper.cs
diff --git a/Server/Base/Log/ALogDecorater.cs b/Server/Server.Base/Log/ALogDecorater.cs
similarity index 100%
rename from Server/Base/Log/ALogDecorater.cs
rename to Server/Server.Base/Log/ALogDecorater.cs
diff --git a/Server/Base/Log/ILog.cs b/Server/Server.Base/Log/ILog.cs
similarity index 100%
rename from Server/Base/Log/ILog.cs
rename to Server/Server.Base/Log/ILog.cs
diff --git a/Server/Base/Log/Log.cs b/Server/Server.Base/Log/Log.cs
similarity index 100%
rename from Server/Base/Log/Log.cs
rename to Server/Server.Base/Log/Log.cs
diff --git a/Server/Base/Log/NLogAdapter.cs b/Server/Server.Base/Log/NLogAdapter.cs
similarity index 100%
rename from Server/Base/Log/NLogAdapter.cs
rename to Server/Server.Base/Log/NLogAdapter.cs
diff --git a/Server/Base/Log/StackInfoDecorater.cs b/Server/Server.Base/Log/StackInfoDecorater.cs
similarity index 100%
rename from Server/Base/Log/StackInfoDecorater.cs
rename to Server/Server.Base/Log/StackInfoDecorater.cs
diff --git a/Server/Base/MultiMap.cs b/Server/Server.Base/MultiMap.cs
similarity index 100%
rename from Server/Base/MultiMap.cs
rename to Server/Server.Base/MultiMap.cs
diff --git a/Server/Base/Network/AChannel.cs b/Server/Server.Base/Network/AChannel.cs
similarity index 100%
rename from Server/Base/Network/AChannel.cs
rename to Server/Server.Base/Network/AChannel.cs
diff --git a/Server/Base/Network/AService.cs b/Server/Server.Base/Network/AService.cs
similarity index 100%
rename from Server/Base/Network/AService.cs
rename to Server/Server.Base/Network/AService.cs
diff --git a/Server/Base/Network/TNet/PacketParser.cs b/Server/Server.Base/Network/TNet/PacketParser.cs
similarity index 100%
rename from Server/Base/Network/TNet/PacketParser.cs
rename to Server/Server.Base/Network/TNet/PacketParser.cs
diff --git a/Server/Base/Network/TNet/TBuffer.cs b/Server/Server.Base/Network/TNet/TBuffer.cs
similarity index 100%
rename from Server/Base/Network/TNet/TBuffer.cs
rename to Server/Server.Base/Network/TNet/TBuffer.cs
diff --git a/Server/Base/Network/TNet/TChannel.cs b/Server/Server.Base/Network/TNet/TChannel.cs
similarity index 100%
rename from Server/Base/Network/TNet/TChannel.cs
rename to Server/Server.Base/Network/TNet/TChannel.cs
diff --git a/Server/Base/Network/TNet/TPoller.cs b/Server/Server.Base/Network/TNet/TPoller.cs
similarity index 100%
rename from Server/Base/Network/TNet/TPoller.cs
rename to Server/Server.Base/Network/TNet/TPoller.cs
diff --git a/Server/Base/Network/TNet/TService.cs b/Server/Server.Base/Network/TNet/TService.cs
similarity index 100%
rename from Server/Base/Network/TNet/TService.cs
rename to Server/Server.Base/Network/TNet/TService.cs
diff --git a/Server/Base/Network/TNet/TSocket.cs b/Server/Server.Base/Network/TNet/TSocket.cs
similarity index 100%
rename from Server/Base/Network/TNet/TSocket.cs
rename to Server/Server.Base/Network/TNet/TSocket.cs
diff --git a/Server/Base/Network/UNet/Library.cs b/Server/Server.Base/Network/UNet/Library.cs
similarity index 100%
rename from Server/Base/Network/UNet/Library.cs
rename to Server/Server.Base/Network/UNet/Library.cs
diff --git a/Server/Base/Network/UNet/NativeMethods.cs b/Server/Server.Base/Network/UNet/NativeMethods.cs
similarity index 100%
rename from Server/Base/Network/UNet/NativeMethods.cs
rename to Server/Server.Base/Network/UNet/NativeMethods.cs
diff --git a/Server/Base/Network/UNet/NativeStructs.cs b/Server/Server.Base/Network/UNet/NativeStructs.cs
similarity index 100%
rename from Server/Base/Network/UNet/NativeStructs.cs
rename to Server/Server.Base/Network/UNet/NativeStructs.cs
diff --git a/Server/Base/Network/UNet/UAddress.cs b/Server/Server.Base/Network/UNet/UAddress.cs
similarity index 100%
rename from Server/Base/Network/UNet/UAddress.cs
rename to Server/Server.Base/Network/UNet/UAddress.cs
diff --git a/Server/Base/Network/UNet/UChannel.cs b/Server/Server.Base/Network/UNet/UChannel.cs
similarity index 100%
rename from Server/Base/Network/UNet/UChannel.cs
rename to Server/Server.Base/Network/UNet/UChannel.cs
diff --git a/Server/Base/Network/UNet/UPacket.cs b/Server/Server.Base/Network/UNet/UPacket.cs
similarity index 100%
rename from Server/Base/Network/UNet/UPacket.cs
rename to Server/Server.Base/Network/UNet/UPacket.cs
diff --git a/Server/Base/Network/UNet/UPoller.cs b/Server/Server.Base/Network/UNet/UPoller.cs
similarity index 100%
rename from Server/Base/Network/UNet/UPoller.cs
rename to Server/Server.Base/Network/UNet/UPoller.cs
diff --git a/Server/Base/Network/UNet/UService.cs b/Server/Server.Base/Network/UNet/UService.cs
similarity index 100%
rename from Server/Base/Network/UNet/UService.cs
rename to Server/Server.Base/Network/UNet/UService.cs
diff --git a/Server/Base/Network/UNet/USocket.cs b/Server/Server.Base/Network/UNet/USocket.cs
similarity index 100%
rename from Server/Base/Network/UNet/USocket.cs
rename to Server/Server.Base/Network/UNet/USocket.cs
diff --git a/Server/Base/Network/UNet/USocketManager.cs b/Server/Server.Base/Network/UNet/USocketManager.cs
similarity index 100%
rename from Server/Base/Network/UNet/USocketManager.cs
rename to Server/Server.Base/Network/UNet/USocketManager.cs
diff --git a/Server/Base/Object/Component.cs b/Server/Server.Base/Object/Component.cs
similarity index 100%
rename from Server/Base/Object/Component.cs
rename to Server/Server.Base/Object/Component.cs
diff --git a/Server/Base/Object/Entity.cs b/Server/Server.Base/Object/Entity.cs
similarity index 100%
rename from Server/Base/Object/Entity.cs
rename to Server/Server.Base/Object/Entity.cs
diff --git a/Server/Base/Object/IAwake.cs b/Server/Server.Base/Object/IAwake.cs
similarity index 100%
rename from Server/Base/Object/IAwake.cs
rename to Server/Server.Base/Object/IAwake.cs
diff --git a/Server/Base/Object/ILoader.cs b/Server/Server.Base/Object/ILoader.cs
similarity index 100%
rename from Server/Base/Object/ILoader.cs
rename to Server/Server.Base/Object/ILoader.cs
diff --git a/Server/Base/Object/IStart.cs b/Server/Server.Base/Object/IStart.cs
similarity index 100%
rename from Server/Base/Object/IStart.cs
rename to Server/Server.Base/Object/IStart.cs
diff --git a/Server/Base/Object/IUpdate.cs b/Server/Server.Base/Object/IUpdate.cs
similarity index 100%
rename from Server/Base/Object/IUpdate.cs
rename to Server/Server.Base/Object/IUpdate.cs
diff --git a/Server/Base/Object/Object.cs b/Server/Server.Base/Object/Object.cs
similarity index 100%
rename from Server/Base/Object/Object.cs
rename to Server/Server.Base/Object/Object.cs
diff --git a/Server/Base/Object/ObjectEventAttribute.cs b/Server/Server.Base/Object/ObjectEventAttribute.cs
similarity index 100%
rename from Server/Base/Object/ObjectEventAttribute.cs
rename to Server/Server.Base/Object/ObjectEventAttribute.cs
diff --git a/Server/Base/Object/ObjectManager.cs b/Server/Server.Base/Object/ObjectManager.cs
similarity index 100%
rename from Server/Base/Object/ObjectManager.cs
rename to Server/Server.Base/Object/ObjectManager.cs
diff --git a/Server/Base/Properties/AssemblyInfo.cs b/Server/Server.Base/Properties/AssemblyInfo.cs
similarity index 100%
rename from Server/Base/Properties/AssemblyInfo.cs
rename to Server/Server.Base/Properties/AssemblyInfo.cs
diff --git a/Server/Base/QueueDictionary.cs b/Server/Server.Base/QueueDictionary.cs
similarity index 100%
rename from Server/Base/QueueDictionary.cs
rename to Server/Server.Base/QueueDictionary.cs
diff --git a/Server/Base/Server.Base.csproj b/Server/Server.Base/Server.Base.csproj
similarity index 100%
rename from Server/Base/Server.Base.csproj
rename to Server/Server.Base/Server.Base.csproj
diff --git a/Server/Base/TryLocker.cs b/Server/Server.Base/TryLocker.cs
similarity index 100%
rename from Server/Base/TryLocker.cs
rename to Server/Server.Base/TryLocker.cs
diff --git a/Server/Controller/Properties/AssemblyInfo.cs b/Server/Server.Controller/Properties/AssemblyInfo.cs
similarity index 100%
rename from Server/Controller/Properties/AssemblyInfo.cs
rename to Server/Server.Controller/Properties/AssemblyInfo.cs
diff --git a/Server/Controller/Server.Controller.csproj b/Server/Server.Controller/Server.Controller.csproj
similarity index 100%
rename from Server/Controller/Server.Controller.csproj
rename to Server/Server.Controller/Server.Controller.csproj
diff --git a/Server/Model/AEventAttribute.cs b/Server/Server.Model/AEventAttribute.cs
similarity index 100%
rename from Server/Model/AEventAttribute.cs
rename to Server/Server.Model/AEventAttribute.cs
diff --git a/Server/Model/AMEvent.cs b/Server/Server.Model/AMEvent.cs
similarity index 100%
rename from Server/Model/AMEvent.cs
rename to Server/Server.Model/AMEvent.cs
diff --git a/Server/Model/Component/EventComponent.cs b/Server/Server.Model/Component/EventComponent.cs
similarity index 100%
rename from Server/Model/Component/EventComponent.cs
rename to Server/Server.Model/Component/EventComponent.cs
diff --git a/Server/Model/Component/MessageComponent.cs b/Server/Server.Model/Component/MessageComponent.cs
similarity index 100%
rename from Server/Model/Component/MessageComponent.cs
rename to Server/Server.Model/Component/MessageComponent.cs
diff --git a/Server/Model/Component/MessageHandlerComponent.cs b/Server/Server.Model/Component/MessageHandlerComponent.cs
similarity index 100%
rename from Server/Model/Component/MessageHandlerComponent.cs
rename to Server/Server.Model/Component/MessageHandlerComponent.cs
diff --git a/Server/Model/Component/NetworkComponent.cs b/Server/Server.Model/Component/NetworkComponent.cs
similarity index 100%
rename from Server/Model/Component/NetworkComponent.cs
rename to Server/Server.Model/Component/NetworkComponent.cs
diff --git a/Server/Model/Component/Scene.cs b/Server/Server.Model/Component/Scene.cs
similarity index 100%
rename from Server/Model/Component/Scene.cs
rename to Server/Server.Model/Component/Scene.cs
diff --git a/Server/Model/Component/TimeComponent.cs b/Server/Server.Model/Component/TimeComponent.cs
similarity index 100%
rename from Server/Model/Component/TimeComponent.cs
rename to Server/Server.Model/Component/TimeComponent.cs
diff --git a/Server/Model/Component/TimerComponent.cs b/Server/Server.Model/Component/TimerComponent.cs
similarity index 100%
rename from Server/Model/Component/TimerComponent.cs
rename to Server/Server.Model/Component/TimerComponent.cs
diff --git a/Server/Model/EntityType.cs b/Server/Server.Model/EntityType.cs
similarity index 100%
rename from Server/Model/EntityType.cs
rename to Server/Server.Model/EntityType.cs
diff --git a/Server/Model/Env.cs b/Server/Server.Model/Env.cs
similarity index 100%
rename from Server/Model/Env.cs
rename to Server/Server.Model/Env.cs
diff --git a/Server/Model/EnvKey.cs b/Server/Server.Model/EnvKey.cs
similarity index 100%
rename from Server/Model/EnvKey.cs
rename to Server/Server.Model/EnvKey.cs
diff --git a/Server/Model/EventAttribute.cs b/Server/Server.Model/EventAttribute.cs
similarity index 100%
rename from Server/Model/EventAttribute.cs
rename to Server/Server.Model/EventAttribute.cs
diff --git a/Server/Model/EventIdType.cs b/Server/Server.Model/EventIdType.cs
similarity index 100%
rename from Server/Model/EventIdType.cs
rename to Server/Server.Model/EventIdType.cs
diff --git a/Server/Model/GameException.cs b/Server/Server.Model/GameException.cs
similarity index 100%
rename from Server/Model/GameException.cs
rename to Server/Server.Model/GameException.cs
diff --git a/Server/Model/IEvent.cs b/Server/Server.Model/IEvent.cs
similarity index 100%
rename from Server/Model/IEvent.cs
rename to Server/Server.Model/IEvent.cs
diff --git a/Server/Model/Message/ErrorCode.cs b/Server/Server.Model/Message/ErrorCode.cs
similarity index 100%
rename from Server/Model/Message/ErrorCode.cs
rename to Server/Server.Model/Message/ErrorCode.cs
diff --git a/Server/Model/Message/IErrorMessage.cs b/Server/Server.Model/Message/IErrorMessage.cs
similarity index 100%
rename from Server/Model/Message/IErrorMessage.cs
rename to Server/Server.Model/Message/IErrorMessage.cs
diff --git a/Server/Model/Message/IMRegister.cs b/Server/Server.Model/Message/IMRegister.cs
similarity index 100%
rename from Server/Model/Message/IMRegister.cs
rename to Server/Server.Model/Message/IMRegister.cs
diff --git a/Server/Model/Message/Message.cs b/Server/Server.Model/Message/Message.cs
similarity index 100%
rename from Server/Model/Message/Message.cs
rename to Server/Server.Model/Message/Message.cs
diff --git a/Server/Model/Message/MessageAttribute.cs b/Server/Server.Model/Message/MessageAttribute.cs
similarity index 100%
rename from Server/Model/Message/MessageAttribute.cs
rename to Server/Server.Model/Message/MessageAttribute.cs
diff --git a/Server/Model/Message/Opcode.cs b/Server/Server.Model/Message/Opcode.cs
similarity index 100%
rename from Server/Model/Message/Opcode.cs
rename to Server/Server.Model/Message/Opcode.cs
diff --git a/Server/Model/Message/OpcodeHelper.cs b/Server/Server.Model/Message/OpcodeHelper.cs
similarity index 100%
rename from Server/Model/Message/OpcodeHelper.cs
rename to Server/Server.Model/Message/OpcodeHelper.cs
diff --git a/Server/Model/Properties/AssemblyInfo.cs b/Server/Server.Model/Properties/AssemblyInfo.cs
similarity index 100%
rename from Server/Model/Properties/AssemblyInfo.cs
rename to Server/Server.Model/Properties/AssemblyInfo.cs
diff --git a/Server/Model/Scene/Server.cs b/Server/Server.Model/Scene/Server.cs
similarity index 100%
rename from Server/Model/Scene/Server.cs
rename to Server/Server.Model/Scene/Server.cs
diff --git a/Server/Model/Server.Model.csproj b/Server/Server.Model/Server.Model.csproj
similarity index 98%
rename from Server/Model/Server.Model.csproj
rename to Server/Server.Model/Server.Model.csproj
index 985f7318c6a7d40b37535de12beaf8fa2a7412da..2504be2bb732bdfc13b167f48d79e0a91878997c 100644
--- a/Server/Model/Server.Model.csproj
+++ b/Server/Server.Model/Server.Model.csproj
@@ -73,7 +73,7 @@
     <Compile Include="Scene\Server.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Base\Server.Base.csproj">
+    <ProjectReference Include="..\Server.Base\Server.Base.csproj">
       <Project>{afbad3d5-c827-4ba6-9940-7060b6c39306}</Project>
       <Name>Server.Base</Name>
     </ProjectReference>
diff --git a/Server/Server.sln b/Server/Server.sln
index 37e1e25da8293dc7466fe900880a193206731db8..ff87736d5407a54ad26f9ab49a6caba29950189a 100644
--- a/Server/Server.sln
+++ b/Server/Server.sln
@@ -3,17 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Base", "Base\Server.Base.csproj", "{AFBAD3D5-C827-4BA6-9940-7060B6C39306}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.App", "Server.App\Server.App.csproj", "{3F8DC04C-9E05-403F-B6A5-36293EB99937}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Model", "Model\Server.Model.csproj", "{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{D736BBFE-822E-4F67-8376-44CDDBAA09F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Controller", "Controller\Server.Controller.csproj", "{ED2A5401-3829-4A8B-915D-A2A18FB233F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Base", "Server.Base\Server.Base.csproj", "{AFBAD3D5-C827-4BA6-9940-7060B6C39306}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget", "Nuget\Nuget.csproj", "{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Controller", "Server.Controller\Server.Controller.csproj", "{ED2A5401-3829-4A8B-915D-A2A18FB233F8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.App", "Server.App\Server.App.csproj", "{3F8DC04C-9E05-403F-B6A5-36293EB99937}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Model", "Server.Model\Server.Model.csproj", "{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ENet", "ThirdParty\ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server.ENet", "ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget", "ThirdParty\Nuget\Nuget.csproj", "{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,6 +27,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.Build.0 = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.Build.0 = Release|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -37,18 +51,6 @@ Global
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x64.Build.0 = Release|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x86.ActiveCfg = Release|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x86.Build.0 = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.Build.0 = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.Build.0 = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.ActiveCfg = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.Build.0 = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.ActiveCfg = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.Build.0 = Release|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -61,26 +63,18 @@ Global
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x64.Build.0 = Release|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x86.ActiveCfg = Release|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x86.Build.0 = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.ActiveCfg = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.Build.0 = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.Build.0 = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.Build.0 = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.Build.0 = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.Build.0 = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.Build.0 = Release|Any CPU
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.ActiveCfg = Debug|x64
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.Build.0 = Debug|x64
@@ -91,8 +85,24 @@ Global
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x64.Build.0 = Release|x64
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.ActiveCfg = Release|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.Build.0 = Release|Win32
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.Build.0 = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C9992B7C-313E-4C9F-A954-640D01EDFB58} = {D736BBFE-822E-4F67-8376-44CDDBAA09F4}
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135} = {D736BBFE-822E-4F67-8376-44CDDBAA09F4}
+	EndGlobalSection
 EndGlobal
diff --git a/Server/ENet/CMakeLists.txt b/Server/ThirdParty/ENet/CMakeLists.txt
similarity index 100%
rename from Server/ENet/CMakeLists.txt
rename to Server/ThirdParty/ENet/CMakeLists.txt
diff --git a/Server/ENet/ENet.vcxproj b/Server/ThirdParty/ENet/ENet.vcxproj
similarity index 100%
rename from Server/ENet/ENet.vcxproj
rename to Server/ThirdParty/ENet/ENet.vcxproj
diff --git a/Server/ENet/ENet.vcxproj.filters b/Server/ThirdParty/ENet/ENet.vcxproj.filters
similarity index 100%
rename from Server/ENet/ENet.vcxproj.filters
rename to Server/ThirdParty/ENet/ENet.vcxproj.filters
diff --git a/Server/ENet/callbacks.c b/Server/ThirdParty/ENet/callbacks.c
similarity index 100%
rename from Server/ENet/callbacks.c
rename to Server/ThirdParty/ENet/callbacks.c
diff --git a/Server/ENet/compress.c b/Server/ThirdParty/ENet/compress.c
similarity index 100%
rename from Server/ENet/compress.c
rename to Server/ThirdParty/ENet/compress.c
diff --git a/Server/ENet/enet/callbacks.h b/Server/ThirdParty/ENet/enet/callbacks.h
similarity index 100%
rename from Server/ENet/enet/callbacks.h
rename to Server/ThirdParty/ENet/enet/callbacks.h
diff --git a/Server/ENet/enet/enet.h b/Server/ThirdParty/ENet/enet/enet.h
similarity index 100%
rename from Server/ENet/enet/enet.h
rename to Server/ThirdParty/ENet/enet/enet.h
diff --git a/Server/ENet/enet/list.h b/Server/ThirdParty/ENet/enet/list.h
similarity index 100%
rename from Server/ENet/enet/list.h
rename to Server/ThirdParty/ENet/enet/list.h
diff --git a/Server/ENet/enet/protocol.h b/Server/ThirdParty/ENet/enet/protocol.h
similarity index 100%
rename from Server/ENet/enet/protocol.h
rename to Server/ThirdParty/ENet/enet/protocol.h
diff --git a/Server/ENet/enet/time.h b/Server/ThirdParty/ENet/enet/time.h
similarity index 100%
rename from Server/ENet/enet/time.h
rename to Server/ThirdParty/ENet/enet/time.h
diff --git a/Server/ENet/enet/types.h b/Server/ThirdParty/ENet/enet/types.h
similarity index 100%
rename from Server/ENet/enet/types.h
rename to Server/ThirdParty/ENet/enet/types.h
diff --git a/Server/ENet/enet/unix.h b/Server/ThirdParty/ENet/enet/unix.h
similarity index 100%
rename from Server/ENet/enet/unix.h
rename to Server/ThirdParty/ENet/enet/unix.h
diff --git a/Server/ENet/enet/utility.h b/Server/ThirdParty/ENet/enet/utility.h
similarity index 100%
rename from Server/ENet/enet/utility.h
rename to Server/ThirdParty/ENet/enet/utility.h
diff --git a/Server/ENet/enet/win32.h b/Server/ThirdParty/ENet/enet/win32.h
similarity index 100%
rename from Server/ENet/enet/win32.h
rename to Server/ThirdParty/ENet/enet/win32.h
diff --git a/Server/ENet/host.c b/Server/ThirdParty/ENet/host.c
similarity index 100%
rename from Server/ENet/host.c
rename to Server/ThirdParty/ENet/host.c
diff --git a/Server/ENet/list.c b/Server/ThirdParty/ENet/list.c
similarity index 100%
rename from Server/ENet/list.c
rename to Server/ThirdParty/ENet/list.c
diff --git a/Server/ENet/packet.c b/Server/ThirdParty/ENet/packet.c
similarity index 100%
rename from Server/ENet/packet.c
rename to Server/ThirdParty/ENet/packet.c
diff --git a/Server/ENet/peer.c b/Server/ThirdParty/ENet/peer.c
similarity index 100%
rename from Server/ENet/peer.c
rename to Server/ThirdParty/ENet/peer.c
diff --git a/Server/ENet/protocol.c b/Server/ThirdParty/ENet/protocol.c
similarity index 100%
rename from Server/ENet/protocol.c
rename to Server/ThirdParty/ENet/protocol.c
diff --git a/Server/ENet/unix.c b/Server/ThirdParty/ENet/unix.c
similarity index 100%
rename from Server/ENet/unix.c
rename to Server/ThirdParty/ENet/unix.c
diff --git a/Server/ENet/win32.c b/Server/ThirdParty/ENet/win32.c
similarity index 100%
rename from Server/ENet/win32.c
rename to Server/ThirdParty/ENet/win32.c
diff --git a/Server/Nuget/Nuget.csproj b/Server/ThirdParty/Nuget/Nuget.csproj
similarity index 100%
rename from Server/Nuget/Nuget.csproj
rename to Server/ThirdParty/Nuget/Nuget.csproj
diff --git a/Server/Nuget/Properties/AssemblyInfo.cs b/Server/ThirdParty/Nuget/Properties/AssemblyInfo.cs
similarity index 100%
rename from Server/Nuget/Properties/AssemblyInfo.cs
rename to Server/ThirdParty/Nuget/Properties/AssemblyInfo.cs
diff --git a/Server/Nuget/packages.config b/Server/ThirdParty/Nuget/packages.config
similarity index 100%
rename from Server/Nuget/packages.config
rename to Server/ThirdParty/Nuget/packages.config