[ios, osx] Consolidate remaining files in platform/{ios,osx}

485 files changed, 111 insertions, 112 deletions

diff --git a/.gitmodules b/.gitmodules
index 782e549df2..e27b5bc8b7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/mapbox/mason.git
 
 [submodule "test/ios/KIF"]
-	path = test/ios/KIF
+	path = platform/ios/test/KIF
 	url = https://github.com/kif-framework/KIF.git
 
 [submodule "platform/ios/vendor/SMCalloutView"]
diff --git a/.jazzy.yaml b/.jazzy.yaml
index ecbf9ff5bd..867c77e6b9 100644
--- a/.jazzy.yaml
+++ b/.jazzy.yaml
@@ -11,8 +11,8 @@ custom_head: |
 objc_mode: Yes
 skip_undocumented: Yes
 hide_documentation_coverage: Yes
-umbrella_header: include/mbgl/ios/Mapbox.h
-framework_root: include/mbgl/darwin
+umbrella_header: platform/ios/include/Mapbox.h
+framework_root: platform/darwin/include
 
 custom_categories:
   - name: Map
diff --git a/gyp/http-nsurl.gypi b/gyp/http-nsurl.gypi
index af15520c56..9c212ee7c0 100644
--- a/gyp/http-nsurl.gypi
+++ b/gyp/http-nsurl.gypi
@@ -7,7 +7,7 @@
       'hard_dependency': 1,
 
       'sources': [
-        '../platform/darwin/http_request_nsurl.mm',
+        '../platform/darwin/src/http_request_nsurl.mm',
       ],
 
       'include_dirs': [
diff --git a/gyp/ios.gyp b/gyp/ios.gyp
index e015318c45..6798384ef4 100644
--- a/gyp/ios.gyp
+++ b/gyp/ios.gyp
@@ -1,7 +1,7 @@
 {
   'includes': [
-    '../ios/app/mapboxgl-app.gypi',
-    '../ios/framework/framework-ios.gypi',
-    '../ios/benchmark/benchmark-ios.gypi',
+    '../platform/ios/app/mapboxgl-app.gypi',
+    '../platform/ios/framework/framework-ios.gypi',
+    '../platform/ios/benchmark/benchmark-ios.gypi',
   ],
 }
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index b166286af7..e33c3d453d 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -24,26 +24,26 @@
         '../platform/default/mbgl/storage/offline_download.cpp',
         '../platform/default/sqlite3.hpp',
         '../platform/default/sqlite3.cpp',
-        '../platform/darwin/log_nslog.mm',
-        '../platform/darwin/string_nsstring.mm',
-        '../platform/darwin/application_root.mm',
-        '../platform/darwin/image.mm',
-        '../platform/darwin/nsthread.mm',
-        '../platform/darwin/reachability.m',
-        '../platform/darwin/NSException+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.m',
-        '../platform/darwin/MGLTypes.m',
-        '../platform/darwin/MGLStyle.mm',
-        '../platform/darwin/MGLGeometry_Private.h',
-        '../platform/darwin/MGLGeometry.mm',
-        '../platform/darwin/MGLShape.m',
-        '../platform/darwin/MGLMultiPoint_Private.h',
-        '../platform/darwin/MGLMultiPoint.mm',
-        '../platform/darwin/MGLPointAnnotation.m',
-        '../platform/darwin/MGLPolyline.mm',
-        '../platform/darwin/MGLPolygon.mm',
-        '../platform/darwin/MGLMapCamera.mm',
+        '../platform/darwin/src/log_nslog.mm',
+        '../platform/darwin/src/string_nsstring.mm',
+        '../platform/darwin/src/application_root.mm',
+        '../platform/darwin/src/image.mm',
+        '../platform/darwin/src/nsthread.mm',
+        '../platform/darwin/src/reachability.m',
+        '../platform/darwin/src/NSException+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.m',
+        '../platform/darwin/src/MGLTypes.m',
+        '../platform/darwin/src/MGLStyle.mm',
+        '../platform/darwin/src/MGLGeometry_Private.h',
+        '../platform/darwin/src/MGLGeometry.mm',
+        '../platform/darwin/src/MGLShape.m',
+        '../platform/darwin/src/MGLMultiPoint_Private.h',
+        '../platform/darwin/src/MGLMultiPoint.mm',
+        '../platform/darwin/src/MGLPointAnnotation.m',
+        '../platform/darwin/src/MGLPolyline.mm',
+        '../platform/darwin/src/MGLPolygon.mm',
+        '../platform/darwin/src/MGLMapCamera.mm',
         '../platform/ios/src/MGLMapboxEvents.h',
         '../platform/ios/src/MGLMapboxEvents.m',
         '../platform/ios/src/MGLMapView.mm',
@@ -55,7 +55,7 @@
         '../platform/ios/src/MGLUserLocationAnnotationView.m',
         '../platform/ios/src/MGLAnnotationImage_Private.h',
         '../platform/ios/src/MGLAnnotationImage.m',
-        '../include/mbgl/ios/MGLCalloutView.h',
+        '../platform/ios/include/MGLCalloutView.h',
         '../platform/ios/src/MGLCompactCalloutView.h',
         '../platform/ios/src/MGLCompactCalloutView.m',
         '../platform/ios/src/NSBundle+MGLAdditions.h',
@@ -100,8 +100,8 @@
       },
 
       'include_dirs': [
-        '../include/mbgl/ios',
-        '../include/mbgl/darwin',
+        '../platform/ios/include',
+        '../platform/darwin/include',
         '../include',
         '../src',
         '../platform/default',
@@ -122,8 +122,8 @@
 
       'direct_dependent_settings': {
         'include_dirs': [
-          '../include/mbgl/ios',
-          '../include/mbgl/darwin',
+          '../platform/ios/include',
+          '../platform/darwin/include',
           '../include',
         ],
         'mac_bundle_resources': [
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 970fd1b5f6..804a4cd9a6 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -23,26 +23,26 @@
         '../platform/default/mbgl/storage/offline_download.cpp',
         '../platform/default/sqlite3.hpp',
         '../platform/default/sqlite3.cpp',
-        '../platform/darwin/log_nslog.mm',
-        '../platform/darwin/string_nsstring.mm',
-        '../platform/darwin/application_root.mm',
-        '../platform/darwin/image.mm',
-        '../platform/darwin/nsthread.mm',
-        '../platform/darwin/reachability.m',
-        '../platform/darwin/NSException+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.m',
-        '../platform/darwin/MGLTypes.m',
-        '../platform/darwin/MGLStyle.mm',
-        '../platform/darwin/MGLGeometry_Private.h',
-        '../platform/darwin/MGLGeometry.mm',
-        '../platform/darwin/MGLShape.m',
-        '../platform/darwin/MGLMultiPoint_Private.h',
-        '../platform/darwin/MGLMultiPoint.mm',
-        '../platform/darwin/MGLPointAnnotation.m',
-        '../platform/darwin/MGLPolyline.mm',
-        '../platform/darwin/MGLPolygon.mm',
-        '../platform/darwin/MGLMapCamera.mm',
+        '../platform/darwin/src/log_nslog.mm',
+        '../platform/darwin/src/string_nsstring.mm',
+        '../platform/darwin/src/application_root.mm',
+        '../platform/darwin/src/image.mm',
+        '../platform/darwin/src/nsthread.mm',
+        '../platform/darwin/src/reachability.m',
+        '../platform/darwin/src/NSException+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.m',
+        '../platform/darwin/src/MGLTypes.m',
+        '../platform/darwin/src/MGLStyle.mm',
+        '../platform/darwin/src/MGLGeometry_Private.h',
+        '../platform/darwin/src/MGLGeometry.mm',
+        '../platform/darwin/src/MGLShape.m',
+        '../platform/darwin/src/MGLMultiPoint_Private.h',
+        '../platform/darwin/src/MGLMultiPoint.mm',
+        '../platform/darwin/src/MGLPointAnnotation.m',
+        '../platform/darwin/src/MGLPolyline.mm',
+        '../platform/darwin/src/MGLPolygon.mm',
+        '../platform/darwin/src/MGLMapCamera.mm',
         '../platform/osx/src/MGLAccountManager_Private.h',
         '../platform/osx/src/MGLAccountManager.m',
         '../platform/osx/src/MGLMapView_Private.h',
@@ -85,8 +85,8 @@
       },
 
       'include_dirs': [
-        '../include/mbgl/osx',
-        '../include/mbgl/darwin',
+        '../platform/osx/include',
+        '../platform/darwin/include',
         '../include',
         '../src',
         '../platform/default',
@@ -107,8 +107,8 @@
 
       'direct_dependent_settings': {
         'include_dirs': [
-          '../include/mbgl/osx',
-          '../include/mbgl/darwin',
+          '../platform/osx/include',
+          '../platform/darwin/include',
           '../include',
         ],
         'mac_bundle_resources': [
diff --git a/ios/README.md b/ios/README.md
deleted file mode 100644
index a5ee2d37e5..0000000000
--- a/ios/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The Mapbox iOS SDK is [located here](../platform/ios/).
diff --git a/include/mbgl/darwin/MGLAnnotation.h b/platform/darwin/include/MGLAnnotation.h
index e4726f9503..e4726f9503 100644
--- a/include/mbgl/darwin/MGLAnnotation.h
+++ b/platform/darwin/include/MGLAnnotation.h
diff --git a/include/mbgl/darwin/MGLGeometry.h b/platform/darwin/include/MGLGeometry.h
index 8d185805db..8d185805db 100644
--- a/include/mbgl/darwin/MGLGeometry.h
+++ b/platform/darwin/include/MGLGeometry.h
diff --git a/include/mbgl/darwin/MGLMapCamera.h b/platform/darwin/include/MGLMapCamera.h
index 3cb902ba52..3cb902ba52 100644
--- a/include/mbgl/darwin/MGLMapCamera.h
+++ b/platform/darwin/include/MGLMapCamera.h
diff --git a/include/mbgl/darwin/MGLMultiPoint.h b/platform/darwin/include/MGLMultiPoint.h
index ad9db1e681..ad9db1e681 100644
--- a/include/mbgl/darwin/MGLMultiPoint.h
+++ b/platform/darwin/include/MGLMultiPoint.h
diff --git a/include/mbgl/darwin/MGLOverlay.h b/platform/darwin/include/MGLOverlay.h
index aa80fe3900..aa80fe3900 100644
--- a/include/mbgl/darwin/MGLOverlay.h
+++ b/platform/darwin/include/MGLOverlay.h
diff --git a/include/mbgl/darwin/MGLPointAnnotation.h b/platform/darwin/include/MGLPointAnnotation.h
index d186cbff18..d186cbff18 100644
--- a/include/mbgl/darwin/MGLPointAnnotation.h
+++ b/platform/darwin/include/MGLPointAnnotation.h
diff --git a/include/mbgl/darwin/MGLPolygon.h b/platform/darwin/include/MGLPolygon.h
index c5480264fb..c5480264fb 100644
--- a/include/mbgl/darwin/MGLPolygon.h
+++ b/platform/darwin/include/MGLPolygon.h
diff --git a/include/mbgl/darwin/MGLPolyline.h b/platform/darwin/include/MGLPolyline.h
index c28299c7e0..c28299c7e0 100644
--- a/include/mbgl/darwin/MGLPolyline.h
+++ b/platform/darwin/include/MGLPolyline.h
diff --git a/include/mbgl/darwin/MGLShape.h b/platform/darwin/include/MGLShape.h
index c1b84816f2..c1b84816f2 100644
--- a/include/mbgl/darwin/MGLShape.h
+++ b/platform/darwin/include/MGLShape.h
diff --git a/include/mbgl/darwin/MGLStyle.h b/platform/darwin/include/MGLStyle.h
index e5b2de877c..e5b2de877c 100644
--- a/include/mbgl/darwin/MGLStyle.h
+++ b/platform/darwin/include/MGLStyle.h
diff --git a/include/mbgl/darwin/MGLTypes.h b/platform/darwin/include/MGLTypes.h
index c107055dbb..c107055dbb 100644
--- a/include/mbgl/darwin/MGLTypes.h
+++ b/platform/darwin/include/MGLTypes.h
diff --git a/platform/darwin/MGLGeometry.mm b/platform/darwin/src/MGLGeometry.mm
index 70f00afd2f..70f00afd2f 100644
--- a/platform/darwin/MGLGeometry.mm
+++ b/platform/darwin/src/MGLGeometry.mm
diff --git a/platform/darwin/MGLGeometry_Private.h b/platform/darwin/src/MGLGeometry_Private.h
index 72123827df..72123827df 100644
--- a/platform/darwin/MGLGeometry_Private.h
+++ b/platform/darwin/src/MGLGeometry_Private.h
diff --git a/platform/darwin/MGLMapCamera.mm b/platform/darwin/src/MGLMapCamera.mm
index 93f3bd45e0..93f3bd45e0 100644
--- a/platform/darwin/MGLMapCamera.mm
+++ b/platform/darwin/src/MGLMapCamera.mm
diff --git a/platform/darwin/MGLMultiPoint.mm b/platform/darwin/src/MGLMultiPoint.mm
index 3cd0f0c117..3cd0f0c117 100644
--- a/platform/darwin/MGLMultiPoint.mm
+++ b/platform/darwin/src/MGLMultiPoint.mm
diff --git a/platform/darwin/MGLMultiPoint_Private.h b/platform/darwin/src/MGLMultiPoint_Private.h
index c1f1fa1584..c1f1fa1584 100644
--- a/platform/darwin/MGLMultiPoint_Private.h
+++ b/platform/darwin/src/MGLMultiPoint_Private.h
diff --git a/platform/darwin/MGLPointAnnotation.m b/platform/darwin/src/MGLPointAnnotation.m
index 13fbba1083..13fbba1083 100644
--- a/platform/darwin/MGLPointAnnotation.m
+++ b/platform/darwin/src/MGLPointAnnotation.m
diff --git a/platform/darwin/MGLPolygon.mm b/platform/darwin/src/MGLPolygon.mm
index 5019385cb2..5019385cb2 100644
--- a/platform/darwin/MGLPolygon.mm
+++ b/platform/darwin/src/MGLPolygon.mm
diff --git a/platform/darwin/MGLPolyline.mm b/platform/darwin/src/MGLPolyline.mm
index f560a571bc..f560a571bc 100644
--- a/platform/darwin/MGLPolyline.mm
+++ b/platform/darwin/src/MGLPolyline.mm
diff --git a/platform/darwin/MGLShape.m b/platform/darwin/src/MGLShape.m
index e3d92c38c8..e3d92c38c8 100644
--- a/platform/darwin/MGLShape.m
+++ b/platform/darwin/src/MGLShape.m
diff --git a/platform/darwin/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm
index 15a25db9e3..15a25db9e3 100644
--- a/platform/darwin/MGLStyle.mm
+++ b/platform/darwin/src/MGLStyle.mm
diff --git a/platform/darwin/MGLTypes.m b/platform/darwin/src/MGLTypes.m
index 01e9a1467c..01e9a1467c 100644
--- a/platform/darwin/MGLTypes.m
+++ b/platform/darwin/src/MGLTypes.m
diff --git a/platform/darwin/NSException+MGLAdditions.h b/platform/darwin/src/NSException+MGLAdditions.h
index f75b54c15c..f75b54c15c 100644
--- a/platform/darwin/NSException+MGLAdditions.h
+++ b/platform/darwin/src/NSException+MGLAdditions.h
diff --git a/platform/darwin/NSString+MGLAdditions.h b/platform/darwin/src/NSString+MGLAdditions.h
index 6064f8b40f..6064f8b40f 100644
--- a/platform/darwin/NSString+MGLAdditions.h
+++ b/platform/darwin/src/NSString+MGLAdditions.h
diff --git a/platform/darwin/NSString+MGLAdditions.m b/platform/darwin/src/NSString+MGLAdditions.m
index b94a5f0198..b94a5f0198 100644
--- a/platform/darwin/NSString+MGLAdditions.m
+++ b/platform/darwin/src/NSString+MGLAdditions.m
diff --git a/platform/darwin/application_root.mm b/platform/darwin/src/application_root.mm
index d4702c7ec5..d4702c7ec5 100644
--- a/platform/darwin/application_root.mm
+++ b/platform/darwin/src/application_root.mm
diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/src/http_request_nsurl.mm
index 90b2ab9131..90b2ab9131 100644
--- a/platform/darwin/http_request_nsurl.mm
+++ b/platform/darwin/src/http_request_nsurl.mm
diff --git a/platform/darwin/image.mm b/platform/darwin/src/image.mm
index 854b9157f8..854b9157f8 100644
--- a/platform/darwin/image.mm
+++ b/platform/darwin/src/image.mm
diff --git a/platform/darwin/log_nslog.mm b/platform/darwin/src/log_nslog.mm
index a2e31968ab..a2e31968ab 100644
--- a/platform/darwin/log_nslog.mm
+++ b/platform/darwin/src/log_nslog.mm
diff --git a/platform/darwin/nsthread.mm b/platform/darwin/src/nsthread.mm
index 9ac1d2caa0..9ac1d2caa0 100644
--- a/platform/darwin/nsthread.mm
+++ b/platform/darwin/src/nsthread.mm
diff --git a/platform/darwin/reachability.m b/platform/darwin/src/reachability.m
index 8abcf5ae6d..8abcf5ae6d 100644
--- a/platform/darwin/reachability.m
+++ b/platform/darwin/src/reachability.m
diff --git a/platform/darwin/settings_nsuserdefaults.mm b/platform/darwin/src/settings_nsuserdefaults.mm
index 548ee9b220..548ee9b220 100644
--- a/platform/darwin/settings_nsuserdefaults.mm
+++ b/platform/darwin/src/settings_nsuserdefaults.mm
diff --git a/platform/darwin/string_nsstring.mm b/platform/darwin/src/string_nsstring.mm
index 9bf199afc0..9bf199afc0 100644
--- a/platform/darwin/string_nsstring.mm
+++ b/platform/darwin/src/string_nsstring.mm
diff --git a/platform/ios/DEVELOPING.md b/platform/ios/DEVELOPING.md
index f4d903532f..1aeb152b98 100644
--- a/platform/ios/DEVELOPING.md
+++ b/platform/ios/DEVELOPING.md
@@ -48,7 +48,7 @@ Run
 
 To run the included integration tests on the command line.
 
-If you want to run the tests in Xcode instead, first `make ipackage` to create a local static library version, then open `test/ios/ios-tests.xcodeproj`, and lastly `Command + U` on the `Mapbox GL Tests` application target.
+If you want to run the tests in Xcode instead, first `make ipackage` to create a local static library version, then open `platform/ios/test/ios-tests.xcodeproj`, and lastly `Command + U` on the `Mapbox GL Tests` application target.
 
 ### Usage
 
diff --git a/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec
index 4e759db61b..4e759db61b 100644
--- a/ios/Mapbox-iOS-SDK.podspec
+++ b/platform/ios/Mapbox-iOS-SDK.podspec
diff --git a/ios/app/MBXAppDelegate.h b/platform/ios/app/MBXAppDelegate.h
index da081fdcd5..da081fdcd5 100644
--- a/ios/app/MBXAppDelegate.h
+++ b/platform/ios/app/MBXAppDelegate.h
diff --git a/ios/app/MBXAppDelegate.m b/platform/ios/app/MBXAppDelegate.m
index a06424feb7..a06424feb7 100644
--- a/ios/app/MBXAppDelegate.m
+++ b/platform/ios/app/MBXAppDelegate.m
diff --git a/ios/app/MBXCustomCalloutView.h b/platform/ios/app/MBXCustomCalloutView.h
index a61619b79f..a61619b79f 100644
--- a/ios/app/MBXCustomCalloutView.h
+++ b/platform/ios/app/MBXCustomCalloutView.h
diff --git a/ios/app/MBXCustomCalloutView.m b/platform/ios/app/MBXCustomCalloutView.m
index 8f9bd8ed40..8f9bd8ed40 100644
--- a/ios/app/MBXCustomCalloutView.m
+++ b/platform/ios/app/MBXCustomCalloutView.m
diff --git a/ios/app/MBXViewController.h b/platform/ios/app/MBXViewController.h
index 924d3af60c..924d3af60c 100644
--- a/ios/app/MBXViewController.h
+++ b/platform/ios/app/MBXViewController.h
diff --git a/ios/app/MBXViewController.mm b/platform/ios/app/MBXViewController.mm
index 8269b09f32..af4e425841 100644
--- a/ios/app/MBXViewController.mm
+++ b/platform/ios/app/MBXViewController.mm
@@ -2,7 +2,7 @@
 #import "MBXCustomCalloutView.h"
 
 #import <Mapbox/Mapbox.h>
-#import "../../include/mbgl/util/default_styles.hpp"
+#import "../../../include/mbgl/util/default_styles.hpp"
 
 #import <CoreLocation/CoreLocation.h>
 #import <OpenGLES/ES2/gl.h>
diff --git a/ios/app/Settings.bundle/Root.plist b/platform/ios/app/Settings.bundle/Root.plist
index 889610e152..889610e152 100644
--- a/ios/app/Settings.bundle/Root.plist
+++ b/platform/ios/app/Settings.bundle/Root.plist
diff --git a/ios/app/Settings.bundle/en.lproj/Root.strings b/platform/ios/app/Settings.bundle/en.lproj/Root.strings
index 5343a34ae5..5343a34ae5 100644
--- a/ios/app/Settings.bundle/en.lproj/Root.strings
+++ b/platform/ios/app/Settings.bundle/en.lproj/Root.strings
diff --git a/ios/app/app-info.plist b/platform/ios/app/app-info.plist
index eb2080dd08..eb2080dd08 100644
--- a/ios/app/app-info.plist
+++ b/platform/ios/app/app-info.plist
diff --git a/ios/app/img/Default-568h@2x.png b/platform/ios/app/img/Default-568h@2x.png
index ea3706427a..ea3706427a 100644
--- a/ios/app/img/Default-568h@2x.png
+++ b/platform/ios/app/img/Default-568h@2x.png
diff --git a/ios/app/img/Default-667h@2x.png b/platform/ios/app/img/Default-667h@2x.png
index 03f139de66..03f139de66 100644
--- a/ios/app/img/Default-667h@2x.png
+++ b/platform/ios/app/img/Default-667h@2x.png
diff --git a/ios/app/img/Icon-40.png b/platform/ios/app/img/Icon-40.png
index eca13393e6..eca13393e6 100644
--- a/ios/app/img/Icon-40.png
+++ b/platform/ios/app/img/Icon-40.png
diff --git a/ios/app/img/Icon-40@2x.png b/platform/ios/app/img/Icon-40@2x.png
index 070d037539..070d037539 100644
--- a/ios/app/img/Icon-40@2x.png
+++ b/platform/ios/app/img/Icon-40@2x.png
diff --git a/ios/app/img/Icon-60.png b/platform/ios/app/img/Icon-60.png
index ff4c6ab4b1..ff4c6ab4b1 100644
--- a/ios/app/img/Icon-60.png
+++ b/platform/ios/app/img/Icon-60.png
diff --git a/ios/app/img/Icon-60@2x.png b/platform/ios/app/img/Icon-60@2x.png
index b7f25955f5..b7f25955f5 100644
--- a/ios/app/img/Icon-60@2x.png
+++ b/platform/ios/app/img/Icon-60@2x.png
diff --git a/ios/app/img/Icon-60@3x.png b/platform/ios/app/img/Icon-60@3x.png
index b00d479839..b00d479839 100644
--- a/ios/app/img/Icon-60@3x.png
+++ b/platform/ios/app/img/Icon-60@3x.png
diff --git a/ios/app/img/Icon-72.png b/platform/ios/app/img/Icon-72.png
index 0c876f664d..0c876f664d 100644
--- a/ios/app/img/Icon-72.png
+++ b/platform/ios/app/img/Icon-72.png
diff --git a/ios/app/img/Icon-72@2x.png b/platform/ios/app/img/Icon-72@2x.png
index 6da408204a..6da408204a 100644
--- a/ios/app/img/Icon-72@2x.png
+++ b/platform/ios/app/img/Icon-72@2x.png
diff --git a/ios/app/img/Icon-76.png b/platform/ios/app/img/Icon-76.png
index 895b4a1761..895b4a1761 100644
--- a/ios/app/img/Icon-76.png
+++ b/platform/ios/app/img/Icon-76.png
diff --git a/ios/app/img/Icon-76@2x.png b/platform/ios/app/img/Icon-76@2x.png
index 7bc5208976..7bc5208976 100644
--- a/ios/app/img/Icon-76@2x.png
+++ b/platform/ios/app/img/Icon-76@2x.png
diff --git a/ios/app/img/Icon-76@3x.png b/platform/ios/app/img/Icon-76@3x.png
index 64edff1835..64edff1835 100644
--- a/ios/app/img/Icon-76@3x.png
+++ b/platform/ios/app/img/Icon-76@3x.png
diff --git a/ios/app/img/Icon-Small-50.png b/platform/ios/app/img/Icon-Small-50.png
index 6d17da4b00..6d17da4b00 100644
--- a/ios/app/img/Icon-Small-50.png
+++ b/platform/ios/app/img/Icon-Small-50.png
diff --git a/ios/app/img/Icon-Small-50@2x.png b/platform/ios/app/img/Icon-Small-50@2x.png
index ac4ec19282..ac4ec19282 100644
--- a/ios/app/img/Icon-Small-50@2x.png
+++ b/platform/ios/app/img/Icon-Small-50@2x.png
diff --git a/ios/app/img/Icon-Small.png b/platform/ios/app/img/Icon-Small.png
index aecbbc8a1d..aecbbc8a1d 100644
--- a/ios/app/img/Icon-Small.png
+++ b/platform/ios/app/img/Icon-Small.png
diff --git a/ios/app/img/Icon-Small@2x.png b/platform/ios/app/img/Icon-Small@2x.png
index 7773852e7a..7773852e7a 100644
--- a/ios/app/img/Icon-Small@2x.png
+++ b/platform/ios/app/img/Icon-Small@2x.png
diff --git a/ios/app/img/Icon-Small@3x.png b/platform/ios/app/img/Icon-Small@3x.png
index e16f3fa6a9..e16f3fa6a9 100644
--- a/ios/app/img/Icon-Small@3x.png
+++ b/platform/ios/app/img/Icon-Small@3x.png
diff --git a/ios/app/img/Icon-Spotlight-40.png b/platform/ios/app/img/Icon-Spotlight-40.png
index eca13393e6..eca13393e6 100644
--- a/ios/app/img/Icon-Spotlight-40.png
+++ b/platform/ios/app/img/Icon-Spotlight-40.png
diff --git a/ios/app/img/Icon-Spotlight-40@2x.png b/platform/ios/app/img/Icon-Spotlight-40@2x.png
index 070d037539..070d037539 100644
--- a/ios/app/img/Icon-Spotlight-40@2x.png
+++ b/platform/ios/app/img/Icon-Spotlight-40@2x.png
diff --git a/ios/app/img/Icon-Spotlight-40@3x.png b/platform/ios/app/img/Icon-Spotlight-40@3x.png
index a3789dcb78..a3789dcb78 100644
--- a/ios/app/img/Icon-Spotlight-40@3x.png
+++ b/platform/ios/app/img/Icon-Spotlight-40@3x.png
diff --git a/ios/app/img/Icon.png b/platform/ios/app/img/Icon.png
index 9ca8194eef..9ca8194eef 100644
--- a/ios/app/img/Icon.png
+++ b/platform/ios/app/img/Icon.png
diff --git a/ios/app/img/Icon@2x.png b/platform/ios/app/img/Icon@2x.png
index 7c2e8ba037..7c2e8ba037 100644
--- a/ios/app/img/Icon@2x.png
+++ b/platform/ios/app/img/Icon@2x.png
diff --git a/ios/app/img/TrackingHeadingMask.png b/platform/ios/app/img/TrackingHeadingMask.png
index 9ec0567a3f..9ec0567a3f 100644
--- a/ios/app/img/TrackingHeadingMask.png
+++ b/platform/ios/app/img/TrackingHeadingMask.png
diff --git a/ios/app/img/TrackingHeadingMask@2x.png b/platform/ios/app/img/TrackingHeadingMask@2x.png
index 0df8ccc229..0df8ccc229 100644
--- a/ios/app/img/TrackingHeadingMask@2x.png
+++ b/platform/ios/app/img/TrackingHeadingMask@2x.png
diff --git a/ios/app/img/TrackingHeadingMask@3x.png b/platform/ios/app/img/TrackingHeadingMask@3x.png
index e4b93e42e7..e4b93e42e7 100644
--- a/ios/app/img/TrackingHeadingMask@3x.png
+++ b/platform/ios/app/img/TrackingHeadingMask@3x.png
diff --git a/ios/app/img/TrackingLocationMask.png b/platform/ios/app/img/TrackingLocationMask.png
index bb7348c482..bb7348c482 100644
--- a/ios/app/img/TrackingLocationMask.png
+++ b/platform/ios/app/img/TrackingLocationMask.png
diff --git a/ios/app/img/TrackingLocationMask@2x.png b/platform/ios/app/img/TrackingLocationMask@2x.png
index 35c5a293ec..35c5a293ec 100644
--- a/ios/app/img/TrackingLocationMask@2x.png
+++ b/platform/ios/app/img/TrackingLocationMask@2x.png
diff --git a/ios/app/img/TrackingLocationMask@3x.png b/platform/ios/app/img/TrackingLocationMask@3x.png
index af523975a5..af523975a5 100644
--- a/ios/app/img/TrackingLocationMask@3x.png
+++ b/platform/ios/app/img/TrackingLocationMask@3x.png
diff --git a/ios/app/img/TrackingLocationOffMask.png b/platform/ios/app/img/TrackingLocationOffMask.png
index 87b26c5710..87b26c5710 100644
--- a/ios/app/img/TrackingLocationOffMask.png
+++ b/platform/ios/app/img/TrackingLocationOffMask.png
diff --git a/ios/app/img/TrackingLocationOffMask@2x.png b/platform/ios/app/img/TrackingLocationOffMask@2x.png
index 232d534b41..232d534b41 100644
--- a/ios/app/img/TrackingLocationOffMask@2x.png
+++ b/platform/ios/app/img/TrackingLocationOffMask@2x.png
diff --git a/ios/app/img/TrackingLocationOffMask@3x.png b/platform/ios/app/img/TrackingLocationOffMask@3x.png
index b609fbe84e..b609fbe84e 100644
--- a/ios/app/img/TrackingLocationOffMask@3x.png
+++ b/platform/ios/app/img/TrackingLocationOffMask@3x.png
diff --git a/ios/app/img/iTunesArtwork b/platform/ios/app/img/iTunesArtwork
index ac6a0c58e8..ac6a0c58e8 100644
--- a/ios/app/img/iTunesArtwork
+++ b/platform/ios/app/img/iTunesArtwork
diff --git a/ios/app/img/iTunesArtwork.png b/platform/ios/app/img/iTunesArtwork.png
index b10824b048..b10824b048 100644
--- a/ios/app/img/iTunesArtwork.png
+++ b/platform/ios/app/img/iTunesArtwork.png
diff --git a/ios/app/img/iTunesArtwork@2x b/platform/ios/app/img/iTunesArtwork@2x
index fae1dad8bf..fae1dad8bf 100644
--- a/ios/app/img/iTunesArtwork@2x
+++ b/platform/ios/app/img/iTunesArtwork@2x
diff --git a/ios/app/img/iTunesArtwork@2x.png b/platform/ios/app/img/iTunesArtwork@2x.png
index fdee900aa4..fdee900aa4 100644
--- a/ios/app/img/iTunesArtwork@2x.png
+++ b/platform/ios/app/img/iTunesArtwork@2x.png
diff --git a/ios/app/img/settings.png b/platform/ios/app/img/settings.png
index 5d7643eef5..5d7643eef5 100644
--- a/ios/app/img/settings.png
+++ b/platform/ios/app/img/settings.png
diff --git a/ios/app/img/settings@2x.png b/platform/ios/app/img/settings@2x.png
index 2bb9f0ebad..2bb9f0ebad 100644
--- a/ios/app/img/settings@2x.png
+++ b/platform/ios/app/img/settings@2x.png
diff --git a/ios/app/main.m b/platform/ios/app/main.m
index 954584f141..954584f141 100644
--- a/ios/app/main.m
+++ b/platform/ios/app/main.m
diff --git a/ios/app/mapboxgl-app.gypi b/platform/ios/app/mapboxgl-app.gypi
index f154a10e9b..5f9a11873a 100644
--- a/ios/app/mapboxgl-app.gypi
+++ b/platform/ios/app/mapboxgl-app.gypi
@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../../gyp/common.gypi',
+    '../../../gyp/common.gypi',
   ],
   'targets': [
     {
@@ -10,7 +10,7 @@
       'product_extension': 'app',
       'mac_bundle': 1,
       'mac_bundle_resources': [
-        '<!@(find ../ios/app/img -type f)',
+        '<!@(find ../platform/ios/app/img -type f)',
         './points.geojson',
         './polyline.geojson',
         './threestates.geojson',
@@ -36,7 +36,7 @@
         'SDKROOT': 'iphoneos',
         'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
         'IPHONEOS_DEPLOYMENT_TARGET': '8.0',
-        'INFOPLIST_FILE': '../ios/app/app-info.plist',
+        'INFOPLIST_FILE': '../platform/ios/app/app-info.plist',
         'TARGETED_DEVICE_FAMILY': '1,2',
         'COMBINE_HIDPI_IMAGES': 'NO', # disable combining @2x, @3x images into .tiff files
         'COPY_PHASE_STRIP': 'NO',
diff --git a/ios/app/points.geojson b/platform/ios/app/points.geojson
index a34f53bd36..a34f53bd36 100644
--- a/ios/app/points.geojson
+++ b/platform/ios/app/points.geojson
diff --git a/ios/app/polyline.geojson b/platform/ios/app/polyline.geojson
index c104969544..c104969544 100644
--- a/ios/app/polyline.geojson
+++ b/platform/ios/app/polyline.geojson
diff --git a/ios/app/threestates.geojson b/platform/ios/app/threestates.geojson
index 9b70388782..9b70388782 100644
--- a/ios/app/threestates.geojson
+++ b/platform/ios/app/threestates.geojson
diff --git a/ios/benchmark/MBXBenchAppDelegate.h b/platform/ios/benchmark/MBXBenchAppDelegate.h
index b8f6c2e641..b8f6c2e641 100644
--- a/ios/benchmark/MBXBenchAppDelegate.h
+++ b/platform/ios/benchmark/MBXBenchAppDelegate.h
diff --git a/ios/benchmark/MBXBenchAppDelegate.m b/platform/ios/benchmark/MBXBenchAppDelegate.m
index e8fbd88d28..e8fbd88d28 100644
--- a/ios/benchmark/MBXBenchAppDelegate.m
+++ b/platform/ios/benchmark/MBXBenchAppDelegate.m
diff --git a/ios/benchmark/MBXBenchViewController.h b/platform/ios/benchmark/MBXBenchViewController.h
index c4439be5ec..c4439be5ec 100644
--- a/ios/benchmark/MBXBenchViewController.h
+++ b/platform/ios/benchmark/MBXBenchViewController.h
diff --git a/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm
index 44ca48f436..44ca48f436 100644
--- a/ios/benchmark/MBXBenchViewController.mm
+++ b/platform/ios/benchmark/MBXBenchViewController.mm
diff --git a/ios/benchmark/app-info.plist b/platform/ios/benchmark/app-info.plist
index 9d0aad09e1..9d0aad09e1 100644
--- a/ios/benchmark/app-info.plist
+++ b/platform/ios/benchmark/app-info.plist
diff --git a/ios/benchmark/assets/glyphs/download.sh b/platform/ios/benchmark/assets/glyphs/download.sh
index 01ca5c63c7..01ca5c63c7 100755
--- a/ios/benchmark/assets/glyphs/download.sh
+++ b/platform/ios/benchmark/assets/glyphs/download.sh
diff --git a/ios/benchmark/assets/sprites/mapbox-streets.json b/platform/ios/benchmark/assets/sprites/mapbox-streets.json
index 488bf335de..488bf335de 100644
--- a/ios/benchmark/assets/sprites/mapbox-streets.json
+++ b/platform/ios/benchmark/assets/sprites/mapbox-streets.json
diff --git a/ios/benchmark/assets/sprites/mapbox-streets.png b/platform/ios/benchmark/assets/sprites/mapbox-streets.png
index 00925f91a2..00925f91a2 100644
--- a/ios/benchmark/assets/sprites/mapbox-streets.png
+++ b/platform/ios/benchmark/assets/sprites/mapbox-streets.png
diff --git a/ios/benchmark/assets/sprites/mapbox-streets@2x.json b/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.json
index 0a193fb4db..0a193fb4db 100644
--- a/ios/benchmark/assets/sprites/mapbox-streets@2x.json
+++ b/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.json
diff --git a/ios/benchmark/assets/sprites/mapbox-streets@2x.png b/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.png
index 0d5bd533f7..0d5bd533f7 100644
--- a/ios/benchmark/assets/sprites/mapbox-streets@2x.png
+++ b/platform/ios/benchmark/assets/sprites/mapbox-streets@2x.png
diff --git a/ios/benchmark/assets/styles/streets-v8.json b/platform/ios/benchmark/assets/styles/streets-v8.json
index 4befdc121a..4befdc121a 100644
--- a/ios/benchmark/assets/styles/streets-v8.json
+++ b/platform/ios/benchmark/assets/styles/streets-v8.json
diff --git a/ios/benchmark/assets/tiles/download.sh b/platform/ios/benchmark/assets/tiles/download.sh
index f44dda18fd..f44dda18fd 100755
--- a/ios/benchmark/assets/tiles/download.sh
+++ b/platform/ios/benchmark/assets/tiles/download.sh
diff --git a/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json b/platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json
index 140aa48fa7..140aa48fa7 100644
--- a/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json
+++ b/platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6.json
diff --git a/ios/benchmark/benchmark-ios.gypi b/platform/ios/benchmark/benchmark-ios.gypi
index 4ed3535cad..3b1efa6d73 100644
--- a/ios/benchmark/benchmark-ios.gypi
+++ b/platform/ios/benchmark/benchmark-ios.gypi
@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../../gyp/common.gypi',
+    '../../../gyp/common.gypi',
   ],
   'targets': [
     { 'target_name': 'ios-bench',
@@ -9,7 +9,7 @@
       'product_extension': 'app',
       'mac_bundle': 1,
       'mac_bundle_resources': [
-        '<!@(find ../ios/benchmark/img -type f)',
+        '<!@(find ../platform/ios/benchmark/img -type f)',
         'assets/glyphs',
         'assets/sprites',
         'assets/tiles',
@@ -36,7 +36,7 @@
         'SDKROOT': 'iphoneos',
         'SUPPORTED_PLATFORMS': 'iphoneos',
         'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
-        'INFOPLIST_FILE': '../ios/benchmark/app-info.plist',
+        'INFOPLIST_FILE': '../platform/ios/benchmark/app-info.plist',
         'TARGETED_DEVICE_FAMILY': '1,2',
         'COMBINE_HIDPI_IMAGES': 'NO', # don't merge @2x.png images into .tiff files
         'CLANG_ENABLE_OBJC_ARC': 'YES',
diff --git a/ios/benchmark/img/Icon-40.png b/platform/ios/benchmark/img/Icon-40.png
index 2425133189..2425133189 100644
--- a/ios/benchmark/img/Icon-40.png
+++ b/platform/ios/benchmark/img/Icon-40.png
diff --git a/ios/benchmark/img/Icon-40@2x.png b/platform/ios/benchmark/img/Icon-40@2x.png
index b827b1e5a1..b827b1e5a1 100644
--- a/ios/benchmark/img/Icon-40@2x.png
+++ b/platform/ios/benchmark/img/Icon-40@2x.png
diff --git a/ios/benchmark/img/Icon-40@3x.png b/platform/ios/benchmark/img/Icon-40@3x.png
index 89c7119ac6..89c7119ac6 100644
--- a/ios/benchmark/img/Icon-40@3x.png
+++ b/platform/ios/benchmark/img/Icon-40@3x.png
diff --git a/ios/benchmark/img/Icon-60.png b/platform/ios/benchmark/img/Icon-60.png
index 409fad814a..409fad814a 100644
--- a/ios/benchmark/img/Icon-60.png
+++ b/platform/ios/benchmark/img/Icon-60.png
diff --git a/ios/benchmark/img/Icon-60@2x.png b/platform/ios/benchmark/img/Icon-60@2x.png
index 89c7119ac6..89c7119ac6 100644
--- a/ios/benchmark/img/Icon-60@2x.png
+++ b/platform/ios/benchmark/img/Icon-60@2x.png
diff --git a/ios/benchmark/img/Icon-60@3x.png b/platform/ios/benchmark/img/Icon-60@3x.png
index 158bcfe27e..158bcfe27e 100644
--- a/ios/benchmark/img/Icon-60@3x.png
+++ b/platform/ios/benchmark/img/Icon-60@3x.png
diff --git a/ios/benchmark/img/Icon-72.png b/platform/ios/benchmark/img/Icon-72.png
index eecd90b5eb..eecd90b5eb 100644
--- a/ios/benchmark/img/Icon-72.png
+++ b/platform/ios/benchmark/img/Icon-72.png
diff --git a/ios/benchmark/img/Icon-72@2x.png b/platform/ios/benchmark/img/Icon-72@2x.png
index ca28d1fa05..ca28d1fa05 100644
--- a/ios/benchmark/img/Icon-72@2x.png
+++ b/platform/ios/benchmark/img/Icon-72@2x.png
diff --git a/ios/benchmark/img/Icon-76.png b/platform/ios/benchmark/img/Icon-76.png
index 0ed2a26730..0ed2a26730 100644
--- a/ios/benchmark/img/Icon-76.png
+++ b/platform/ios/benchmark/img/Icon-76.png
diff --git a/ios/benchmark/img/Icon-76@2x.png b/platform/ios/benchmark/img/Icon-76@2x.png
index 311a1658a8..311a1658a8 100644
--- a/ios/benchmark/img/Icon-76@2x.png
+++ b/platform/ios/benchmark/img/Icon-76@2x.png
diff --git a/ios/benchmark/img/Icon-Small-50.png b/platform/ios/benchmark/img/Icon-Small-50.png
index a071034743..a071034743 100644
--- a/ios/benchmark/img/Icon-Small-50.png
+++ b/platform/ios/benchmark/img/Icon-Small-50.png
diff --git a/ios/benchmark/img/Icon-Small-50@2x.png b/platform/ios/benchmark/img/Icon-Small-50@2x.png
index 5d7c76d5e2..5d7c76d5e2 100644
--- a/ios/benchmark/img/Icon-Small-50@2x.png
+++ b/platform/ios/benchmark/img/Icon-Small-50@2x.png
diff --git a/ios/benchmark/img/Icon-Small.png b/platform/ios/benchmark/img/Icon-Small.png
index 630d7c04c6..630d7c04c6 100644
--- a/ios/benchmark/img/Icon-Small.png
+++ b/platform/ios/benchmark/img/Icon-Small.png
diff --git a/ios/benchmark/img/Icon-Small@2x.png b/platform/ios/benchmark/img/Icon-Small@2x.png
index c0ee89211a..c0ee89211a 100644
--- a/ios/benchmark/img/Icon-Small@2x.png
+++ b/platform/ios/benchmark/img/Icon-Small@2x.png
diff --git a/ios/benchmark/img/Icon-Small@3x.png b/platform/ios/benchmark/img/Icon-Small@3x.png
index 436a8b404c..436a8b404c 100644
--- a/ios/benchmark/img/Icon-Small@3x.png
+++ b/platform/ios/benchmark/img/Icon-Small@3x.png
diff --git a/ios/benchmark/img/Icon.png b/platform/ios/benchmark/img/Icon.png
index 7af0c68a38..7af0c68a38 100644
--- a/ios/benchmark/img/Icon.png
+++ b/platform/ios/benchmark/img/Icon.png
diff --git a/ios/benchmark/img/Icon.svg b/platform/ios/benchmark/img/Icon.svg
index 28df6f600d..28df6f600d 100644
--- a/ios/benchmark/img/Icon.svg
+++ b/platform/ios/benchmark/img/Icon.svg
diff --git a/ios/benchmark/img/Icon@2x.png b/platform/ios/benchmark/img/Icon@2x.png
index ff5ea0c073..ff5ea0c073 100644
--- a/ios/benchmark/img/Icon@2x.png
+++ b/platform/ios/benchmark/img/Icon@2x.png
diff --git a/ios/benchmark/img/iTunesArtwork.png b/platform/ios/benchmark/img/iTunesArtwork.png
index f87c8734b5..f87c8734b5 100644
--- a/ios/benchmark/img/iTunesArtwork.png
+++ b/platform/ios/benchmark/img/iTunesArtwork.png
diff --git a/ios/benchmark/img/iTunesArtwork@2x.png b/platform/ios/benchmark/img/iTunesArtwork@2x.png
index 8d456a126f..8d456a126f 100644
--- a/ios/benchmark/img/iTunesArtwork@2x.png
+++ b/platform/ios/benchmark/img/iTunesArtwork@2x.png
diff --git a/ios/benchmark/locations.cpp b/platform/ios/benchmark/locations.cpp
index 9f53877e40..9f53877e40 100644
--- a/ios/benchmark/locations.cpp
+++ b/platform/ios/benchmark/locations.cpp
diff --git a/ios/benchmark/locations.hpp b/platform/ios/benchmark/locations.hpp
index 96f9c6025b..96f9c6025b 100644
--- a/ios/benchmark/locations.hpp
+++ b/platform/ios/benchmark/locations.hpp
diff --git a/ios/benchmark/main.m b/platform/ios/benchmark/main.m
index 52bb445552..52bb445552 100644
--- a/ios/benchmark/main.m
+++ b/platform/ios/benchmark/main.m
diff --git a/platform/ios/bitrise.yml b/platform/ios/bitrise.yml
index 25860485a4..556d10a2bb 100644
--- a/platform/ios/bitrise.yml
+++ b/platform/ios/bitrise.yml
@@ -48,7 +48,7 @@ workflows:
         title: Run Xcode Tests
         run_if: '{{enveq "SKIPCI" "false"}}'
         inputs:
-        - project_path: "./test/ios/ios-tests.xcodeproj"
+        - project_path: "./platform/ios/test/ios-tests.xcodeproj"
         - scheme: Mapbox GL Tests
         - simulator_device: iPhone 6
           opts:
diff --git a/ios/docs/doc-README.md b/platform/ios/docs/doc-README.md
index 0565d65cdd..0565d65cdd 100644
--- a/ios/docs/doc-README.md
+++ b/platform/ios/docs/doc-README.md
diff --git a/ios/docs/install_docs.sh b/platform/ios/docs/install_docs.sh
index 43af9432b2..c5093cb5e1 100755
--- a/ios/docs/install_docs.sh
+++ b/platform/ios/docs/install_docs.sh
@@ -19,7 +19,7 @@ echo >> ${README}
 echo -n "#" >> ${README}
 cat ../../CHANGELOG.md | sed -n "/^## iOS ${DOCS_VERSION}/,/^##/p" | sed '$d' >> ${README}
 # Copy headers to a temporary location where we can substitute macros that appledoc doesn't understand.
-cp -r ../../include/mbgl/ios /tmp/mbgl
+cp -r ../../platform/ios/include /tmp/mbgl
 perl \
     -pi \
     -e 's/NS_(?:(MUTABLE)_)?(ARRAY|SET|DICTIONARY)_OF\(\s*(.+?)\s*\)/NS\L\u$1\u$2\E <$3>/g' \
diff --git a/ios/docs/pod-README.md b/platform/ios/docs/pod-README.md
index f0e28673b9..f0e28673b9 100644
--- a/ios/docs/pod-README.md
+++ b/platform/ios/docs/pod-README.md
diff --git a/ios/docs/remove_docs.sh b/platform/ios/docs/remove_docs.sh
index 747ca0a3ae..747ca0a3ae 100755
--- a/ios/docs/remove_docs.sh
+++ b/platform/ios/docs/remove_docs.sh
diff --git a/ios/framework/Info.plist b/platform/ios/framework/Info.plist
index 3bf250da27..3bf250da27 100644
--- a/ios/framework/Info.plist
+++ b/platform/ios/framework/Info.plist
diff --git a/ios/framework/Mapbox.h b/platform/ios/framework/Mapbox.h
index 11f163376a..11f163376a 100644
--- a/ios/framework/Mapbox.h
+++ b/platform/ios/framework/Mapbox.h
diff --git a/ios/framework/Mapbox.m b/platform/ios/framework/Mapbox.m
index a81ca09135..93f58b9be6 100644
--- a/ios/framework/Mapbox.m
+++ b/platform/ios/framework/Mapbox.m
@@ -1,8 +1,8 @@
 #import <Mapbox/Mapbox.h>
 
-#import "../../platform/ios/src/NSBundle+MGLAdditions.h"
-#import "../../platform/ios/src/NSProcessInfo+MGLAdditions.h"
-#import "../../platform/darwin/NSString+MGLAdditions.h"
+#import "../src/NSBundle+MGLAdditions.h"
+#import "../src/NSProcessInfo+MGLAdditions.h"
+#import "../../darwin/src/NSString+MGLAdditions.h"
 
 __attribute__((constructor))
 static void InitializeMapbox() {
diff --git a/ios/framework/Settings.bundle/Root.plist b/platform/ios/framework/Settings.bundle/Root.plist
index 889610e152..889610e152 100644
--- a/ios/framework/Settings.bundle/Root.plist
+++ b/platform/ios/framework/Settings.bundle/Root.plist
diff --git a/ios/framework/Settings.bundle/en.lproj/Root.strings b/platform/ios/framework/Settings.bundle/en.lproj/Root.strings
index e7658d692d..e7658d692d 100644
--- a/ios/framework/Settings.bundle/en.lproj/Root.strings
+++ b/platform/ios/framework/Settings.bundle/en.lproj/Root.strings
diff --git a/ios/framework/framework-ios.gypi b/platform/ios/framework/framework-ios.gypi
index 8c83523e58..1dcc2c0f9d 100644
--- a/ios/framework/framework-ios.gypi
+++ b/platform/ios/framework/framework-ios.gypi
@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../../gyp/common.gypi',
+    '../../../gyp/common.gypi',
   ],
   'targets': [
     {
@@ -22,7 +22,7 @@
         'CURRENT_PROJECT_VERSION': '0',
         'DEFINES_MODULE': 'YES',
         'DYLIB_INSTALL_NAME_BASE': '@rpath',
-        'INFOPLIST_FILE': '../ios/framework/Info.plist',
+        'INFOPLIST_FILE': '../platform/ios/framework/Info.plist',
         'LD_RUNPATH_SEARCH_PATHS': [
           '$(inherited)',
           '@executable_path/Frameworks',
@@ -41,7 +41,7 @@
       
       'mac_framework_headers': [
         'Mapbox.h',
-        '<!@(find ../include/mbgl/{darwin,ios} -type f \! -name \'.*\' \! -name Mapbox.h)',
+        '<!@(find ../platform/{darwin,ios}/include -type f \! -name \'.*\' \! -name Mapbox.h)',
       ],
       
       'sources': [
diff --git a/ios/framework/modulemap b/platform/ios/framework/modulemap
index 122db0c2b1..122db0c2b1 100644
--- a/ios/framework/modulemap
+++ b/platform/ios/framework/modulemap
diff --git a/ios/framework/strip-frameworks.sh b/platform/ios/framework/strip-frameworks.sh
index 9deb404ca1..9deb404ca1 100755
--- a/ios/framework/strip-frameworks.sh
+++ b/platform/ios/framework/strip-frameworks.sh
diff --git a/include/mbgl/ios/MGLAccountManager.h b/platform/ios/include/MGLAccountManager.h
index c52ef08607..c52ef08607 100644
--- a/include/mbgl/ios/MGLAccountManager.h
+++ b/platform/ios/include/MGLAccountManager.h
diff --git a/include/mbgl/ios/MGLAnnotationImage.h b/platform/ios/include/MGLAnnotationImage.h
index f9d9e70566..f9d9e70566 100644
--- a/include/mbgl/ios/MGLAnnotationImage.h
+++ b/platform/ios/include/MGLAnnotationImage.h
diff --git a/include/mbgl/ios/MGLCalloutView.h b/platform/ios/include/MGLCalloutView.h
index 8e72ee9d68..8e72ee9d68 100644
--- a/include/mbgl/ios/MGLCalloutView.h
+++ b/platform/ios/include/MGLCalloutView.h
diff --git a/include/mbgl/ios/MGLMapView+IBAdditions.h b/platform/ios/include/MGLMapView+IBAdditions.h
index f18df56e01..f18df56e01 100644
--- a/include/mbgl/ios/MGLMapView+IBAdditions.h
+++ b/platform/ios/include/MGLMapView+IBAdditions.h
diff --git a/include/mbgl/ios/MGLMapView+MGLCustomStyleLayerAdditions.h b/platform/ios/include/MGLMapView+MGLCustomStyleLayerAdditions.h
index de4dc01f99..de4dc01f99 100644
--- a/include/mbgl/ios/MGLMapView+MGLCustomStyleLayerAdditions.h
+++ b/platform/ios/include/MGLMapView+MGLCustomStyleLayerAdditions.h
diff --git a/include/mbgl/ios/MGLMapView.h b/platform/ios/include/MGLMapView.h
index dc03c13f7b..dc03c13f7b 100644
--- a/include/mbgl/ios/MGLMapView.h
+++ b/platform/ios/include/MGLMapView.h
diff --git a/include/mbgl/ios/MGLUserLocation.h b/platform/ios/include/MGLUserLocation.h
index 6160413510..6160413510 100644
--- a/include/mbgl/ios/MGLUserLocation.h
+++ b/platform/ios/include/MGLUserLocation.h
diff --git a/include/mbgl/ios/Mapbox.h b/platform/ios/include/Mapbox.h
index fd4f532a40..fd4f532a40 100644
--- a/include/mbgl/ios/Mapbox.h
+++ b/platform/ios/include/Mapbox.h
diff --git a/ios/screenshot.png b/platform/ios/screenshot.png
index 5bea3095a6..5bea3095a6 100644
--- a/ios/screenshot.png
+++ b/platform/ios/screenshot.png
diff --git a/platform/ios/scripts/benchmark.sh b/platform/ios/scripts/benchmark.sh
index 1c342e6533..cf1950ca90 100755
--- a/platform/ios/scripts/benchmark.sh
+++ b/platform/ios/scripts/benchmark.sh
@@ -8,8 +8,8 @@ if [ -z "$(which ios-deploy)" ] ; then
     npm install -g ios-deploy
 fi
 
-(cd ios/benchmark/assets/tiles && ./download.sh)
-(cd ios/benchmark/assets/glyphs && ./download.sh)
+(cd platform/ios/benchmark/assets/tiles && ./download.sh)
+(cd platform/ios/benchmark/assets/glyphs && ./download.sh)
 
 make ibench
 
diff --git a/platform/ios/scripts/document.sh b/platform/ios/scripts/document.sh
index 345cfdf7ea..c470c59dbd 100755
--- a/platform/ios/scripts/document.sh
+++ b/platform/ios/scripts/document.sh
@@ -22,7 +22,7 @@ RELEASE_VERSION=$( echo ${SHORT_VERSION} | sed -e 's/^ios-v//' -e 's/-.*//' )
 rm -rf /tmp/mbgl
 mkdir -p /tmp/mbgl/
 README=/tmp/mbgl/README.md
-cp ios/docs/doc-README.md "${README}"
+cp platform/ios/docs/doc-README.md "${README}"
 # http://stackoverflow.com/a/4858011/4585461
 echo "## Changes in version ${RELEASE_VERSION}" >> "${README}"
 sed -n -e '/^## iOS/{' -e ':a' -e 'n' -e '/^##/q' -e 'p' -e 'ba' -e '}' CHANGELOG.md >> "${README}"
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index 97f0c74fc7..ab6db61395 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -187,34 +187,34 @@ fi
 if [[ ${BUILD_STATIC} == true ]]; then
     step "Copying static library headers…"
     mkdir -p "${OUTPUT}/static/${NAME}.framework/Headers"
-    cp -pv include/mbgl/{darwin,ios}/*.h "${OUTPUT}/static/${NAME}.framework/Headers"
+    cp -pv platform/{darwin,ios}/include/*.h "${OUTPUT}/static/${NAME}.framework/Headers"
 fi
 
 step "Copying library resources…"
 SHORT_VERSION=$( git describe --tags --match=ios-v*.*.* --abbrev=0 | sed 's/^ios-v//' )
 cp -pv LICENSE.md "${OUTPUT}"
-cp -rv ios/app/Settings.bundle "${OUTPUT}"
+cp -rv platform/ios/app/Settings.bundle "${OUTPUT}"
 if [[ ${BUILD_STATIC} == true ]]; then
     cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.framework"
-    cp -pv ios/framework/Info.plist "${OUTPUT}/static/${NAME}.framework/Info.plist"
+    cp -pv platform/ios/framework/Info.plist "${OUTPUT}/static/${NAME}.framework/Info.plist"
     plutil -replace CFBundleExecutable -string ${NAME} "${OUTPUT}/static/${NAME}.framework/Info.plist"
     plutil -replace CFBundleIdentifier -string com.mapbox.sdk.ios "${OUTPUT}/static/${NAME}.framework/Info.plist"
     plutil -replace CFBundleName -string ${NAME} "${OUTPUT}/static/${NAME}.framework/Info.plist"
     plutil -replace CFBundleShortVersionString -string "${SHORT_VERSION}" "${OUTPUT}/static/${NAME}.framework/Info.plist"
     plutil -replace CFBundleVersion -string ${PROJ_VERSION} "${OUTPUT}/static/${NAME}.framework/Info.plist"
     mkdir "${OUTPUT}/static/${NAME}.framework/Modules"
-    cp -pv ios/framework/modulemap "${OUTPUT}/static/${NAME}.framework/Modules/module.modulemap"
+    cp -pv platform/ios/framework/modulemap "${OUTPUT}/static/${NAME}.framework/Modules/module.modulemap"
 fi
 if [[ ${BUILD_DYNAMIC} == true ]]; then
     plutil -replace CFBundleShortVersionString -string "${SHORT_VERSION}" "${OUTPUT}/dynamic/${NAME}.framework/Info.plist"
-    cp -pv ios/framework/strip-frameworks.sh "${OUTPUT}/dynamic/${NAME}.framework/strip-frameworks.sh"
+    cp -pv platform/ios/framework/strip-frameworks.sh "${OUTPUT}/dynamic/${NAME}.framework/strip-frameworks.sh"
 fi
 sed -n -e '/^## iOS/,$p' CHANGELOG.md > "${OUTPUT}/CHANGELOG.md"
 
 rm -rf /tmp/mbgl
 mkdir -p /tmp/mbgl/
 README=/tmp/mbgl/README.md
-cp ios/docs/pod-README.md "${README}"
+cp platform/ios/docs/pod-README.md "${README}"
 if [[ ${BUILD_DYNAMIC} == false ]]; then
     sed -i '' -e '/{{DYNAMIC}}/,/{{\/DYNAMIC}}/d' "${README}"
 fi
diff --git a/platform/ios/scripts/test.sh b/platform/ios/scripts/test.sh
index 2192ac7f4d..630a99686d 100755
--- a/platform/ios/scripts/test.sh
+++ b/platform/ios/scripts/test.sh
@@ -5,7 +5,7 @@ set -o pipefail
 set -u
 
 xcodebuild \
-    -project ./test/ios/ios-tests.xcodeproj \
+    -project ./platform/ios/test/ios-tests.xcodeproj \
     -scheme 'Mapbox GL Tests' \
     -sdk iphonesimulator \
     -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 2922997fa3..748bfc7414 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -28,8 +28,8 @@
 #include <mbgl/util/chrono.hpp>
 
 #import "Mapbox.h"
-#import "../../darwin/MGLGeometry_Private.h"
-#import "../../darwin/MGLMultiPoint_Private.h"
+#import "../../darwin/src/MGLGeometry_Private.h"
+#import "../../darwin/src/MGLMultiPoint_Private.h"
 
 #import "NSBundle+MGLAdditions.h"
 #import "NSString+MGLAdditions.h"
diff --git a/test/ios/.gitignore b/platform/ios/test/.gitignore
index 516812b72d..516812b72d 100644
--- a/test/ios/.gitignore
+++ b/platform/ios/test/.gitignore
diff --git a/test/ios/App-Info.plist b/platform/ios/test/App-Info.plist
index 8753067af1..8753067af1 100644
--- a/test/ios/App-Info.plist
+++ b/platform/ios/test/App-Info.plist
diff --git a/test/ios/Bundle-Info.plist b/platform/ios/test/Bundle-Info.plist
index 169b6f710e..169b6f710e 100644
--- a/test/ios/Bundle-Info.plist
+++ b/platform/ios/test/Bundle-Info.plist
diff --git a/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/test/Images.xcassets/AppIcon.appiconset/Contents.json
index 5008911f9e..5008911f9e 100644
--- a/test/ios/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/platform/ios/test/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/test/ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/platform/ios/test/Images.xcassets/LaunchImage.launchimage/Contents.json
index 628027f247..628027f247 100644
--- a/test/ios/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/platform/ios/test/Images.xcassets/LaunchImage.launchimage/Contents.json
diff --git a/test/ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/platform/ios/test/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
index 208eea205a..208eea205a 100644
--- a/test/ios/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
+++ b/platform/ios/test/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png
diff --git a/test/ios/Images.xcassets/LaunchImage.launchimage/Default@2x.png b/platform/ios/test/Images.xcassets/LaunchImage.launchimage/Default@2x.png
index 4438336215..4438336215 100644
--- a/test/ios/Images.xcassets/LaunchImage.launchimage/Default@2x.png
+++ b/platform/ios/test/Images.xcassets/LaunchImage.launchimage/Default@2x.png
diff --git a/test/ios/KIF b/platform/ios/test/KIF
-Subproject 21a137bc8068f9fb738f835c6e285d44fe2ce4d
+Subproject 21a137bc8068f9fb738f835c6e285d44fe2ce4d
diff --git a/test/ios/KIFTestActor+MapboxGL.h b/platform/ios/test/KIFTestActor+MapboxGL.h
index d16e348486..d16e348486 100644
--- a/test/ios/KIFTestActor+MapboxGL.h
+++ b/platform/ios/test/KIFTestActor+MapboxGL.h
diff --git a/test/ios/KIFTestActor+MapboxGL.m b/platform/ios/test/KIFTestActor+MapboxGL.m
index 6c5e53f40d..6c5e53f40d 100644
--- a/test/ios/KIFTestActor+MapboxGL.m
+++ b/platform/ios/test/KIFTestActor+MapboxGL.m
diff --git a/test/ios/LaunchScreen.xib b/platform/ios/test/LaunchScreen.xib
index 238fb51b50..238fb51b50 100644
--- a/test/ios/LaunchScreen.xib
+++ b/platform/ios/test/LaunchScreen.xib
diff --git a/test/ios/MGLTAppDelegate.h b/platform/ios/test/MGLTAppDelegate.h
index c0025582ee..c0025582ee 100644
--- a/test/ios/MGLTAppDelegate.h
+++ b/platform/ios/test/MGLTAppDelegate.h
diff --git a/test/ios/MGLTAppDelegate.m b/platform/ios/test/MGLTAppDelegate.m
index b79c2f4abb..b79c2f4abb 100644
--- a/test/ios/MGLTAppDelegate.m
+++ b/platform/ios/test/MGLTAppDelegate.m
diff --git a/test/ios/MGLTViewController.h b/platform/ios/test/MGLTViewController.h
index 0be0e1ff2c..0be0e1ff2c 100644
--- a/test/ios/MGLTViewController.h
+++ b/platform/ios/test/MGLTViewController.h
diff --git a/test/ios/MGLTViewController.m b/platform/ios/test/MGLTViewController.m
index 09c60bf614..09c60bf614 100644
--- a/test/ios/MGLTViewController.m
+++ b/platform/ios/test/MGLTViewController.m
diff --git a/test/ios/MapViewTests.m b/platform/ios/test/MapViewTests.m
index 40022a1ee5..40022a1ee5 100644
--- a/test/ios/MapViewTests.m
+++ b/platform/ios/test/MapViewTests.m
diff --git a/test/ios/OCMock/OCMock/NSNotificationCenter+OCMAdditions.h b/platform/ios/test/OCMock/OCMock/NSNotificationCenter+OCMAdditions.h
index c20a9c2b20..c20a9c2b20 100644
--- a/test/ios/OCMock/OCMock/NSNotificationCenter+OCMAdditions.h
+++ b/platform/ios/test/OCMock/OCMock/NSNotificationCenter+OCMAdditions.h
diff --git a/test/ios/OCMock/OCMock/OCMArg.h b/platform/ios/test/OCMock/OCMock/OCMArg.h
index d53437cb7d..d53437cb7d 100644
--- a/test/ios/OCMock/OCMock/OCMArg.h
+++ b/platform/ios/test/OCMock/OCMock/OCMArg.h
diff --git a/test/ios/OCMock/OCMock/OCMConstraint.h b/platform/ios/test/OCMock/OCMock/OCMConstraint.h
index 777966ab7d..777966ab7d 100644
--- a/test/ios/OCMock/OCMock/OCMConstraint.h
+++ b/platform/ios/test/OCMock/OCMock/OCMConstraint.h
diff --git a/test/ios/OCMock/OCMock/OCMLocation.h b/platform/ios/test/OCMock/OCMock/OCMLocation.h
index e510db7aaf..e510db7aaf 100644
--- a/test/ios/OCMock/OCMock/OCMLocation.h
+++ b/platform/ios/test/OCMock/OCMock/OCMLocation.h
diff --git a/test/ios/OCMock/OCMock/OCMMacroState.h b/platform/ios/test/OCMock/OCMock/OCMMacroState.h
index 4b2d635086..4b2d635086 100644
--- a/test/ios/OCMock/OCMock/OCMMacroState.h
+++ b/platform/ios/test/OCMock/OCMock/OCMMacroState.h
diff --git a/test/ios/OCMock/OCMock/OCMRecorder.h b/platform/ios/test/OCMock/OCMock/OCMRecorder.h
index f56d2ca4c0..f56d2ca4c0 100644
--- a/test/ios/OCMock/OCMock/OCMRecorder.h
+++ b/platform/ios/test/OCMock/OCMock/OCMRecorder.h
diff --git a/test/ios/OCMock/OCMock/OCMStubRecorder.h b/platform/ios/test/OCMock/OCMock/OCMStubRecorder.h
index 890c9ef3bc..890c9ef3bc 100644
--- a/test/ios/OCMock/OCMock/OCMStubRecorder.h
+++ b/platform/ios/test/OCMock/OCMock/OCMStubRecorder.h
diff --git a/test/ios/OCMock/OCMock/OCMock.h b/platform/ios/test/OCMock/OCMock/OCMock.h
index f0083b3507..f0083b3507 100644
--- a/test/ios/OCMock/OCMock/OCMock.h
+++ b/platform/ios/test/OCMock/OCMock/OCMock.h
diff --git a/test/ios/OCMock/OCMock/OCMockObject.h b/platform/ios/test/OCMock/OCMock/OCMockObject.h
index 63f2bae2be..63f2bae2be 100644
--- a/test/ios/OCMock/OCMock/OCMockObject.h
+++ b/platform/ios/test/OCMock/OCMock/OCMockObject.h
diff --git a/test/ios/OCMock/libOCMock.a b/platform/ios/test/OCMock/libOCMock.a
index 9bb38e21a3..9bb38e21a3 100644
--- a/test/ios/OCMock/libOCMock.a
+++ b/platform/ios/test/OCMock/libOCMock.a
diff --git a/test/ios/OHHTTPStubs/.gitignore b/platform/ios/test/OHHTTPStubs/.gitignore
index a27dff4c47..a27dff4c47 100644
--- a/test/ios/OHHTTPStubs/.gitignore
+++ b/platform/ios/test/OHHTTPStubs/.gitignore
diff --git a/test/ios/OHHTTPStubs/.travis.yml b/platform/ios/test/OHHTTPStubs/.travis.yml
index 45bfb794fd..45bfb794fd 100644
--- a/test/ios/OHHTTPStubs/.travis.yml
+++ b/platform/ios/test/OHHTTPStubs/.travis.yml
diff --git a/test/ios/OHHTTPStubs/CHANGELOG.md b/platform/ios/test/OHHTTPStubs/CHANGELOG.md
index 34f2e98990..34f2e98990 100644
--- a/test/ios/OHHTTPStubs/CHANGELOG.md
+++ b/platform/ios/test/OHHTTPStubs/CHANGELOG.md
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/MainViewController.h
index bf1a8f5fce..bf1a8f5fce 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/MainViewController.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.m b/platform/ios/test/OHHTTPStubs/Examples/ObjC/MainViewController.m
index 327a4d2d20..327a4d2d20 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/MainViewController.m
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.xib b/platform/ios/test/OHHTTPStubs/Examples/ObjC/MainViewController.xib
index bab95b860c..bab95b860c 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/MainViewController.xib
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/MainViewController.xib
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
index d79722eabb..d79722eabb 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 68ace104de..68ace104de 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Demo.xcscheme b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Demo.xcscheme
index 41f5f1bbc6..41f5f1bbc6 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Demo.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Demo.xcscheme
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
index e23833bf24..e23833bf24 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
index cfc0e73f1c..cfc0e73f1c 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Podfile b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Podfile
index 30504595e8..30504595e8 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Podfile
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Podfile
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Podfile.lock b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Podfile.lock
index 0d7e09fc56..0d7e09fc56 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Podfile.lock
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Podfile.lock
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/Compatibility.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/Compatibility.h
index 7a6d07a0a9..7a6d07a0a9 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/Compatibility.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/Compatibility.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
index e466a30930..e466a30930 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
index 55a0a6a468..55a0a6a468 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
index f976df50d7..f976df50d7 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
index 773f3f322e..773f3f322e 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
index 81aae9624d..81aae9624d 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/Compatibility.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/Compatibility.h
index 7a6d07a0a9..7a6d07a0a9 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/Compatibility.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/Compatibility.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
index e466a30930..e466a30930 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
index 55a0a6a468..55a0a6a468 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
index f976df50d7..f976df50d7 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
index 773f3f322e..773f3f322e 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
index 81aae9624d..81aae9624d 120000
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
index a1bed26164..a1bed26164 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Manifest.lock b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Manifest.lock
index 0d7e09fc56..0d7e09fc56 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Manifest.lock
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Manifest.lock
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
index cf0b52702f..cf0b52702f 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme
index 39df59c3c9..39df59c3c9 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig
index b9b8578c7f..b9b8578c7f 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m
index 4deafde22c..4deafde22c 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
index aa992a4adb..aa992a4adb 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
index a14c030722..a14c030722 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
index 8fb40d2e94..8fb40d2e94 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
index 6e93a65cc8..6e93a65cc8 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
index 95cf11d9fb..95cf11d9fb 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
index de1d241adc..de1d241adc 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
index 79d3603ad7..79d3603ad7 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
index 756aa4392a..756aa4392a 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-dummy.m b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-dummy.m
index ade64bd1a9..ade64bd1a9 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-dummy.m
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h
index 5918510c4e..5918510c4e 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-environment.h
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-resources.sh b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-resources.sh
index ea685a22b1..ea685a22b1 100755
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-resources.sh
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods-resources.sh
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.debug.xcconfig
index 722a231f1e..722a231f1e 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.debug.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.debug.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.release.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.release.xcconfig
index 722a231f1e..722a231f1e 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.release.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Pods/Target Support Files/Pods/Pods.release.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.jpg b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Stubs/stub.jpg
index c42a21cd74..c42a21cd74 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.jpg
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Stubs/stub.jpg
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.txt b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Stubs/stub.txt
index e662f91b23..e662f91b23 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Stubs/stub.txt
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Stubs/stub.txt
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/Default-568h@2x.png b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/Default-568h@2x.png
index 0891b7aabf..0891b7aabf 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/Default-568h@2x.png
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/Default-568h@2x.png
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Info.plist b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Info.plist
index 25bfd55966..25bfd55966 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Info.plist
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Info.plist
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Prefix.pch b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Prefix.pch
index 20ef719789..20ef719789 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/OHHTTPStubsDemo-Prefix.pch
diff --git a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/main.m b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/main.m
index 478bfb3959..478bfb3959 100644
--- a/test/ios/OHHTTPStubs/Examples/ObjC/Supporting Files/main.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/ObjC/Supporting Files/main.m
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/AppDelegate.swift b/platform/ios/test/OHHTTPStubs/Examples/Swift/AppDelegate.swift
index 58f489a7d7..58f489a7d7 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/AppDelegate.swift
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/AppDelegate.swift
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Main.storyboard b/platform/ios/test/OHHTTPStubs/Examples/Swift/Main.storyboard
index 438521ca5c..438521ca5c 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Main.storyboard
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Main.storyboard
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/MainViewController.swift b/platform/ios/test/OHHTTPStubs/Examples/Swift/MainViewController.swift
index 9133e20d46..9133e20d46 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/MainViewController.swift
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/MainViewController.swift
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
index 48a07864e3..48a07864e3 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 919434a625..919434a625 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
index 870383aff8..870383aff8 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
index cfc0e73f1c..cfc0e73f1c 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/OHHTTPStubsDemo.xcworkspace/contents.xcworkspacedata
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Podfile b/platform/ios/test/OHHTTPStubs/Examples/Swift/Podfile
index 17dfc0103f..17dfc0103f 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Podfile
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Podfile
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Podfile.lock b/platform/ios/test/OHHTTPStubs/Examples/Swift/Podfile.lock
index 834a7de58b..834a7de58b 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Podfile.lock
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Podfile.lock
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/Compatibility.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/Compatibility.h
index 7a6d07a0a9..7a6d07a0a9 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/Compatibility.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/Compatibility.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
index e466a30930..e466a30930 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubs.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
index 55a0a6a468..55a0a6a468 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
index f976df50d7..f976df50d7 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
index 773f3f322e..773f3f322e 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHHTTPStubsResponse.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
index 81aae9624d..81aae9624d 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Private/OHHTTPStubs/OHPathHelpers.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
index e466a30930..e466a30930 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubs.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
index 55a0a6a468..55a0a6a468 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
index 247257b1d8..247257b1d8 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse+JSON.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
index 773f3f322e..773f3f322e 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHHTTPStubsResponse.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
index 6a6273c69c..6a6273c69c 120000
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Headers/Public/OHHTTPStubs/OHPathHelpers.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
index a1bed26164..a1bed26164 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Manifest.lock b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Manifest.lock
index 834a7de58b..834a7de58b 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Manifest.lock
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Manifest.lock
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
index c30d5eaa4d..c30d5eaa4d 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme
index 699b998d1c..699b998d1c 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Pods.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs.xcscheme
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist
index cea441462f..cea441462f 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig
index cf3a26e1ef..cf3a26e1ef 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m
index 4deafde22c..4deafde22c 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-dummy.m
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
index aa992a4adb..aa992a4adb 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-umbrella.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-umbrella.h
index d95666a8a9..d95666a8a9 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-umbrella.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-umbrella.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.modulemap b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.modulemap
index 268a7c33d4..268a7c33d4 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.modulemap
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.modulemap
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
index a14c030722..a14c030722 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist
index c10e7eab4f..c10e7eab4f 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Info.plist
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
index 56b72965aa..56b72965aa 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
index 6e93a65cc8..6e93a65cc8 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-dummy.m
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
index 95cf11d9fb..95cf11d9fb 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-prefix.pch
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-umbrella.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-umbrella.h
index 28cfb1c4c0..28cfb1c4c0 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-umbrella.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs-umbrella.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap
index efe706e390..efe706e390 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.modulemap
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
index de1d241adc..de1d241adc 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubs/Pods-OHHTTPStubs.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Info.plist b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Info.plist
index 6974542586..6974542586 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Info.plist
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Info.plist
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
index 79d3603ad7..79d3603ad7 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.plist b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
index 756aa4392a..756aa4392a 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-dummy.m b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-dummy.m
index ade64bd1a9..ade64bd1a9 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-dummy.m
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h
index 5918510c4e..5918510c4e 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-environment.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh
index 91e9c70b4d..91e9c70b4d 100755
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-frameworks.sh
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-resources.sh b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-resources.sh
index ea685a22b1..ea685a22b1 100755
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-resources.sh
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-resources.sh
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-umbrella.h b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-umbrella.h
index 21dcfd2c21..21dcfd2c21 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-umbrella.h
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods-umbrella.h
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig
index a5a034c3e4..a5a034c3e4 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.debug.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.modulemap b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.modulemap
index 8413413077..8413413077 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.modulemap
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.modulemap
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig
index a5a034c3e4..a5a034c3e4 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Pods/Target Support Files/Pods/Pods.release.xcconfig
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.jpg b/platform/ios/test/OHHTTPStubs/Examples/Swift/Stubs/stub.jpg
index c42a21cd74..c42a21cd74 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.jpg
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Stubs/stub.jpg
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.txt b/platform/ios/test/OHHTTPStubs/Examples/Swift/Stubs/stub.txt
index e662f91b23..e662f91b23 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Stubs/stub.txt
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Stubs/stub.txt
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Default-568h@2x.png b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/Default-568h@2x.png
index 0891b7aabf..0891b7aabf 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Default-568h@2x.png
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/Default-568h@2x.png
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json
index 36d2c80d88..36d2c80d88 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Info.plist b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/Info.plist
index 0ca4d80efa..0ca4d80efa 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/Info.plist
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/Info.plist
diff --git a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/LaunchScreen.xib b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/LaunchScreen.xib
index a9be7a994c..a9be7a994c 100644
--- a/test/ios/OHHTTPStubs/Examples/Swift/Supporting Files/LaunchScreen.xib
+++ b/platform/ios/test/OHHTTPStubs/Examples/Swift/Supporting Files/LaunchScreen.xib
diff --git a/test/ios/OHHTTPStubs/LICENSE b/platform/ios/test/OHHTTPStubs/LICENSE
index a83928dd2e..a83928dd2e 100644
--- a/test/ios/OHHTTPStubs/LICENSE
+++ b/platform/ios/test/OHHTTPStubs/LICENSE
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs.podspec b/platform/ios/test/OHHTTPStubs/OHHTTPStubs.podspec
index 7ddbe58e23..7ddbe58e23 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs.podspec
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs.podspec
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
index 7b1a4fa4db..7b1a4fa4db 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 25fccc6ba4..25fccc6ba4 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
index f5a14781a1..f5a14781a1 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
index d82274e7af..d82274e7af 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
index 998a5b942f..998a5b942f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata
index 06ceb62b61..06ceb62b61 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/contents.xcworkspacedata
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
index 08de0be8d3..08de0be8d3 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Podfile
index c20f4c541f..c20f4c541f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Podfile
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile.lock b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Podfile.lock
index 5896b3b3b0..5896b3b3b0 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Podfile.lock
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Podfile.lock
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h
index dfa82f6691..dfa82f6691 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m
index 1de5812ca1..1de5812ca1 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
index 9f390294e2..9f390294e2 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m
index 4ae7275480..4ae7275480 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h
index 8fed5a6891..8fed5a6891 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m
index 6413297d72..6413297d72 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
index 5e610d887f..5e610d887f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m
index 1da148282d..1da148282d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworking.h
index 68273da58e..68273da58e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h
index a880d75191..a880d75191 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m
index 1f97f914f3..1f97f914f3 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h
index 85435564c3..85435564c3 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m
index cfe609a2de..cfe609a2de 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h
index aed4549815..aed4549815 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m
index a56e8542e1..a56e8542e1 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h
index 030e8faed7..030e8faed7 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m
index 083d30c266..083d30c266 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h
index f475773d02..f475773d02 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m
index d53e6ec2db..d53e6ec2db 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/AFNetworking/AFURLSessionManager.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/LICENSE b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/LICENSE
index 0616192d00..0616192d00 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/LICENSE
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/LICENSE
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/README.md b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/README.md
index 13e080c096..13e080c096 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/README.md
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/README.md
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
index 312d680e0d..312d680e0d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m
index c2d855a59c..c2d855a59c 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
index 1c1f8dd6f8..1c1f8dd6f8 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m
index 6627dbb1b8..6627dbb1b8 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
index b94f1cb8e0..b94f1cb8e0 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m
index b7e2a26cb2..b7e2a26cb2 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
index e6ed6de04c..e6ed6de04c 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m
index a225290a25..a225290a25 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
index 5d523636e8..5d523636e8 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m
index c06aa9ca4c..c06aa9ca4c 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
index 94082f6cb5..94082f6cb5 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
index 3f1bc086f5..3f1bc086f5 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m
index 927f56d843..927f56d843 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
index 37ce772de0..37ce772de0 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m
index e266451fe5..e266451fe5 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
index 202e8f4ea2..202e8f4ea2 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m
index 525d02aead..525d02aead 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h
index ac762c8238..ac762c8238 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h
index 9dcc623c63..9dcc623c63 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h
index 56feb9fb85..56feb9fb85 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h
index 67519d9848..67519d9848 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h
index 68fc7744f2..68fc7744f2 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworking.h
index a5a38da7dc..a5a38da7dc 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h
index fd1322db9c..fd1322db9c 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h
index d9b35fb754..d9b35fb754 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h
index ca8209b81f..ca8209b81f 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h
index e36a765d82..e36a765d82 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLSessionManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLSessionManager.h
index 835101de7b..835101de7b 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLSessionManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/AFURLSessionManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h
index c534ebfb02..c534ebfb02 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h
index f992813385..f992813385 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h
index 8f2e221939..8f2e221939 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h
index a95d67380f..a95d67380f 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h
index 95017cce57..95017cce57 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h
index 730b167dcd..730b167dcd 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h
index 8efd826209..8efd826209 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h
index c8df6ef17b..c8df6ef17b 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h
index ac762c8238..ac762c8238 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h
index 9dcc623c63..9dcc623c63 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h
index 56feb9fb85..56feb9fb85 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h
index 67519d9848..67519d9848 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h
index 68fc7744f2..68fc7744f2 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworking.h
index a5a38da7dc..a5a38da7dc 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h
index fd1322db9c..fd1322db9c 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h
index d9b35fb754..d9b35fb754 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h
index ca8209b81f..ca8209b81f 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h
index e36a765d82..e36a765d82 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLSessionManager.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLSessionManager.h
index 835101de7b..835101de7b 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLSessionManager.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/AFURLSessionManager.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h
index c534ebfb02..c534ebfb02 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h
index f992813385..f992813385 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h
index 8f2e221939..8f2e221939 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h
index a95d67380f..a95d67380f 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h
index 95017cce57..95017cce57 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h
index 730b167dcd..730b167dcd 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h
index 8efd826209..8efd826209 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
index c8df6ef17b..c8df6ef17b 120000
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Manifest.lock b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Manifest.lock
index 5896b3b3b0..5896b3b3b0 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Manifest.lock
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Manifest.lock
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
index 7c52607f05..7c52607f05 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig
index 3487d75ca9..3487d75ca9 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m
index 2de591a2e2..2de591a2e2 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch
index b9c163b498..b9c163b498 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking-prefix.pch
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig
index 1fb0c387d4..1fb0c387d4 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests-AFNetworking/Pods-OHHTTPStubs Mac Tests-AFNetworking.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown
index 59a175087d..59a175087d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.markdown
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.plist b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.plist
index 899e8ae43e..899e8ae43e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.plist
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-acknowledgements.plist
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-dummy.m
index f124d0bf53..f124d0bf53 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-environment.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-environment.h
index 42c1cb9116..42c1cb9116 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-environment.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-environment.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh
index ea685a22b1..ea685a22b1 100755
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests-resources.sh
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig
index 6514eaa721..6514eaa721 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.debug.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig
index 6514eaa721..6514eaa721 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs Mac Tests/Pods-OHHTTPStubs Mac Tests.release.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-Private.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-Private.xcconfig
index 8eb1a3989e..8eb1a3989e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-dummy.m
index 8fb666b3d8..8fb666b3d8 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-prefix.pch b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-prefix.pch
index aa992a4adb..aa992a4adb 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking-prefix.pch
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking.xcconfig
index 7f67782003..7f67782003 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking/Pods-OHHTTPStubs iOS Fmk Tests-AFNetworking.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.markdown b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.markdown
index 59a175087d..59a175087d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.markdown
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.markdown
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.plist b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.plist
index 899e8ae43e..899e8ae43e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.plist
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-acknowledgements.plist
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-dummy.m
index dbb179ac46..dbb179ac46 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-resources.sh b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-resources.sh
index ea685a22b1..ea685a22b1 100755
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-resources.sh
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests-resources.sh
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.debug.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.debug.xcconfig
index 72ec462315..72ec462315 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.debug.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.debug.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.release.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.release.xcconfig
index 72ec462315..72ec462315 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.release.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Fmk Tests/Pods-OHHTTPStubs iOS Fmk Tests.release.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-Private.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-Private.xcconfig
index 927eecdfe5..927eecdfe5 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-dummy.m
index 174408f7fa..174408f7fa 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-prefix.pch b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-prefix.pch
index aa992a4adb..aa992a4adb 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking-prefix.pch
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking.xcconfig
index 758125c1eb..758125c1eb 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking/Pods-OHHTTPStubs iOS Lib Tests-AFNetworking.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.markdown b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.markdown
index 59a175087d..59a175087d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.markdown
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.markdown
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.plist b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.plist
index 899e8ae43e..899e8ae43e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.plist
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-acknowledgements.plist
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-dummy.m
index 391f5bc28d..391f5bc28d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-resources.sh b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-resources.sh
index ea685a22b1..ea685a22b1 100755
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-resources.sh
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests-resources.sh
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.debug.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.debug.xcconfig
index 19fb024a98..19fb024a98 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.debug.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.debug.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.release.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.release.xcconfig
index 19fb024a98..19fb024a98 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.release.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Lib Tests/Pods-OHHTTPStubs iOS Lib Tests.release.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig
index 6f43611720..6f43611720 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-Private.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m
index 8aa49d1389..8aa49d1389 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch
index 80fbb8dc3c..80fbb8dc3c 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking-prefix.pch
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig
index b8aeea85b3..b8aeea85b3 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests-AFNetworking/Pods-OHHTTPStubs iOS Tests-AFNetworking.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown
index 59a175087d..59a175087d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.markdown
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.plist b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.plist
index 899e8ae43e..899e8ae43e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.plist
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-acknowledgements.plist
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-dummy.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-dummy.m
index 0fb6509a93..0fb6509a93 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-dummy.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-dummy.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-environment.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-environment.h
index e1a5d47d3b..e1a5d47d3b 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-environment.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-environment.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh
index 43f08523e1..43f08523e1 100755
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests-resources.sh
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig
index 89450f5b6a..89450f5b6a 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.debug.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig
index 89450f5b6a..89450f5b6a 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Pods/Target Support Files/Pods-OHHTTPStubs iOS Tests/Pods-OHHTTPStubs iOS Tests.release.xcconfig
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h
index b41ddda60f..b41ddda60f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h
index 2776a4f3b7..2776a4f3b7 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m
index 06d7363f23..06d7363f23 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h
index 3069ff32ec..3069ff32ec 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m
index d88fee9bdd..d88fee9bdd 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h
index 77fe65e892..77fe65e892 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m
index 4de8996ae0..4de8996ae0 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m
index b0e14a093c..b0e14a093c 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/NSURLSession/OHHTTPStubs+NSURLSessionConfiguration.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m
index 1184dcad1f..1184dcad1f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs+NSURLSessionConfiguration.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
index f4c2a07a98..f4c2a07a98 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
index 4fa31f907b..4fa31f907b 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
index 0ac0f6e124..0ac0f6e124 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m
index 03d0e7a6db..03d0e7a6db 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+HTTPMessage.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
index fc8719df0d..fc8719df0d 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m
index aebcb99080..aebcb99080 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse+JSON.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
index 27f487f9fa..27f487f9fa 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
index db8d7efa79..db8d7efa79 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h
index aa250547b8..aa250547b8 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m
index cac24a636a..cac24a636a 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h
index b3c301acdd..b3c301acdd 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.h
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m
index 18b769e45a..18b769e45a 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/OHPathHelpers/OHPathHelpers.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
index 5229dcb808..5229dcb808 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs Mac-Info.plist b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs Mac-Info.plist
index bcee41c04a..bcee41c04a 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs Mac-Info.plist
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs Mac-Info.plist
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs iOS-Info.plist b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs iOS-Info.plist
index d3de8eefb6..d3de8eefb6 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs iOS-Info.plist
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/Supporting Files/OHHTTPStubs iOS-Info.plist
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/empty.bundle/nothingtoseehere.json b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/empty.bundle/nothingtoseehere.json
index e69de29bb2..e69de29bb2 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/empty.bundle/nothingtoseehere.json
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/empty.bundle/nothingtoseehere.json
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/emptyfile.json b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/emptyfile.json
index e69de29bb2..e69de29bb2 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/emptyfile.json
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Fixtures/emptyfile.json
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/cards.tail b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/cards.tail
index 596a2ecdb4..596a2ecdb4 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/cards.tail
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/cards.tail
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/login.tail b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/login.tail
index 1755e71d57..1755e71d57 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/login.tail
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/login.tail
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/logos_ebay.tail b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/logos_ebay.tail
index a21bc088c6..a21bc088c6 100755
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/logos_ebay.tail
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/MocktailFolder/logos_ebay.tail
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/OHPathHelpersTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/OHPathHelpersTests.m
index 98086feeb1..98086feeb1 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/OHPathHelpersTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/OHPathHelpersTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m
index a4ee670a6e..a4ee670a6e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m
index db7725703c..db7725703c 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
index 1321854169..1321854169 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m
index 1fe6c91e87..1fe6c91e87 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
index 2e829ca432..2e829ca432 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m
index ec263d543f..ec263d543f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
index 3d2f1c3577..3d2f1c3577 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m
index b2e820f80f..b2e820f80f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/TimingTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m
index 0e34aea54f..0e34aea54f 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Info.plist b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Info.plist
index 169b6f710e..169b6f710e 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Info.plist
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Info.plist
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Prefix.pch b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Prefix.pch
index a0a31a66c6..a0a31a66c6 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Prefix.pch
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/UnitTests-Prefix.pch
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/login.tail b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/login.tail
index 283ca0271b..283ca0271b 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/UnitTests/login.tail
+++ b/platform/ios/test/OHHTTPStubs/OHHTTPStubs/UnitTests/login.tail
diff --git a/test/ios/OHHTTPStubs/README.md b/platform/ios/test/OHHTTPStubs/README.md
index 2c9c831393..2c9c831393 100644
--- a/test/ios/OHHTTPStubs/README.md
+++ b/platform/ios/test/OHHTTPStubs/README.md
diff --git a/test/ios/OHHTTPStubs/Rakefile b/platform/ios/test/OHHTTPStubs/Rakefile
index a7c7397fba..a7c7397fba 100644
--- a/test/ios/OHHTTPStubs/Rakefile
+++ b/platform/ios/test/OHHTTPStubs/Rakefile
diff --git a/test/ios/ios-tests.xcodeproj/project.pbxproj b/platform/ios/test/ios-tests.xcodeproj/project.pbxproj
index 282bcc209e..09cc7f3c31 100644
--- a/test/ios/ios-tests.xcodeproj/project.pbxproj
+++ b/platform/ios/test/ios-tests.xcodeproj/project.pbxproj
@@ -82,7 +82,7 @@
 /* Begin PBXFileReference section */
 		96567A221B0E84CD00D78776 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = SOURCE_ROOT; };
 		96567A301B0E8BB900D78776 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = SOURCE_ROOT; };
-		DA482C7F1C12582600772FE3 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapbox.framework; path = ../../build/ios/pkg/dynamic/Mapbox.framework; sourceTree = "<group>"; };
+		DA482C7F1C12582600772FE3 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mapbox.framework; path = ../../../build/ios/pkg/dynamic/Mapbox.framework; sourceTree = "<group>"; };
 		DACAD7111B08719F009119DC /* MGLMapboxEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = ../../platform/ios/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; };
 		DADD9EB51BD16D8B00DA9161 /* Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Compatibility.h; path = OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h; sourceTree = SOURCE_ROOT; };
 		DD043323196DB9BC00E6F39D /* Mapbox GL Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -539,7 +539,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../build/ios/pkg/dynamic/",
+					"$(PROJECT_DIR)/../../../build/ios/pkg/dynamic/",
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist";
@@ -564,7 +564,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../build/ios/pkg/dynamic/",
+					"$(PROJECT_DIR)/../../../build/ios/pkg/dynamic/",
 				);
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist";
@@ -588,7 +588,7 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Mapbox GL Tests.app/Mapbox GL Tests";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../build/ios/pkg/dynamic/",
+					"$(PROJECT_DIR)/../../../build/ios/pkg/dynamic/",
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -625,7 +625,7 @@
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Mapbox GL Tests.app/Mapbox GL Tests";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../build/ios/pkg/dynamic/",
+					"$(PROJECT_DIR)/../../../build/ios/pkg/dynamic/",
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = "KIF_XCTEST=1";
 				HEADER_SEARCH_PATHS = (
diff --git a/test/ios/ios-tests.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/ios/test/ios-tests.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 4cad7961db..4cad7961db 100644
--- a/test/ios/ios-tests.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/platform/ios/test/ios-tests.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/Mapbox GL Tests.xccheckout b/platform/ios/test/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/Mapbox GL Tests.xccheckout
index 68c68a2234..68c68a2234 100644
--- a/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/Mapbox GL Tests.xccheckout
+++ b/platform/ios/test/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/Mapbox GL Tests.xccheckout
diff --git a/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout b/platform/ios/test/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout
index 33408b6083..33408b6083 100644
--- a/test/ios/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout
+++ b/platform/ios/test/ios-tests.xcodeproj/project.xcworkspace/xcshareddata/ios-tests.xccheckout
diff --git a/test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme b/platform/ios/test/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme
index df15849ee0..df15849ee0 100644
--- a/test/ios/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme
+++ b/platform/ios/test/ios-tests.xcodeproj/xcshareddata/xcschemes/Mapbox GL Tests.xcscheme
diff --git a/test/ios/main.m b/platform/ios/test/main.m
index d79750dcdd..d79750dcdd 100644
--- a/test/ios/main.m
+++ b/platform/ios/test/main.m
diff --git a/include/mbgl/osx/MGLAccountManager.h b/platform/osx/include/MGLAccountManager.h
index efcec5419c..efcec5419c 100644
--- a/include/mbgl/osx/MGLAccountManager.h
+++ b/platform/osx/include/MGLAccountManager.h
diff --git a/include/mbgl/osx/MGLAnnotationImage.h b/platform/osx/include/MGLAnnotationImage.h
index a33ea75a5e..a33ea75a5e 100644
--- a/include/mbgl/osx/MGLAnnotationImage.h
+++ b/platform/osx/include/MGLAnnotationImage.h
diff --git a/include/mbgl/osx/MGLMapView+IBAdditions.h b/platform/osx/include/MGLMapView+IBAdditions.h
index 81f4506a57..81f4506a57 100644
--- a/include/mbgl/osx/MGLMapView+IBAdditions.h
+++ b/platform/osx/include/MGLMapView+IBAdditions.h
diff --git a/include/mbgl/osx/MGLMapView.h b/platform/osx/include/MGLMapView.h
index ca55ba7cd5..ca55ba7cd5 100644
--- a/include/mbgl/osx/MGLMapView.h
+++ b/platform/osx/include/MGLMapView.h
diff --git a/include/mbgl/osx/MGLMapViewDelegate.h b/platform/osx/include/MGLMapViewDelegate.h
index eece606c39..eece606c39 100644
--- a/include/mbgl/osx/MGLMapViewDelegate.h
+++ b/platform/osx/include/MGLMapViewDelegate.h
diff --git a/platform/osx/sdk/Mapbox.m b/platform/osx/sdk/Mapbox.m
index a96ec6df2d..58ebb408e0 100644
--- a/platform/osx/sdk/Mapbox.m
+++ b/platform/osx/sdk/Mapbox.m
@@ -3,7 +3,7 @@
 #import "../src/MGLMapView_Private.h"
 #import "../src/NSBundle+MGLAdditions.h"
 #import "../src/NSProcessInfo+MGLAdditions.h"
-#import "../../darwin/NSString+MGLAdditions.h"
+#import "../../darwin/src/NSString+MGLAdditions.h"
 
 __attribute__((constructor))
 static void InitializeMapbox() {
diff --git a/platform/osx/sdk/framework-osx.gypi b/platform/osx/sdk/framework-osx.gypi
index 3f03f9edaf..259066f702 100644
--- a/platform/osx/sdk/framework-osx.gypi
+++ b/platform/osx/sdk/framework-osx.gypi
@@ -37,7 +37,7 @@
       
       'mac_framework_headers': [
         './Mapbox.h',
-        '<!@(find ../include/mbgl/{darwin,osx} -type f \! -name \'.*\')',
+        '<!@(find ../platform/{darwin,osx}/include -type f \! -name \'.*\')',
       ],
       
       'sources': [
diff --git a/platform/osx/src/MGLAccountManager.m b/platform/osx/src/MGLAccountManager.m
index f3a2fce7cf..8458248357 100644
--- a/platform/osx/src/MGLAccountManager.m
+++ b/platform/osx/src/MGLAccountManager.m
@@ -1,6 +1,6 @@
 #import "MGLAccountManager_Private.h"
 
-#import <mbgl/osx/MGLMapView.h>
+#import <MGLMapView.h>
 
 @interface MGLAccountManager ()
 
diff --git a/platform/osx/src/MGLAccountManager_Private.h b/platform/osx/src/MGLAccountManager_Private.h
index a918f2b2d3..5088c8dfd2 100644
--- a/platform/osx/src/MGLAccountManager_Private.h
+++ b/platform/osx/src/MGLAccountManager_Private.h
@@ -1,4 +1,4 @@
-#import <mbgl/osx/MGLAccountManager.h>
+#import <MGLAccountManager.h>
 
 @interface MGLAccountManager (Private)
 
diff --git a/platform/osx/src/MGLAnnotationImage.m b/platform/osx/src/MGLAnnotationImage.m
index 855105fded..e65a6d15cf 100644
--- a/platform/osx/src/MGLAnnotationImage.m
+++ b/platform/osx/src/MGLAnnotationImage.m
@@ -1,4 +1,4 @@
-#import <mbgl/osx/MGLAnnotationImage.h>
+#import <MGLAnnotationImage.h>
 
 @interface MGLAnnotationImage ()
 
diff --git a/platform/osx/src/MGLMapView+IBAdditions.m b/platform/osx/src/MGLMapView+IBAdditions.m
index 2d37d29037..cafd4511f1 100644
--- a/platform/osx/src/MGLMapView+IBAdditions.m
+++ b/platform/osx/src/MGLMapView+IBAdditions.m
@@ -1,4 +1,4 @@
-#import <mbgl/osx/MGLMapView+IBAdditions.h>
+#import <MGLMapView+IBAdditions.h>
 
 #import "MGLMapView_Private.h"
 
diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm
index 82fdff4668..de65e0496d 100644
--- a/platform/osx/src/MGLMapView.mm
+++ b/platform/osx/src/MGLMapView.mm
@@ -5,14 +5,14 @@
 #import "MGLOpenGLLayer.h"
 #import "MGLStyle.h"
 
-#import "../../darwin/MGLGeometry_Private.h"
-#import "../../darwin/MGLMultiPoint_Private.h"
+#import "../../darwin/src/MGLGeometry_Private.h"
+#import "../../darwin/src/MGLMultiPoint_Private.h"
 
-#import <mbgl/darwin/MGLMapCamera.h>
-#import <mbgl/darwin/MGLPolygon.h>
-#import <mbgl/darwin/MGLPolyline.h>
-#import <mbgl/osx/MGLAnnotationImage.h>
-#import <mbgl/osx/MGLMapViewDelegate.h>
+#import <MGLMapCamera.h>
+#import <MGLPolygon.h>
+#import <MGLPolyline.h>
+#import <MGLAnnotationImage.h>
+#import <MGLMapViewDelegate.h>
 
 #import <mbgl/mbgl.hpp>
 #import <mbgl/annotation/point_annotation.hpp>
@@ -32,8 +32,8 @@
 
 #import "NSBundle+MGLAdditions.h"
 #import "NSProcessInfo+MGLAdditions.h"
-#import "../../darwin/NSException+MGLAdditions.h"
-#import "../../darwin/NSString+MGLAdditions.h"
+#import "../../darwin/src/NSException+MGLAdditions.h"
+#import "../../darwin/src/NSString+MGLAdditions.h"
 
 #import <QuartzCore/QuartzCore.h>
 
diff --git a/platform/osx/src/MGLMapView_Private.h b/platform/osx/src/MGLMapView_Private.h
index 77f2aab323..a162beca61 100644
--- a/platform/osx/src/MGLMapView_Private.h
+++ b/platform/osx/src/MGLMapView_Private.h
@@ -1,4 +1,4 @@
-#import <mbgl/osx/MGLMapView.h>
+#import <MGLMapView.h>
 
 void mgl_linkMapViewIBCategory();
 
diff --git a/platform/osx/test/MGLGeometryTests.mm b/platform/osx/test/MGLGeometryTests.mm
index be3c7cb2da..e6e7c4b45c 100644
--- a/platform/osx/test/MGLGeometryTests.mm
+++ b/platform/osx/test/MGLGeometryTests.mm
@@ -1,4 +1,4 @@
-#import "../../darwin/MGLGeometry_Private.h"
+#import "../../darwin/src/MGLGeometry_Private.h"
 
 #pragma clang diagnostic ignored "-Wgnu-statement-expression"
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
diff --git a/platform/osx/test/osxtest.gypi b/platform/osx/test/osxtest.gypi
index d5d54f3c22..30bced31c4 100644
--- a/platform/osx/test/osxtest.gypi
+++ b/platform/osx/test/osxtest.gypi
@@ -48,8 +48,8 @@
       ],
 
       'include_dirs': [
-        '../../../include/mbgl/osx',
-        '../../../include/mbgl/darwin',
+        '../../../platform/osx/include',
+        '../../../platform/darwin/include',
         '../../../include',
         '../../../src',
       ],
diff --git a/scripts/main.mk b/scripts/main.mk
index 17ddbe9a6a..5c28396f76 100644
--- a/scripts/main.mk
+++ b/scripts/main.mk
@@ -53,9 +53,9 @@ SUBMODULES += platform/ios/vendor/SMCalloutView/SMCalloutView.h
 platform/ios/vendor/SMCalloutView/SMCalloutView.h:
 	./scripts/flock.py .git/Submodule.lock git submodule update --init platform/ios/vendor/SMCalloutView
 
-SUBMODULES += test/ios/KIF/KIF.xcodeproj
-test/ios/KIF/KIF.xcodeproj:
-	./scripts/flock.py .git/Submodule.lock git submodule update --init test/ios/KIF
+SUBMODULES += platform/ios/test/KIF/KIF.xcodeproj
+platform/ios/test/KIF/KIF.xcodeproj:
+	./scripts/flock.py .git/Submodule.lock git submodule update --init platform/ios/test/KIF
 endif
 endif