diff --git a/.gitignore b/.gitignore
index 89aeb4b..fcc1cfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 _ReSharper*
 *.suo
+packages
+bin
+obj
diff --git a/AutomatedTester.BrowserMob/AutomatedTester.BrowserMob.csproj b/AutomatedTester.BrowserMob/AutomatedTester.BrowserMob.csproj
index 4d86ce6..98554fe 100644
--- a/AutomatedTester.BrowserMob/AutomatedTester.BrowserMob.csproj
+++ b/AutomatedTester.BrowserMob/AutomatedTester.BrowserMob.csproj
@@ -32,8 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json.Net20">
-      <HintPath>..\ThirdParty\Newtonsoft.Json.Net20.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -44,28 +45,31 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Client.cs" />
-    <Compile Include="HAR\Browser.cs" />
-    <Compile Include="HAR\Cache.cs" />
-    <Compile Include="HAR\CacheEntry.cs" />
-    <Compile Include="HAR\Content.cs" />
-    <Compile Include="HAR\Cookie.cs" />
-    <Compile Include="HAR\Creator.cs" />
-    <Compile Include="HAR\Entry.cs" />
-    <Compile Include="HAR\HarResult.cs" />
-    <Compile Include="HAR\Header.cs" />
-    <Compile Include="HAR\Log.cs" />
-    <Compile Include="HAR\Page.cs" />
-    <Compile Include="HAR\PageTimings.cs" />
-    <Compile Include="HAR\Param.cs" />
-    <Compile Include="HAR\PostData.cs" />
-    <Compile Include="HAR\QueryStringItem.cs" />
-    <Compile Include="HAR\Request.cs" />
-    <Compile Include="HAR\Response.cs" />
-    <Compile Include="HAR\Timings.cs" />
-    <Compile Include="LimitOptions.cs" />
-    <Compile Include="Server.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="src\ProxyClient.cs" />
+    <Compile Include="src\HAR\Browser.cs" />
+    <Compile Include="src\HAR\Cache.cs" />
+    <Compile Include="src\HAR\CacheEntry.cs" />
+    <Compile Include="src\HAR\Content.cs" />
+    <Compile Include="src\HAR\Cookie.cs" />
+    <Compile Include="src\HAR\Creator.cs" />
+    <Compile Include="src\HAR\Entry.cs" />
+    <Compile Include="src\HAR\HarResult.cs" />
+    <Compile Include="src\HAR\Header.cs" />
+    <Compile Include="src\HAR\Log.cs" />
+    <Compile Include="src\HAR\Page.cs" />
+    <Compile Include="src\HAR\PageTimings.cs" />
+    <Compile Include="src\HAR\Param.cs" />
+    <Compile Include="src\HAR\PostData.cs" />
+    <Compile Include="src\HAR\QueryStringItem.cs" />
+    <Compile Include="src\HAR\Request.cs" />
+    <Compile Include="src\HAR\Response.cs" />
+    <Compile Include="src\HAR\Timings.cs" />
+    <Compile Include="src\LimitOptions.cs" />
+    <Compile Include="src\Server.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/AutomatedTester.BrowserMob/AutomatedTester.BrowserMob.nuspec b/AutomatedTester.BrowserMob/AutomatedTester.BrowserMob.nuspec
new file mode 100644
index 0000000..b549890
--- /dev/null
+++ b/AutomatedTester.BrowserMob/AutomatedTester.BrowserMob.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>$author$</authors>
+    <owners>$author$</owners>
+    <licenseUrl>http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE</licenseUrl>
+    <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl>
+    <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
+    <copyright>Copyright 2014</copyright>
+    <tags>Tag1 Tag2</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/AutomatedTester.BrowserMob/Client.cs b/AutomatedTester.BrowserMob/Client.cs
deleted file mode 100644
index a8c46b6..0000000
--- a/AutomatedTester.BrowserMob/Client.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Web;
-using AutomatedTester.BrowserMob.HAR;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace AutomatedTester.BrowserMob
-{
-    public class Client
-    {
-        private readonly string _url;
-        private readonly Int16 _port;
-        private readonly string _proxy;
-        private readonly string _baseUrlProxy;
-
-        public Client(string url)
-        {
-            if (String.IsNullOrEmpty(url))
-                throw new ArgumentException("url not supplied", "url");
-
-            _url = url;
-            _baseUrlProxy = String.Format("{0}/proxy", _url);
-            using (var response = MakeRequest(_baseUrlProxy, "POST"))
-            {
-                var responseStream = response.GetResponseStream();
-                if (responseStream == null)
-                    throw new Exception("No response from proxy");
-
-                using (var responseStreamReader = new StreamReader(responseStream))
-                {
-                    var jsonReader = new JsonTextReader(responseStreamReader);
-                    var token = JToken.ReadFrom(jsonReader);
-                    var portToken = token.SelectToken("port");                    
-                    if (portToken == null) 
-                        throw new Exception("No port number returned from proxy");
-
-                    _port = (Int16) portToken;
-                }            
-            }
-
-            var parts = url.Split(':');
-            _proxy = parts[1].TrimStart('/') + ":" + _port;
-        }
-        
-        public void NewHar(string reference = null)
-        {
-            MakeRequest(String.Format("{0}/{1}/har", _baseUrlProxy, _port), "PUT", reference);
-        }
-
-        private static WebResponse MakeRequest(string url, string method, string reference = null)
-        {
-            var request = (HttpWebRequest) WebRequest.Create(url);     
-            request.Method = method;
-            if (reference != null)
-            {
-                byte[] requestBytes = Encoding.UTF8.GetBytes(reference);
-                using (var requestStream = request.GetRequestStream())
-                {
-                    requestStream.Write(requestBytes, 0, requestBytes.Length);
-                    requestStream.Close();
-                }
-                
-                request.ContentType = "application/x-www-form-urlencoded";
-            }
-            else            
-                request.ContentLength = 0;
-            
-            return request.GetResponse();
-        }
-
-        private static WebResponse MakeJsonRequest(string url, string method, string payload)
-        {
-            var request = (HttpWebRequest)WebRequest.Create(url);
-            request.Method = method;
-            
-            if (payload != null)
-            {
-                request.ContentType = "text/json";
-                request.ContentLength = payload.Length;
-                using (var streamWriter = new StreamWriter(request.GetRequestStream()))
-                {
-                    streamWriter.Write(payload);
-                    streamWriter.Flush();
-                    streamWriter.Close();
-                }
-            }
-            else
-                request.ContentLength = 0;
-
-            return request.GetResponse();           
-        }
-
-        public void NewPage(string reference)
-        {
-            MakeRequest(String.Format("{0}/{1}/har/pageRef", _baseUrlProxy, _port), "PUT", reference);            
-        }
-
-        public HarResult GetHar()
-        {
-            var response = MakeRequest(String.Format("{0}/{1}/har", _baseUrlProxy, _port), "GET");
-            using (var responseStream = response.GetResponseStream())
-            {
-                if (responseStream == null)
-                    return null;
-
-                using (var responseStreamReader = new StreamReader(responseStream))
-                {
-                    var json = responseStreamReader.ReadToEnd();
-                    return JsonConvert.DeserializeObject<HarResult>(json);
-                }
-            }
-        }
-       
-        public void SetLimits(LimitOptions options)
-        {
-            if (options == null)
-                throw new ArgumentNullException("options", "LimitOptions must be supplied");
-
-            MakeRequest(String.Format("{0}/{1}/limit", _baseUrlProxy, _port), "PUT", options.ToFormData());
-        }
-
-        public string SeleniumProxy
-        {
-            get { return _proxy; }
-        }       
-
-        public void WhiteList(string regexp, int statusCode)
-        {
-            string data = FormatBlackOrWhiteListFormData(regexp, statusCode);
-            MakeRequest(String.Format("{0}/{1}/whitelist", _baseUrlProxy, _port), "PUT", data);                                    
-        }
-
-        public void Blacklist(string regexp, int statusCode)
-        {
-            string data = FormatBlackOrWhiteListFormData(regexp, statusCode);
-            MakeRequest(String.Format("{0}/{1}/blacklist", _baseUrlProxy, _port), "PUT", data); 
-        }        
-
-        public void RemapHost(string host, string ipAddress)
-        {
-            MakeJsonRequest(String.Format("{0}/{1}/hosts", _baseUrlProxy, _port), "POST", "{\"" + host + "\":\"" + ipAddress + "\"}");            
-        }
-
-        private static string FormatBlackOrWhiteListFormData(string regexp, int statusCode)
-        {
-            return String.Format("regex={0}&status={1}", HttpUtility.UrlEncode(regexp), statusCode);
-        }
-
-        /// <summary>
-        /// shuts down the proxy and closes the port
-        /// </summary>
-        public void Close()
-        {
-            MakeRequest(String.Format("{0}/{1}", _baseUrlProxy, _port), "DELETE");
-        }
-
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AutomatedTester.BrowserMob/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/AutomatedTester.BrowserMob/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index a24c006..0000000
Binary files a/AutomatedTester.BrowserMob/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/AutomatedTester.BrowserMob/packages.config b/AutomatedTester.BrowserMob/packages.config
new file mode 100644
index 0000000..cab5515
--- /dev/null
+++ b/AutomatedTester.BrowserMob/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net35" />
+</packages>
\ No newline at end of file
diff --git a/AutomatedTester.BrowserMob/HAR/Browser.cs b/AutomatedTester.BrowserMob/src/HAR/Browser.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Browser.cs
rename to AutomatedTester.BrowserMob/src/HAR/Browser.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Cache.cs b/AutomatedTester.BrowserMob/src/HAR/Cache.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Cache.cs
rename to AutomatedTester.BrowserMob/src/HAR/Cache.cs
diff --git a/AutomatedTester.BrowserMob/HAR/CacheEntry.cs b/AutomatedTester.BrowserMob/src/HAR/CacheEntry.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/CacheEntry.cs
rename to AutomatedTester.BrowserMob/src/HAR/CacheEntry.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Content.cs b/AutomatedTester.BrowserMob/src/HAR/Content.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Content.cs
rename to AutomatedTester.BrowserMob/src/HAR/Content.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Cookie.cs b/AutomatedTester.BrowserMob/src/HAR/Cookie.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Cookie.cs
rename to AutomatedTester.BrowserMob/src/HAR/Cookie.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Creator.cs b/AutomatedTester.BrowserMob/src/HAR/Creator.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Creator.cs
rename to AutomatedTester.BrowserMob/src/HAR/Creator.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Entry.cs b/AutomatedTester.BrowserMob/src/HAR/Entry.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Entry.cs
rename to AutomatedTester.BrowserMob/src/HAR/Entry.cs
diff --git a/AutomatedTester.BrowserMob/HAR/HarResult.cs b/AutomatedTester.BrowserMob/src/HAR/HarResult.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/HarResult.cs
rename to AutomatedTester.BrowserMob/src/HAR/HarResult.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Header.cs b/AutomatedTester.BrowserMob/src/HAR/Header.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Header.cs
rename to AutomatedTester.BrowserMob/src/HAR/Header.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Log.cs b/AutomatedTester.BrowserMob/src/HAR/Log.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Log.cs
rename to AutomatedTester.BrowserMob/src/HAR/Log.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Page.cs b/AutomatedTester.BrowserMob/src/HAR/Page.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Page.cs
rename to AutomatedTester.BrowserMob/src/HAR/Page.cs
diff --git a/AutomatedTester.BrowserMob/HAR/PageTimings.cs b/AutomatedTester.BrowserMob/src/HAR/PageTimings.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/PageTimings.cs
rename to AutomatedTester.BrowserMob/src/HAR/PageTimings.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Param.cs b/AutomatedTester.BrowserMob/src/HAR/Param.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Param.cs
rename to AutomatedTester.BrowserMob/src/HAR/Param.cs
diff --git a/AutomatedTester.BrowserMob/HAR/PostData.cs b/AutomatedTester.BrowserMob/src/HAR/PostData.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/PostData.cs
rename to AutomatedTester.BrowserMob/src/HAR/PostData.cs
diff --git a/AutomatedTester.BrowserMob/HAR/QueryStringItem.cs b/AutomatedTester.BrowserMob/src/HAR/QueryStringItem.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/QueryStringItem.cs
rename to AutomatedTester.BrowserMob/src/HAR/QueryStringItem.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Request.cs b/AutomatedTester.BrowserMob/src/HAR/Request.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Request.cs
rename to AutomatedTester.BrowserMob/src/HAR/Request.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Response.cs b/AutomatedTester.BrowserMob/src/HAR/Response.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Response.cs
rename to AutomatedTester.BrowserMob/src/HAR/Response.cs
diff --git a/AutomatedTester.BrowserMob/HAR/Timings.cs b/AutomatedTester.BrowserMob/src/HAR/Timings.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/HAR/Timings.cs
rename to AutomatedTester.BrowserMob/src/HAR/Timings.cs
diff --git a/AutomatedTester.BrowserMob/LimitOptions.cs b/AutomatedTester.BrowserMob/src/LimitOptions.cs
similarity index 100%
rename from AutomatedTester.BrowserMob/LimitOptions.cs
rename to AutomatedTester.BrowserMob/src/LimitOptions.cs
diff --git a/AutomatedTester.BrowserMob/src/ProxyClient.cs b/AutomatedTester.BrowserMob/src/ProxyClient.cs
new file mode 100644
index 0000000..a5df9a6
--- /dev/null
+++ b/AutomatedTester.BrowserMob/src/ProxyClient.cs
@@ -0,0 +1,202 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Web;
+
+using AutomatedTester.BrowserMob.HAR;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace AutomatedTester.BrowserMob {
+
+    public class ProxyClient : IDisposable {
+
+        private readonly String _browserMobHost;
+        private readonly Int32 _browserMobPort;
+        private readonly String _browserMobUrl;
+
+        private Int32 _proxyPort;
+
+        /// <summary>
+        ///     Create new ProxyClient
+        /// </summary>
+        /// <param name="browserMobHost">host which BrowserMobProxy is bound to</param>
+        /// <param name="browserMobPort">port on which BrowserMobProxy is listening</param>
+        public ProxyClient(String browserMobHost, Int32 browserMobPort) {
+            if (String.IsNullOrEmpty(browserMobHost)) {
+                throw new ArgumentNullException("browserMobHost");
+            }
+
+            if (browserMobPort <= 0) {
+                throw new ArgumentOutOfRangeException("browserMobPort");
+            }
+
+            _browserMobHost = browserMobHost;
+            _browserMobPort = browserMobPort;
+            _browserMobUrl = String.Format("http://{0}:{1}/proxy", browserMobHost, browserMobPort);
+        }
+
+        /// <summary>
+        ///     Host which BrowserMobProxy is bound to
+        /// </summary>
+        public String BrowserMobHost {
+            get { return _browserMobHost; }
+        }
+
+        /// <summary>
+        ///     Port on which BrowserMobProxy is listening
+        /// </summary>
+        public Int32 BrowserMobPort {
+            get { return _browserMobPort; }
+        }
+
+        /// <summary>
+        ///     Port of current client proxy
+        /// </summary>
+        public Int32 ProxyPort {
+            get {
+                if (_proxyPort == 0) {
+                    _proxyPort = StartProxy();
+                }
+
+                return _proxyPort;
+            }
+        }
+
+        public String SeleniumProxyUrl {
+            get { return String.Format("http://{0}:{1}", _browserMobHost, ProxyPort); }
+        }
+
+        private Int32 StartProxy() {
+            using (var response = MakeRequest(_browserMobUrl, "POST")) {
+                var responseStream = response.GetResponseStream();
+
+                if (responseStream == null) {
+                    throw new IOException("No response from BrowserMobProxy");
+                }
+
+                using (var streamReader = new StreamReader(responseStream)) {
+                    var jsonReader = new JsonTextReader(streamReader);
+                    var token = JToken.ReadFrom(jsonReader);
+                    var portToken = token.SelectToken("port");
+
+                    if (portToken == null) {
+                        throw new IOException("No port number returned from BrowserMobProxy");
+                    }
+
+                    return (Int32) portToken;
+                }
+            }
+        }
+
+        public void NewHar(string reference = null) {
+            MakeRequest(String.Format("{0}/{1}/har", _browserMobUrl, ProxyPort), "PUT", reference);
+        }
+
+        private static WebResponse MakeRequest(string url, string method, string reference = null) {
+            var request = (HttpWebRequest) WebRequest.Create(url);
+            request.Method = method;
+
+            if (reference != null) {
+                byte[] requestBytes = Encoding.UTF8.GetBytes(reference);
+                using (var requestStream = request.GetRequestStream()) {
+                    requestStream.Write(requestBytes, 0, requestBytes.Length);
+                    requestStream.Close();
+                }
+
+                request.ContentType = "application/x-www-form-urlencoded";
+            } else {
+                request.ContentLength = 0;
+            }
+
+            return request.GetResponse();
+        }
+
+        private static WebResponse MakeJsonRequest(string url, string method, string payload) {
+            var request = (HttpWebRequest) WebRequest.Create(url);
+            request.Method = method;
+
+            if (payload != null) {
+                request.ContentType = "text/json";
+                request.ContentLength = payload.Length;
+                using (var streamWriter = new StreamWriter(request.GetRequestStream())) {
+                    streamWriter.Write(payload);
+                    streamWriter.Flush();
+                    streamWriter.Close();
+                }
+            } else {
+                request.ContentLength = 0;
+            }
+
+            return request.GetResponse();
+        }
+
+        public void NewPage(string reference) {
+            MakeRequest(String.Format("{0}/{1}/har/pageRef", _browserMobUrl, ProxyPort), "PUT", reference);
+        }
+
+        public HarResult GetHar() {
+            var response = MakeRequest(String.Format("{0}/{1}/har", _browserMobUrl, ProxyPort), "GET");
+            using (var responseStream = response.GetResponseStream()) {
+                if (responseStream == null) {
+                    return null;
+                }
+
+                using (var responseStreamReader = new StreamReader(responseStream)) {
+                    var json = responseStreamReader.ReadToEnd();
+                    return JsonConvert.DeserializeObject<HarResult>(json);
+                }
+            }
+        }
+
+        public void SetLimits(LimitOptions options) {
+            if (options == null) {
+                throw new ArgumentNullException("options", "LimitOptions must be supplied");
+            }
+
+            MakeRequest(String.Format("{0}/{1}/limit", _browserMobUrl, ProxyPort), "PUT", options.ToFormData());
+        }
+
+        public void WhiteList(string regexp, int statusCode) {
+            string data = FormatBlackOrWhiteListFormData(regexp, statusCode);
+            MakeRequest(String.Format("{0}/{1}/whitelist", _browserMobUrl, ProxyPort), "PUT", data);
+        }
+
+        public void Blacklist(string regexp, int statusCode) {
+            string data = FormatBlackOrWhiteListFormData(regexp, statusCode);
+            MakeRequest(String.Format("{0}/{1}/blacklist", _browserMobUrl, ProxyPort), "PUT", data);
+        }
+
+        public void RemapHost(string host, string ipAddress) {
+            MakeJsonRequest(String.Format("{0}/{1}/hosts", _browserMobUrl, ProxyPort), "POST", "{\"" + host + "\":\"" + ipAddress + "\"}");
+        }
+
+        private static string FormatBlackOrWhiteListFormData(string regexp, int statusCode) {
+            return String.Format("regex={0}&status={1}", HttpUtility.UrlEncode(regexp), statusCode);
+        }
+
+        /// <summary>
+        ///     Shuts down the proxy and closes the port
+        /// </summary>
+        public void Close() {
+            if (_proxyPort == 0) {
+                return;
+            }
+
+            MakeRequest(String.Format("{0}/{1}", _browserMobUrl, _proxyPort), "DELETE");
+
+            _proxyPort = 0;
+        }
+
+        /// <summary>
+        ///     Invoke <see cref="Close"/>.
+        /// </summary>
+        public void Dispose() {
+            Close();
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/AutomatedTester.BrowserMob/Server.cs b/AutomatedTester.BrowserMob/src/Server.cs
similarity index 61%
rename from AutomatedTester.BrowserMob/Server.cs
rename to AutomatedTester.BrowserMob/src/Server.cs
index 2692b70..b93145f 100644
--- a/AutomatedTester.BrowserMob/Server.cs
+++ b/AutomatedTester.BrowserMob/src/Server.cs
@@ -4,102 +4,85 @@
 using System.Net.Sockets;
 using System.Threading;
 
-namespace AutomatedTester.BrowserMob
-{
-    public class Server
-    {
+namespace AutomatedTester.BrowserMob {
+
+    public class Server {
+
+        private const string Host = "localhost";
         private Process _serverProcess;
-        private readonly int _port;
         private readonly String _path = string.Empty;
-        private const string Host = "localhost";
+        private readonly int _port;
 
-        public Server(string path) : this(path, 8080)
-        {}
+        public Server(string path) : this(path, 8080) {}
 
-        public Server(string path, int port)
-        {
+        public Server(string path, int port) {
             _path = path;
             _port = port;
         }
 
-        public void Start()
-        {
-            _serverProcess = new Process
-                                 {
-                                     StartInfo = {FileName = _path}
-                                 };
-            if (_port != 0)
-            {
+        /// <summary>
+        /// </summary>
+        public string Url {
+            get { return String.Format("http://{0}:{1}", Host, _port.ToString(CultureInfo.InvariantCulture)); }
+        }
+
+        public void Start() {
+            _serverProcess = new Process {
+                StartInfo = {
+                    FileName = _path
+                }
+            };
+            if (_port != 0) {
                 _serverProcess.StartInfo.Arguments = String.Format("--port={0}", _port);
             }
-            
-            try
-            {
+
+            try {
                 _serverProcess.Start();
                 int count = 0;
-                while (!IsListening())
-                {
+                while (!IsListening()) {
                     Thread.Sleep(1000);
                     count++;
-                    if (count == 30)
-                    {
+                    if (count == 30) {
                         throw new Exception("Can not connect to BrowserMob Proxy");
                     }
                 }
-            }
-            catch
-            {
+            } catch {
                 _serverProcess.Dispose();
                 _serverProcess = null;
                 throw;
-            }            
+            }
         }
 
         /// <summary>
-        /// 
         /// </summary>
-        public void Stop()
-        {            
-            if (_serverProcess != null && !_serverProcess.HasExited)
-            {
+        public void Stop() {
+            if (_serverProcess != null && !_serverProcess.HasExited) {
                 _serverProcess.CloseMainWindow();
                 _serverProcess.Dispose();
                 _serverProcess = null;
-            }            
+            }
         }
 
         /// <summary>
-        /// 
         /// </summary>
         /// <returns></returns>
-        public Client CreateProxy(){
-            return new Client(Url);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Url
-        {
-            get { return String.Format("http://{0}:{1}", Host, _port.ToString(CultureInfo.InvariantCulture)); }
+        public ProxyClient CreateProxy() {
+            return new ProxyClient(Host, _port);
         }
 
         /// <summary>
-        /// 
         /// </summary>
-        private bool IsListening()
-        {
-            try
-            {
+        private bool IsListening() {
+            try {
                 var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
                 socket.Connect(Host, _port);
                 socket.Close();
                 return true;
-            }
-            catch (Exception)
-            {
+            } catch (Exception) {
                 return false;
-            }            
+            }
         }
+
     }
-}
+
+}
\ No newline at end of file
diff --git a/ThirdParty/Newtonsoft.Json.Net20.dll b/ThirdParty/Newtonsoft.Json.Net20.dll
deleted file mode 100644
index 5b9827d..0000000
Binary files a/ThirdParty/Newtonsoft.Json.Net20.dll and /dev/null differ