diff --git a/libs/Newtonsoft.Json.dll b/Newtonsoft.Json.dll
similarity index 100%
rename from libs/Newtonsoft.Json.dll
rename to Newtonsoft.Json.dll
diff --git a/__resource.lua b/__resource.lua
index ecfc277..dba5fd6 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -1,9 +1,10 @@
 resource_manifest_version "44febabe-d386-4d18-afbe-5e627f4af937"
 
-client_script("client.lua")
+client_scripts{
+    "client/client.lua"
+}
 
-server_scripts {
-    "blips.lua",
-    "blip_helper.lua",
-    "live.lua"
+server_scripts{
+    "server/live_map.net.dll",
+    "server/wrapper.lua"
 }
diff --git a/deniszykov.WebSocketListener.dll b/deniszykov.WebSocketListener.dll
new file mode 100644
index 0000000..b277a25
Binary files /dev/null and b/deniszykov.WebSocketListener.dll differ
diff --git a/libs/Live Map.dll b/libs/Live Map.dll
deleted file mode 100644
index bc6ef5a..0000000
Binary files a/libs/Live Map.dll and /dev/null differ
diff --git a/libs/Live Map.dll.config b/libs/Live Map.dll.config
deleted file mode 100644
index dde2c3c..0000000
--- a/libs/Live Map.dll.config	
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/libs/Live Map.pdb b/libs/Live Map.pdb
deleted file mode 100644
index ef61ea5..0000000
Binary files a/libs/Live Map.pdb and /dev/null differ
diff --git a/libs/websocket-sharp.dll b/libs/websocket-sharp.dll
deleted file mode 100644
index 6ec719f..0000000
Binary files a/libs/websocket-sharp.dll and /dev/null differ
diff --git a/server/live_map.net.dll b/server/live_map.net.dll
new file mode 100644
index 0000000..e7ff5da
Binary files /dev/null and b/server/live_map.net.dll differ
diff --git a/server/wrapper.lua b/server/wrapper.lua
new file mode 100644
index 0000000..dc6bb3e
--- /dev/null
+++ b/server/wrapper.lua
@@ -0,0 +1,50 @@
+--[[
+    Simple file that wraps all the internal events so that they can just be called
+    by the client without any extra steps needed by the end-developer :)
+]]
+
+RegisterServerEvent("livemap:AddPlayerData")
+RegisterServerEvent("livemap:UpdatePlayerData")
+
+RegisterServerEvent("livemap:playerSpawned")
+
+AddEventHandler("livemap:AddPlayerData", function(k, d)
+    local id = GetPlayerIdentifier(source, 0) -- Get the first id, it'll do
+    print("Adding data for " .. id)
+
+    TriggerEvent("livemap:internal_AddPlayerData", id, k, d)
+end)
+
+AddEventHandler("livemap:UpdatePlayerData", function(k, d)
+    local id = GetPlayerIdentifier(source, 0) -- Get the first id, it'll do
+    print("Updating data for " .. id)
+
+    TriggerEvent("livemap:internal_UpdatePlayerData", id, k, d)
+end)
+
+
+function setStaticDataFor(index, id)
+    TriggerEvent("livemap:internal_AddPlayerData", id, "identifer", id)
+    TriggerEvent("livemap:internal_AddPlayerData", id, "name", GetPlayerName(index))
+end
+
+--[[
+    Set some static data that isn't going to change
+    e.g. Player's Identifer
+]]
+AddEventHandler("livemap:playerSpawned", function()
+    local id = GetPlayerIdentifier(source, 0) -- Get the first id, it'll do
+    setStaticDataFor(source, id)
+end)
+
+-- If any players are already on the server
+AddEventHandler("onResourceStart", function(name)
+    if name == GetCurrentResourceName() then
+        if GetNumPlayerIndices() ~= -1 then
+            for i=0, GetNumPlayerIndices()-1 do
+                local id = GetPlayerIdentifier(GetPlayerFromIndex(i), 0)
+                setStaticDataFor(GetPlayerFromIndex(i), id)
+            end
+        end
+    end
+end)
diff --git a/src/Live Map/Live Map.csproj b/src/Live Map/Live Map.csproj
index 7267663..7229798 100644
--- a/src/Live Map/Live Map.csproj	
+++ b/src/Live Map/Live Map.csproj	
@@ -7,8 +7,8 @@
     <ProjectGuid>{15269C18-91AF-4129-8FA0-3601D1B0C6D2}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Live_Map</RootNamespace>
