diff --git a/Ragon.Common/Protocol/IPacket.cs b/Ragon.Common/Protocol/IPacket.cs
index 316cfe1..a3be150 100644
--- a/Ragon.Common/Protocol/IPacket.cs
+++ b/Ragon.Common/Protocol/IPacket.cs
@@ -1,6 +1,6 @@
 using NetStack.Serialization;
 
-namespace Ragon.Core
+namespace Ragon.Common
 {
   public interface IPacket
   {
diff --git a/Ragon.Common/Protocol/RagonHeader.cs b/Ragon.Common/Protocol/RagonHeader.cs
index 2819f29..8a8fbe4 100644
--- a/Ragon.Common/Protocol/RagonHeader.cs
+++ b/Ragon.Common/Protocol/RagonHeader.cs
@@ -2,7 +2,7 @@ using System;
 using System.Runtime.CompilerServices;
 using NetStack.Buffers;
 
-namespace Ragon.Core
+namespace Ragon.Common
 {
   public static class RagonHeader
   {
diff --git a/Ragon.Common/Protocol/RagonOperation.cs b/Ragon.Common/Protocol/RagonOperation.cs
index 0e0fae6..46fa3de 100644
--- a/Ragon.Common/Protocol/RagonOperation.cs
+++ b/Ragon.Common/Protocol/RagonOperation.cs
@@ -1,4 +1,4 @@
-namespace Ragon.Common.Protocol
+namespace Ragon.Common
 {
   public enum RagonOperation: ushort
   {
diff --git a/Ragon.Common/Ragon.Common.csproj b/Ragon.Common/Ragon.Common.csproj
index 70ae002..b25b27c 100644
--- a/Ragon.Common/Ragon.Common.csproj
+++ b/Ragon.Common/Ragon.Common.csproj
@@ -8,14 +8,14 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>/Users/edmand46/UnityProjects/ragon-client/Assets/RagonSDK/</OutputPath>
+      <OutputPath>/Users/edmand46/UnityProjects/Ragon-Unity-SDK/Assets/RagonSDK/netstandard2.1/</OutputPath>
       <DebugSymbols>false</DebugSymbols>
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <DefineConstants>TRACE;NETSTACK_SPAN</DefineConstants>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-      <OutputPath>/Users/edmand46/UnityProjects/ragon-client/Assets/RagonSDK/</OutputPath>
+      <OutputPath>/Users/edmand46/UnityProjects/Ragon-Unity-SDK/Assets/RagonSDK/netstandard2.1/</OutputPath>
       <DefineConstants>TRACE;NETSTACK_SPAN</DefineConstants>
     </PropertyGroup>
 
diff --git a/Ragon/Sources/Application.cs b/Ragon/Sources/Application.cs
index 4e0307c..f8b5405 100755
--- a/Ragon/Sources/Application.cs
+++ b/Ragon/Sources/Application.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using DisruptorUnity3d;
-using NetStack.Serialization;
 using NLog;
-using Ragon.Common.Protocol;
 
 namespace Ragon.Core
 {
diff --git a/Ragon/Sources/Plugin/PluginBase.cs b/Ragon/Sources/Plugin/PluginBase.cs
index 307827a..99ef977 100755
--- a/Ragon/Sources/Plugin/PluginBase.cs
+++ b/Ragon/Sources/Plugin/PluginBase.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using NetStack.Serialization;
-using Ragon.Common.Protocol;
+using Ragon.Common;
 
 namespace Ragon.Core
 {
diff --git a/Ragon/Sources/Rooms/Room.cs b/Ragon/Sources/Rooms/Room.cs
index df8c167..0e40e78 100755
--- a/Ragon/Sources/Rooms/Room.cs
+++ b/Ragon/Sources/Rooms/Room.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
-using NetStack.Serialization;
 using NLog;
-using NLog.LayoutRenderers;
-using Ragon.Common.Protocol;
+using Ragon.Common;
 
 namespace Ragon.Core
 {
@@ -152,13 +149,9 @@ namespace Ragon.Core
             var props = _entities[entityId].Properties;
 
             if (props.ContainsKey(propertyId))
-            {
               props[propertyId] = payload;
-            }
             else
-            {
               props.Add(propertyId, payload);
-            }
 
             // Span<byte> sendData = MemoryMarshal.CreateSpan(ref MemoryMarshal.GetReference(rawData), rawData.Length);
 
@@ -251,7 +244,6 @@ namespace Ragon.Core
             Span<byte> entityStateData = sendData.Slice(10, entity.State.Length);
 
             RagonHeader.WriteUShort((ushort) RagonOperation.CREATE_ENTITY, ref operationData);
-            ;
             RagonHeader.WriteInt(entity.EntityId, ref entityData);
             RagonHeader.WriteInt((int) entity.OwnerId, ref ownerData);
 
diff --git a/Ragon/Sources/Rooms/RoomManager.cs b/Ragon/Sources/Rooms/RoomManager.cs
index cf3c469..5e0eec5 100644
--- a/Ragon/Sources/Rooms/RoomManager.cs
+++ b/Ragon/Sources/Rooms/RoomManager.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using NLog;
-using Ragon.Common.Protocol;
+using Ragon.Common;
 
 namespace Ragon.Core
 {
diff --git a/Ragon/Sources/Rooms/RoomThread.cs b/Ragon/Sources/Rooms/RoomThread.cs
index 449086c..f378270 100755
--- a/Ragon/Sources/Rooms/RoomThread.cs
+++ b/Ragon/Sources/Rooms/RoomThread.cs
@@ -3,9 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using DisruptorUnity3d;
-using ENet;
-using NetStack.Serialization;
-using Ragon.Common.Protocol;
+using Ragon.Common;
 
 namespace Ragon.Core
 {