diff --git a/.gitignore b/.gitignore
index c907dbdec..38dfa7307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
 /mason_packages
 /config.gypi
 /config-ios.gypi
-/config/constants_local.cpp
 /build
 /include/mbgl/shader/shaders.hpp
 /src/shader/shaders_gl.cpp
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi
index 022480350..279051968 100644
--- a/gyp/mbgl-core.gypi
+++ b/gyp/mbgl-core.gypi
@@ -21,7 +21,6 @@
       },
       'sources': [
         '<!@(find src -name "*.cpp")',
-        '<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")',
         '<!@(find src -name "*.c")',
         '<!@(find src -name "*.h")',
         '<!@(find include -name "*.hpp")',
@@ -31,6 +30,7 @@
       ],
       'include_dirs': [
         '../include',
+        '../src',
       ],
       'conditions': [
         ['OS == "mac"', {
diff --git a/gyp/mbgl-headless.gypi b/gyp/mbgl-headless.gypi
index da11c8781..a96ec24c9 100644
--- a/gyp/mbgl-headless.gypi
+++ b/gyp/mbgl-headless.gypi
@@ -29,7 +29,6 @@
       'sources': [
         '../platform/default/headless_view.cpp',
         '../platform/default/headless_display.cpp',
-        '../platform/default/caching_http_file_source.cpp',
       ],
     },
   ],
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index c26e72849..dd1c9c0c2 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/mbgl-ios.gypi
@@ -36,7 +36,6 @@
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
         '../platform/darwin/image.mm',
-        '../platform/default/caching_http_file_source.cpp',
       ],
       'include_dirs': [
         '../include',
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index 510703140..9d979ddf1 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -35,7 +35,6 @@
         '../platform/default/image_reader.cpp',
         '../platform/default/png_reader.cpp',
         '../platform/default/jpeg_reader.cpp',
-        '../platform/default/caching_http_file_source.cpp',
       ],
       'include_dirs': [
         '../include',
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index 015ee13ab..76c22f5ad 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -11,7 +11,6 @@
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
         '../platform/darwin/image.mm',
-        '../platform/default/caching_http_file_source.cpp',
       ],
       'include_dirs': [
         '../include',
diff --git a/include/libtess2/LICENSE.txt b/include/libtess2/LICENSE.txt
deleted file mode 100644
index 30133655c..000000000
--- a/include/libtess2/LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-** SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-** Copyright (C) [dates of first publication] Silicon Graphics, Inc.
-** All Rights Reserved.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-** of the Software, and to permit persons to whom the Software is furnished to do so,
-** subject to the following conditions:
-**
-** The above copyright notice including the dates of first publication and either this
-** permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be
-** included in all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-** INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-** PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC.
-** BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-** OR OTHER DEALINGS IN THE SOFTWARE.
-**
-** Except as contained in this notice, the name of Silicon Graphics, Inc. shall not
-** be used in advertising or otherwise to promote the sale, use or other dealings in
-** this Software without prior written authorization from Silicon Graphics, Inc.
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 4e6eef89c..3a50a7013 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -2,9 +2,6 @@
 #define MBGL_MAP_MAP
 
 #include <mbgl/map/transform.hpp>
-#include <mbgl/renderer/painter.hpp>
-#include <mbgl/geometry/glyph_atlas.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/time.hpp>
 #include <mbgl/util/uv.hpp>
@@ -19,6 +16,7 @@
 
 namespace mbgl {
 
+class Painter;
 class GlyphStore;
 class LayerDescription;
 class Sprite;
@@ -29,6 +27,8 @@ class StyleSource;
 class TexturePool;
 class FileSource;
 class View;
+class GlyphAtlas;
+class SpriteAtlas;
 
 class Map : private util::noncopyable {
     typedef void (*stop_callback)(void *);
@@ -182,13 +182,13 @@ private:
     FileSource& fileSource;
 
     util::ptr<Style> style;
-    GlyphAtlas glyphAtlas;
+    const std::unique_ptr<GlyphAtlas> glyphAtlas;
     util::ptr<GlyphStore> glyphStore;
-    SpriteAtlas spriteAtlas;
+    const std::unique_ptr<SpriteAtlas> spriteAtlas;
     util::ptr<Sprite> sprite;
     util::ptr<TexturePool> texturePool;
 
-    Painter painter;
+    const std::unique_ptr<Painter> painter;
 
     std::string styleURL;
     std::string styleJSON = "";
diff --git a/include/mbgl/map/transform_state.hpp b/include/mbgl/map/transform_state.hpp
index bb330c101..6dc34bd87 100644
--- a/include/mbgl/map/transform_state.hpp
+++ b/include/mbgl/map/transform_state.hpp
@@ -4,7 +4,6 @@
 #include <mbgl/map/tile.hpp>
 
 #include <mbgl/util/mat4.hpp>
-#include <mbgl/util/vec.hpp>
 
 #include <cstdint>
 #include <array>
diff --git a/include/mbgl/platform/gl.hpp b/include/mbgl/platform/gl.hpp
index a63dd9b1f..d16478dab 100644
--- a/include/mbgl/platform/gl.hpp
+++ b/include/mbgl/platform/gl.hpp
@@ -134,9 +134,9 @@ extern PFNGLISVERTEXARRAYPROC IsVertexArray;
 // static int indent = 0;
 inline void start_group(const std::string &str) {
     if (gl::PushDebugGroup != nullptr) {
-        gl::PushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, str.size(), str.c_str());
+        gl::PushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, GLsizei(str.size()), str.c_str());
     } else if (gl::PushGroupMarkerEXT != nullptr) {
-        gl::PushGroupMarkerEXT(str.size(), str.c_str());
+        gl::PushGroupMarkerEXT(GLsizei(str.size()), str.c_str());
     }
     // fprintf(stderr, "%s%s\n", std::string(indent * 4, ' ').c_str(), str.c_str());
     // indent++;
diff --git a/include/mbgl/platform/default/caching_http_file_source.hpp b/include/mbgl/storage/caching_http_file_source.hpp
similarity index 94%
rename from include/mbgl/platform/default/caching_http_file_source.hpp
rename to include/mbgl/storage/caching_http_file_source.hpp
index c39447488..a093ef244 100644
--- a/include/mbgl/platform/default/caching_http_file_source.hpp
+++ b/include/mbgl/storage/caching_http_file_source.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_STORAGE_CACHING_HTTP_FILE_SOURCE
 #define MBGL_STORAGE_CACHING_HTTP_FILE_SOURCE
 
-#include <mbgl/storage/file_source.hpp>
+#include "file_source.hpp"
 
 #include <thread>
 #include <unordered_map>
@@ -16,7 +16,7 @@ class SQLiteStore;
 class CachingHTTPFileSource : public FileSource {
 public:
     CachingHTTPFileSource(const std::string &path_);
-    ~CachingHTTPFileSource();
+    virtual ~CachingHTTPFileSource();
 
     // Stores and checks the libuv loop for requests
     void setLoop(uv_loop_t*);
diff --git a/include/mbgl/storage/file_source.hpp b/include/mbgl/storage/file_source.hpp
index e825a9d61..eeda529bf 100644
--- a/include/mbgl/storage/file_source.hpp
+++ b/include/mbgl/storage/file_source.hpp
@@ -2,14 +2,15 @@
 #define MBGL_STORAGE_FILE_SOURCE
 
 #include <mbgl/util/noncopyable.hpp>
-#include <mbgl/storage/resource_type.hpp>
-#include <mbgl/storage/request.hpp>
+#include "resource_type.hpp"
+#include "request.hpp"
 
 #include <string>
 #include <functional>
 
 typedef struct uv_loop_s uv_loop_t;
 
+
 namespace mbgl {
 
 class FileSource : public util::noncopyable {
diff --git a/include/mbgl/storage/http_request_baton.hpp b/include/mbgl/storage/http_request_baton.hpp
index 545f9e236..74c0ff498 100644
--- a/include/mbgl/storage/http_request_baton.hpp
+++ b/include/mbgl/storage/http_request_baton.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_STORAGE_HTTP_REQUEST_BATON
 #define MBGL_STORAGE_HTTP_REQUEST_BATON
 
-#include <mbgl/storage/response.hpp>
+#include "response.hpp"
 #include <mbgl/util/ptr.hpp>
 
 #include <string>
diff --git a/include/mbgl/storage/request.hpp b/include/mbgl/storage/request.hpp
index 11b5541d1..f63283aa2 100644
--- a/include/mbgl/storage/request.hpp
+++ b/include/mbgl/storage/request.hpp
@@ -1,8 +1,9 @@
 #ifndef MBGL_STORAGE_REQUEST
 #define MBGL_STORAGE_REQUEST
 
-#include <mbgl/storage/request_callback.hpp>
-#include <mbgl/storage/response.hpp>
+#include "request_callback.hpp"
+#include "response.hpp"
+
 #include <mbgl/util/ptr.hpp>
 
 #include <thread>
diff --git a/include/mbgl/util/vec.hpp b/include/mbgl/util/vec.hpp
index 0179254fd..32de85275 100644
--- a/include/mbgl/util/vec.hpp
+++ b/include/mbgl/util/vec.hpp
@@ -105,11 +105,6 @@ struct vec4 {
 };
 
 
-struct box {
-    vec2<double> tl, tr, bl, br;
-    vec2<double> center;
-};
-
 typedef vec2<int16_t> Coordinate;
 
 }
diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa
index 61cde4549..a44ac9c3d 160000
--- a/ios/mapbox-gl-cocoa
+++ b/ios/mapbox-gl-cocoa
@@ -1 +1 @@
-Subproject commit 61cde4549c1f4a9903b4039c5e2a9a05f66285c8
+Subproject commit a44ac9c3dddc564cb3bddc8b3a89d45e13ff2a0e
diff --git a/linux/main.cpp b/linux/main.cpp
index 9cf23df95..d6994fd01 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -4,7 +4,7 @@
 #include <mbgl/platform/default/settings_json.hpp>
 #include <mbgl/platform/default/glfw_view.hpp>
 #include <mbgl/platform/default/log_stderr.hpp>
-#include <mbgl/platform/default/caching_http_file_source.hpp>
+#include <mbgl/storage/caching_http_file_source.hpp>
 
 #include <signal.h>
 #include <getopt.h>
diff --git a/macosx/main.mm b/macosx/main.mm
index fe654e1f7..77305a325 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -1,8 +1,9 @@
+#include <mbgl/platform/platform.hpp>
 #include <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
 #include <mbgl/platform/darwin/log_nslog.hpp>
 #include <mbgl/platform/darwin/Reachability.h>
 #include <mbgl/platform/default/glfw_view.hpp>
-#include <mbgl/platform/default/caching_http_file_source.hpp>
+#include <mbgl/storage/caching_http_file_source.hpp>
 
 #import <Foundation/Foundation.h>
 
diff --git a/src/clipper/clipper.cpp b/src/clipper/clipper.cpp
index ea468d69e..f5d8cd3c9 100755
--- a/src/clipper/clipper.cpp
+++ b/src/clipper/clipper.cpp
@@ -38,7 +38,7 @@
 *                                                                              *
 *******************************************************************************/
 
-#include <clipper/clipper.hpp>
+#include "clipper.hpp"
 #include <cmath>
 #include <vector>
 #include <algorithm>
diff --git a/include/clipper/clipper.hpp b/src/clipper/clipper.hpp
similarity index 100%
rename from include/clipper/clipper.hpp
rename to src/clipper/clipper.hpp
diff --git a/src/csscolorparser/csscolorparser.cpp b/src/csscolorparser/csscolorparser.cpp
index 938470f19..7ba989fde 100644
--- a/src/csscolorparser/csscolorparser.cpp
+++ b/src/csscolorparser/csscolorparser.cpp
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-#include <csscolorparser/csscolorparser.hpp>
+#include "csscolorparser.hpp"
 
 #include <cstdint>
 #include <vector>
diff --git a/include/csscolorparser/csscolorparser.hpp b/src/csscolorparser/csscolorparser.hpp
similarity index 100%
rename from include/csscolorparser/csscolorparser.hpp
rename to src/csscolorparser/csscolorparser.hpp
diff --git a/src/libtess2/bucketalloc.c b/src/libtess2/bucketalloc.c
index df1a83c76..efb2b9813 100755
--- a/src/libtess2/bucketalloc.c
+++ b/src/libtess2/bucketalloc.c
@@ -35,7 +35,7 @@ extern "C" {
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <libtess2/tesselator.h>
+#include "tesselator.h"
 
 //#define CHECK_BOUNDS
 
diff --git a/src/libtess2/bucketalloc.h b/src/libtess2/bucketalloc.h
index 7168cd7aa..077d76813 100755
--- a/src/libtess2/bucketalloc.h
+++ b/src/libtess2/bucketalloc.h
@@ -36,7 +36,7 @@
 extern "C" {
 #endif
 
-#include <libtess2/tesselator.h>
+#include "tesselator.h"
 
 struct BucketAlloc *createBucketAlloc( TESSalloc* alloc, const char *name,
 									  unsigned int itemSize, unsigned int bucketSize );
diff --git a/src/libtess2/dict.c b/src/libtess2/dict.c
index 53c66568d..dd7bade2c 100755
--- a/src/libtess2/dict.c
+++ b/src/libtess2/dict.c
@@ -30,7 +30,7 @@
 */
 
 #include <stddef.h>
-#include <libtess2/tesselator.h>
+#include "tesselator.h"
 #include "bucketalloc.h"
 #include "dict.h"
 
diff --git a/src/libtess2/mesh.h b/src/libtess2/mesh.h
index d6142716a..1e16a194c 100755
--- a/src/libtess2/mesh.h
+++ b/src/libtess2/mesh.h
@@ -32,7 +32,7 @@
 #ifndef MESH_H
 #define MESH_H
 
-#include <libtess2/tesselator.h>
+#include "tesselator.h"
 
 typedef struct TESSmesh TESSmesh;
 typedef struct TESSvertex TESSvertex;
diff --git a/src/libtess2/priorityq.c b/src/libtess2/priorityq.c
index 49e1c012f..6229b6bfc 100755
--- a/src/libtess2/priorityq.c
+++ b/src/libtess2/priorityq.c
@@ -32,7 +32,7 @@
 //#include "tesos.h"
 #include <stddef.h>
 #include <assert.h>
-#include <libtess2/tesselator.h>
+#include "tesselator.h"
 #include "priorityq.h"
 
 
diff --git a/src/libtess2/tess.h b/src/libtess2/tess.h
index e4673b34f..8ed75600d 100755
--- a/src/libtess2/tess.h
+++ b/src/libtess2/tess.h
@@ -37,7 +37,7 @@
 #include "mesh.h"
 #include "dict.h"
 #include "priorityq.h"
-#include <libtess2/tesselator.h>
+#include "tesselator.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libtess2/tesselator.h b/src/libtess2/tesselator.h
similarity index 100%
rename from include/libtess2/tesselator.h
rename to src/libtess2/tesselator.h
diff --git a/include/mbgl/geometry/anchor.hpp b/src/mbgl/geometry/anchor.hpp
similarity index 100%
rename from include/mbgl/geometry/anchor.hpp
rename to src/mbgl/geometry/anchor.hpp
diff --git a/include/mbgl/geometry/binpack.hpp b/src/mbgl/geometry/binpack.hpp
similarity index 100%
rename from include/mbgl/geometry/binpack.hpp
rename to src/mbgl/geometry/binpack.hpp
diff --git a/include/mbgl/geometry/buffer.hpp b/src/mbgl/geometry/buffer.hpp
similarity index 100%
rename from include/mbgl/geometry/buffer.hpp
rename to src/mbgl/geometry/buffer.hpp
diff --git a/src/geometry/debug_font_buffer.cpp b/src/mbgl/geometry/debug_font_buffer.cpp
similarity index 96%
rename from src/geometry/debug_font_buffer.cpp
rename to src/mbgl/geometry/debug_font_buffer.cpp
index 6c233f88d..1ec71463e 100644
--- a/src/geometry/debug_font_buffer.cpp
+++ b/src/mbgl/geometry/debug_font_buffer.cpp
@@ -1,10 +1,10 @@
 #include <mbgl/geometry/debug_font_buffer.hpp>
+#include <mbgl/geometry/debug_font_data.hpp>
+
 #include <mbgl/platform/gl.hpp>
 #include <cmath>
 #include <cstring>
 
-#include "debug_font_data.hpp"
-
 using namespace mbgl;
 
 void DebugFontBuffer::addText(const char *text, double left, double baseline, double scale) {
diff --git a/include/mbgl/geometry/debug_font_buffer.hpp b/src/mbgl/geometry/debug_font_buffer.hpp
similarity index 89%
rename from include/mbgl/geometry/debug_font_buffer.hpp
rename to src/mbgl/geometry/debug_font_buffer.hpp
index 7cceb0f57..802b5dbaa 100644
--- a/include/mbgl/geometry/debug_font_buffer.hpp
+++ b/src/mbgl/geometry/debug_font_buffer.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_GEOMETRY_DEBUG_FONT_BUFFER
 #define MBGL_GEOMETRY_DEBUG_FONT_BUFFER
 
-#include "buffer.hpp"
+#include <mbgl/geometry/buffer.hpp>
 
 namespace mbgl {
 
diff --git a/src/geometry/debug_font_data.hpp b/src/mbgl/geometry/debug_font_data.hpp
similarity index 100%
rename from src/geometry/debug_font_data.hpp
rename to src/mbgl/geometry/debug_font_data.hpp
diff --git a/src/geometry/elements_buffer.cpp b/src/mbgl/geometry/elements_buffer.cpp
similarity index 100%
rename from src/geometry/elements_buffer.cpp
rename to src/mbgl/geometry/elements_buffer.cpp
diff --git a/include/mbgl/geometry/elements_buffer.hpp b/src/mbgl/geometry/elements_buffer.hpp
similarity index 99%
rename from include/mbgl/geometry/elements_buffer.hpp
rename to src/mbgl/geometry/elements_buffer.hpp
index 045560f9a..9255337cb 100644
--- a/include/mbgl/geometry/elements_buffer.hpp
+++ b/src/mbgl/geometry/elements_buffer.hpp
@@ -3,6 +3,7 @@
 
 #include <mbgl/geometry/buffer.hpp>
 #include <mbgl/geometry/vao.hpp>
+
 #include <mbgl/util/noncopyable.hpp>
 
 #include <array>
diff --git a/src/geometry/fill_buffer.cpp b/src/mbgl/geometry/fill_buffer.cpp
similarity index 99%
rename from src/geometry/fill_buffer.cpp
rename to src/mbgl/geometry/fill_buffer.cpp
index c75ad3477..339269943 100644
--- a/src/geometry/fill_buffer.cpp
+++ b/src/mbgl/geometry/fill_buffer.cpp
@@ -1,4 +1,5 @@
 #include <mbgl/geometry/fill_buffer.hpp>
+
 #include <mbgl/platform/gl.hpp>
 
 #include <climits>
diff --git a/include/mbgl/geometry/fill_buffer.hpp b/src/mbgl/geometry/fill_buffer.hpp
similarity index 90%
rename from include/mbgl/geometry/fill_buffer.hpp
rename to src/mbgl/geometry/fill_buffer.hpp
index 4a3d5a5b3..2cd1637fa 100644
--- a/include/mbgl/geometry/fill_buffer.hpp
+++ b/src/mbgl/geometry/fill_buffer.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_GEOMETRY_FILL_BUFFER
 #define MBGL_GEOMETRY_FILL_BUFFER
 
-#include "buffer.hpp"
+#include <mbgl/geometry/buffer.hpp>
 #include <vector>
 #include <cstdint>
 
diff --git a/include/mbgl/geometry/geometry.hpp b/src/mbgl/geometry/geometry.hpp
similarity index 100%
rename from include/mbgl/geometry/geometry.hpp
rename to src/mbgl/geometry/geometry.hpp
diff --git a/src/geometry/glyph_atlas.cpp b/src/mbgl/geometry/glyph_atlas.cpp
similarity index 99%
rename from src/geometry/glyph_atlas.cpp
rename to src/mbgl/geometry/glyph_atlas.cpp
index 40459821f..bafcf2b00 100644
--- a/src/geometry/glyph_atlas.cpp
+++ b/src/mbgl/geometry/glyph_atlas.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/map/vector_tile.hpp>
+
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/platform.hpp>
 
diff --git a/include/mbgl/geometry/glyph_atlas.hpp b/src/mbgl/geometry/glyph_atlas.hpp
similarity index 100%
rename from include/mbgl/geometry/glyph_atlas.hpp
rename to src/mbgl/geometry/glyph_atlas.hpp
diff --git a/src/geometry/icon_buffer.cpp b/src/mbgl/geometry/icon_buffer.cpp
similarity index 100%
rename from src/geometry/icon_buffer.cpp
rename to src/mbgl/geometry/icon_buffer.cpp
diff --git a/include/mbgl/geometry/icon_buffer.hpp b/src/mbgl/geometry/icon_buffer.hpp
similarity index 92%
rename from include/mbgl/geometry/icon_buffer.hpp
rename to src/mbgl/geometry/icon_buffer.hpp
index e7e5f4035..08c968700 100644
--- a/include/mbgl/geometry/icon_buffer.hpp
+++ b/src/mbgl/geometry/icon_buffer.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_GEOMETRY_ICON_BUFFER
 #define MBGL_GEOMETRY_ICON_BUFFER
 
-#include "buffer.hpp"
+#include <mbgl/geometry/buffer.hpp>
 
 #include <array>
 
diff --git a/src/geometry/line_buffer.cpp b/src/mbgl/geometry/line_buffer.cpp
similarity index 100%
rename from src/geometry/line_buffer.cpp
rename to src/mbgl/geometry/line_buffer.cpp
diff --git a/include/mbgl/geometry/line_buffer.hpp b/src/mbgl/geometry/line_buffer.hpp
similarity index 96%
rename from include/mbgl/geometry/line_buffer.hpp
rename to src/mbgl/geometry/line_buffer.hpp
index 5012bb12a..1c217b59d 100644
--- a/include/mbgl/geometry/line_buffer.hpp
+++ b/src/mbgl/geometry/line_buffer.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_GEOMETRY_LINE_BUFFER
 #define MBGL_GEOMETRY_LINE_BUFFER
 
-#include "buffer.hpp"
+#include <mbgl/geometry/buffer.hpp>
 
 namespace mbgl {
 
diff --git a/src/geometry/resample.cpp b/src/mbgl/geometry/resample.cpp
similarity index 100%
rename from src/geometry/resample.cpp
rename to src/mbgl/geometry/resample.cpp
diff --git a/include/mbgl/geometry/resample.hpp b/src/mbgl/geometry/resample.hpp
similarity index 100%
rename from include/mbgl/geometry/resample.hpp
rename to src/mbgl/geometry/resample.hpp
diff --git a/src/geometry/sprite_atlas.cpp b/src/mbgl/geometry/sprite_atlas.cpp
similarity index 100%
rename from src/geometry/sprite_atlas.cpp
rename to src/mbgl/geometry/sprite_atlas.cpp
diff --git a/include/mbgl/geometry/sprite_atlas.hpp b/src/mbgl/geometry/sprite_atlas.hpp
similarity index 99%
rename from include/mbgl/geometry/sprite_atlas.hpp
rename to src/mbgl/geometry/sprite_atlas.hpp
index 9fb42a30b..9e0fe995b 100644
--- a/include/mbgl/geometry/sprite_atlas.hpp
+++ b/src/mbgl/geometry/sprite_atlas.hpp
@@ -2,6 +2,7 @@
 #define MBGL_GEOMETRY_SPRITE_ATLAS
 
 #include <mbgl/geometry/binpack.hpp>
+
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/ptr.hpp>
 
diff --git a/src/geometry/static_vertex_buffer.cpp b/src/mbgl/geometry/static_vertex_buffer.cpp
similarity index 100%
rename from src/geometry/static_vertex_buffer.cpp
rename to src/mbgl/geometry/static_vertex_buffer.cpp
diff --git a/include/mbgl/geometry/static_vertex_buffer.hpp b/src/mbgl/geometry/static_vertex_buffer.hpp
similarity index 100%
rename from include/mbgl/geometry/static_vertex_buffer.hpp
rename to src/mbgl/geometry/static_vertex_buffer.hpp
diff --git a/src/geometry/text_buffer.cpp b/src/mbgl/geometry/text_buffer.cpp
similarity index 100%
rename from src/geometry/text_buffer.cpp
rename to src/mbgl/geometry/text_buffer.cpp
diff --git a/include/mbgl/geometry/text_buffer.hpp b/src/mbgl/geometry/text_buffer.hpp
similarity index 92%
rename from include/mbgl/geometry/text_buffer.hpp
rename to src/mbgl/geometry/text_buffer.hpp
index 159f3207a..4687b32f9 100644
--- a/include/mbgl/geometry/text_buffer.hpp
+++ b/src/mbgl/geometry/text_buffer.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_GEOMETRY_TEXT_BUFFER
 #define MBGL_GEOMETRY_TEXT_BUFFER
 
-#include "buffer.hpp"
+#include <mbgl/geometry/buffer.hpp>
 #include <array>
 
 namespace mbgl {
diff --git a/src/geometry/vao.cpp b/src/mbgl/geometry/vao.cpp
similarity index 100%
rename from src/geometry/vao.cpp
rename to src/mbgl/geometry/vao.cpp
diff --git a/include/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp
similarity index 100%
rename from include/mbgl/geometry/vao.hpp
rename to src/mbgl/geometry/vao.hpp
diff --git a/src/map/map.cpp b/src/mbgl/map/map.cpp
similarity index 95%
rename from src/map/map.cpp
rename to src/mbgl/map/map.cpp
index 822a98d63..5be29d754 100644
--- a/src/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -1,7 +1,8 @@
 #include <mbgl/map/map.hpp>
-#include <mbgl/map/source.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/platform/platform.hpp>
+#include <mbgl/map/source.hpp>
+#include <mbgl/renderer/painter.hpp>
 #include <mbgl/map/sprite.hpp>
 #include <mbgl/util/transition.hpp>
 #include <mbgl/util/time.hpp>
@@ -15,6 +16,7 @@
 #include <mbgl/style/style.hpp>
 #include <mbgl/text/glyph_store.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
+#include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_layer_group.hpp>
 #include <mbgl/style/style_bucket.hpp>
 #include <mbgl/util/texture_pool.hpp>
@@ -93,10 +95,10 @@ Map::Map(View& view_, FileSource& fileSource_)
 #endif
       transform(view_),
       fileSource(fileSource_),
-      glyphAtlas(1024, 1024),
-      spriteAtlas(512, 512),
+      glyphAtlas(util::make_unique<GlyphAtlas>(1024, 1024)),
+      spriteAtlas(util::make_unique<SpriteAtlas>(512, 512)),
       texturePool(std::make_shared<TexturePool>()),
-      painter(spriteAtlas, glyphAtlas)
+      painter(util::make_unique<Painter>(*spriteAtlas, *glyphAtlas))
 {
     view.initialize(this);
     // Make sure that we're doing an initial drawing in all cases.
@@ -175,7 +177,8 @@ void Map::start() {
     });
 
     asyncCleanup = util::make_unique<uv::async>(**loop, [this]() {
-        painter.cleanup();
+        assert(painter);
+        painter->cleanup();
     });
 
     thread = std::thread([this]() {
@@ -279,7 +282,8 @@ void Map::cleanup() {
 }
 
 void Map::terminate() {
-    painter.terminate();
+    assert(painter);
+    painter->terminate();
 }
 
 void Map::setReachability(bool reachable) {
@@ -295,8 +299,9 @@ void Map::setReachability(bool reachable) {
 
 void Map::setup() {
     assert(std::this_thread::get_id() == mapThread);
+    assert(painter);
     view.make_active();
-    painter.setup();
+    painter->setup();
     view.make_inactive();
 }
 
@@ -500,7 +505,8 @@ void Map::stopRotating() {
 
 void Map::setDebug(bool value) {
     debug = value;
-    painter.setDebug(debug);
+    assert(painter);
+    painter->setDebug(debug);
     update();
 }
 
@@ -583,8 +589,8 @@ void Map::updateSources(const util::ptr<StyleLayerGroup> &group) {
 void Map::updateTiles() {
     for (const auto& source : activeSources) {
         source->source->update(*this, getWorker(),
-                               style, glyphAtlas, *glyphStore,
-                               spriteAtlas, getSprite(),
+                               style, *glyphAtlas, *glyphStore,
+                               *spriteAtlas, getSprite(),
                                *texturePool, fileSource, [this](){ update(); });
     }
 }
@@ -627,8 +633,8 @@ void Map::prepare() {
     style->updateProperties(state.getNormalizedZoom(), animationTime);
 
     // Allow the sprite atlas to potentially pull new sprite images if needed.
-    spriteAtlas.resize(state.getPixelRatio());
-    spriteAtlas.setSprite(getSprite());
+    spriteAtlas->resize(state.getPixelRatio());
+    spriteAtlas->setSprite(getSprite());
 
     updateTiles();
 }
@@ -636,7 +642,8 @@ void Map::prepare() {
 void Map::render() {
     view.make_active();
 
-    painter.render(*style, activeSources,
+    assert(painter);
+    painter->render(*style, activeSources,
                    state, animationTime);
     // Schedule another rerender when we definitely need a next frame.
     if (transform.needsTransition() || style->hasTransitions()) {
diff --git a/src/map/raster_tile_data.cpp b/src/mbgl/map/raster_tile_data.cpp
similarity index 100%
rename from src/map/raster_tile_data.cpp
rename to src/mbgl/map/raster_tile_data.cpp
diff --git a/include/mbgl/map/raster_tile_data.hpp b/src/mbgl/map/raster_tile_data.hpp
similarity index 100%
rename from include/mbgl/map/raster_tile_data.hpp
rename to src/mbgl/map/raster_tile_data.hpp
diff --git a/src/map/source.cpp b/src/mbgl/map/source.cpp
similarity index 99%
rename from src/map/source.cpp
rename to src/mbgl/map/source.cpp
index f4f5a1b81..8e67ffb86 100644
--- a/src/map/source.cpp
+++ b/src/mbgl/map/source.cpp
@@ -10,6 +10,7 @@
 #include <mbgl/util/vec.hpp>
 #include <mbgl/util/math.hpp>
 #include <mbgl/util/std.hpp>
+#include <mbgl/util/box.hpp>
 #include <mbgl/util/mapbox.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/style/style_layer.hpp>
diff --git a/include/mbgl/map/source.hpp b/src/mbgl/map/source.hpp
similarity index 100%
rename from include/mbgl/map/source.hpp
rename to src/mbgl/map/source.hpp
diff --git a/src/map/sprite.cpp b/src/mbgl/map/sprite.cpp
similarity index 100%
rename from src/map/sprite.cpp
rename to src/mbgl/map/sprite.cpp
diff --git a/include/mbgl/map/sprite.hpp b/src/mbgl/map/sprite.hpp
similarity index 100%
rename from include/mbgl/map/sprite.hpp
rename to src/mbgl/map/sprite.hpp
diff --git a/src/map/tile.cpp b/src/mbgl/map/tile.cpp
similarity index 99%
rename from src/map/tile.cpp
rename to src/mbgl/map/tile.cpp
index 52f353841..9f3104885 100644
--- a/src/map/tile.cpp
+++ b/src/mbgl/map/tile.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/map/tile.hpp>
 #include <mbgl/util/vec.hpp>
 #include <mbgl/util/string.hpp>
+#include <mbgl/util/box.hpp>
 
 
 #include <cassert>
diff --git a/src/map/tile_data.cpp b/src/mbgl/map/tile_data.cpp
similarity index 100%
rename from src/map/tile_data.cpp
rename to src/mbgl/map/tile_data.cpp
diff --git a/include/mbgl/map/tile_data.hpp b/src/mbgl/map/tile_data.hpp
similarity index 100%
rename from include/mbgl/map/tile_data.hpp
rename to src/mbgl/map/tile_data.hpp
diff --git a/src/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp
similarity index 99%
rename from src/map/tile_parser.cpp
rename to src/mbgl/map/tile_parser.cpp
index cbfd6fa7b..1e12e5fc1 100644
--- a/src/map/tile_parser.cpp
+++ b/src/mbgl/map/tile_parser.cpp
@@ -1,5 +1,4 @@
 #include <mbgl/map/tile_parser.hpp>
-
 #include <mbgl/map/vector_tile_data.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
diff --git a/include/mbgl/map/tile_parser.hpp b/src/mbgl/map/tile_parser.hpp
similarity index 100%
rename from include/mbgl/map/tile_parser.hpp
rename to src/mbgl/map/tile_parser.hpp
diff --git a/src/map/transform.cpp b/src/mbgl/map/transform.cpp
similarity index 100%
rename from src/map/transform.cpp
rename to src/mbgl/map/transform.cpp
diff --git a/src/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp
similarity index 99%
rename from src/map/transform_state.cpp
rename to src/mbgl/map/transform_state.cpp
index afc5b59ef..a7da8ccab 100644
--- a/src/map/transform_state.cpp
+++ b/src/mbgl/map/transform_state.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/map/transform_state.hpp>
 #include <mbgl/util/constants.hpp>
+#include <mbgl/util/box.hpp>
 
 using namespace mbgl;
 
diff --git a/src/map/vector_tile.cpp b/src/mbgl/map/vector_tile.cpp
similarity index 100%
rename from src/map/vector_tile.cpp
rename to src/mbgl/map/vector_tile.cpp
diff --git a/include/mbgl/map/vector_tile.hpp b/src/mbgl/map/vector_tile.hpp
similarity index 100%
rename from include/mbgl/map/vector_tile.hpp
rename to src/mbgl/map/vector_tile.hpp
diff --git a/src/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp
similarity index 100%
rename from src/map/vector_tile_data.cpp
rename to src/mbgl/map/vector_tile_data.cpp
diff --git a/include/mbgl/map/vector_tile_data.hpp b/src/mbgl/map/vector_tile_data.hpp
similarity index 100%
rename from include/mbgl/map/vector_tile_data.hpp
rename to src/mbgl/map/vector_tile_data.hpp
diff --git a/src/platform/gl.cpp b/src/mbgl/platform/gl.cpp
similarity index 100%
rename from src/platform/gl.cpp
rename to src/mbgl/platform/gl.cpp
diff --git a/src/platform/log.cpp b/src/mbgl/platform/log.cpp
similarity index 100%
rename from src/platform/log.cpp
rename to src/mbgl/platform/log.cpp
diff --git a/include/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp
similarity index 100%
rename from include/mbgl/renderer/bucket.hpp
rename to src/mbgl/renderer/bucket.hpp
diff --git a/src/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp
similarity index 99%
rename from src/renderer/debug_bucket.cpp
rename to src/mbgl/renderer/debug_bucket.cpp
index 58fbf8a35..f08937456 100644
--- a/src/renderer/debug_bucket.cpp
+++ b/src/mbgl/renderer/debug_bucket.cpp
@@ -1,5 +1,4 @@
 #include <mbgl/renderer/debug_bucket.hpp>
-
 #include <mbgl/renderer/painter.hpp>
 
 #include <mbgl/platform/gl.hpp>
diff --git a/include/mbgl/renderer/debug_bucket.hpp b/src/mbgl/renderer/debug_bucket.hpp
similarity index 100%
rename from include/mbgl/renderer/debug_bucket.hpp
rename to src/mbgl/renderer/debug_bucket.hpp
diff --git a/src/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp
similarity index 100%
rename from src/renderer/fill_bucket.cpp
rename to src/mbgl/renderer/fill_bucket.cpp
diff --git a/include/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp
similarity index 100%
rename from include/mbgl/renderer/fill_bucket.hpp
rename to src/mbgl/renderer/fill_bucket.hpp
diff --git a/src/renderer/frame_history.cpp b/src/mbgl/renderer/frame_history.cpp
similarity index 100%
rename from src/renderer/frame_history.cpp
rename to src/mbgl/renderer/frame_history.cpp
diff --git a/include/mbgl/renderer/frame_history.hpp b/src/mbgl/renderer/frame_history.hpp
similarity index 100%
rename from include/mbgl/renderer/frame_history.hpp
rename to src/mbgl/renderer/frame_history.hpp
diff --git a/src/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp
similarity index 100%
rename from src/renderer/line_bucket.cpp
rename to src/mbgl/renderer/line_bucket.cpp
diff --git a/include/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp
similarity index 100%
rename from include/mbgl/renderer/line_bucket.hpp
rename to src/mbgl/renderer/line_bucket.hpp
diff --git a/src/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
similarity index 100%
rename from src/renderer/painter.cpp
rename to src/mbgl/renderer/painter.cpp
diff --git a/include/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
similarity index 100%
rename from include/mbgl/renderer/painter.hpp
rename to src/mbgl/renderer/painter.hpp
diff --git a/src/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp
similarity index 100%
rename from src/renderer/painter_clipping.cpp
rename to src/mbgl/renderer/painter_clipping.cpp
diff --git a/src/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
similarity index 100%
rename from src/renderer/painter_debug.cpp
rename to src/mbgl/renderer/painter_debug.cpp
diff --git a/src/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
similarity index 100%
rename from src/renderer/painter_fill.cpp
rename to src/mbgl/renderer/painter_fill.cpp
diff --git a/src/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
similarity index 100%
rename from src/renderer/painter_line.cpp
rename to src/mbgl/renderer/painter_line.cpp
diff --git a/src/renderer/painter_prerender.cpp b/src/mbgl/renderer/painter_prerender.cpp
similarity index 100%
rename from src/renderer/painter_prerender.cpp
rename to src/mbgl/renderer/painter_prerender.cpp
diff --git a/src/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
similarity index 100%
rename from src/renderer/painter_raster.cpp
rename to src/mbgl/renderer/painter_raster.cpp
diff --git a/src/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
similarity index 100%
rename from src/renderer/painter_symbol.cpp
rename to src/mbgl/renderer/painter_symbol.cpp
diff --git a/src/renderer/prerendered_texture.cpp b/src/mbgl/renderer/prerendered_texture.cpp
similarity index 100%
rename from src/renderer/prerendered_texture.cpp
rename to src/mbgl/renderer/prerendered_texture.cpp
diff --git a/include/mbgl/renderer/prerendered_texture.hpp b/src/mbgl/renderer/prerendered_texture.hpp
similarity index 100%
rename from include/mbgl/renderer/prerendered_texture.hpp
rename to src/mbgl/renderer/prerendered_texture.hpp
diff --git a/src/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
similarity index 100%
rename from src/renderer/raster_bucket.cpp
rename to src/mbgl/renderer/raster_bucket.cpp
diff --git a/include/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp
similarity index 100%
rename from include/mbgl/renderer/raster_bucket.hpp
rename to src/mbgl/renderer/raster_bucket.hpp
diff --git a/src/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
similarity index 100%
rename from src/renderer/symbol_bucket.cpp
rename to src/mbgl/renderer/symbol_bucket.cpp
diff --git a/include/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
similarity index 98%
rename from include/mbgl/renderer/symbol_bucket.hpp
rename to src/mbgl/renderer/symbol_bucket.hpp
index 9a5da1d01..dd596b1a0 100644
--- a/include/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_RENDERER_SYMBOLBUCKET
 #define MBGL_RENDERER_SYMBOLBUCKET
 
-#include "bucket.hpp"
+#include <mbgl/renderer/bucket.hpp>
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/text_buffer.hpp>
diff --git a/src/shader/dot.fragment.glsl b/src/mbgl/shader/dot.fragment.glsl
similarity index 100%
rename from src/shader/dot.fragment.glsl
rename to src/mbgl/shader/dot.fragment.glsl
diff --git a/src/shader/dot.vertex.glsl b/src/mbgl/shader/dot.vertex.glsl
similarity index 100%
rename from src/shader/dot.vertex.glsl
rename to src/mbgl/shader/dot.vertex.glsl
diff --git a/src/shader/dot_shader.cpp b/src/mbgl/shader/dot_shader.cpp
similarity index 100%
rename from src/shader/dot_shader.cpp
rename to src/mbgl/shader/dot_shader.cpp
diff --git a/include/mbgl/shader/dot_shader.hpp b/src/mbgl/shader/dot_shader.hpp
similarity index 100%
rename from include/mbgl/shader/dot_shader.hpp
rename to src/mbgl/shader/dot_shader.hpp
diff --git a/src/shader/gaussian.fragment.glsl b/src/mbgl/shader/gaussian.fragment.glsl
similarity index 100%
rename from src/shader/gaussian.fragment.glsl
rename to src/mbgl/shader/gaussian.fragment.glsl
diff --git a/src/shader/gaussian.vertex.glsl b/src/mbgl/shader/gaussian.vertex.glsl
similarity index 100%
rename from src/shader/gaussian.vertex.glsl
rename to src/mbgl/shader/gaussian.vertex.glsl
diff --git a/src/shader/gaussian_shader.cpp b/src/mbgl/shader/gaussian_shader.cpp
similarity index 100%
rename from src/shader/gaussian_shader.cpp
rename to src/mbgl/shader/gaussian_shader.cpp
diff --git a/include/mbgl/shader/gaussian_shader.hpp b/src/mbgl/shader/gaussian_shader.hpp
similarity index 100%
rename from include/mbgl/shader/gaussian_shader.hpp
rename to src/mbgl/shader/gaussian_shader.hpp
diff --git a/src/shader/icon.fragment.glsl b/src/mbgl/shader/icon.fragment.glsl
similarity index 100%
rename from src/shader/icon.fragment.glsl
rename to src/mbgl/shader/icon.fragment.glsl
diff --git a/src/shader/icon.vertex.glsl b/src/mbgl/shader/icon.vertex.glsl
similarity index 100%
rename from src/shader/icon.vertex.glsl
rename to src/mbgl/shader/icon.vertex.glsl
diff --git a/src/shader/icon_shader.cpp b/src/mbgl/shader/icon_shader.cpp
similarity index 100%
rename from src/shader/icon_shader.cpp
rename to src/mbgl/shader/icon_shader.cpp
diff --git a/include/mbgl/shader/icon_shader.hpp b/src/mbgl/shader/icon_shader.hpp
similarity index 100%
rename from include/mbgl/shader/icon_shader.hpp
rename to src/mbgl/shader/icon_shader.hpp
diff --git a/src/shader/line.fragment.glsl b/src/mbgl/shader/line.fragment.glsl
similarity index 100%
rename from src/shader/line.fragment.glsl
rename to src/mbgl/shader/line.fragment.glsl
diff --git a/src/shader/line.vertex.glsl b/src/mbgl/shader/line.vertex.glsl
similarity index 100%
rename from src/shader/line.vertex.glsl
rename to src/mbgl/shader/line.vertex.glsl
diff --git a/src/shader/line_shader.cpp b/src/mbgl/shader/line_shader.cpp
similarity index 100%
rename from src/shader/line_shader.cpp
rename to src/mbgl/shader/line_shader.cpp
diff --git a/include/mbgl/shader/line_shader.hpp b/src/mbgl/shader/line_shader.hpp
similarity index 100%
rename from include/mbgl/shader/line_shader.hpp
rename to src/mbgl/shader/line_shader.hpp
diff --git a/src/shader/linejoin.fragment.glsl b/src/mbgl/shader/linejoin.fragment.glsl
similarity index 100%
rename from src/shader/linejoin.fragment.glsl
rename to src/mbgl/shader/linejoin.fragment.glsl
diff --git a/src/shader/linejoin.vertex.glsl b/src/mbgl/shader/linejoin.vertex.glsl
similarity index 100%
rename from src/shader/linejoin.vertex.glsl
rename to src/mbgl/shader/linejoin.vertex.glsl
diff --git a/src/shader/linejoin_shader.cpp b/src/mbgl/shader/linejoin_shader.cpp
similarity index 100%
rename from src/shader/linejoin_shader.cpp
rename to src/mbgl/shader/linejoin_shader.cpp
diff --git a/include/mbgl/shader/linejoin_shader.hpp b/src/mbgl/shader/linejoin_shader.hpp
similarity index 100%
rename from include/mbgl/shader/linejoin_shader.hpp
rename to src/mbgl/shader/linejoin_shader.hpp
diff --git a/src/shader/linepattern.fragment.glsl b/src/mbgl/shader/linepattern.fragment.glsl
similarity index 100%
rename from src/shader/linepattern.fragment.glsl
rename to src/mbgl/shader/linepattern.fragment.glsl
diff --git a/src/shader/linepattern.vertex.glsl b/src/mbgl/shader/linepattern.vertex.glsl
similarity index 100%
rename from src/shader/linepattern.vertex.glsl
rename to src/mbgl/shader/linepattern.vertex.glsl
diff --git a/src/shader/linepattern_shader.cpp b/src/mbgl/shader/linepattern_shader.cpp
similarity index 100%
rename from src/shader/linepattern_shader.cpp
rename to src/mbgl/shader/linepattern_shader.cpp
diff --git a/include/mbgl/shader/linepattern_shader.hpp b/src/mbgl/shader/linepattern_shader.hpp
similarity index 100%
rename from include/mbgl/shader/linepattern_shader.hpp
rename to src/mbgl/shader/linepattern_shader.hpp
diff --git a/src/shader/outline.fragment.glsl b/src/mbgl/shader/outline.fragment.glsl
similarity index 100%
rename from src/shader/outline.fragment.glsl
rename to src/mbgl/shader/outline.fragment.glsl
diff --git a/src/shader/outline.vertex.glsl b/src/mbgl/shader/outline.vertex.glsl
similarity index 100%
rename from src/shader/outline.vertex.glsl
rename to src/mbgl/shader/outline.vertex.glsl
diff --git a/src/shader/outline_shader.cpp b/src/mbgl/shader/outline_shader.cpp
similarity index 100%
rename from src/shader/outline_shader.cpp
rename to src/mbgl/shader/outline_shader.cpp
diff --git a/include/mbgl/shader/outline_shader.hpp b/src/mbgl/shader/outline_shader.hpp
similarity index 100%
rename from include/mbgl/shader/outline_shader.hpp
rename to src/mbgl/shader/outline_shader.hpp
diff --git a/src/shader/pattern.fragment.glsl b/src/mbgl/shader/pattern.fragment.glsl
similarity index 100%
rename from src/shader/pattern.fragment.glsl
rename to src/mbgl/shader/pattern.fragment.glsl
diff --git a/src/shader/pattern.vertex.glsl b/src/mbgl/shader/pattern.vertex.glsl
similarity index 100%
rename from src/shader/pattern.vertex.glsl
rename to src/mbgl/shader/pattern.vertex.glsl
diff --git a/src/shader/pattern_shader.cpp b/src/mbgl/shader/pattern_shader.cpp
similarity index 100%
rename from src/shader/pattern_shader.cpp
rename to src/mbgl/shader/pattern_shader.cpp
diff --git a/include/mbgl/shader/pattern_shader.hpp b/src/mbgl/shader/pattern_shader.hpp
similarity index 100%
rename from include/mbgl/shader/pattern_shader.hpp
rename to src/mbgl/shader/pattern_shader.hpp
diff --git a/src/shader/plain.fragment.glsl b/src/mbgl/shader/plain.fragment.glsl
similarity index 100%
rename from src/shader/plain.fragment.glsl
rename to src/mbgl/shader/plain.fragment.glsl
diff --git a/src/shader/plain.vertex.glsl b/src/mbgl/shader/plain.vertex.glsl
similarity index 100%
rename from src/shader/plain.vertex.glsl
rename to src/mbgl/shader/plain.vertex.glsl
diff --git a/src/shader/plain_shader.cpp b/src/mbgl/shader/plain_shader.cpp
similarity index 100%
rename from src/shader/plain_shader.cpp
rename to src/mbgl/shader/plain_shader.cpp
diff --git a/include/mbgl/shader/plain_shader.hpp b/src/mbgl/shader/plain_shader.hpp
similarity index 100%
rename from include/mbgl/shader/plain_shader.hpp
rename to src/mbgl/shader/plain_shader.hpp
diff --git a/src/shader/raster.fragment.glsl b/src/mbgl/shader/raster.fragment.glsl
similarity index 100%
rename from src/shader/raster.fragment.glsl
rename to src/mbgl/shader/raster.fragment.glsl
diff --git a/src/shader/raster.vertex.glsl b/src/mbgl/shader/raster.vertex.glsl
similarity index 100%
rename from src/shader/raster.vertex.glsl
rename to src/mbgl/shader/raster.vertex.glsl
diff --git a/src/shader/raster_shader.cpp b/src/mbgl/shader/raster_shader.cpp
similarity index 100%
rename from src/shader/raster_shader.cpp
rename to src/mbgl/shader/raster_shader.cpp
diff --git a/include/mbgl/shader/raster_shader.hpp b/src/mbgl/shader/raster_shader.hpp
similarity index 100%
rename from include/mbgl/shader/raster_shader.hpp
rename to src/mbgl/shader/raster_shader.hpp
diff --git a/src/shader/sdf.fragment.glsl b/src/mbgl/shader/sdf.fragment.glsl
similarity index 100%
rename from src/shader/sdf.fragment.glsl
rename to src/mbgl/shader/sdf.fragment.glsl
diff --git a/src/shader/sdf.vertex.glsl b/src/mbgl/shader/sdf.vertex.glsl
similarity index 100%
rename from src/shader/sdf.vertex.glsl
rename to src/mbgl/shader/sdf.vertex.glsl
diff --git a/src/shader/sdf_shader.cpp b/src/mbgl/shader/sdf_shader.cpp
similarity index 100%
rename from src/shader/sdf_shader.cpp
rename to src/mbgl/shader/sdf_shader.cpp
diff --git a/include/mbgl/shader/sdf_shader.hpp b/src/mbgl/shader/sdf_shader.hpp
similarity index 100%
rename from include/mbgl/shader/sdf_shader.hpp
rename to src/mbgl/shader/sdf_shader.hpp
diff --git a/src/shader/shader.cpp b/src/mbgl/shader/shader.cpp
similarity index 100%
rename from src/shader/shader.cpp
rename to src/mbgl/shader/shader.cpp
diff --git a/include/mbgl/shader/shader.hpp b/src/mbgl/shader/shader.hpp
similarity index 100%
rename from include/mbgl/shader/shader.hpp
rename to src/mbgl/shader/shader.hpp
diff --git a/src/shader/uniform.cpp b/src/mbgl/shader/uniform.cpp
similarity index 100%
rename from src/shader/uniform.cpp
rename to src/mbgl/shader/uniform.cpp
diff --git a/include/mbgl/shader/uniform.hpp b/src/mbgl/shader/uniform.hpp
similarity index 99%
rename from include/mbgl/shader/uniform.hpp
rename to src/mbgl/shader/uniform.hpp
index a87bbd7aa..8579ae22c 100644
--- a/include/mbgl/shader/uniform.hpp
+++ b/src/mbgl/shader/uniform.hpp
@@ -43,7 +43,7 @@ public:
 
 private:
     void bind(const T&);
-    
+
     T current;
     GLint location;
 };
diff --git a/src/storage/base_request.cpp b/src/mbgl/storage/base_request.cpp
similarity index 100%
rename from src/storage/base_request.cpp
rename to src/mbgl/storage/base_request.cpp
diff --git a/include/mbgl/storage/base_request.hpp b/src/mbgl/storage/base_request.hpp
similarity index 100%
rename from include/mbgl/storage/base_request.hpp
rename to src/mbgl/storage/base_request.hpp
diff --git a/platform/default/caching_http_file_source.cpp b/src/mbgl/storage/caching_http_file_source.cpp
similarity index 98%
rename from platform/default/caching_http_file_source.cpp
rename to src/mbgl/storage/caching_http_file_source.cpp
index 3e74f5ed0..70254b68d 100644
--- a/platform/default/caching_http_file_source.cpp
+++ b/src/mbgl/storage/caching_http_file_source.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/platform/default/caching_http_file_source.hpp>
+#include <mbgl/storage/caching_http_file_source.hpp>
 #include <mbgl/storage/file_request.hpp>
 #include <mbgl/storage/http_request.hpp>
 #include <mbgl/storage/sqlite_store.hpp>
diff --git a/src/storage/file_request.cpp b/src/mbgl/storage/file_request.cpp
similarity index 100%
rename from src/storage/file_request.cpp
rename to src/mbgl/storage/file_request.cpp
diff --git a/include/mbgl/storage/file_request.hpp b/src/mbgl/storage/file_request.hpp
similarity index 100%
rename from include/mbgl/storage/file_request.hpp
rename to src/mbgl/storage/file_request.hpp
diff --git a/src/storage/file_request_baton.cpp b/src/mbgl/storage/file_request_baton.cpp
similarity index 100%
rename from src/storage/file_request_baton.cpp
rename to src/mbgl/storage/file_request_baton.cpp
diff --git a/include/mbgl/storage/file_request_baton.hpp b/src/mbgl/storage/file_request_baton.hpp
similarity index 100%
rename from include/mbgl/storage/file_request_baton.hpp
rename to src/mbgl/storage/file_request_baton.hpp
diff --git a/src/storage/http_request.cpp b/src/mbgl/storage/http_request.cpp
similarity index 100%
rename from src/storage/http_request.cpp
rename to src/mbgl/storage/http_request.cpp
diff --git a/include/mbgl/storage/http_request.hpp b/src/mbgl/storage/http_request.hpp
similarity index 100%
rename from include/mbgl/storage/http_request.hpp
rename to src/mbgl/storage/http_request.hpp
diff --git a/src/storage/http_request_baton.cpp b/src/mbgl/storage/http_request_baton.cpp
similarity index 100%
rename from src/storage/http_request_baton.cpp
rename to src/mbgl/storage/http_request_baton.cpp
diff --git a/src/storage/request.cpp b/src/mbgl/storage/request.cpp
similarity index 100%
rename from src/storage/request.cpp
rename to src/mbgl/storage/request.cpp
diff --git a/src/storage/response.cpp b/src/mbgl/storage/response.cpp
similarity index 100%
rename from src/storage/response.cpp
rename to src/mbgl/storage/response.cpp
diff --git a/src/storage/sqlite_store.cpp b/src/mbgl/storage/sqlite_store.cpp
similarity index 100%
rename from src/storage/sqlite_store.cpp
rename to src/mbgl/storage/sqlite_store.cpp
diff --git a/include/mbgl/storage/sqlite_store.hpp b/src/mbgl/storage/sqlite_store.hpp
similarity index 93%
rename from include/mbgl/storage/sqlite_store.hpp
rename to src/mbgl/storage/sqlite_store.hpp
index a691b474e..988eca259 100644
--- a/include/mbgl/storage/sqlite_store.hpp
+++ b/src/mbgl/storage/sqlite_store.hpp
@@ -1,8 +1,9 @@
 #ifndef MBGL_STORAGE_SQLITE_STORE
 #define MBGL_STORAGE_SQLITE_STORE
 
-#include <mbgl/storage/file_source.hpp>
 #include <mbgl/storage/response.hpp>
+#include <mbgl/storage/resource_type.hpp>
+#include <mbgl/util/ptr.hpp>
 
 #include <uv.h>
 
diff --git a/src/style/applied_class_properties.cpp b/src/mbgl/style/applied_class_properties.cpp
similarity index 100%
rename from src/style/applied_class_properties.cpp
rename to src/mbgl/style/applied_class_properties.cpp
diff --git a/include/mbgl/style/applied_class_properties.hpp b/src/mbgl/style/applied_class_properties.hpp
similarity index 100%
rename from include/mbgl/style/applied_class_properties.hpp
rename to src/mbgl/style/applied_class_properties.hpp
diff --git a/src/style/class_dictionary.cpp b/src/mbgl/style/class_dictionary.cpp
similarity index 100%
rename from src/style/class_dictionary.cpp
rename to src/mbgl/style/class_dictionary.cpp
diff --git a/include/mbgl/style/class_dictionary.hpp b/src/mbgl/style/class_dictionary.hpp
similarity index 100%
rename from include/mbgl/style/class_dictionary.hpp
rename to src/mbgl/style/class_dictionary.hpp
diff --git a/src/style/class_properties.cpp b/src/mbgl/style/class_properties.cpp
similarity index 100%
rename from src/style/class_properties.cpp
rename to src/mbgl/style/class_properties.cpp
diff --git a/include/mbgl/style/class_properties.hpp b/src/mbgl/style/class_properties.hpp
similarity index 100%
rename from include/mbgl/style/class_properties.hpp
rename to src/mbgl/style/class_properties.hpp
diff --git a/src/style/filter_expression.cpp b/src/mbgl/style/filter_expression.cpp
similarity index 100%
rename from src/style/filter_expression.cpp
rename to src/mbgl/style/filter_expression.cpp
diff --git a/include/mbgl/style/filter_expression.hpp b/src/mbgl/style/filter_expression.hpp
similarity index 100%
rename from include/mbgl/style/filter_expression.hpp
rename to src/mbgl/style/filter_expression.hpp
diff --git a/include/mbgl/style/filter_expression_private.hpp b/src/mbgl/style/filter_expression_private.hpp
similarity index 100%
rename from include/mbgl/style/filter_expression_private.hpp
rename to src/mbgl/style/filter_expression_private.hpp
diff --git a/src/style/function_properties.cpp b/src/mbgl/style/function_properties.cpp
similarity index 100%
rename from src/style/function_properties.cpp
rename to src/mbgl/style/function_properties.cpp
diff --git a/include/mbgl/style/function_properties.hpp b/src/mbgl/style/function_properties.hpp
similarity index 100%
rename from include/mbgl/style/function_properties.hpp
rename to src/mbgl/style/function_properties.hpp
diff --git a/src/style/property_fallback.cpp b/src/mbgl/style/property_fallback.cpp
similarity index 100%
rename from src/style/property_fallback.cpp
rename to src/mbgl/style/property_fallback.cpp
diff --git a/include/mbgl/style/property_fallback.hpp b/src/mbgl/style/property_fallback.hpp
similarity index 100%
rename from include/mbgl/style/property_fallback.hpp
rename to src/mbgl/style/property_fallback.hpp
diff --git a/include/mbgl/style/property_key.hpp b/src/mbgl/style/property_key.hpp
similarity index 100%
rename from include/mbgl/style/property_key.hpp
rename to src/mbgl/style/property_key.hpp
diff --git a/include/mbgl/style/property_transition.hpp b/src/mbgl/style/property_transition.hpp
similarity index 100%
rename from include/mbgl/style/property_transition.hpp
rename to src/mbgl/style/property_transition.hpp
diff --git a/include/mbgl/style/property_value.hpp b/src/mbgl/style/property_value.hpp
similarity index 100%
rename from include/mbgl/style/property_value.hpp
rename to src/mbgl/style/property_value.hpp
diff --git a/src/style/style.cpp b/src/mbgl/style/style.cpp
similarity index 100%
rename from src/style/style.cpp
rename to src/mbgl/style/style.cpp
diff --git a/include/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
similarity index 100%
rename from include/mbgl/style/style.hpp
rename to src/mbgl/style/style.hpp
diff --git a/src/style/style_bucket.cpp b/src/mbgl/style/style_bucket.cpp
similarity index 100%
rename from src/style/style_bucket.cpp
rename to src/mbgl/style/style_bucket.cpp
diff --git a/include/mbgl/style/style_bucket.hpp b/src/mbgl/style/style_bucket.hpp
similarity index 100%
rename from include/mbgl/style/style_bucket.hpp
rename to src/mbgl/style/style_bucket.hpp
diff --git a/src/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp
similarity index 100%
rename from src/style/style_layer.cpp
rename to src/mbgl/style/style_layer.cpp
diff --git a/include/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp
similarity index 100%
rename from include/mbgl/style/style_layer.hpp
rename to src/mbgl/style/style_layer.hpp
diff --git a/src/style/style_layer_group.cpp b/src/mbgl/style/style_layer_group.cpp
similarity index 99%
rename from src/style/style_layer_group.cpp
rename to src/mbgl/style/style_layer_group.cpp
index a731aebdc..0ca0fa0cc 100644
--- a/src/style/style_layer_group.cpp
+++ b/src/mbgl/style/style_layer_group.cpp
@@ -1,4 +1,3 @@
-
 #include <mbgl/style/style_layer_group.hpp>
 
 namespace mbgl {
diff --git a/include/mbgl/style/style_layer_group.hpp b/src/mbgl/style/style_layer_group.hpp
similarity index 100%
rename from include/mbgl/style/style_layer_group.hpp
rename to src/mbgl/style/style_layer_group.hpp
diff --git a/src/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp
similarity index 100%
rename from src/style/style_parser.cpp
rename to src/mbgl/style/style_parser.cpp
diff --git a/include/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp
similarity index 100%
rename from include/mbgl/style/style_parser.hpp
rename to src/mbgl/style/style_parser.hpp
diff --git a/src/style/style_properties.cpp b/src/mbgl/style/style_properties.cpp
similarity index 100%
rename from src/style/style_properties.cpp
rename to src/mbgl/style/style_properties.cpp
diff --git a/include/mbgl/style/style_properties.hpp b/src/mbgl/style/style_properties.hpp
similarity index 100%
rename from include/mbgl/style/style_properties.hpp
rename to src/mbgl/style/style_properties.hpp
diff --git a/src/style/style_source.cpp b/src/mbgl/style/style_source.cpp
similarity index 100%
rename from src/style/style_source.cpp
rename to src/mbgl/style/style_source.cpp
diff --git a/include/mbgl/style/style_source.hpp b/src/mbgl/style/style_source.hpp
similarity index 100%
rename from include/mbgl/style/style_source.hpp
rename to src/mbgl/style/style_source.hpp
diff --git a/src/style/types.cpp b/src/mbgl/style/types.cpp
similarity index 100%
rename from src/style/types.cpp
rename to src/mbgl/style/types.cpp
diff --git a/include/mbgl/style/types.hpp b/src/mbgl/style/types.hpp
similarity index 100%
rename from include/mbgl/style/types.hpp
rename to src/mbgl/style/types.hpp
diff --git a/src/style/value.cpp b/src/mbgl/style/value.cpp
similarity index 100%
rename from src/style/value.cpp
rename to src/mbgl/style/value.cpp
diff --git a/include/mbgl/style/value.hpp b/src/mbgl/style/value.hpp
similarity index 100%
rename from include/mbgl/style/value.hpp
rename to src/mbgl/style/value.hpp
diff --git a/include/mbgl/style/value_comparison.hpp b/src/mbgl/style/value_comparison.hpp
similarity index 99%
rename from include/mbgl/style/value_comparison.hpp
rename to src/mbgl/style/value_comparison.hpp
index 98e29afa7..895c8a086 100644
--- a/include/mbgl/style/value_comparison.hpp
+++ b/src/mbgl/style/value_comparison.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_STYLE_VALUE_COMPARISON
 #define MBGL_STYLE_VALUE_COMPARISON
 
-#include "value.hpp"
+#include <mbgl/style/value.hpp>
 #include <cstdlib>
 #include <cerrno>
 
diff --git a/src/text/collision.cpp b/src/mbgl/text/collision.cpp
similarity index 100%
rename from src/text/collision.cpp
rename to src/mbgl/text/collision.cpp
diff --git a/include/mbgl/text/collision.hpp b/src/mbgl/text/collision.hpp
similarity index 100%
rename from include/mbgl/text/collision.hpp
rename to src/mbgl/text/collision.hpp
diff --git a/src/text/glyph.cpp b/src/mbgl/text/glyph.cpp
similarity index 100%
rename from src/text/glyph.cpp
rename to src/mbgl/text/glyph.cpp
diff --git a/include/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp
similarity index 100%
rename from include/mbgl/text/glyph.hpp
rename to src/mbgl/text/glyph.hpp
diff --git a/src/text/glyph_store.cpp b/src/mbgl/text/glyph_store.cpp
similarity index 100%
rename from src/text/glyph_store.cpp
rename to src/mbgl/text/glyph_store.cpp
diff --git a/include/mbgl/text/glyph_store.hpp b/src/mbgl/text/glyph_store.hpp
similarity index 100%
rename from include/mbgl/text/glyph_store.hpp
rename to src/mbgl/text/glyph_store.hpp
diff --git a/src/text/placement.cpp b/src/mbgl/text/placement.cpp
similarity index 100%
rename from src/text/placement.cpp
rename to src/mbgl/text/placement.cpp
diff --git a/include/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp
similarity index 100%
rename from include/mbgl/text/placement.hpp
rename to src/mbgl/text/placement.hpp
diff --git a/src/text/rotation_range.cpp b/src/mbgl/text/rotation_range.cpp
similarity index 100%
rename from src/text/rotation_range.cpp
rename to src/mbgl/text/rotation_range.cpp
diff --git a/include/mbgl/text/rotation_range.hpp b/src/mbgl/text/rotation_range.hpp
similarity index 100%
rename from include/mbgl/text/rotation_range.hpp
rename to src/mbgl/text/rotation_range.hpp
diff --git a/include/mbgl/text/types.hpp b/src/mbgl/text/types.hpp
similarity index 100%
rename from include/mbgl/text/types.hpp
rename to src/mbgl/text/types.hpp
diff --git a/src/mbgl/util/box.hpp b/src/mbgl/util/box.hpp
new file mode 100644
index 000000000..55a5d46fb
--- /dev/null
+++ b/src/mbgl/util/box.hpp
@@ -0,0 +1,15 @@
+#ifndef MBGL_UTIL_BOX
+#define MBGL_UTIL_BOX
+
+#include <mbgl/util/vec.hpp>
+
+namespace mbgl {
+
+struct box {
+    vec2<double> tl, tr, bl, br;
+    vec2<double> center;
+};
+
+}
+
+#endif
diff --git a/src/util/clip_ids.cpp b/src/mbgl/util/clip_ids.cpp
similarity index 100%
rename from src/util/clip_ids.cpp
rename to src/mbgl/util/clip_ids.cpp
diff --git a/include/mbgl/util/clip_ids.hpp b/src/mbgl/util/clip_ids.hpp
similarity index 100%
rename from include/mbgl/util/clip_ids.hpp
rename to src/mbgl/util/clip_ids.hpp
diff --git a/src/util/compression.cpp b/src/mbgl/util/compression.cpp
similarity index 100%
rename from src/util/compression.cpp
rename to src/mbgl/util/compression.cpp
diff --git a/include/mbgl/util/compression.hpp b/src/mbgl/util/compression.hpp
similarity index 100%
rename from include/mbgl/util/compression.hpp
rename to src/mbgl/util/compression.hpp
diff --git a/config/constants.cpp b/src/mbgl/util/constants.cpp
similarity index 100%
rename from config/constants.cpp
rename to src/mbgl/util/constants.cpp
diff --git a/include/mbgl/util/constants.hpp b/src/mbgl/util/constants.hpp
similarity index 96%
rename from include/mbgl/util/constants.hpp
rename to src/mbgl/util/constants.hpp
index 89e8af2ef..98365e0f3 100644
--- a/include/mbgl/util/constants.hpp
+++ b/src/mbgl/util/constants.hpp
@@ -3,8 +3,6 @@
 
 #include <cmath>
 
-#include "vec.hpp"
-
 namespace mbgl {
 
 namespace util {
diff --git a/include/mbgl/util/error.hpp b/src/mbgl/util/error.hpp
similarity index 100%
rename from include/mbgl/util/error.hpp
rename to src/mbgl/util/error.hpp
diff --git a/include/mbgl/util/interpolate.hpp b/src/mbgl/util/interpolate.hpp
similarity index 100%
rename from include/mbgl/util/interpolate.hpp
rename to src/mbgl/util/interpolate.hpp
diff --git a/src/util/io.cpp b/src/mbgl/util/io.cpp
similarity index 100%
rename from src/util/io.cpp
rename to src/mbgl/util/io.cpp
diff --git a/include/mbgl/util/io.hpp b/src/mbgl/util/io.hpp
similarity index 100%
rename from include/mbgl/util/io.hpp
rename to src/mbgl/util/io.hpp
diff --git a/src/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp
similarity index 100%
rename from src/util/mapbox.cpp
rename to src/mbgl/util/mapbox.cpp
diff --git a/include/mbgl/util/mapbox.hpp b/src/mbgl/util/mapbox.hpp
similarity index 100%
rename from include/mbgl/util/mapbox.hpp
rename to src/mbgl/util/mapbox.hpp
diff --git a/src/util/mat3.cpp b/src/mbgl/util/mat3.cpp
similarity index 100%
rename from src/util/mat3.cpp
rename to src/mbgl/util/mat3.cpp
diff --git a/include/mbgl/util/mat3.hpp b/src/mbgl/util/mat3.hpp
similarity index 100%
rename from include/mbgl/util/mat3.hpp
rename to src/mbgl/util/mat3.hpp
diff --git a/src/util/mat4.cpp b/src/mbgl/util/mat4.cpp
similarity index 100%
rename from src/util/mat4.cpp
rename to src/mbgl/util/mat4.cpp
diff --git a/src/util/math.cpp b/src/mbgl/util/math.cpp
similarity index 100%
rename from src/util/math.cpp
rename to src/mbgl/util/math.cpp
diff --git a/include/mbgl/util/optional.hpp b/src/mbgl/util/optional.hpp
similarity index 97%
rename from include/mbgl/util/optional.hpp
rename to src/mbgl/util/optional.hpp
index 133e2c8f9..8d46eae85 100644
--- a/include/mbgl/util/optional.hpp
+++ b/src/mbgl/util/optional.hpp
@@ -3,7 +3,7 @@
 
 #include <type_traits>
 
-#include "variant.hpp"
+#include <mbgl/util/variant.hpp>
 
 namespace mapbox
 {
diff --git a/src/util/parsedate.c b/src/mbgl/util/parsedate.c
similarity index 100%
rename from src/util/parsedate.c
rename to src/mbgl/util/parsedate.c
diff --git a/include/mbgl/util/pbf.hpp b/src/mbgl/util/pbf.hpp
similarity index 100%
rename from include/mbgl/util/pbf.hpp
rename to src/mbgl/util/pbf.hpp
diff --git a/include/mbgl/util/queue.h b/src/mbgl/util/queue.h
similarity index 100%
rename from include/mbgl/util/queue.h
rename to src/mbgl/util/queue.h
diff --git a/src/util/raster.cpp b/src/mbgl/util/raster.cpp
similarity index 100%
rename from src/util/raster.cpp
rename to src/mbgl/util/raster.cpp
diff --git a/include/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp
similarity index 100%
rename from include/mbgl/util/raster.hpp
rename to src/mbgl/util/raster.hpp
diff --git a/include/mbgl/util/rect.hpp b/src/mbgl/util/rect.hpp
similarity index 100%
rename from include/mbgl/util/rect.hpp
rename to src/mbgl/util/rect.hpp
diff --git a/src/util/sqlite3.cpp b/src/mbgl/util/sqlite3.cpp
similarity index 100%
rename from src/util/sqlite3.cpp
rename to src/mbgl/util/sqlite3.cpp
diff --git a/include/mbgl/util/sqlite3.hpp b/src/mbgl/util/sqlite3.hpp
similarity index 100%
rename from include/mbgl/util/sqlite3.hpp
rename to src/mbgl/util/sqlite3.hpp
diff --git a/src/util/stopwatch.cpp b/src/mbgl/util/stopwatch.cpp
similarity index 100%
rename from src/util/stopwatch.cpp
rename to src/mbgl/util/stopwatch.cpp
diff --git a/include/mbgl/util/stopwatch.hpp b/src/mbgl/util/stopwatch.hpp
similarity index 100%
rename from include/mbgl/util/stopwatch.hpp
rename to src/mbgl/util/stopwatch.hpp
diff --git a/src/util/texture_pool.cpp b/src/mbgl/util/texture_pool.cpp
similarity index 100%
rename from src/util/texture_pool.cpp
rename to src/mbgl/util/texture_pool.cpp
diff --git a/include/mbgl/util/texture_pool.hpp b/src/mbgl/util/texture_pool.hpp
similarity index 100%
rename from include/mbgl/util/texture_pool.hpp
rename to src/mbgl/util/texture_pool.hpp
diff --git a/src/util/time.cpp b/src/mbgl/util/time.cpp
similarity index 100%
rename from src/util/time.cpp
rename to src/mbgl/util/time.cpp
diff --git a/include/mbgl/util/token.hpp b/src/mbgl/util/token.hpp
similarity index 100%
rename from include/mbgl/util/token.hpp
rename to src/mbgl/util/token.hpp
diff --git a/src/util/transition.cpp b/src/mbgl/util/transition.cpp
similarity index 100%
rename from src/util/transition.cpp
rename to src/mbgl/util/transition.cpp
diff --git a/include/mbgl/util/transition.hpp b/src/mbgl/util/transition.hpp
similarity index 98%
rename from include/mbgl/util/transition.hpp
rename to src/mbgl/util/transition.hpp
index b78abfa8f..d6bbc9eba 100644
--- a/include/mbgl/util/transition.hpp
+++ b/src/mbgl/util/transition.hpp
@@ -3,7 +3,6 @@
 
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/time.hpp>
-#include <mbgl/style/types.hpp>
 
 namespace mbgl {
 namespace util {
diff --git a/include/mbgl/util/unitbezier.hpp b/src/mbgl/util/unitbezier.hpp
similarity index 100%
rename from include/mbgl/util/unitbezier.hpp
rename to src/mbgl/util/unitbezier.hpp
diff --git a/src/util/url.cpp b/src/mbgl/util/url.cpp
similarity index 100%
rename from src/util/url.cpp
rename to src/mbgl/util/url.cpp
diff --git a/include/mbgl/util/url.hpp b/src/mbgl/util/url.hpp
similarity index 100%
rename from include/mbgl/util/url.hpp
rename to src/mbgl/util/url.hpp
diff --git a/src/mbgl/util/utf.hpp b/src/mbgl/util/utf.hpp
new file mode 100644
index 000000000..d6ba2a1f2
--- /dev/null
+++ b/src/mbgl/util/utf.hpp
@@ -0,0 +1,24 @@
+#ifndef MBGL_UTIL_UTF
+#define MBGL_UTIL_UTF
+
+#include <memory>
+
+#include <boost/regex/pending/unicode_iterator.hpp>
+
+namespace mbgl {
+
+namespace util {
+
+class utf8_to_utf32 {
+ public:
+    static std::u32string convert(std::string const& utf8)
+    {
+        boost::u8_to_u32_iterator<std::string::const_iterator> begin(utf8.begin());
+        boost::u8_to_u32_iterator<std::string::const_iterator> end(utf8.end());
+        return std::u32string(begin,end);
+    }
+};
+
+}}
+
+#endif
diff --git a/src/util/uv-channel.c b/src/mbgl/util/uv-channel.c
similarity index 100%
rename from src/util/uv-channel.c
rename to src/mbgl/util/uv-channel.c
diff --git a/include/mbgl/util/uv-channel.h b/src/mbgl/util/uv-channel.h
similarity index 100%
rename from include/mbgl/util/uv-channel.h
rename to src/mbgl/util/uv-channel.h
diff --git a/src/util/uv-messenger.c b/src/mbgl/util/uv-messenger.c
similarity index 100%
rename from src/util/uv-messenger.c
rename to src/mbgl/util/uv-messenger.c
diff --git a/src/util/uv-worker.c b/src/mbgl/util/uv-worker.c
similarity index 100%
rename from src/util/uv-worker.c
rename to src/mbgl/util/uv-worker.c
diff --git a/include/mbgl/util/uv-worker.h b/src/mbgl/util/uv-worker.h
similarity index 100%
rename from include/mbgl/util/uv-worker.h
rename to src/mbgl/util/uv-worker.h
diff --git a/src/util/uv.cpp b/src/mbgl/util/uv.cpp
similarity index 100%
rename from src/util/uv.cpp
rename to src/mbgl/util/uv.cpp
diff --git a/include/mbgl/util/uv_detail.hpp b/src/mbgl/util/uv_detail.hpp
similarity index 100%
rename from include/mbgl/util/uv_detail.hpp
rename to src/mbgl/util/uv_detail.hpp
diff --git a/src/mbgl/util/vec.hpp b/src/mbgl/util/vec.hpp
new file mode 100644
index 000000000..60065b4fc
--- /dev/null
+++ b/src/mbgl/util/vec.hpp
@@ -0,0 +1,15 @@
+#ifndef MBGL_UTIL_VEC
+#define MBGL_UTIL_VEC
+
+#include <mbgl/util/vec.hpp>
+
+namespace mbgl {
+
+struct box {
+    vec2<double> tl, tr, bl, br;
+    vec2<double> center;
+};
+
+}
+
+#endif
diff --git a/include/rapidjson/document.h b/src/rapidjson/document.h
similarity index 100%
rename from include/rapidjson/document.h
rename to src/rapidjson/document.h
diff --git a/include/rapidjson/filestream.h b/src/rapidjson/filestream.h
similarity index 100%
rename from include/rapidjson/filestream.h
rename to src/rapidjson/filestream.h
diff --git a/include/rapidjson/internal/pow10.h b/src/rapidjson/internal/pow10.h
similarity index 100%
rename from include/rapidjson/internal/pow10.h
rename to src/rapidjson/internal/pow10.h
diff --git a/include/rapidjson/internal/stack.h b/src/rapidjson/internal/stack.h
similarity index 100%
rename from include/rapidjson/internal/stack.h
rename to src/rapidjson/internal/stack.h
diff --git a/include/rapidjson/internal/strfunc.h b/src/rapidjson/internal/strfunc.h
similarity index 100%
rename from include/rapidjson/internal/strfunc.h
rename to src/rapidjson/internal/strfunc.h
diff --git a/include/rapidjson/prettywriter.h b/src/rapidjson/prettywriter.h
similarity index 100%
rename from include/rapidjson/prettywriter.h
rename to src/rapidjson/prettywriter.h
diff --git a/include/rapidjson/rapidjson.h b/src/rapidjson/rapidjson.h
similarity index 100%
rename from include/rapidjson/rapidjson.h
rename to src/rapidjson/rapidjson.h
diff --git a/include/rapidjson/reader.h b/src/rapidjson/reader.h
similarity index 100%
rename from include/rapidjson/reader.h
rename to src/rapidjson/reader.h
diff --git a/include/rapidjson/stringbuffer.h b/src/rapidjson/stringbuffer.h
similarity index 100%
rename from include/rapidjson/stringbuffer.h
rename to src/rapidjson/stringbuffer.h
diff --git a/include/rapidjson/writer.h b/src/rapidjson/writer.h
similarity index 100%
rename from include/rapidjson/writer.h
rename to src/rapidjson/writer.h
diff --git a/test/headless.cpp b/test/headless.cpp
index 29db9500d..1c583a9c0 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -2,16 +2,16 @@
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/util/image.hpp>
-#include <mbgl/util/io.hpp>
 #include <mbgl/util/std.hpp>
 
+#include <mbgl/util/io.hpp>
 #include <rapidjson/document.h>
 #include <rapidjson/writer.h>
 #include <rapidjson/stringbuffer.h>
 
 #include <mbgl/platform/default/headless_view.hpp>
 #include <mbgl/platform/default/headless_display.hpp>
-#include <mbgl/platform/default/caching_http_file_source.hpp>
+#include <mbgl/storage/caching_http_file_source.hpp>
 
 #include "./fixtures/fixture_log.hpp"
 
diff --git a/test/test.gyp b/test/test.gyp
index 86dbcc08a..5aec5ac3a 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -23,6 +23,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone',
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
         }, {
@@ -41,6 +42,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone',
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)'] }
         }, {
@@ -59,6 +61,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone',
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)'] }
         }, {
@@ -79,6 +82,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone'
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
         }, {
@@ -97,6 +101,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone',
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
         }, {
@@ -115,6 +120,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone',
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
         }, {
@@ -133,6 +139,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone',
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
         }, {
@@ -151,6 +158,7 @@
         '../deps/gtest/gtest.gyp:gtest',
         '../mapboxgl.gyp:mbgl-standalone',
       ],
+      'include_dirs': [ '../src' ],
       'conditions': [
         ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
         }, {
@@ -184,7 +192,8 @@
         '../mapboxgl.gyp:mbgl-standalone',
         '../mapboxgl.gyp:mbgl-headless',
         '<(platform_library)',
-      ]
+      ],
+      'include_dirs': [ '../src' ]
     },
     { 'target_name': 'text_conversions',
       'product_name': 'test_text_conversions',
@@ -198,6 +207,7 @@
         '../mapboxgl.gyp:mbgl-standalone',
         '<(platform_library)',
       ],
+      'include_dirs': [ '../src' ],
       'variables': {
         'cflags_cc': [
           '-I<(boost_root)/include',