-    <AssemblyName>Live Map</AssemblyName>
+    <RootNamespace>Havoc.Live_Map</RootNamespace>
+    <AssemblyName>live_map.net</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -30,8 +30,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CitizenMP.Server">
-      <HintPath>F:\cfx-server\CitizenMP.Server.exe</HintPath>
+    <Reference Include="CitizenFX.Core">
+      <HintPath>F:\fx-artifacts\374\citizen\clr2\lib\mono\4.5\CitizenFX.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="deniszykov.WebSocketListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7f78616efb4a208d, processorArchitecture=MSIL">
+      <HintPath>..\packages\deniszykov.WebSocketListener.4.0.0\lib\net45\deniszykov.WebSocketListener.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -45,21 +49,23 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
-      <HintPath>..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="LiveMap.cs" />
-    <Compile Include="PlayerLocations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SocketHandler.cs" />
+    <Compile Include="WebSocketServer.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>COPY /Y "$(TargetPath)" "F:\fx-server\resources\live_map\server"
+COPY /Y "$(TargetDir)\deniszykov.WebSocketListener.dll" "F:\fx-server\resources\live_map"
+COPY /Y "$(TargetDir)\Newtonsoft.Json.dll" "F:\fx-server\resources\live_map"</PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/src/Live Map/LiveMap.cs b/src/Live Map/LiveMap.cs
index 0df4052..a45729a 100644
--- a/src/Live Map/LiveMap.cs	
+++ b/src/Live Map/LiveMap.cs	
@@ -1,255 +1,93 @@
 using System;
 using System.Collections.Generic;
 
-using System.IO;
+using CitizenFX.Core;
+using CitizenFX.Core.Native;
+
+using vtortola.WebSockets;
 
 using Newtonsoft.Json.Linq;
