diff --git a/.travis.yml b/.travis.yml
index e472f06..2d8ab71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,14 @@ language:
   - csharp
 
 solution:
-  - MapboxSDKUnity.sln
+  - MapboxSdkCs.sln
 
 mono:
   - 4.6.1
 
 install:
-  - nuget restore MapboxSDKUnityCore.sln
+  - nuget restore MapboxSdkCs.sln
 
 script:
-  - xbuild /p:Configuration=Release /p:CIBuild=true  /p:StyleCopTreatErrorsAsWarnings=false MapboxSDKUnityCore.sln
+  - xbuild /p:Configuration=Release /p:CIBuild=true  /p:StyleCopTreatErrorsAsWarnings=true MapboxSdkCs.sln
   - mono packages/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe bin/Release/test/Mapbox.UnitTest.dll
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 85ea96f..dcb18f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 If you want to contribute code:
 
-1. Ensure that existing [pull requests](https://github.com/mapbox/mapbox-sdk-unity-core/pulls) and [issues](https://github.com/mapbox/mapbox-sdk-unity-core/issues) don’t already cover your contribution or question.
+1. Ensure that existing [pull requests](https://github.com/mapbox/mapbox-sdk-cs/pulls) and [issues](https://github.com/mapbox/mapbox-sdk-cs/issues) don’t already cover your contribution or question.
 
 2. Pull requests are gladly accepted. We require code reviews before merging PRs. When your tests pass, tag a project contributor (for example, @tmpsantos or @BergWerkGIS) and request a review.
 
@@ -22,11 +22,11 @@ Coming soon.
 
 # Running tests
 
-Tests are located in [test/UnitTest](https://github.com/mapbox/mapbox-sdk-unity-core/tree/master/test/UnitTest). On Linux or a mac run them with Mono, `mono packages/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe bin/Debug/test/Mapbox.UnitTest.dll` or from within your IDE of choice. Tests require a valid MAPBOX_ACCESS_TOKEN env variable in order to pass. Get a MAPBOX_ACCESS_TOKEN by logging into [Mapbox Studio](https://www.mapbox.com/studio/).
+Tests are located in [test/UnitTest](https://github.com/mapbox/mapbox-sdk-cs/tree/master/test/UnitTest). On Linux or a mac run them with Mono, `mono packages/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe bin/Debug/test/Mapbox.UnitTest.dll` or from within your IDE of choice. Tests require a valid MAPBOX_ACCESS_TOKEN env variable in order to pass. Get a MAPBOX_ACCESS_TOKEN by logging into [Mapbox Studio](https://www.mapbox.com/studio/).
 
 # Generating documentation
 
-Documentation for the the Mapbox Unity SDK is automatically generated from XML headers in code. *Instructions for generating documentation are coming soon*.
+Documentation for the the Mapbox SDK C# is automatically generated from XML headers in code. *Instructions for generating documentation are coming soon*.
 
 # Code of conduct
 
diff --git a/MapboxSDKUnityCore.nuspec b/MapboxSdkCs.nuspec
similarity index 85%
rename from MapboxSDKUnityCore.nuspec
rename to MapboxSdkCs.nuspec
index be30f09..82fc292 100644
--- a/MapboxSDKUnityCore.nuspec
+++ b/MapboxSdkCs.nuspec
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <package >
 	<metadata>
-		<id>MapboxSDKforUnityCore</id>
-		<title>Mapbox SDK for Unity - Core</title>
+		<id>MapboxSdkCs</id>
+		<title>A C# client to Mapbox services</title>
 		<version>$version$</version>
 		<authors>Mapbox</authors>
 		<owners>Mapbox</owners>
-		<licenseUrl>https://github.com/mapbox/mapbox-sdk-unity-core</licenseUrl>
-		<projectUrl>https://github.com/mapbox/mapbox-sdk-unity-core</projectUrl>
+		<licenseUrl>https://github.com/mapbox/mapbox-sdk-cs</licenseUrl>
+		<projectUrl>https://github.com/mapbox/mapbox-sdk-cs</projectUrl>
 		<!--<iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>-->
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>Core modules for accessing Mapbox services</description>
 		<summary>Core modules for accessing Mapbox services</summary>
 		<releaseNotes>Inital packaging</releaseNotes>
-		<copyright>Copyright 2016</copyright>
-		<tags>Mapbox SDK Unity Vectortiles</tags>
+		<copyright>Copyright 2017</copyright>
+		<tags>Mapbox SDK CSharp Geocoding Directions Vectortiles</tags>
 	</metadata>
 	<files>
 <!--
@@ -23,14 +23,12 @@
 		<file src="bin\$configuration$\Mapbox.Json.dll" target="lib\net35\"></file>
 		<file src="bin\$configuration$\Mapbox.Map.dll" target="lib\net35\"></file>
 		<file src="bin\$configuration$\Mapbox.Platform.dll" target="lib\net35\"></file>
-		<file src="bin\$configuration$\Mapbox.Unity.dll" target="lib\net35\"></file>
 		<file src="bin\$configuration$\Mapbox.Utils.dll" target="lib\net35\"></file>
 -->
 		<file src="src\Directions\**\*.cs" exclude="**\Properties\AssemblyInfo.cs" target="content\sdkproject\Assets\Mapbox\Core\Directions\"></file>
 		<file src="src\Geocoding\**\*.cs" exclude="**\Properties\AssemblyInfo.cs" target="content\sdkproject\Assets\Mapbox\Core\Geocoding\"></file>
 		<file src="src\Map\**\*.cs" exclude="**\Properties\AssemblyInfo.cs" target="content\sdkproject\Assets\Mapbox\Core\Map\"></file>
 		<file src="src\Platform\**\*.cs" exclude="**\Properties\AssemblyInfo.cs" target="content\sdkproject\Assets\Mapbox\Core\Platform\"></file>
-		<file src="src\Unity\**\*.cs" exclude="**\Properties\AssemblyInfo.cs" target="content\sdkproject\Assets\Mapbox\Core\Unity\"></file>
 		<file src="src\Utils\**\*.cs" exclude="**\Properties\AssemblyInfo.cs" target="content\sdkproject\Assets\Mapbox\Core\Utils\"></file>
 <!--
 		<file src="????\link.xml" target="content\sdkproject\Assets\Mapbox\Assets\Plugins\"></file>
diff --git a/MapboxSDKUnityCore.sln b/MapboxSdkCs.sln
similarity index 92%
rename from MapboxSDKUnityCore.sln
rename to MapboxSdkCs.sln
index 936f392..82d6843 100644
--- a/MapboxSDKUnityCore.sln
+++ b/MapboxSdkCs.sln
@@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Platform", "src\Platform\Pl
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Geocoding", "src\Geocoding\Geocoding.csproj", "{89F8BAB2-2E7A-425E-B715-2CC4519D561F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "src\Unity\Unity.csproj", "{24CA1FB8-BE9B-46ED-8E09-3767505128B6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Directions", "src\Directions\Directions.csproj", "{08214364-755E-4D6F-B7FF-9D2D49011C20}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono", "src\Mono\Mono.csproj", "{346B1208-1587-490B-A7DE-A96B86E81CD6}"
@@ -38,10 +36,6 @@ Global
 		{89F8BAB2-2E7A-425E-B715-2CC4519D561F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89F8BAB2-2E7A-425E-B715-2CC4519D561F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89F8BAB2-2E7A-425E-B715-2CC4519D561F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24CA1FB8-BE9B-46ED-8E09-3767505128B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24CA1FB8-BE9B-46ED-8E09-3767505128B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24CA1FB8-BE9B-46ED-8E09-3767505128B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24CA1FB8-BE9B-46ED-8E09-3767505128B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08214364-755E-4D6F-B7FF-9D2D49011C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08214364-755E-4D6F-B7FF-9D2D49011C20}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08214364-755E-4D6F-B7FF-9D2D49011C20}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/README.md b/README.md
index 3d3e6f3..ed6b3da 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,22 @@
-# mapbox-sdk-unity-core
+# mapbox-sdk-cs
 
-Tools for using Mapbox APIs with C# / Unity. If you'd like to contribute to the project, [read CONTRIBUTING.md](https://github.com/mapbox/mapbox-sdk-unity-core/blob/master/CONTRIBUTING.md).
-Tools for using Mapbox with Unity.
+SDK for using Mapbox APIs with C#. If you'd like to contribute to the project, [read CONTRIBUTING.md](https://github.com/mapbox/mapbox-sdk-cs/blob/master/CONTRIBUTING.md).
 
 
-`master` branch build status: [![Build status](https://ci.appveyor.com/api/projects/status/mh7ad8p1qonkbnwr/branch/master?svg=true)](https://ci.appveyor.com/project/Mapbox/mapbox-sdk-unity-core/branch/master)
-`master` branch code coverage: [![Coverage Status](https://coveralls.io/repos/github/mapbox/mapbox-sdk-unity-core/badge.svg?branch=master&t=jR0cza)](https://coveralls.io/github/mapbox/mapbox-sdk-unity-core?branch=master)
+`master` branch build status: [![Build status](https://ci.appveyor.com/api/projects/status/mh7ad8p1qonkbnwr/branch/master?svg=true)](https://ci.appveyor.com/project/Mapbox/mapbox-sdk-cs/branch/master)
+`master` branch code coverage: [![Coverage Status](https://coveralls.io/repos/github/mapbox/mapbox-sdk-cs/badge.svg?branch=master&t=jR0cza)](https://coveralls.io/github/mapbox/mapbox-sdk-cs?branch=master)
 
 ## Build
 
-You need to have `Unity` installed for a successful build.
-
 With an IDE:
-* Open `MapboxSDKUnity.sln` with Visual Studio or Xamarin Studio
+* Open `MapboxSdkCs.sln` with Visual Studio or Xamarin Studio
 * `Build -> Rebuild Solution`
 * DLLs will be in `bin`
 
 On the command line:
-* `nuget restore MapboxSDKUnity.sln`
-* Windows: `msbuild MapboxSDKUnity.sln`
-* Linux/OSX: `xbuild MapboxSDKUnity.sln`
+* `nuget restore MapboxSdkCs.sln`
+* Windows: `msbuild MapboxSdkCs.sln`
+* Linux/OSX: `xbuild MapboxSdkCs.sln`
 * DLLs will be in `bin`
 
 ## Tests
@@ -42,7 +39,7 @@ Log into your Mapbox account at https://www.mapbox.com/studio to obtain an acces
 * Tag the commit with the `nupkg` version
 * Push.
   * AppVeyor build will publish to nuget.org
-  * Verify the build itself and publishing finished successfully: https://ci.appveyor.com/project/Mapbox/mapbox-sdk-unity-core
+  * Verify the build itself and publishing finished successfully: https://ci.appveyor.com/project/Mapbox/mapbox-sdk-cs
 
 ### Publishing Docs
 
@@ -52,8 +49,8 @@ Log into your Mapbox account at https://www.mapbox.com/studio to obtain an acces
 * Push
   * AppVeyor build will publish to `gh-pages`
   * Verify the build itself and publishing finished successfully:
-    * https://ci.appveyor.com/project/Mapbox/mapbox-sdk-unity-core
-    * https://mapbox.github.io/mapbox-sdk-unity-core/
+    * https://ci.appveyor.com/project/Mapbox/mapbox-sdk-cs
+    * https://mapbox.github.io/mapbox-sdk-cs/
 
 ### Publishing locally (currently Windows only)
 
diff --git a/appveyor.yml b/appveyor.yml
index 1d1fbaf..bea1168 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,10 +8,6 @@ init:
 shallow_clone: true
 
 
-install:
-  - powershell Invoke-WebRequest "https://mapbox.s3.amazonaws.com/windows-builds/windows-build-deps/Unity-Managed.7z" -OutFile um.7z
-  - 7z -y x um.7z -o"C:\Program Files\Unity\Editor\Data\" | %windir%\system32\FIND "ing archive"
-
 platform: Any CPU
 configuration:
   - Debug
@@ -68,8 +64,7 @@ after_test:
       /file:bin\%configuration%\Mapbox.Geocoding.dll ^
       /file:bin\%configuration%\Mapbox.Map.dll ^
       /file:bin\%configuration%\Mapbox.Platform.dll ^
-      /file:bin\%configuration%\Mapbox.Utils.dll ^
-      /reference:"C:\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll"
+      /file:bin\%configuration%\Mapbox.Utils.dll
   ##http://help.appveyor.com/discussions/kb/9-support-for-stylecop-report#comment_34865295
   ##http://help.appveyor.com/discussions/kb/5-code-analysis-fxcop-support
   ##levels: Informational, Warning, Error, CriticalWarning, CriticalError
diff --git a/docfx.json b/docfx.json
index 1f644de..20a5405 100644
--- a/docfx.json
+++ b/docfx.json
@@ -4,7 +4,7 @@
       "src": [
         {
           "files": [
-            "MapboxSDKUnity.sln"
+            "MapboxSdkCs.sln"
           ],
           "exclude": [
             "**/obj/**",
diff --git a/scope.md b/scope.md
deleted file mode 100644
index cc8b454..0000000
--- a/scope.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Project scope
-
-The goal of the Unity API is to make it easy for game developers to build beautiful location based games. The API should be flexible enough to allow creative developers to use location data in novel ways, but easy enough to prototype a game environment with a map in a couple minutes.
-
-The API will include a core C# library for requesting data from Mapbox APIS, and then a higher-level set of components designed to work specifically with Unity. 
-
-There are four parts to the Unity SDK: core API support, utilities, Unity components, and custom inspectors:
-
-## Core API support
-
-The Unity SDK will provide an interface to the following [Mapbox web services](https://www.mapbox.com/api-documentation/). I separated services into two priority levels. Priority level 1 is the base level of support we need to release the Unity SDK. Priority level 2 features are those that would be necessary to make the SDK feel complete and up to par with our SDKs on other platforms. 
-
-### Vector tilesets
-_Priority level 1_
-
-To support vector tileset resources, the SDK will need to:
-
-- Dynamically fetch vector tiles based on a given map center point.
-- Decode vector tiles and store them as geometries usable by Unity developers.
-- Position data from tiles in 2D Unity game space
-- Position data from tiles in spherical 3D game space.  
-
-First version of vector tile support can leave the rendering implementation to the user of the SDK.
-
-Documentation: https://www.mapbox.com/api-documentation/#retrieve-tiles
-
-### Raster tilesets
-_Priority level 2_
-
-Much of the work we do to support vector tiles will be applicable to raster tiles. The main difference between vector tiles and raster tiles is that raster tiles would need to be used as textures. We could also add support for 3D terrain meshes based on raster elevation data.
-
-Documentation: https://www.mapbox.com/api-documentation/#retrieve-tiles
-
-### Static maps
-_Priority level 2_
-
-Make it easy for a developer to request and apply a map texture of a fixed size to a game object.
-
-Documentation: https://www.mapbox.com/api-documentation/#static
-
-### Datasets
-_Priority level 2_
-
-Provide methods for both requesting data from a dataset and for posting changes to a dataset based on game objects.
-
-Documentation: https://www.mapbox.com/api-documentation/#datasets
-
-### Geocoding
-_Priority level 1_
-
-Provide methods for requesting and storing forward geocode and reverse geocode results. Support all optional parameters.
-
-Will use callback functions like `GetForwardGeocode(GeocoderOptions, callback())` where `GeocoderOptions` is an object that includes the geocode query and all options, and callback is a function that receives the geocode response object. The response object can be used to do things like position points on the map or fill a UI template with search results.
-
-Documentation: https://www.mapbox.com/api-documentation/#geocoding
-
-### Directions
-_Priority level 1_
-
-Provide a method for requesting and storing directions results. Support all optional parameters.
-
-Will use callback functions like `GetDirections(DirectionsOptions, callback())` where `DirectionsOptions` is an object that includes the directions query and all options, and callback is a function that receives the directions response object. The response object can then be used to do things like build a path on the map or to fill a UI template with instructions.
-
-Documentation: https://www.mapbox.com/api-documentation/#directions
-
-### Map matching
-_Priority level 2_
-
-Provide a method for sending user location and getting a match back. Support all optional parameters. Useful for snapping user position to road path. 
-
-Documentation: https://www.mapbox.com/api-documentation/#map-matching
-
-## Utilities
-_Priority level 1_
-
-The SDK should include a library of utilities for working with spatial data in Unity. Utilities include:
-
-- Classes for spatial data structures like geojson, latlng, bounding box.
-- Convert Lat/Lng to Unity X/Y and back.
-- Convert Lat/Lng to Spherical Unity X/Y/Z and back.
-- Utility to make it easy to reset game center point to [avoid making game space too big](http://davenewson.com/posts/2013/unity-coordinates-and-scales.html).
-
-This is not a complete list. There are many directions we could go from here. For example, do developers want utilities for procedurally generating game content from vector tiles? Do developers want to be able to do turf-like data manipulation, or will the Unity API itself provide enough tools for manipulating game objects made from spatial data?
-
-## Mapbox prefab with custom inspectors
-_Priority level 1_
-
-We will need to include a primary "Mapbox" Monobehavior prefab that uses the Mapbox SDK and stores data on itself, so developers can conveniently use the SDK without needing to code.
-
-Developers work on Unity games in two different ways. Through scripting C#, or through the [inspector panel](https://docs.unity3d.com/Manual/UsingTheInspector.html). We should add [custom inspector editing panels](https://docs.unity3d.com/Manual/editor-CustomEditors.html) for all supported tools and resources.
-
-## Drop-in Unity components
-_Priority level 2_
-
-Once we have a core library for working with Mapbox resources and tools, we should build customizable drop-in components on top of the core library. The details of which components we build still needs to be defined. Here are some ideas:
-
-- Drop-in traditional slippy map (done).
-- Marker component to work with geocoding API. Configure the marker to use 2d or spherical space, set a scale on it, and pass it a location and it places itself in the right position.
-- Route line component to work with directions API. Configure the line's scale, whether it's 2d/spherical space, it's style, then pass it starting and ending point and it'll draw a line.
-- Mini-map component to work with static map API. Pass Mapbox style URL, size, and marker properties to generate a 2D mini map with markers.
-- User interface components for geocoding and routing. Customizable input boxes, submit buttons, results displays.
-- A library of meshes, materials, and textures to use with our vector tile renderer to quickly prototype scenes.
diff --git a/scripts/build.csx b/scripts/build.csx
index 9e8b2ed..0ebce07 100644
--- a/scripts/build.csx
+++ b/scripts/build.csx
@@ -7,6 +7,18 @@ using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 
+string access_token = Environment.GetEnvironmentVariable("MAPBOX_ACCESS_TOKEN");
+if(string.IsNullOrWhiteSpace(access_token)){
+    Console.Error.WriteLine("%MAPBOX_ACCESS_TOKEN% not set - cannot run tests");
+    Environment.Exit(1);
+}
+
+//ATTENTION: latest version of `srciptcs` seems to change the current directory
+string rootDir = Environment.GetEnvironmentVariable("ROOTDIR");
+Console.WriteLine("rootDir [build.csx]: {0}", rootDir);
+Console.WriteLine("cwd [build.csx]: {0}", Directory.GetCurrentDirectory());
+Directory.SetCurrentDirectory(rootDir);
+Console.WriteLine("cwd [build.csx]: {0}", Directory.GetCurrentDirectory());
 string commitMessage = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE");
 Console.WriteLine("commit message: \"{0}\"", commitMessage);
 
@@ -41,6 +53,7 @@ if (publishDocs)
 string versionDLL;
 string versionNupkg;
 
+
 using (TextReader tr = new StreamReader("versions.txt"))
 {
     versionDLL = tr.ReadLine().Split(":".ToCharArray())[1].Trim();
@@ -54,8 +67,6 @@ Console.WriteLine("  - DLLs  : {0}", versionDLL);
 Console.WriteLine("  - nupkg : {0}", versionNupkg);
 
 
-string rootDir = Environment.GetEnvironmentVariable("ROOTDIR");
-
 //////// PATCH SharedAssemblyInfo.cs
 string sharedAssemblyInfo = Path.Combine(
     rootDir
@@ -83,7 +94,7 @@ using (TextWriter tw = new StreamWriter(sharedAssemblyInfo, false, Encoding.UTF8
 
 
 string buildCmd = string.Format(
-    "msbuild MapboxSDKUnityCore.sln /p:Configuration={0}",
+    "msbuild MapboxSdkCs.sln /p:Configuration={0}",
     configuration
 );
 Console.WriteLine("building [{0}]", buildCmd);
@@ -112,7 +123,7 @@ if (!publishNuget)
 else
 {
     Console.WriteLine("publishing to nuget.org");
-    string nugetCmd = string.Format("nuget push MapboxSDKforUnityCore.{0}.nupkg {1} -Source https://www.nuget.org/api/v2/package", versionNupkg, nugetApiKey);
+    string nugetCmd = string.Format("nuget push MapboxSdkCs.{0}.nupkg {1} -Source https://www.nuget.org/api/v2/package", versionNupkg, nugetApiKey);
     if (!RunCommand(nugetCmd))
     {
         Console.Error.WriteLine("publishing to nuget.org failed");
@@ -137,7 +148,7 @@ else
         }
         else
         {
-            originalCommit = "https://github.com/mapbox/mapbox-sdk-unity-core/commit/" + originalCommit;
+            originalCommit = "https://github.com/mapbox/mapbox-sdk-cs/commit/" + originalCommit;
         }
 
         string commitAuthor = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR");
@@ -154,7 +165,7 @@ else
             "git init .",
             "git add .",
             string.Format("git commit -m \"pushed via [{0}] by [{1}]\"", originalCommit,commitAuthor),
-            string.Format("git remote add origin https://{0}@github.com/mapbox/mapbox-sdk-unity.git", githubToken),
+            string.Format("git remote add origin https://{0}@github.com/mapbox/mapbox-sdk-cs.git", githubToken),
             "git checkout -b gh-pages",
             "git push -f origin gh-pages"
         });
diff --git a/src/Documentation/index.md b/src/Documentation/index.md
index 90f9f15..38f9775 100644
--- a/src/Documentation/index.md
+++ b/src/Documentation/index.md
@@ -1,5 +1,7 @@
 
-# **Mapbox SDK for Unity**.
+# **Mapbox SDK C#**.
+
+A C# client to Mapbox Services.
 Refer to [API documentation](api/index.md) for how to use the SDK.
 
 ## LEGAL
@@ -10,7 +12,5 @@ Refer to [API documentation](api/index.md) for how to use the SDK.
 ## Quick Start Notes:
 
 1. **[Get MAPBOX_ACCESS_TOKEN!](articles/intro.md)**
-2. Install Unity ;-)
-3. Extract Mapbox SDK for Unity to `Assets`
-4. Put your own `MAPBOX_ACCESS_TOKEN` into the code
-
+2. Set your token as environment variable: `SET MAPBOX_ACCESS_TOKEN=<YOUR_TOKEN>`
+3. Start using SDK
diff --git a/src/Map/Map.cs b/src/Map/Map.cs
index 4b27666..dbb5f9a 100644
--- a/src/Map/Map.cs
+++ b/src/Map/Map.cs
@@ -276,16 +276,9 @@ public void DownloadTiles() {
 			var waitHandles = new List<WaitHandle>();
 			var tilesNotImmediatelyAvailable = new List<CanonicalTileId>();
 
-			//_TileFetcher.Clear();
-
 			HashSet<CanonicalTileId> tileCover = GetTileCover();
-			//UnityEngine.Debug.LogFormat("Map.DownloadTiles() about to download [{0}] tiles", tileCover.Count);
 
 			foreach(var id in tileCover) {
-				//if ("0/0/0" == id.ToString())
-				//{
-				//    continue;
-				//}
 
 				AutoResetEvent are = _TileFetcher.AsyncMode ? null : new AutoResetEvent(false);
 				T tile = new T() { Id = id };
@@ -294,6 +287,7 @@ public void DownloadTiles() {
 					, id
 					, are
 				);
+
 				if(null != tileData) {
 					addTile(tileData, id, false, string.Empty);
 				}
diff --git a/src/Map/RasterTile.cs b/src/Map/RasterTile.cs
index 70796c2..a3eae8c 100644
--- a/src/Map/RasterTile.cs
+++ b/src/Map/RasterTile.cs
@@ -6,38 +6,38 @@
 
 using System;
 
-namespace Mapbox.Map
-{
-    /// <summary>
-    ///    A raster tile from the Mapbox Style API, a encoded image representing a geographic
-    ///    bounding box. Usually JPEG or PNG encoded.
-    /// </summary>
-    public class RasterTile : Tile
-    {
-        private byte[] data;
-
-        /// <summary> Gets the raster tile raw data. </summary>
-        /// <value> The raw data, usually an encoded JPEG or PNG. </value>
-        public byte[] Data
-        {
-            get
-            {
-                return this.data;
-            }
-        }
-
-        internal override TileResource MakeTileResource(string styleUrl)
-        {
-            return TileResource.MakeRaster(Id, styleUrl);
-        }
-
-        internal override bool ParseTileData(byte[] data)
-        {
-            // We do not parse raster tiles as they are
-            // decoded by Unity on `Texture2D.LoadImage`.
-            this.data = data;
-
-            return true;
-        }
-    }
+namespace Mapbox.Map {
+
+
+	/// <summary>
+	///    A raster tile from the Mapbox Style API, a encoded image representing a geographic
+	///    bounding box. Usually JPEG or PNG encoded.
+	/// </summary>
+	public class RasterTile : Tile {
+
+		private byte[] data;
+
+		/// <summary> Gets the raster tile raw data. </summary>
+		/// <value> The raw data, usually an encoded JPEG or PNG. </value>
+		public byte[] Data {
+			get {
+				return this.data;
+			}
+		}
+
+
+		internal override TileResource MakeTileResource(string styleUrl) {
+			return TileResource.MakeRaster(Id, styleUrl);
+		}
+
+
+		internal override bool ParseTileData(byte[] data) {
+			// We do not parse raster tiles as they are
+			this.data = data;
+
+			return true;
+		}
+
+
+	}
 }
diff --git a/src/Map/Tile.cs b/src/Map/Tile.cs
index df06bee..121a9cd 100644
--- a/src/Map/Tile.cs
+++ b/src/Map/Tile.cs
@@ -5,6 +5,7 @@
 //-----------------------------------------------------------------------
 
 namespace Mapbox.Map {
+
 	using System;
 
 	/// <summary>
@@ -13,10 +14,10 @@ namespace Mapbox.Map {
 	///    here </see>.
 	/// </summary>
 	public abstract class Tile {
+
 		private CanonicalTileId id;
 		private string error;
 		private State state = State.New;
-
 		private IAsyncRequest request;
 		private Action callback;
 
@@ -24,13 +25,10 @@ public abstract class Tile {
 		public enum State {
 			/// <summary> New tile, not yet initialized. </summary>
 			New,
-
 			/// <summary> Loading data. </summary>
 			Loading,
-
 			/// <summary> Data loaded and parsed. </summary>
 			Loaded,
-
 			/// <summary> Data loading cancelled. </summary>
 			Canceled
 		}
diff --git a/src/Unity/FileSource.cs b/src/Unity/FileSource.cs
deleted file mode 100644
index 0ddd166..0000000
--- a/src/Unity/FileSource.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="FileSource.cs" company="Mapbox">
-//     Copyright (c) 2016 Mapbox. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace Mapbox.Unity
-{
-    using System;
-    using UnityEngine;
-
-    /// <summary>
-    ///     Unity implementation of the FileSource class. It will use Unity's
-    ///     <see href="https://docs.unity3d.com/Manual/Coroutines.html">coroutines</see> to
-    ///     asynchronously fetch data from the network via HTTP or HTTPS requests.
-    /// </summary>
-    /// <remarks>
-    ///     A FileSource is needed for each MonoBehaviour in the game doing network requests.
-    ///     The code is compatible for exporting to Unity's WebPlayer.
-    /// </remarks>
-    public sealed class FileSource : IFileSource
-    {
-        private readonly MonoBehaviour behaviour;
-
-        private string accessToken;
-
-        /// <summary> Initializes a new instance of the <see cref="FileSource" /> class. </summary>
-        /// <param name="behaviour">
-        ///     MonoBehaviour that will be used for processing the coroutine used on
-        ///     the asynchronous request.
-        /// </param>
-        public FileSource(MonoBehaviour behaviour)
-        {
-            this.behaviour = behaviour;
-        }
-
-        /// <summary> Gets or sets the access token. </summary>
-        public string AccessToken
-        {
-            get
-            {
-                return this.accessToken;
-            }
-
-            set
-            {
-                this.accessToken = value;
-            }
-        }
-
-        /// <summary> Performs a request asynchronously. </summary>
-        /// <param name="url"> The HTTP/HTTPS url. </param>
-        /// <param name="callback"> Callback to be called after the request is completed. </param>
-        /// <returns>
-        ///     Returns a <see cref="IAsyncRequest" /> that can be used for canceling a pending
-        ///     request. This handle can be completely ignored if there is no intention of ever
-        ///     canceling the request.
-        /// </returns>
-        public IAsyncRequest Request(string url, Action<Response> callback)
-        {
-            // Make a uri builder in order to set access token.
-            var uriBuilder = new UriBuilder(url);
-
-            if (this.AccessToken != null)
-            {
-                string accessTokenQuery = "access_token=" + this.accessToken;
-
-                if (uriBuilder.Query != null && uriBuilder.Query.Length > 1)
-                {
-                    uriBuilder.Query = uriBuilder.Query.Substring(1) + "&" + accessTokenQuery;
-                }
-                else
-                {
-                    uriBuilder.Query = accessTokenQuery;
-                }
-            }
-
-            return new HTTPRequest(this.behaviour, uriBuilder.ToString(), callback);    
-        }
-    }
-}
diff --git a/src/Unity/HTTPRequest.cs b/src/Unity/HTTPRequest.cs
deleted file mode 100644
index 48d8d34..0000000
--- a/src/Unity/HTTPRequest.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="HTTPRequest.cs" company="Mapbox">
-//     Copyright (c) 2016 Mapbox. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace Mapbox.Unity {
-	using System;
-	using System.Collections;
-	using UnityEngine;
-	using UnityEngine.Networking;
-
-	internal sealed class HTTPRequest : IAsyncRequest {
-		private UnityWebRequest request;
-		private readonly Action<Response> callback;
-
-		public HTTPRequest(MonoBehaviour behaviour, string url, Action<Response> callback) {
-			this.request = UnityWebRequest.Get(url);
-			this.callback = callback;
-
-			behaviour.StartCoroutine(this.DoRequest());
-		}
-
-		public void Cancel() {
-			this.request.Abort();
-		}
-
-		private IEnumerator DoRequest() {
-			yield return this.request.Send();
-
-			var response = new Response();
-			response.Headers = this.request.GetResponseHeaders();
-			response.Error = this.request.error;
-			response.Data = this.request.downloadHandler.data;
-
-			request.Dispose();
-			request = null;
-
-			this.callback(response);
-		}
-	}
-}
diff --git a/src/Unity/HTTPRequestUnityWebRequest.cs b/src/Unity/HTTPRequestUnityWebRequest.cs
deleted file mode 100644
index ec94ccf..0000000
--- a/src/Unity/HTTPRequestUnityWebRequest.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="HTTPRequest.cs" company="Mapbox">
-//     Copyright (c) 2016 Mapbox. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace Mapbox.Unity
-{
-    using System;
-    using System.Collections;
-    using UnityEngine;
-    using UnityEngine.Networking;
-
-    internal sealed class HTTPRequestUnityWebRequest : IAsyncRequest
-    {
-        private readonly UnityWebRequest request;
-        private readonly Action<Response> callback;
-
-        public HTTPRequestUnityWebRequest(MonoBehaviour behaviour, string url, Action<Response> callback)
-        {
-            this.request = UnityWebRequest.Get(url);
-            this.callback = callback;
-
-            behaviour.StartCoroutine(this.DoRequest());
-        }
-
-        public void Cancel()
-        {
-            this.request.Abort();
-        }
-
-        private IEnumerator DoRequest()
-        {
-            yield return this.request.Send();
-
-            var response = new Response();
-            response.Error = this.request.error;
-            response.Data = this.request.downloadHandler.data;
-
-            this.callback(response);
-        }
-    }
-}
diff --git a/src/Unity/HTTPRequestWWW.cs b/src/Unity/HTTPRequestWWW.cs
deleted file mode 100644
index aa43414..0000000
--- a/src/Unity/HTTPRequestWWW.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="HTTPRequest.cs" company="Mapbox">
-//     Copyright (c) 2016 Mapbox. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace Mapbox.Unity
-{
-    using System;
-    using System.Collections;
-    using UnityEngine;
-    using UnityEngine.Networking;
-
-    internal sealed class HTTPRequestWWW : IAsyncRequest
-    {
-        private WWW request;
-        private readonly Action<Response> callback;
-
-        public HTTPRequestWWW(MonoBehaviour behaviour, string url, Action<Response> callback)
-        {
-            this.callback = callback;
-
-            behaviour.StartCoroutine(this.DoRequest(url));
-        }
-
-        public void Cancel()
-        {
-            throw new NotImplementedException();
-        }
-
-        private IEnumerator DoRequest(string url)
-        {
-            request = new WWW(url);
-            yield return request;
-
-            var response = new Response();
-            response.Headers = request.responseHeaders;
-            response.Error = request.error;
-            response.Data = request.bytes;
-
-            //http://answers.unity3d.com/questions/474421/wwwtexture-dispose-didnt-work-causing-memory-leak.html
-            request.Dispose();
-            request = null;
-
-            callback(response);
-        }
-    }
-}
diff --git a/src/Unity/Properties/AssemblyInfo.cs b/src/Unity/Properties/AssemblyInfo.cs
deleted file mode 100644
index d752431..0000000
--- a/src/Unity/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <auto-generated />
-
-using System.Reflection;
-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("Unity")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("${AuthorCopyright}")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
diff --git a/src/Unity/TextWriter.cs b/src/Unity/TextWriter.cs
deleted file mode 100644
index aa7409d..0000000
--- a/src/Unity/TextWriter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="TextWriter.cs" company="Mapbox">
-//     Copyright (c) 2016 Mapbox. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace Mapbox.Unity
-{
-    using UnityEngine;
-
-    /// <summary>
-    ///     Redirects System.Console to Unity's console.
-    /// </summary>
-    public class TextWriter : System.IO.TextWriter
-    {
-        internal TextWriter() : base()
-        {
-        }
-
-        /// <summary> Gets the data encoding. </summary>
-        /// <value> The data encoding. </value>
-        public override System.Text.Encoding Encoding
-        {
-            get { return System.Text.Encoding.UTF8; }
-        }
-
-        /// <summary>
-        ///     Register an instance of this class for redirecting
-        ///     messages from Console.Write*() to Debug.Log().
-        /// </summary>
-        public static void Register()
-        {
-            System.Console.SetOut(new TextWriter());
-        }
-
-        /// <summary> Write the specified value. </summary>
-        /// <param name="value"> Console message. </param>
-        public override void Write(string value)
-        {
-            base.Write(value);
-            Debug.Log(value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unity/Unity.csproj b/src/Unity/Unity.csproj
deleted file mode 100644
index 4d7820e..0000000
--- a/src/Unity/Unity.csproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{24CA1FB8-BE9B-46ED-8E09-3767505128B6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Mapbox.Unity</RootNamespace>
-    <AssemblyName>Mapbox.Unity</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <ReleaseVersion>0.0.1</ReleaseVersion>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StyleCopOverrideSettingsFile>..\..\data\Settings.StyleCop</StyleCopOverrideSettingsFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="UnityEngine-Linux" Condition="Exists('\opt\Unity\Editor\Data\Managed\UnityEngine.dll')">
-      <HintPath>\opt\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine-macOS" Condition="Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEngine.dll')">
-      <HintPath>\Applications\Unity\Unity.app\Contents\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine-Win" Condition="Exists('\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll')">
-      <HintPath>\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="HTTPRequest.cs" />
-    <Compile Include="FileSource.cs" />
-    <Compile Include="TextWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Platform\Platform.csproj">
-      <Project>{FE49745C-01F6-4A3F-BF08-828113D3E19F}</Project>
-      <Name>Platform</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Utils\Utils.csproj">
-      <Project>{48BE9D66-3A19-4248-BBDD-4DB4A52B3FE5}</Project>
-      <Name>Utils</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Target Name="Build" Condition="'$(CIBuild)'=='true' ">
-  </Target>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(CIBuild)'=='' " />
-  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
-</Project>
\ No newline at end of file
diff --git a/src/Unity/packages.config b/src/Unity/packages.config
deleted file mode 100644
index 125c168..0000000
--- a/src/Unity/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net20" developmentDependency="true" />
-</packages>
\ No newline at end of file
diff --git a/src/Utils/Conversions.cs b/src/Utils/Conversions.cs
deleted file mode 100644
index 075e28e..0000000
--- a/src/Utils/Conversions.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="Conversions.cs" company="Mapbox">
-//     Copyright (c) 2016 Mapbox. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace Mapbox
-{
-    using System;
-    using UnityEngine;
-
-    /// <summary>
-    /// A set of Geo and Terrain Conversion utils.
-    /// </summary>
-    public static class Conversions
-    {
-        private const int TileSize = 256;
-        private const int EarthRadius = 6378137;
-        private const double InitialResolution = 2 * Math.PI * EarthRadius / TileSize;
-        private const double OriginShift = 2 * Math.PI * EarthRadius / 2;
-
-        /// <summary>
-        /// Converts <see cref="T:Mapbox.Utils.GeoCoordinate"/> struct, WGS84
-        /// lat/lon to Spherical Mercator EPSG:900913 xy meters.
-        /// </summary>
-        /// <param name="v"> The <see cref="T:Mapbox.Utils.GeoCoordinate"/>. </param>
-        /// <returns> A <see cref="T:UnityEngine.Vector2"/> of coordinates in meters. </returns>
-        public static Vector2 LatLonToMeters(GeoCoordinate v)
-        {
-            return LatLonToMeters(v.Latitude, v.Longitude);
-        }
-
-        /// <summary>
-        /// Converts WGS84 lat/lon to Spherical Mercator EPSG:900913 xy meters.
-        /// SOURCE: http://stackoverflow.com/questions/12896139/geographic-coordinates-converter.
-        /// </summary>
-        /// <param name="lat"> The latitude. </param>
-        /// <param name="lon"> The longitude. </param>
-        /// <returns> A <see cref="T:UnityEngine.Vector2"/> of xy meters. </returns>
-        public static Vector2 LatLonToMeters(double lat, double lon)
-        {
-            var posx = lon * OriginShift / 180;
-            var posy = Math.Log(Math.Tan((90 + lat) * Math.PI / 360)) / (Math.PI / 180);
-            posy = posy * OriginShift / 180;
-            return new Vector2((float)posx, (float)posy);
-        }
-
-        /// <summary>
-        /// Converts Spherical Mercator EPSG:900913 in xy meters to WGS84 lat/lon.
-        /// Inverse of LatLonToMeters.
-        /// </summary>
-        /// <param name="m"> A <see cref="T:UnityEngine.Vector2"/> of coordinates in meters.  </param>
-        /// <returns> The <see cref="T:Mapbox.Utils.GeoCoordinate"/> in lat/lon. </returns>
-        public static GeoCoordinate MetersToLatLon(Vector2 m)
-        {
-            var vx = (m.x / OriginShift) * 180;
-            var vy = (m.y / OriginShift) * 180;
-            vy = 180 / Math.PI * (2 * Math.Atan(Math.Exp(vy * Math.PI / 180)) - Math.PI / 2);
-            return new GeoCoordinate(vy, vx);
-        }
-
-        /// <summary>
-        /// Gets the xy tile ID from Spherical Mercator EPSG:900913 xy coords.
-        /// </summary>
-        /// <param name="m"> <see cref="T:UnityEngine.Vector2"/> XY coords in meters. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns> A <see cref="T:UnityEngine.Vector2"/> xy tile ID. </returns>
-        public static Vector2 MetersToTile(Vector2 m, int zoom)
-        {
-            var p = MetersToPixels(m, zoom);
-            return PixelsToTile(p);
-        }
-
-        /// <summary>
-        /// Gets the tile bounds in Spherical Mercator EPSG:900913 meters from an xy tile ID.
-        /// </summary>
-        /// <param name="t"> XY tile ID. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns> A <see cref="T:UnityEngine.Rect"/> in meters. </returns>
-        public static Rect TileBounds(Vector2 t, int zoom)
-        {
-            var min = PixelsToMeters(new Vector2(t.x * TileSize, t.y * TileSize), zoom);
-            var max = PixelsToMeters(new Vector2((t.x + 1) * TileSize, (t.y + 1) * TileSize), zoom);
-            return new Rect(min, max - min);
-        }
-        
-        /// <summary>
-        /// Gets the xy tile ID at the requested zoom that contains the WGS84 lat/lon point.
-        /// See: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames.
-        /// </summary>
-        /// <param name="latitude"> The latitude. </param>
-        /// <param name="longitude"> The longitude. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns> A <see cref="T:UnityEngine.Vector2"/> xy tile ID. </returns>
-        public static Vector2 LatitudeLongitudeToTileId(float latitude, float longitude, int zoom)
-        {
-            var x = (int)Math.Floor((longitude + 180.0) / 360.0 * Math.Pow(2.0, zoom));
-            var y = (int)Math.Floor((1.0 - Math.Log(Math.Tan(latitude * Math.PI / 180.0)
-                    + 1.0 / Math.Cos(latitude * Math.PI / 180.0)) / Math.PI) / 2.0 * Math.Pow(2.0, zoom));
-    
-            return new Vector2(x, y);
-        }
-
-        /// <summary>
-        /// Gets the WGS84 longitude of the northwest corner from a tile's X position and zoom level.
-        /// See: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames.
-        /// </summary>
-        /// <param name="x"> Tile X position. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns> NW Longitude. </returns>
-        public static double TileXToNWLongitude(int x, int zoom)
-        {
-            var n = Math.Pow(2.0, zoom);
-            var lon_deg = x / n * 360.0 - 180.0;
-            return lon_deg;
-        }
-        
-        /// <summary>
-        /// Gets the WGS84 latitude of the northwest corner from a tile's Y position and zoom level.
-        /// See: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames.
-        /// </summary>
-        /// <param name="y"> Tile Y position. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns> NW Latitude. </returns>
-        public static double TileYToNWLatitude(int y, int zoom)
-        {
-            var n = Math.Pow(2.0, zoom);
-            var lat_rad = Math.Atan(Math.Sinh(Math.PI * (1 - 2 * y / n)));
-            var lat_deg = lat_rad * 180.0 / Math.PI;
-            return lat_deg;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="T:Mapbox.Utils.GeoCoordinateBounds"/> of a tile.
-        /// </summary>
-        /// <param name="x"> Tile X position. </param>
-        /// <param name="y"> Tile Y position. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns> The <see cref="T:Mapbox.Utils.GeoCoordinateBounds"/> of the tile. </returns>
-        public static GeoCoordinateBounds TileIdToBounds(int x, int y, int zoom)
-        {
-            var sw = new GeoCoordinate(TileYToNWLatitude(y, zoom), TileXToNWLongitude(x + 1, zoom));
-            var ne = new GeoCoordinate(TileYToNWLatitude(y + 1, zoom), TileXToNWLongitude(x, zoom));
-            return new GeoCoordinateBounds(sw, ne);
-        }
-
-        /// <summary>
-        /// Gets the WGS84 lat/lon of the center of a tile.
-        /// </summary>
-        /// <param name="x"> Tile X position. </param>
-        /// <param name="y"> Tile Y position. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns>A <see cref="T:UnityEngine.Vector2"/> of lat/lon coordinates.</returns>
-        public static Vector2 TileIdToCenterLatitudeLongitude(int x, int y, int zoom)
-        {
-            var bb = TileIdToBounds(x, y, zoom);
-            var center = bb.Center;
-            return new Vector2((float)center.Latitude, (float)center.Longitude);
-        }
-    
-        /// <summary>
-        /// Gets the meters per pixels at given latitude and zoom level for a 256x256 tile.
-        /// See: http://wiki.openstreetmap.org/wiki/Zoom_levels.
-        /// </summary>
-        /// <param name="latitude"> The latitude. </param>
-        /// <param name="zoom"> Zoom level. </param>
-        /// <returns> Meters per pixel. </returns>
-        public static float GetTileScaleInMeters(float latitude, int zoom)
-        {
-            return 156543.034f * Mathf.Cos(Mathf.Deg2Rad * latitude) / Mathf.Pow(2f, zoom + 8);
-        }
-
-        /// <summary>
-        /// Gets height from terrain-rgb adjusted for a given scale.
-        /// </summary>
-        /// <param name="color"> The <see cref="T:UnityEngine.Color"/>. </param>
-        /// <param name="relativeScale"> Relative scale. </param>
-        /// <returns> Adjusted height in meters. </returns>
-        public static float GetRelativeHeightFromColor(Color color, float relativeScale)
-        {
-            return GetAbsoluteHeightFromColor(color) * relativeScale;
-        }
-
-        /// <summary>
-        /// Specific formula for mapbox.terrain-rgb to decode height values from pixel values.
-        /// See: https://www.mapbox.com/blog/terrain-rgb/.
-        /// </summary>
-        /// <param name="color"> The <see cref="T:UnityEngine.Color"/>. </param>
-        /// <returns> Height in meters. </returns>
-        public static float GetAbsoluteHeightFromColor(Color color)
-        {
-            return (float)(-10000 + ((color.r * 255 * 256 * 256 + color.g * 255 * 256 + color.b * 255) * 0.1));
-        }
-
-        private static double Resolution(int zoom)
-        {
-            return InitialResolution / Math.Pow(2, zoom);
-        }
-
-        private static Vector2 PixelsToMeters(Vector2 p, int zoom)
-        {
-            var res = Resolution(zoom);
-            var met = new Vector2();
-            met.x = (float)(p.x * res - OriginShift);
-            met.y = (float)-(p.y * res - OriginShift);
-            return met;
-        }
-
-        private static Vector2 MetersToPixels(Vector2 m, int zoom)
-        {
-            var res = Resolution(zoom);
-            var pix = new Vector2((float)((m.x + OriginShift) / res), (float)((-m.y + OriginShift) / res));
-            return pix;
-        }
-
-        private static Vector2 PixelsToTile(Vector2 p)
-        {
-            var t = new Vector2((int)Math.Ceiling(p.x / (double)TileSize) - 1, (int)Math.Ceiling(p.y / (double)TileSize) - 1);
-            return t;
-        }
-    }
-}
diff --git a/src/Utils/Utils.csproj b/src/Utils/Utils.csproj
index aeaf239..46dea6b 100644
--- a/src/Utils/Utils.csproj
+++ b/src/Utils/Utils.csproj
@@ -40,18 +40,6 @@
     <Reference Include="Mapbox.Json">
       <HintPath>..\..\3rdparty\Json.Net.Unity3D\Mapbox.Json.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine-Linux" Condition="Exists('\opt\Unity\Editor\Data\Managed\UnityEngine.dll')">
-      <HintPath>\opt\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine-macOS" Condition="Exists('\Applications\Unity\Unity.app\Contents\Managed\UnityEngine.dll')">
-      <HintPath>\Applications\Unity\Unity.app\Contents\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="UnityEngine-Win" Condition="Exists('\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll')">
-      <HintPath>\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">
@@ -70,7 +58,6 @@
     <Compile Include="JsonConverters\LonLatToGeoCoordinateConverter.cs" />
     <Compile Include="JsonConverters\PolylineToGeoCoordinateListConverter.cs" />
     <Compile Include="JsonConverters\JsonConverters.cs" />
-    <Compile Include="Conversions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/test/UnitTest/CompressionTest.cs b/test/UnitTest/CompressionTest.cs
index af2f5ee..011c8a7 100644
--- a/test/UnitTest/CompressionTest.cs
+++ b/test/UnitTest/CompressionTest.cs
@@ -33,6 +33,7 @@ public void Corrupt() {
 				"https://api.mapbox.com/v4/mapbox.mapbox-streets-v7/0/0/0.vector.pbf",
 				(Response res) => {
 					buffer = res.Data;
+					Assert.NotNull(buffer, "tile data not null");
 					Assert.Greater(buffer.Length, 30);
 
 					buffer[10] = 0;
@@ -52,6 +53,7 @@ public void Corrupt() {
 		public void Decompress() {
 			var fs = new Mono.FileSource();
 			var buffer = new byte[] { };
+			bool finished = false;
 
 			// Vector tiles are compressed.
 			fs.Request(
@@ -59,7 +61,10 @@ public void Decompress() {
 				(Response res) => {
 					buffer = res.Data;
 					Assert.Less(buffer.Length, Compression.Decompress(buffer).Length);
+					finished = true;
 				});
+
+			while(!finished) { System.Threading.Thread.Sleep(5); }
 		}
 	}
 }
diff --git a/test/UnitTest/DirectionsTest.cs b/test/UnitTest/DirectionsTest.cs
index 26800ec..2d4b2da 100644
--- a/test/UnitTest/DirectionsTest.cs
+++ b/test/UnitTest/DirectionsTest.cs
@@ -4,48 +4,45 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace Mapbox.UnitTest
-{
-    using Directions;
-    using Mapbox.Json;
-    using NUnit.Framework;
-
-    /// <summary>
-    /// Test that Directions serializes and deserializes responses correctly.
-    /// </summary>
-    [TestFixture]
-    internal class DirectionsTest
-    {
-        private string basicResponse = "{\"routes\":[{\"legs\":[{\"steps\":[],\"summary\":\"\",\"duration\":214.4,\"distance\":1318.2}],\"geometry\":\"_urwFt}qbMuLp_@jWzPoHhRMK\",\"duration\":214.4,\"distance\":1318.2}],\"waypoints\":[{\"name\":\"East 13th Street\",\"location\":[-73.988909,40.733122]},{\"name\":\"6th Avenue\",\"location\":[-74.00001,40.733004]}],\"code\":\"Ok\"}";
-        private string responseWithSteps = "{\"routes\":[{\"legs\":[{\"steps\":[{\"intersections\":[{\"out\":0,\"entry\":[true],\"bearings\":[299],\"location\":[-73.988909,40.733122]},{\"out\":3,\"location\":[-73.989868,40.733528],\"bearings\":[15,120,195,300],\"entry\":[true,false,false,true],\"in\":1},{\"out\":3,\"location\":[-73.990945,40.733978],\"bearings\":[15,120,195,300],\"entry\":[false,false,true,true],\"in\":1},{\"out\":3,\"location\":[-73.992266,40.734532],\"bearings\":[30,120,210,300],\"entry\":[true,false,false,true],\"in\":1}],\"geometry\":\"_urwFt}qbMqA~DyAvEmBfG{CpJ\",\"maneuver\":{\"bearing_after\":299,\"type\":\"depart\",\"modifier\":\"left\",\"bearing_before\":0,\"location\":[-73.988909,40.733122],\"instruction\":\"Head northwest on East 13th Street\"},\"duration\":90.5,\"distance\":502.1,\"name\":\"East 13th Street\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":2,\"location\":[-73.994118,40.735313],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":1},{\"out\":2,\"location\":[-73.994585,40.734672],\"bearings\":[30,120,210,300],\"entry\":[false,true,true,false],\"in\":0},{\"out\":2,\"location\":[-73.99505,40.734034],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":0},{\"out\":2,\"location\":[-73.995489,40.733437],\"bearings\":[30,120,210,300],\"entry\":[false,true,true,false],\"in\":0},{\"out\":2,\"location\":[-73.995914,40.732847],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":0},{\"out\":2,\"location\":[-73.996351,40.732255],\"bearings\":[30,120,210,300],\"entry\":[false,true,true,false],\"in\":0}],\"geometry\":\"ubswFf~rbM~B|A~BzAtBvAtBrAtBvAh@Vd@`@lAx@JH\",\"maneuver\":{\"bearing_after\":209,\"type\":\"turn\",\"modifier\":\"left\",\"bearing_before\":299,\"location\":[-73.994118,40.735313],\"instruction\":\"Turn left onto 5th Avenue\"},\"duration\":67.8,\"distance\":496.3,\"name\":\"5th Avenue\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":2,\"location\":[-73.996976,40.731414],\"bearings\":[30,120,300],\"entry\":[false,true,true],\"in\":0}],\"geometry\":\"ijrwFbpsbMKPoChHEH\",\"maneuver\":{\"bearing_after\":305,\"type\":\"end of road\",\"modifier\":\"right\",\"bearing_before\":212,\"location\":[-73.996976,40.731414],\"instruction\":\"Turn right onto Washington Square North\"},\"duration\":21,\"distance\":164.2,\"name\":\"Washington Square North\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":3,\"location\":[-73.998612,40.732215],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":1}],\"geometry\":\"korwFhzsbMmCbH\",\"maneuver\":{\"bearing_after\":303,\"type\":\"new name\",\"modifier\":\"straight\",\"bearing_before\":303,\"location\":[-73.998612,40.732215],\"instruction\":\"Continue straight onto Waverly Place\"},\"duration\":34.5,\"distance\":146,\"name\":\"Waverly Place\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":0,\"location\":[-74.000066,40.732929],\"bearings\":[30,120,210,300],\"entry\":[true,false,false,true],\"in\":1}],\"geometry\":\"ysrwFlctbMMK\",\"maneuver\":{\"bearing_after\":30,\"type\":\"turn\",\"modifier\":\"right\",\"bearing_before\":303,\"location\":[-74.000066,40.732929],\"instruction\":\"Turn right onto 6th Avenue\"},\"duration\":0.6,\"distance\":9.6,\"name\":\"6th Avenue\",\"mode\":\"driving\"},{\"intersections\":[{\"in\":0,\"entry\":[true],\"bearings\":[210],\"location\":[-74.00001,40.733004]}],\"geometry\":\"gtrwF`ctbM\",\"maneuver\":{\"bearing_after\":0,\"location\":[-74.000066,40.732929],\"bearing_before\":30,\"type\":\"arrive\",\"instruction\":\"You have arrived at your destination\"},\"duration\":0,\"distance\":0,\"name\":\"6th Avenue\",\"mode\":\"driving\"}],\"summary\":\"East 13th Street, 5th Avenue\",\"duration\":214.4,\"distance\":1318.2}],\"geometry\":\"_urwFt}qbMuLp_@jWzPoHhRMK\",\"duration\":214.4,\"distance\":1318.2}],\"waypoints\":[{\"name\":\"East 13th Street\",\"location\":[-73.988909,40.733122]},{\"name\":\"6th Avenue\",\"location\":[-74.00001,40.733004]}],\"code\":\"Ok\"}";
-        private Directions directions = new Directions(new Mono.FileSource());
-
-        [Test]
-        public void SerializesAndDeserializesBasic()
-        {
-            // First, deserialize the example response
-            DirectionsResponse basicResp = this.directions.Deserialize(this.basicResponse);
-
-            // Then deserialize it back to a string.
-            string basicReserialized = JsonConvert.SerializeObject(basicResp);
-
-            // Ensure the two match
-            Assert.AreEqual(this.basicResponse, basicReserialized);
-        }
-
-        /// <summary> This test will fail, see https://github.com/mapbox/mapbox-sdk-unity/issues/51. </summary>
-        [Test]
-        [Ignore("Ignore a fixture")]
-        public void SerializesAndDeserializesWithSteps()
-        {
-            // First, deserialize the example response.
-            DirectionsResponse withStepsResp = this.directions.Deserialize(this.responseWithSteps);
-
-            // Then deserialize it back to a string.
-            string withStepsReserialized = JsonConvert.SerializeObject(withStepsResp);
-
-            // Ensure the two match.
-            Assert.AreEqual(this.responseWithSteps, withStepsReserialized);
-        }
-    }
+namespace Mapbox.UnitTest {
+	using Directions;
+	using Mapbox.Json;
+	using NUnit.Framework;
+
+	/// <summary>
+	/// Test that Directions serializes and deserializes responses correctly.
+	/// </summary>
+	[TestFixture]
+	internal class DirectionsTest {
+		private string basicResponse = "{\"routes\":[{\"legs\":[{\"steps\":[],\"summary\":\"\",\"duration\":214.4,\"distance\":1318.2}],\"geometry\":\"_urwFt}qbMuLp_@jWzPoHhRMK\",\"duration\":214.4,\"distance\":1318.2}],\"waypoints\":[{\"name\":\"East 13th Street\",\"location\":[-73.988909,40.733122]},{\"name\":\"6th Avenue\",\"location\":[-74.00001,40.733004]}],\"code\":\"Ok\"}";
+		private string responseWithSteps = "{\"routes\":[{\"legs\":[{\"steps\":[{\"intersections\":[{\"out\":0,\"entry\":[true],\"bearings\":[299],\"location\":[-73.988909,40.733122]},{\"out\":3,\"location\":[-73.989868,40.733528],\"bearings\":[15,120,195,300],\"entry\":[true,false,false,true],\"in\":1},{\"out\":3,\"location\":[-73.990945,40.733978],\"bearings\":[15,120,195,300],\"entry\":[false,false,true,true],\"in\":1},{\"out\":3,\"location\":[-73.992266,40.734532],\"bearings\":[30,120,210,300],\"entry\":[true,false,false,true],\"in\":1}],\"geometry\":\"_urwFt}qbMqA~DyAvEmBfG{CpJ\",\"maneuver\":{\"bearing_after\":299,\"type\":\"depart\",\"modifier\":\"left\",\"bearing_before\":0,\"location\":[-73.988909,40.733122],\"instruction\":\"Head northwest on East 13th Street\"},\"duration\":90.5,\"distance\":502.1,\"name\":\"East 13th Street\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":2,\"location\":[-73.994118,40.735313],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":1},{\"out\":2,\"location\":[-73.994585,40.734672],\"bearings\":[30,120,210,300],\"entry\":[false,true,true,false],\"in\":0},{\"out\":2,\"location\":[-73.99505,40.734034],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":0},{\"out\":2,\"location\":[-73.995489,40.733437],\"bearings\":[30,120,210,300],\"entry\":[false,true,true,false],\"in\":0},{\"out\":2,\"location\":[-73.995914,40.732847],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":0},{\"out\":2,\"location\":[-73.996351,40.732255],\"bearings\":[30,120,210,300],\"entry\":[false,true,true,false],\"in\":0}],\"geometry\":\"ubswFf~rbM~B|A~BzAtBvAtBrAtBvAh@Vd@`@lAx@JH\",\"maneuver\":{\"bearing_after\":209,\"type\":\"turn\",\"modifier\":\"left\",\"bearing_before\":299,\"location\":[-73.994118,40.735313],\"instruction\":\"Turn left onto 5th Avenue\"},\"duration\":67.8,\"distance\":496.3,\"name\":\"5th Avenue\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":2,\"location\":[-73.996976,40.731414],\"bearings\":[30,120,300],\"entry\":[false,true,true],\"in\":0}],\"geometry\":\"ijrwFbpsbMKPoChHEH\",\"maneuver\":{\"bearing_after\":305,\"type\":\"end of road\",\"modifier\":\"right\",\"bearing_before\":212,\"location\":[-73.996976,40.731414],\"instruction\":\"Turn right onto Washington Square North\"},\"duration\":21,\"distance\":164.2,\"name\":\"Washington Square North\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":3,\"location\":[-73.998612,40.732215],\"bearings\":[30,120,210,300],\"entry\":[false,false,true,true],\"in\":1}],\"geometry\":\"korwFhzsbMmCbH\",\"maneuver\":{\"bearing_after\":303,\"type\":\"new name\",\"modifier\":\"straight\",\"bearing_before\":303,\"location\":[-73.998612,40.732215],\"instruction\":\"Continue straight onto Waverly Place\"},\"duration\":34.5,\"distance\":146,\"name\":\"Waverly Place\",\"mode\":\"driving\"},{\"intersections\":[{\"out\":0,\"location\":[-74.000066,40.732929],\"bearings\":[30,120,210,300],\"entry\":[true,false,false,true],\"in\":1}],\"geometry\":\"ysrwFlctbMMK\",\"maneuver\":{\"bearing_after\":30,\"type\":\"turn\",\"modifier\":\"right\",\"bearing_before\":303,\"location\":[-74.000066,40.732929],\"instruction\":\"Turn right onto 6th Avenue\"},\"duration\":0.6,\"distance\":9.6,\"name\":\"6th Avenue\",\"mode\":\"driving\"},{\"intersections\":[{\"in\":0,\"entry\":[true],\"bearings\":[210],\"location\":[-74.00001,40.733004]}],\"geometry\":\"gtrwF`ctbM\",\"maneuver\":{\"bearing_after\":0,\"location\":[-74.000066,40.732929],\"bearing_before\":30,\"type\":\"arrive\",\"instruction\":\"You have arrived at your destination\"},\"duration\":0,\"distance\":0,\"name\":\"6th Avenue\",\"mode\":\"driving\"}],\"summary\":\"East 13th Street, 5th Avenue\",\"duration\":214.4,\"distance\":1318.2}],\"geometry\":\"_urwFt}qbMuLp_@jWzPoHhRMK\",\"duration\":214.4,\"distance\":1318.2}],\"waypoints\":[{\"name\":\"East 13th Street\",\"location\":[-73.988909,40.733122]},{\"name\":\"6th Avenue\",\"location\":[-74.00001,40.733004]}],\"code\":\"Ok\"}";
+		private Directions directions = new Directions(new Mono.FileSource());
+
+		[Test]
+		public void SerializesAndDeserializesBasic() {
+			// First, deserialize the example response
+			DirectionsResponse basicResp = this.directions.Deserialize(this.basicResponse);
+
+			// Then deserialize it back to a string.
+			string basicReserialized = JsonConvert.SerializeObject(basicResp);
+
+			// Ensure the two match
+			Assert.AreEqual(this.basicResponse, basicReserialized);
+		}
+
+		//TODO: implement a proper Json object comaparer
+		/// <summary> This test will fail, see https://github.com/mapbox/mapbox-sdk-unity/issues/51. </summary>
+		[Test]
+		[Ignore("That's not working as the order of JSON properties is not guaranteed. We need a proper object comparer.")]
+		public void SerializesAndDeserializesWithSteps() {
+			// First, deserialize the example response.
+			DirectionsResponse withStepsResp = this.directions.Deserialize(this.responseWithSteps);
+
+			// Then deserialize it back to a string.
+			string withStepsReserialized = JsonConvert.SerializeObject(withStepsResp);
+
+			// Ensure the two match.
+			Assert.AreEqual(this.responseWithSteps, withStepsReserialized);
+		}
+	}
 }
diff --git a/test/UnitTest/VectorTileTest.cs b/test/UnitTest/VectorTileTest.cs
index 1966576..19fda26 100644
--- a/test/UnitTest/VectorTileTest.cs
+++ b/test/UnitTest/VectorTileTest.cs
@@ -131,7 +131,9 @@ public void ParseFailure() {
 			map.Zoom = 13;
 
 			//wait for all requests
-			while(!_TileLoadingFinished) {
+			//TODO: invesitgate: with only one tile being requested on ligh latency networks
+			//sometime QueueEmtpy is fired before TileReceived
+			while(!_TileLoadingFinished && !(_Tiles.Count > 0 || _FailedTiles.Count > 0)) {
 				System.Threading.Thread.Sleep(5);
 			}