-using System.Security.Cryptography;
-using WebSocketSharp.Server;
-using System.Security.Cryptography.X509Certificates;
-using System.Diagnostics;
 
 namespace Havoc.Live_Map
 {
-    public class LiveMap
+    public class LiveMap : BaseScript
     {
-        WebSocketServer wssv;
 
-        public static JArray playerLocations = new JArray();
-        public static JArray blipLocations = new JArray();
+        public static bool doDebug = false;
+
+        WebSocketServer server;
+        SocketHandler handler;
 
-        public bool isOpen()
+        public static void Log(string format, params object[] vars)
         {
-            return wssv.IsListening;
+            if (doDebug)
+            {
+                Debug.WriteLine("Havoc's LiveMap:\n\t" + format + "\n", vars);
+            }
         }
 
-        public LiveMap(int listenPort, bool useSsl)
+        public LiveMap()
         {
-            wssv = new WebSocketServer(listenPort, useSsl);
-            Debug.WriteLine("creating websocket c#");
+            int port = API.GetConvarInt("socket_port", 30121);
 
-            //var passwd = ConfigurationManager.AppSettings["CertFilePassword
+            string debugEnabled = API.GetConvar("livemap_debug", bool.FalseString);
+            bool suc = bool.TryParse(debugEnabled, out doDebug);
 
-            if (useSsl)
+            if (!suc)
             {
-                // From the server.txt file (base64 encoded pfx file)
-                string base64Encoded = @"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";
-                X509Certificate2 cert = null;
-                try
-                {
-                    Debug.WriteLine("importing base4 encoded string");
-                    cert = new X509Certificate2(Convert.FromBase64String(base64Encoded), string.Empty);
-                    Debug.WriteLine("data imported.. hopefully");
-
-                    Debug.WriteLine("cert: " + cert);
-                    wssv.SslConfiguration.ServerCertificate = cert;
-                }
-                catch (CryptographicException e)
-                {
-                    Debug.WriteLine("Error creating cert");
-                    Debug.WriteLine(e.StackTrace);
-
-                    // Console.Write is shown on the linux servers, might as well show that we didn't import the cert
-                    Console.WriteLine("Error creating cert");
-                    Console.WriteLine(e.StackTrace);
+                Debug.WriteLine("Couldn't parse \"{0}\". Apparently it isn't a boolean (\"{1}\" or \"{2}\")\n\tDefaulting to {2}", debugEnabled, bool.TrueString, bool.FalseString);
+            }
 
-                    // Default to insecure sockets
-                    wssv = new WebSocketServer(listenPort, false);
-                }
+            Log("Starting on port {0}", port);
 
-                
-            }
+            server = new WebSocketServer(port);
+            handler = new SocketHandler(server);
 
-            Debug.WriteLine("setting routes");
+            EventHandlers["onResourceStart"] += new Action<string>(OnStart);
+            EventHandlers["onResourceStop"] += new Action<string>(OnStop);
 
-            wssv.AddWebSocketService<PlayerLocations>("/");
+            EventHandlers["livemap:internal_AddPlayerData"] += new Action<string, string, dynamic>(InternalAddPlayerData);
+            EventHandlers["livemap:internal_UpdatePlayerData"] += new Action<string, string, dynamic>(InternalUpdatePlayerData);
         }
 
-        public void start()
+        private void InternalAddPlayerData(string identifier, string key, dynamic data)
         {
-            Debug.WriteLine("Starting..");
-            wssv.Start();
-            if (wssv.IsListening)
-            {
-                Debug.WriteLine("Listening on port {0}, and providing WebSocket servvices:", wssv.Port);
-                foreach (var path in wssv.WebSocketServices.Paths)
-                {
-                    Debug.WriteLine("- {0}", path);
-                }
-            }
+            handler.AddPlayerData(identifier, key, data);
         }
 
-        public void stop()
+        private void InternalUpdatePlayerData(string identifier, string key, dynamic data)
         {
-            playerLocations.Clear();
-            blipLocations.Clear();
-
-            wssv.Stop();
-            Debug.WriteLine("Stopped server");
+            handler.UpdatePlayerData(identifier, key, data);
         }
 
-        public void addPlayer(string identifier, string name, float x = 0f, float y = 0f, float z = 0f)
+        public void OnStart(string name)
         {
-            lock (playerLocations)
+            if (name == API.GetCurrentResourceName())
             {
-                bool updatedPlayer = false;
-                foreach (var item in playerLocations)
+                try
                 {
-                    if (item["id"].ToString() == identifier)
-                    {
-                        // Update it
-                        item["x"] = x;
-                        item["y"] = y;
-                        item["z"] = z;
-
-                        updatedPlayer = true;
-                    }
-                    else
-                    {
-                        continue;
-                    }
-                }
+                    server.Start();
+                    Tick += server.ListenAsync;
 
-                if (!updatedPlayer)
-                {
-                    // Add them
-                    JObject playerObj = new JObject();
-                    playerObj.Add("id", identifier);
-                    playerObj.Add("name", name);
-                    playerObj.Add("x", x);
-                    playerObj.Add("y", y);
-                    playerObj.Add("z", z);
-
-                    playerLocations.Add(playerObj);
-                }
-            }
-        }
-        public void addPlayerString(string id, string key, string data)
-        {
-            Debug.WriteLine("Adding string data \"{0}\" with value \"{1}\"", key, data);
-            lock (playerLocations)
-            {
-                foreach (var item in playerLocations)
-                {
-                    if (item["id"].ToString() == id)
-                    {
-                        // Update it
-                        item[key] = data;
-                    }
-                }
-            }
-        }
-        public void addPlayerFloat(string id, string key, float data)
-        {
-            Debug.WriteLine("Adding float data \"{0}\" with value \"{1}\"", key, data);
-            lock (playerLocations)
-            {
-                foreach (var item in playerLocations)
+                }catch(Exception e)
                 {
-                    if (item["id"].ToString() == id)
-                    {
-                        // Update it
-                        item[key] = data;
-                    }
+                    Debug.WriteLine("Couldn't start {0}: {1}", name, e.StackTrace);
                 }
             }
         }
 
-        public void removePlayer(string identifier)
+        public void OnStop(string name)
         {
-            Debug.WriteLine("Removing player \"{0}\"", identifier);
-            lock (playerLocations)
+            if (name == API.GetCurrentResourceName())
             {
-                JToken token = null;
-                foreach (var item in playerLocations)
-                {
-                    if (item["id"].ToString() == identifier)
-                    {
-                        token = item;
-                    }
-                }
-                if(token != null)
+
+                if (server != null) // Apparently this is a thing that can happen :/
                 {
-                    playerLocations.Remove(token);
+                    server.Stop();
+                    server.Dispose();
                 }
-            }
-
-            JObject obj = new JObject();
-            obj["type"] = "playerLeft";
-            obj["payload"] = identifier;
-
-            wssv.WebSocketServices["/"].Sessions.Broadcast(obj.ToString(Newtonsoft.Json.Formatting.None));
-        }
-
-        public void addBlip(string name, string desc="", string type = "waypoint", float x = 0f, float y = 0f, float z = 0f)
-        {
-            Debug.WriteLine("Adding blip with name \"{0}\" of type \"{1}\"", name, type);
-            JObject blip = new JObject();
-
-            blip["name"] = name;
-            blip["description"] = desc;
-            blip["type"] = type;
-            blip["x"] = x;
-            blip["y"] = y;
-            blip["z"] = z;
-
-            lock (blipLocations)
-            {
-                blipLocations.Add(blip);
-            }
-        }
-
-        public void initBlips(string blipJson)
-        {
-            Debug.WriteLine("Initilizing blips from string \"{0}\"", blipJson);
-            lock (blipLocations)
-            {
-                blipLocations = JArray.Parse(blipJson);
+                
             }
         }
-
     }
 }
diff --git a/src/Live Map/PlayerLocations.cs b/src/Live Map/PlayerLocations.cs
deleted file mode 100644
index f90587a..0000000
--- a/src/Live Map/PlayerLocations.cs	
+++ /dev/null
@@ -1,50 +0,0 @@
-using Newtonsoft.Json.Linq;
-
-using System.Diagnostics;
-
-using WebSocketSharp;
-using WebSocketSharp.Server;
-
-namespace Havoc.Live_Map
-{
-    class PlayerLocations : WebSocketBehavior
-    {
-        protected override void OnOpen()
-        {
-        }
-
-        protected override void OnMessage(MessageEventArgs e)
-        {
-            if (e.IsText)
-            {
-                string[] args = e.Data.Split(' ');
-                if (args[0] == "getLocations")
-                {
-                    JObject obj = new JObject();
-                    obj["type"] = "players";
-                    lock (LiveMap.playerLocations)
-                    {
-                        obj["payload"] = LiveMap.playerLocations;
-                    }
-
-                    Debug.WriteLine("Sending locations\n{0}", obj.ToString(Newtonsoft.Json.Formatting.None));
-                    Send(obj.ToString(Newtonsoft.Json.Formatting.None));
-                }
-                else if(args[0] == "getBlips")
-                {
-                    JObject obj = new JObject();
-                    obj["type"] = "blips";
-
-                    lock (LiveMap.blipLocations)
-                    {
-                        obj["payload"] = LiveMap.blipLocations;
-                    }
-
-                    Debug.WriteLine("Sending blips\n{0}", obj.ToString(Newtonsoft.Json.Formatting.None));
-                    Send(obj.ToString(Newtonsoft.Json.Formatting.None));
-                }
-                // TODO: Expand for more socket commands
-            }
-        }
-    }
-}
diff --git a/src/Live Map/SocketHandler.cs b/src/Live Map/SocketHandler.cs
new file mode 100644
index 0000000..250a76a
--- /dev/null
+++ b/src/Live Map/SocketHandler.cs	
@@ -0,0 +1,100 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using vtortola.WebSockets;
+
+namespace Havoc.Live_Map
+{
+    class SocketHandler
+    {
+        WebSocketServer server;
+        JObject playerData;
+
+        public SocketHandler(WebSocketServer server)
+        {
+            this.server = server;
+            playerData = new JObject();
+
+            server.OnConnect += Server_OnConnect;
+            server.OnDisconnect += Server_OnDisconnect;
+            server.OnError += Server_OnError;
+            server.OnMessage += Server_OnMessage;
+        }
+
+        private void Server_OnMessage(WebSocket ws, string msg)
+        {
+            string[] args = msg.Split(' ');
+            LiveMap.Log("Recieved message from client {0}:\n\t\"{1}\"", ws.RemoteEndpoint.ToString(), msg);
+
+            if(args[0] == "getLocations")
+            {
+                // TODO: Send them the "playerData"
+                lock (playerData)
+                {
+                    LiveMap.Log("Debug\n\n{0}\n\n", playerData.ToString(Newtonsoft.Json.Formatting.Indented));
+                }
+            }
+
+        }
+
+        private void Server_OnError(WebSocket ws, Exception ex)
+        {
+            LiveMap.Log("Socket error from {0}: {1}", ws == null ? "Unknown" : ws.RemoteEndpoint.ToString(), ex.Message);
+        }
+
+        private void Server_OnDisconnect(WebSocket ws)
+        {
+            LiveMap.Log("Socket connection was closed at {0}", ws.RemoteEndpoint.ToString());
+        }
+
+        private void Server_OnConnect(WebSocket ws)
+        {
+            LiveMap.Log("Socket connection opened at {0}", ws.RemoteEndpoint.ToString());
+        }
+
+        private void MakeSurePlayerExists(string identifier)
+        {
+            lock (playerData)
+            {
+
+                if (playerData[identifier] == null)
+                {
+                    playerData[identifier] = new JObject();
+                }
+            }
+        }
+
+        public void AddPlayerData(string identifier, string key, object data)
+        {
+            MakeSurePlayerExists(identifier);
+            lock (playerData)
+            {
+                JObject playerObj = (JObject)playerData[identifier];
+                
+                if(playerObj[key] == null)
+                    playerObj.Add(key, JToken.FromObject(data));
+            }
+
+            LiveMap.Log("Added \"{1}\" to player {0} with value of \"{2}\"", identifier, key, data);
+        }
+
+        public void UpdatePlayerData(string identifier, string key, object newData)
+        {
+            MakeSurePlayerExists(identifier);
+            lock (playerData)
+            {
+                JObject playerObj = (JObject)playerData[identifier];
+                playerObj[key] = JToken.FromObject(newData);
+                playerData[identifier] = playerObj;
+            }
+
+            LiveMap.Log("Updated player {0}'s \"{1}\" to \"{2}\"", identifier, key, newData);
+        }
+
+
+    }
+}
diff --git a/src/Live Map/WebSocketServer.cs b/src/Live Map/WebSocketServer.cs
new file mode 100644
index 0000000..fe612fb
--- /dev/null
+++ b/src/Live Map/WebSocketServer.cs	
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using vtortola.WebSockets;
+using vtortola.WebSockets.Rfc6455;
+
+namespace Havoc.Live_Map
+{
+
+    public delegate void Connection(WebSocket ws);
+    public delegate void Disconnection(WebSocket ws);
+    public delegate void Message(WebSocket ws, string msg);
+    public delegate void Error(WebSocket ws, Exception ex);
+
+    public class WebSocketServer
+    {
+        public event Message OnMessage;
+        public event Connection OnConnect;
+        public event Disconnection OnDisconnect;
+        public event Error OnError;
+
+        WebSocketListener listener;
+
+        public WebSocketServer(int port)
+        {
+            WebSocketListenerOptions opts = new WebSocketListenerOptions()
+            {
+                SubProtocols = new string[] { "text" }
+            };
+            opts.Standards.RegisterRfc6455();
+
+            listener = new WebSocketListener(new System.Net.IPEndPoint(System.Net.IPAddress.Loopback, port), opts);
+
+            LiveMap.Log("Created websocket server");
+        }
+
+
+        public void Start()
+        {
+            listener.StartAsync().Wait();            
+        }
+
+        public void Stop()
+        {
+            listener.StopAsync().Wait();
+        }
+
+        public async Task ListenAsync()
+        {
+            while (listener.IsStarted)
+            {
+                try
+                {
+                    WebSocket socket = await listener.AcceptWebSocketAsync(CancellationToken.None).ConfigureAwait(false);
+
+                    if(socket != null)
+                    {
+                        Task.Run(() => HandleSocket(socket));
+                    }
+
+                }catch(Exception ex)
+                {
+                    if (OnError != null)
+                        OnError.Invoke(null, ex);
+                }
+            }
+        }
+
+        private async Task HandleSocket(WebSocket ws)
+        {
+            try
+            {
+                if (OnConnect != null)
+                    OnConnect.Invoke(ws);
+
+                while (ws.IsConnected)
+                {
+                    string message = await ws.ReadStringAsync(CancellationToken.None).ConfigureAwait(false);
+                    if (message != null && OnMessage != null)
+                        OnMessage.Invoke(ws, message);
+
+                }
+
+                if (OnDisconnect != null)
+                    OnDisconnect.Invoke(ws);
+
+            }catch(Exception e)
+            {
+                if (OnError != null)
+                    OnError.Invoke(ws, e);
+            }
+            finally
+            {
+                ws.Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            listener.Dispose();
+        }
+
+
+    }
+}
diff --git a/src/Live Map/packages.config b/src/Live Map/packages.config
index 7a3495e..009376d 100644
--- a/src/Live Map/packages.config	
+++ b/src/Live Map/packages.config	
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="deniszykov.WebSocketListener" version="4.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
-  <package id="uHttpSharp" version="0.1.6.22" targetFramework="net452" />
-  <package id="WebSocketSharp" version="1.0.3-rc11" targetFramework="net452" />
 </packages>
\ No newline at end of file