Removed SwiftUIFlowLayout dependency and updated WhirlyGlobe-Maply to latest develop version

228 files changed, 1099 insertions, 1037 deletions

diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/Info.plist b/iosApp/WhirlyGlobe.xcframework/Info.plist
index 18dc2b7..4528555 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/Info.plist
+++ b/iosApp/WhirlyGlobe.xcframework/Info.plist
@@ -8,7 +8,7 @@
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
-			<string>WhirlyGlobeMaplyComponent.framework</string>
+			<string>WhirlyGlobe.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
@@ -23,7 +23,7 @@
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64</string>
 			<key>LibraryPath</key>
-			<string>WhirlyGlobeMaplyComponent.framework</string>
+			<string>WhirlyGlobe.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Config-ac.h.in
index ac3ba0b..ac3ba0b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Config-ac.h.in
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GeoJSONSource.h
index 55c1446..ff80172 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GeoJSONSource.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 #define GEOJSON_MAX_POINTS 4096
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GeographicLib_ObjC.h
index e57a3d2..22bd915 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GeographicLib_ObjC.h
@@ -9,7 +9,7 @@
 #ifndef GeographicLib_Wrapper_h
 #define GeographicLib_Wrapper_h
 
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 typedef struct GeoLibInv_t {
     double distance;    // meters
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeDoubleTapDelegate.h
index ea1b934..ea1b934 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeDoubleTapDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeDoubleTapDragDelegate.h
index 7df7f12..295fff8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeDoubleTapDragDelegate.h
@@ -16,7 +16,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+#import <WhirlyGlobe/GlobePinchDelegate.h>
 
 // Sent out when the double tap delegate takes control
 #define kGlobeDoubleTapDragDidStart @"WKGlobeDoubleTapDragStarted"
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobePanDelegate.h
index 02d2249..02d2249 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobePanDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobePinchDelegate.h
index 35d40d8..35d40d8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobePinchDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeRotateDelegate.h
index 9e57c3a..9e57c3a 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeRotateDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeTapDelegate.h
index 61e3492..61e3492 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeTapDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeTiltDelegate.h
index f326c3e..09cf3eb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeTiltDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+#import <WhirlyGlobe/GlobePinchDelegate.h>
 
 // The tilt delegate handle the 3D camera tilt
 @interface WhirlyGlobeTiltDelegate : NSObject<UIGestureRecognizerDelegate>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeTwoFingerTapDelegate.h
index 93bea5e..93bea5e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/GlobeTwoFingerTapDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapboxVectorInterpreter.h
index 6229604..25a3417 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapboxVectorInterpreter.h
@@ -20,11 +20,11 @@
 
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MaplyQuadImageFrameLoader.h>
 
 @class MapboxVectorStyleSet;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapboxVectorStyleSet.h
index acf5d30..1f5c9ae 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapboxVectorStyleSet.h
@@ -19,8 +19,8 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 typedef NS_ENUM(NSUInteger,MapboxLayerType) {
     MapboxLayerTypeBackground,
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapboxVectorTiles.h
index b52cd5b..7b4cbef 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapboxVectorTiles.h
@@ -18,10 +18,10 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
 
 typedef NS_ENUM(NSInteger,MapboxGeometryType)
 {
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/Maply3DTouchPreviewDatasource.h
index ef42bf5..ef42bf5 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/Maply3DTouchPreviewDatasource.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/Maply3dTouchPreviewDelegate.h
index 5986f38..1957e10 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/Maply3dTouchPreviewDelegate.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobe/Maply3DTouchPreviewDatasource.h>
 
 @class MaplyBaseInteractionLayer;
 @class MaplyBaseViewController;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyActiveObject.h
index 864e853..864e853 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyActiveObject.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyAnnotation.h
index 0a30524..1337cc3 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyAnnotation.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     This object displays an annotation at a particular point and will track that point as the map or globe moves.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyAtmosphere.h
index 3af444f..f5de72d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyAtmosphere.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyLight.h>
 
 /** 
     Sets up the objects and shaders to implement an atmosphere.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyBaseViewController.h
index 9d5715b..119b330 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyBaseViewController.h
@@ -18,29 +18,30 @@
 
 #import <UIKit/UIKit.h>
 #import <Metal/Metal.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyAnnotation.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobe/MaplyLocationTracker.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyVertexAttribute.h>
 
 typedef double (^ZoomEasingBlock)(double z0,double z1,double t);
+typedef void (__strong ^InitCompletionBlock)(void);
 
 /** 
     When selecting multiple objects, one or more of these is returned.
@@ -1572,4 +1573,10 @@ typedef double (^ZoomEasingBlock)(double z0,double z1,double t);
 /// Return the renderer type being used
 - (MaplyRenderType)getRenderType;
 
+/**
+    Blocks to be called after the view is set up, or immediately if it is already set up.
+    Similar to `addPostSurfaceRunnable` on Android.
+*/
+- (void)addPostInitBlock:(_Nonnull InitCompletionBlock)block;
+
 @end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyBillboard.h
index 3a24e43..f29eb87 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyBillboard.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenObject.h>
 
 /** 
     A billboard is tied to a specific point, but rotates to face the user.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyBridge.h
index 152d869..d0e9832 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyBridge.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/MaplyViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyCluster.h
index aea79cf..d874bb3 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyCluster.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyShader.h>
 
 @class MaplyBaseViewController;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyColorRampGenerator.h
index 95d2331..95d2331 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyColorRampGenerator.h
diff --git a/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyComponent.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyComponent.h
new file mode 100644
index 0000000..1d51b1b
--- /dev/null
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyComponent.h
@@ -0,0 +1,102 @@
+/*  MaplyComponent.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/6/12.
+ *  Copyright 2012-2022 mousebird consulting
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+
+#import <WhirlyGlobe/NSData+Zlib.h>
+#import <WhirlyGlobe/NSDictionary+StyleRules.h>
+
+#import <WhirlyGlobe/MaplyGeomBuilder.h>
+#import <WhirlyGlobe/MaplyIconManager.h>
+#import <WhirlyGlobe/MaplyLocationTracker.h>
+#import <WhirlyGlobe/MaplyTextureBuilder.h>
+
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyAnnotation.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyUpdateLayer.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyViewController.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
+
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplyBillboard.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/MaplyLabel.h>
+#import <WhirlyGlobe/MaplyGeomModel.h>
+#import <WhirlyGlobe/MaplyMarker.h>
+#import <WhirlyGlobe/MaplyMoon.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplySticker.h>
+#import <WhirlyGlobe/MaplyShape.h>
+#import <WhirlyGlobe/MaplyScreenLabel.h>
+#import <WhirlyGlobe/MaplySun.h>
+#import <WhirlyGlobe/MaplyScreenObject.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyStarsModel.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+
+#import <WhirlyGlobe/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorInterpreter.h>
+
+#import <WhirlyGlobe/SLDStyleSet.h>
+#import <WhirlyGlobe/SLDExpressions.h>
+#import <WhirlyGlobe/SLDOperators.h>
+#import <WhirlyGlobe/SLDSymbolizers.h>
+#import <WhirlyGlobe/SLDWellKnownMarkers.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobe/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobe/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobe/MapboxVectorStyleSet.h>
+#import <WhirlyGlobe/MapnikStyle.h>
+#import <WhirlyGlobe/MapnikStyleRule.h>
+#import <WhirlyGlobe/MapnikStyleSet.h>
+
+#import <WhirlyGlobe/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyImageTile.h>
+#import <WhirlyGlobe/MaplyQuadImageLoader.h>
+#import <WhirlyGlobe/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobe/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/GeoJSONSource.h>
+
+#import <WhirlyGlobe/MaplyWMSTileSource.h>
+#import <WhirlyGlobe/MaplyMBTileFetcher.h>
+
+#import <WhirlyGlobe/MaplyVariableTarget.h>
+#import <WhirlyGlobe/MaplyAtmosphere.h>
+#import <WhirlyGlobe/MaplyColorRampGenerator.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyVertexAttribute.h>
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyComponentObject.h
index 59ccde6..59ccde6 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyComponentObject.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyControllerLayer.h
index d8775d0..d8775d0 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyControllerLayer.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyCoordinate.h
index d1c01e8..753b77e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyCoordinate.h
@@ -35,7 +35,7 @@ typedef struct
 } MaplyCoordinate;
 
 
-static const MaplyCoordinate kMaplyNullCoordinate = {.x = FLT_MIN, .y = FLT_MIN};
+extern const MaplyCoordinate kMaplyNullCoordinate;
 
 
 /** 
@@ -49,7 +49,7 @@ typedef struct
     double x,y;
 } MaplyCoordinateD;
 
-static const MaplyCoordinateD kMaplyNullCoordinateD = {.x = DBL_MIN, .y = DBL_MIN};
+extern const MaplyCoordinateD kMaplyNullCoordinateD;
 
 
 /** 
@@ -84,7 +84,7 @@ typedef struct
     double x,y,z;
 } MaplyCoordinate3dD;
 
-static const MaplyCoordinate3dD kMaplyNullCoordinate3dD = {.x = DBL_MIN, .y = DBL_MIN, .z = DBL_MIN};
+extern const MaplyCoordinate3dD kMaplyNullCoordinate3dD;
 
 /** 
     An NSObject based wrapper for 3D coordinates.
@@ -112,10 +112,7 @@ typedef struct
     MaplyCoordinate ur;
 } MaplyBoundingBox;
 
-static const MaplyBoundingBox kMaplyNullBoundingBox = {
-	.ll = {.x = FLT_MIN, .y = FLT_MIN},
-	.ur = {.x = FLT_MIN, .y = FLT_MIN}
-};
+extern const MaplyBoundingBox kMaplyNullBoundingBox;
 
 /**
     A category that uses NSValue to store MaplyCoordinate data
@@ -152,10 +149,7 @@ typedef struct
 	MaplyCoordinateD ur;
 } MaplyBoundingBoxD;
 
-static const MaplyBoundingBoxD kMaplyNullBoundingBoxD = {
-	.ll = {.x = DBL_MIN, .y = DBL_MIN},
-	.ur = {.x = DBL_MIN, .y = DBL_MIN}
-};
+extern const MaplyBoundingBoxD kMaplyNullBoundingBoxD;
 
 #if __cplusplus
 extern "C" {
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyCoordinateSystem.h
index 6778bd3..d1ddf69 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyCoordinateSystem.h
@@ -17,7 +17,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     Coordinate system for tiling systems and data sources and such.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyDoubleTapDelegate.h
index 45329e1..963d108 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyDoubleTapDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyDoubleTapDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyDoubleTapDragDelegate.h
index 5e55d23..53b4233 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyDoubleTapDragDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyDoubleTapDragDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyGeomBuilder.h
index 2f05d38..65a4374 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyGeomBuilder.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyGeomModel.h>
 
 /** 
     Geometry State is used to describe the visual look of objects as they're added.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyGeomModel.h
index 82a3db9..7e41021 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyGeomModel.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyShape.h>
 
 @class MaplyShader;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyGlobeRenderController.h
index 95d1b61..27c7afd 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyGlobeRenderController.h
@@ -19,8 +19,8 @@
 */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
 
 /**
     Animation State used by the WhirlyGlobeViewControllerAnimationDelegate.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyIconManager.h
index e6f545a..7e19b44 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyIconManager.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /**
  Holds info about a single style from the MaplySimpleStyleManager.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyImageTile.h
index a1a9903..808634d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyImageTile.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 @class MaplyElevationChunk;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyLabel.h
index 38af6a7..ddd52a2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyLabel.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 typedef NS_ENUM(NSInteger, MaplyLabelJustify) {
 	MaplyLabelJustifyLeft,
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyLight.h
index 4c83fca..31c415f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyLight.h
@@ -18,7 +18,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     The Light provides a simple interface to basic lighting within the toolkit.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyLocationTracker.h
index d759183..76e6ebc 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyLocationTracker.h
@@ -20,7 +20,7 @@
 
 #import <UIKit/UIKit.h>
 #import <CoreLocation/CoreLocation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 #define LOC_TRACKER_POS_MARKER_SIZE 32
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMBTileFetcher.h
index 84cfab6..278e5dc 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMBTileFetcher.h
@@ -16,9 +16,9 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /**
     MBTiles tile fetcher.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMarker.h
index 04d5e59..ea31c2d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMarker.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     The Marker places a UIImage on the globe or map at a given location.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMatrix.h
index 646a29b..646a29b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMatrix.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMoon.h
index f55f616..ee967b8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyMoon.h
@@ -17,9 +17,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyLight.h>
 
 /** 
     Utility for calculating moon position.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyPanDelegate.h
index bf3dc43..bf3dc43 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyPanDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyParticleSystem.h
index ac92b21..b5f603c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyParticleSystem.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
 
 typedef NS_ENUM(NSInteger, MaplyParticleSystemType) {
 	MaplyParticleSystemTypePoint,
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyPinchDelegate.h
index 01c0b9e..06c35b2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyPinchDelegate.h
@@ -16,7 +16,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyPinchDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyPoints.h
index ee59f35..2b2e6fd 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyPoints.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
 
 /** 
     The Maply Points object is used to add a large number of static points to the scene.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadImageFrameLoader.h
index b1da668..b4fea4c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadImageFrameLoader.h
@@ -17,8 +17,8 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyQuadImageLoader.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
 
 @class MaplyQuadImageFrameLoader;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadImageLoader.h
index b524401..d5b346d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadImageLoader.h
@@ -17,13 +17,13 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyQuadLoader.h>
 
 /**
  This version of the loader return is used by the MaplyImageLoaderInterpreter.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadLoader.h
index 3ef22cd..65ad61f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadLoader.h
@@ -18,12 +18,12 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
 
 @class MaplyQuadLoaderBase;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadPagingLoader.h
index e08a04d..18d8b18 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadPagingLoader.h
@@ -17,7 +17,7 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyQuadLoader.h>
 
 /**
  This version of the loader return is used by the MaplyQuadPagingLoader.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadSampler.h
index 2f9ec39..5381a95 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyQuadSampler.h
@@ -18,10 +18,10 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /**
     Sampling parameters.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRemoteTileFetcher.h
index 32dba80..cc26370 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRemoteTileFetcher.h
@@ -18,8 +18,8 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /**
  Remote Tile Info Object (New)
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRenderController.h
index cddd63d..0c7c36d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRenderController.h
@@ -18,20 +18,20 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
 
 @class MaplyRemoteTileFetcher;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRenderTarget.h
index 82b283f..5f6034c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRenderTarget.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyTexture.h>
 
 typedef NS_ENUM(NSUInteger,MaplyMipmapType) {
     /// Don't generate a mipmap
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRotateDelegate.h
index 2cb073b..2cb073b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyRotateDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyScreenLabel.h
index 3893d2f..f0c00e6 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyScreenLabel.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 @class MaplyVectorObject;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyScreenMarker.h
index 3481876..8ed1bab 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyScreenMarker.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 @class MaplyVectorObject;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyScreenObject.h
index 48028ae..4779746 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyScreenObject.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /** 
     The Maply Screen Object is used to build up a more complex screen object from multiple pieces.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyShader.h
index 45e309e..45e309e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyShader.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyShape.h
index baed55f..51dc1eb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyShape.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyTexture.h>
 
 /** 
     Maply Shape is the base class for the actual shape objects.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySharedAttributes.h
index 00bd24d..00bd24d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySharedAttributes.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySimpleTileFetcher.h
index f500c68..78307c2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySimpleTileFetcher.h
@@ -18,7 +18,7 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
 
 /** Simple Tile Fetcher is meant for sub classing.
  
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyStarsModel.h
index 951afbc..0cbf7aa 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyStarsModel.h
@@ -17,8 +17,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
 
 /** 
     The Stars Model parses and then displays a star field.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySticker.h
index 91e886b..5ccf386 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySticker.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /** 
     Stickers are rectangles placed on the globe with an image.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySun.h
index c106a09..a7722eb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplySun.h
@@ -17,9 +17,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyLight.h>
 
 /** 
     Utility for calculating sun position and shading info.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTapDelegate.h
index 34589f1..2acf077 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTapDelegate.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
+#import <WhirlyGlobe/MaplyTapMessage.h>
 
 /** Maply tap gesture delegate responds to a tap
  by sending out a notification.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTapMessage.h
index 6500e2f..6500e2f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTapMessage.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTexture.h
index d9eb9df..d9eb9df 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTexture.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTextureBuilder.h
index 74d842c..74d842c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTextureBuilder.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTileSourceNew.h
index 8100007..8c5bcd0 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTileSourceNew.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyImageTile.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /**
  This represents the indentifier for a unique tile in the pyramid.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTouchCancelAnimationDelegate.h
index 74c1391..74c1391 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTouchCancelAnimationDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTwoFingerTapDelegate.h
index ad373c8..0e8fe6e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyTwoFingerTapDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyTwoFingerTapDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyUpdateLayer.h
index 4ff9ede..772cea1 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyUpdateLayer.h
@@ -18,12 +18,12 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 @class MaplyUpdateLayer;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVariableTarget.h
index d6ba490..9259826 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVariableTarget.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /**
     A variable target manages two pass rendering for one type of variable.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorObject.h
index e85aeb4..80b2ca4 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorObject.h
@@ -18,8 +18,8 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 @class MaplyBaseViewController;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorStyle.h
index cecf6d9..2d30fab 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorStyle.h
@@ -17,8 +17,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 @class MaplyVectorTileData;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorStyleSimple.h
index 3543e30..ccb309e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorStyleSimple.h
@@ -17,7 +17,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 /** 
     Simple default style to see something in vector tile data.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileLineStyle.h
index ce3984a..f56dd07 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileLineStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the line style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileMarkerStyle.h
index 9dac65a..994307e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileMarkerStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the marker style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTilePolygonStyle.h
index 509916a..4d9d81f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTilePolygonStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the polygon style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileStyle.h
index c917859..5f4eed2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileStyle.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
 
 /** The Maply Vector Tile Style is an internal representation of the style JSON coming out
     of a Maply Vector Tile database.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileTextStyle.h
index b69b826..59b53c3 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVectorTileTextStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the text style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVertexAttribute.h
index 07e220a..07e220a 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyVertexAttribute.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyViewController.h
index fc5b2eb..c49ae41 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyViewController.h
@@ -17,13 +17,13 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 @class MaplyControllerLayer;
 @class MaplyViewController;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyViewTracker.h
index b54b45c..9317c00 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyViewTracker.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     The View Tracker associates a view with a geographic location.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyWMSTileSource.h
index 0c25ea3..4b9d317 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyWMSTileSource.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /** A bounding box for a specific CRS in that coordinate
     system.  This is part of the Web Map Server parser.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyZoomGestureDelegate.h
index 442a976..442a976 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MaplyZoomGestureDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapnikStyle.h
index 3f489ef..22e4cf0 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapnikStyle.h
@@ -19,7 +19,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+#import <WhirlyGlobe/MapnikStyleRule.h>
 
 @interface MapnikStyle : NSObject
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapnikStyleRule.h
index f462857..f462857 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapnikStyleRule.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapnikStyleSet.h
index 0d615f5..86c54e7 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/MapnikStyleSet.h
@@ -20,7 +20,7 @@
 
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 @class MaplyVectorStyleSettings;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/NSData+Zlib.h
index 4a28f18..4a28f18 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/NSData+Zlib.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/NSDictionary+StyleRules.h
index 9c4ab96..9c4ab96 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/NSDictionary+StyleRules.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDExpressions.h
index 43a042d..43a042d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDExpressions.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDOperators.h
index 2457979..746695e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDOperators.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+#import <WhirlyGlobe/SLDExpressions.h>
 
 /** @brief Base class for elements of ogc:comparisonOps or ogc:logicOps.
  
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDStyleSet.h
index 2000b20..4e705cf 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDStyleSet.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 /** @brief Class corresponding to the sld:NamedLayer element
  @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDSymbolizers.h
index 4eb7151..78e2acb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDSymbolizers.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 @class DDXMLNode;
 @class DDXMLElement;
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** @brief Base class for Symbolizer elements
  @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDWellKnownMarkers.h
index cdb4cc8..cdb4cc8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/SLDWellKnownMarkers.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WGCoordinate.h
index 39b882f..8b79f7b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WGCoordinate.h
@@ -18,7 +18,7 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /// WhirlyGlobe just takes geo coordinates.
 /// This contains lon and lat values in the x and y fields.
diff --git a/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WhirlyGlobe.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WhirlyGlobe.h
new file mode 100644
index 0000000..4fc8123
--- /dev/null
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WhirlyGlobe.h
@@ -0,0 +1,121 @@
+//
+//  WhirlyGlobeMaplyComponent.h
+//  WhirlyGlobeMaplyComponent
+//
+//  Created by Steve Gifford on 6/29/16.
+//  Copyright © 2016-2019 mousebird consulting.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT double WhirlyGlobeMaplyComponentVersionNumber;
+
+//! Project version string for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT const unsigned char WhirlyGlobeMaplyComponentVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <WhirlyGlobeMaplyComponent/PublicHeader.h>
+
+#import <WhirlyGlobe/GeographicLib_ObjC.h>
+#import <WhirlyGlobe/GeoJSONSource.h>
+#import <WhirlyGlobe/GlobeDoubleTapDelegate.h>
+#import <WhirlyGlobe/GlobeDoubleTapDragDelegate.h>
+#import <WhirlyGlobe/GlobePanDelegate.h>
+#import <WhirlyGlobe/GlobePinchDelegate.h>
+#import <WhirlyGlobe/GlobeRotateDelegate.h>
+#import <WhirlyGlobe/GlobeTapDelegate.h>
+#import <WhirlyGlobe/GlobeTiltDelegate.h>
+#import <WhirlyGlobe/GlobeTwoFingerTapDelegate.h>
+#import <WhirlyGlobe/MapboxVectorInterpreter.h>
+#import <WhirlyGlobe/MapboxVectorStyleSet.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
+#import <WhirlyGlobe/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobe/Maply3dTouchPreviewDelegate.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyAnnotation.h>
+#import <WhirlyGlobe/MaplyAtmosphere.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyBillboard.h>
+#import <WhirlyGlobe/MaplyBridge.h>
+#import <WhirlyGlobe/MaplyBridge.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/MaplyColorRampGenerator.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyDoubleTapDelegate.h>
+#import <WhirlyGlobe/MaplyDoubleTapDragDelegate.h>
+#import <WhirlyGlobe/MaplyGeomBuilder.h>
+#import <WhirlyGlobe/MaplyGeomModel.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/MaplyIconManager.h>
+#import <WhirlyGlobe/MaplyImageTile.h>
+#import <WhirlyGlobe/MaplyLabel.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyLocationTracker.h>
+#import <WhirlyGlobe/MaplyMarker.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyMBTileFetcher.h>
+#import <WhirlyGlobe/MaplyMoon.h>
+#import <WhirlyGlobe/MaplyPanDelegate.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPinchDelegate.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobe/MaplyQuadImageLoader.h>
+#import <WhirlyGlobe/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyRotateDelegate.h>
+#import <WhirlyGlobe/MaplyScreenLabel.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyScreenObject.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyShape.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobe/MaplyStarsModel.h>
+#import <WhirlyGlobe/MaplySticker.h>
+#import <WhirlyGlobe/MaplySun.h>
+#import <WhirlyGlobe/MaplyTapDelegate.h>
+#import <WhirlyGlobe/MaplyTapMessage.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyTextureBuilder.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyTouchCancelAnimationDelegate.h>
+#import <WhirlyGlobe/MaplyTwoFingerTapDelegate.h>
+#import <WhirlyGlobe/MaplyUpdateLayer.h>
+#import <WhirlyGlobe/MaplyVariableTarget.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobe/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobe/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobe/MaplyVertexAttribute.h>
+#import <WhirlyGlobe/MaplyViewController.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyWMSTileSource.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MapnikStyle.h>
+#import <WhirlyGlobe/MapnikStyleRule.h>
+#import <WhirlyGlobe/MapnikStyleSet.h>
+#import <WhirlyGlobe/NSData+Zlib.h>
+#import <WhirlyGlobe/NSDictionary+StyleRules.h>
+#import <WhirlyGlobe/SLDExpressions.h>
+#import <WhirlyGlobe/SLDOperators.h>
+#import <WhirlyGlobe/SLDStyleSet.h>
+#import <WhirlyGlobe/SLDSymbolizers.h>
+#import <WhirlyGlobe/SLDWellKnownMarkers.h>
+#import <WhirlyGlobe/WGCoordinate.h>
+#import <WhirlyGlobe/WhirlyGlobeComponent.h>
+#import <WhirlyGlobe/WhirlyGlobeComponent.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WhirlyGlobeComponent.h
index 5142734..babfdf7 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WhirlyGlobeComponent.h
@@ -18,6 +18,6 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WhirlyGlobeViewController.h
index ae3c444..f2e3b82 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Headers/WhirlyGlobeViewController.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 @class WGViewControllerLayer;
 @class WhirlyGlobeViewController;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Info.plist b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Info.plist
index 2ff1ea4..47bf396 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Info.plist
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Info.plist
diff --git a/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Modules/module.modulemap b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Modules/module.modulemap
new file mode 100644
index 0000000..2e32255
--- /dev/null
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module WhirlyGlobe {
+  umbrella header "WhirlyGlobe.h"
+
+  export *
+  module * { export * }
+}
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/WhirlyGlobe
index 88108b7..8625600 100755
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/WhirlyGlobe
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/default.metallib b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/default.metallib
index 5d85be9..5d85be9 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/default.metallib
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64/WhirlyGlobe.framework/default.metallib
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Config-ac.h.in
index ac3ba0b..ac3ba0b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Config-ac.h.in
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Config-ac.h.in
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GeoJSONSource.h
index 55c1446..ff80172 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeoJSONSource.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GeoJSONSource.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 #define GEOJSON_MAX_POINTS 4096
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GeographicLib_ObjC.h
index e57a3d2..22bd915 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GeographicLib_ObjC.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GeographicLib_ObjC.h
@@ -9,7 +9,7 @@
 #ifndef GeographicLib_Wrapper_h
 #define GeographicLib_Wrapper_h
 
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 typedef struct GeoLibInv_t {
     double distance;    // meters
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeDoubleTapDelegate.h
index ea1b934..ea1b934 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeDoubleTapDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeDoubleTapDragDelegate.h
index 7df7f12..295fff8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/GlobeDoubleTapDragDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeDoubleTapDragDelegate.h
@@ -16,7 +16,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+#import <WhirlyGlobe/GlobePinchDelegate.h>
 
 // Sent out when the double tap delegate takes control
 #define kGlobeDoubleTapDragDidStart @"WKGlobeDoubleTapDragStarted"
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobePanDelegate.h
index 02d2249..02d2249 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePanDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobePanDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobePinchDelegate.h
index 35d40d8..35d40d8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobePinchDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobePinchDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeRotateDelegate.h
index 9e57c3a..9e57c3a 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeRotateDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeRotateDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeTapDelegate.h
index 61e3492..61e3492 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeTapDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeTiltDelegate.h
index f326c3e..09cf3eb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTiltDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeTiltDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
+#import <WhirlyGlobe/GlobePinchDelegate.h>
 
 // The tilt delegate handle the 3D camera tilt
 @interface WhirlyGlobeTiltDelegate : NSObject<UIGestureRecognizerDelegate>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeTwoFingerTapDelegate.h
index 93bea5e..93bea5e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/GlobeTwoFingerTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/GlobeTwoFingerTapDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapboxVectorInterpreter.h
index 6229604..25a3417 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorInterpreter.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapboxVectorInterpreter.h
@@ -20,11 +20,11 @@
 
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MaplyQuadImageFrameLoader.h>
 
 @class MapboxVectorStyleSet;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapboxVectorStyleSet.h
index acf5d30..1f5c9ae 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorStyleSet.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapboxVectorStyleSet.h
@@ -19,8 +19,8 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 typedef NS_ENUM(NSUInteger,MapboxLayerType) {
     MapboxLayerTypeBackground,
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapboxVectorTiles.h
index b52cd5b..7b4cbef 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapboxVectorTiles.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapboxVectorTiles.h
@@ -18,10 +18,10 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
 
 typedef NS_ENUM(NSInteger,MapboxGeometryType)
 {
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/Maply3DTouchPreviewDatasource.h
index ef42bf5..ef42bf5 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/Maply3DTouchPreviewDatasource.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/Maply3DTouchPreviewDatasource.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/Maply3dTouchPreviewDelegate.h
index 5986f38..1957e10 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/Maply3dTouchPreviewDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/Maply3dTouchPreviewDelegate.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobe/Maply3DTouchPreviewDatasource.h>
 
 @class MaplyBaseInteractionLayer;
 @class MaplyBaseViewController;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyActiveObject.h
index 864e853..864e853 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyActiveObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyActiveObject.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyAnnotation.h
index 0a30524..1337cc3 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAnnotation.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyAnnotation.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     This object displays an annotation at a particular point and will track that point as the map or globe moves.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyAtmosphere.h
index 3af444f..f5de72d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyAtmosphere.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyAtmosphere.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyLight.h>
 
 /** 
     Sets up the objects and shaders to implement an atmosphere.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyBaseViewController.h
index 9d5715b..119b330 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBaseViewController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyBaseViewController.h
@@ -18,29 +18,30 @@
 
 #import <UIKit/UIKit.h>
 #import <Metal/Metal.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyAnnotation.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobe/MaplyLocationTracker.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyVertexAttribute.h>
 
 typedef double (^ZoomEasingBlock)(double z0,double z1,double t);
+typedef void (__strong ^InitCompletionBlock)(void);
 
 /** 
     When selecting multiple objects, one or more of these is returned.
@@ -1572,4 +1573,10 @@ typedef double (^ZoomEasingBlock)(double z0,double z1,double t);
 /// Return the renderer type being used
 - (MaplyRenderType)getRenderType;
 
+/**
+    Blocks to be called after the view is set up, or immediately if it is already set up.
+    Similar to `addPostSurfaceRunnable` on Android.
+*/
+- (void)addPostInitBlock:(_Nonnull InitCompletionBlock)block;
+
 @end
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyBillboard.h
index 3a24e43..f29eb87 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBillboard.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyBillboard.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenObject.h>
 
 /** 
     A billboard is tied to a specific point, but rotates to face the user.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyBridge.h
index 152d869..d0e9832 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyBridge.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyBridge.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/MaplyViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyCluster.h
index aea79cf..d874bb3 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCluster.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyCluster.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyShader.h>
 
 @class MaplyBaseViewController;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyColorRampGenerator.h
index 95d2331..95d2331 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyColorRampGenerator.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyColorRampGenerator.h
diff --git a/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyComponent.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyComponent.h
new file mode 100644
index 0000000..1d51b1b
--- /dev/null
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyComponent.h
@@ -0,0 +1,102 @@
+/*  MaplyComponent.h
+ *  MaplyComponent
+ *
+ *  Created by Steve Gifford on 9/6/12.
+ *  Copyright 2012-2022 mousebird consulting
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+
+#import <WhirlyGlobe/NSData+Zlib.h>
+#import <WhirlyGlobe/NSDictionary+StyleRules.h>
+
+#import <WhirlyGlobe/MaplyGeomBuilder.h>
+#import <WhirlyGlobe/MaplyIconManager.h>
+#import <WhirlyGlobe/MaplyLocationTracker.h>
+#import <WhirlyGlobe/MaplyTextureBuilder.h>
+
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyAnnotation.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyUpdateLayer.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyViewController.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
+
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplyBillboard.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/MaplyLabel.h>
+#import <WhirlyGlobe/MaplyGeomModel.h>
+#import <WhirlyGlobe/MaplyMarker.h>
+#import <WhirlyGlobe/MaplyMoon.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplySticker.h>
+#import <WhirlyGlobe/MaplyShape.h>
+#import <WhirlyGlobe/MaplyScreenLabel.h>
+#import <WhirlyGlobe/MaplySun.h>
+#import <WhirlyGlobe/MaplyScreenObject.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyStarsModel.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+
+#import <WhirlyGlobe/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorInterpreter.h>
+
+#import <WhirlyGlobe/SLDStyleSet.h>
+#import <WhirlyGlobe/SLDExpressions.h>
+#import <WhirlyGlobe/SLDOperators.h>
+#import <WhirlyGlobe/SLDSymbolizers.h>
+#import <WhirlyGlobe/SLDWellKnownMarkers.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobe/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobe/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobe/MapboxVectorStyleSet.h>
+#import <WhirlyGlobe/MapnikStyle.h>
+#import <WhirlyGlobe/MapnikStyleRule.h>
+#import <WhirlyGlobe/MapnikStyleSet.h>
+
+#import <WhirlyGlobe/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyImageTile.h>
+#import <WhirlyGlobe/MaplyQuadImageLoader.h>
+#import <WhirlyGlobe/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobe/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/GeoJSONSource.h>
+
+#import <WhirlyGlobe/MaplyWMSTileSource.h>
+#import <WhirlyGlobe/MaplyMBTileFetcher.h>
+
+#import <WhirlyGlobe/MaplyVariableTarget.h>
+#import <WhirlyGlobe/MaplyAtmosphere.h>
+#import <WhirlyGlobe/MaplyColorRampGenerator.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyVertexAttribute.h>
+
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyComponentObject.h
index 59ccde6..59ccde6 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponentObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyComponentObject.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyControllerLayer.h
index d8775d0..d8775d0 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyControllerLayer.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyControllerLayer.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyCoordinate.h
index d1c01e8..753b77e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyCoordinate.h
@@ -35,7 +35,7 @@ typedef struct
 } MaplyCoordinate;
 
 
-static const MaplyCoordinate kMaplyNullCoordinate = {.x = FLT_MIN, .y = FLT_MIN};
+extern const MaplyCoordinate kMaplyNullCoordinate;
 
 
 /** 
@@ -49,7 +49,7 @@ typedef struct
     double x,y;
 } MaplyCoordinateD;
 
-static const MaplyCoordinateD kMaplyNullCoordinateD = {.x = DBL_MIN, .y = DBL_MIN};
+extern const MaplyCoordinateD kMaplyNullCoordinateD;
 
 
 /** 
@@ -84,7 +84,7 @@ typedef struct
     double x,y,z;
 } MaplyCoordinate3dD;
 
-static const MaplyCoordinate3dD kMaplyNullCoordinate3dD = {.x = DBL_MIN, .y = DBL_MIN, .z = DBL_MIN};
+extern const MaplyCoordinate3dD kMaplyNullCoordinate3dD;
 
 /** 
     An NSObject based wrapper for 3D coordinates.
@@ -112,10 +112,7 @@ typedef struct
     MaplyCoordinate ur;
 } MaplyBoundingBox;
 
-static const MaplyBoundingBox kMaplyNullBoundingBox = {
-	.ll = {.x = FLT_MIN, .y = FLT_MIN},
-	.ur = {.x = FLT_MIN, .y = FLT_MIN}
-};
+extern const MaplyBoundingBox kMaplyNullBoundingBox;
 
 /**
     A category that uses NSValue to store MaplyCoordinate data
@@ -152,10 +149,7 @@ typedef struct
 	MaplyCoordinateD ur;
 } MaplyBoundingBoxD;
 
-static const MaplyBoundingBoxD kMaplyNullBoundingBoxD = {
-	.ll = {.x = DBL_MIN, .y = DBL_MIN},
-	.ur = {.x = DBL_MIN, .y = DBL_MIN}
-};
+extern const MaplyBoundingBoxD kMaplyNullBoundingBoxD;
 
 #if __cplusplus
 extern "C" {
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyCoordinateSystem.h
index 6778bd3..d1ddf69 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyCoordinateSystem.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyCoordinateSystem.h
@@ -17,7 +17,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     Coordinate system for tiling systems and data sources and such.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyDoubleTapDelegate.h
index 45329e1..963d108 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyDoubleTapDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyDoubleTapDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyDoubleTapDragDelegate.h
index 5e55d23..53b4233 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyDoubleTapDragDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyDoubleTapDragDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyDoubleTapDragDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyGeomBuilder.h
index 2f05d38..65a4374 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomBuilder.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyGeomBuilder.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyGeomModel.h>
 
 /** 
     Geometry State is used to describe the visual look of objects as they're added.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyGeomModel.h
index 82a3db9..7e41021 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGeomModel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyGeomModel.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyShape.h>
 
 @class MaplyShader;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyGlobeRenderController.h
index 95d1b61..27c7afd 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyGlobeRenderController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyGlobeRenderController.h
@@ -19,8 +19,8 @@
 */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
 
 /**
     Animation State used by the WhirlyGlobeViewControllerAnimationDelegate.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyIconManager.h
index e6f545a..7e19b44 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyIconManager.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyIconManager.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /**
  Holds info about a single style from the MaplySimpleStyleManager.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyImageTile.h
index a1a9903..808634d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyImageTile.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyImageTile.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 @class MaplyElevationChunk;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyLabel.h
index 38af6a7..ddd52a2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLabel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyLabel.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 typedef NS_ENUM(NSInteger, MaplyLabelJustify) {
 	MaplyLabelJustifyLeft,
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyLight.h
index 4c83fca..31c415f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLight.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyLight.h
@@ -18,7 +18,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     The Light provides a simple interface to basic lighting within the toolkit.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyLocationTracker.h
index d759183..76e6ebc 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyLocationTracker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyLocationTracker.h
@@ -20,7 +20,7 @@
 
 #import <UIKit/UIKit.h>
 #import <CoreLocation/CoreLocation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 #define LOC_TRACKER_POS_MARKER_SIZE 32
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMBTileFetcher.h
index 84cfab6..278e5dc 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMBTileFetcher.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMBTileFetcher.h
@@ -16,9 +16,9 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /**
     MBTiles tile fetcher.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMarker.h
index 04d5e59..ea31c2d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMarker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMarker.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     The Marker places a UIImage on the globe or map at a given location.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMatrix.h
index 646a29b..646a29b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMatrix.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMatrix.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMoon.h
index f55f616..ee967b8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyMoon.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyMoon.h
@@ -17,9 +17,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyLight.h>
 
 /** 
     Utility for calculating moon position.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyPanDelegate.h
index bf3dc43..bf3dc43 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPanDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyPanDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyParticleSystem.h
index ac92b21..b5f603c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyParticleSystem.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyParticleSystem.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
 
 typedef NS_ENUM(NSInteger, MaplyParticleSystemType) {
 	MaplyParticleSystemTypePoint,
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyPinchDelegate.h
index 01c0b9e..06c35b2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPinchDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyPinchDelegate.h
@@ -16,7 +16,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyPinchDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyPoints.h
index ee59f35..2b2e6fd 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyPoints.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyPoints.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
 
 /** 
     The Maply Points object is used to add a large number of static points to the scene.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadImageFrameLoader.h
index b1da668..b4fea4c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageFrameLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadImageFrameLoader.h
@@ -17,8 +17,8 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyQuadImageLoader.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
 
 @class MaplyQuadImageFrameLoader;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadImageLoader.h
index b524401..d5b346d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadImageLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadImageLoader.h
@@ -17,13 +17,13 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyQuadLoader.h>
 
 /**
  This version of the loader return is used by the MaplyImageLoaderInterpreter.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadLoader.h
index 3ef22cd..65ad61f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadLoader.h
@@ -18,12 +18,12 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
 
 @class MaplyQuadLoaderBase;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadPagingLoader.h
index e08a04d..18d8b18 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadPagingLoader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadPagingLoader.h
@@ -17,7 +17,7 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyQuadLoader.h>
 
 /**
  This version of the loader return is used by the MaplyQuadPagingLoader.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadSampler.h
index 2f9ec39..5381a95 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyQuadSampler.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyQuadSampler.h
@@ -18,10 +18,10 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /**
     Sampling parameters.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRemoteTileFetcher.h
index 32dba80..cc26370 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRemoteTileFetcher.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRemoteTileFetcher.h
@@ -18,8 +18,8 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /**
  Remote Tile Info Object (New)
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRenderController.h
index cddd63d..0c7c36d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRenderController.h
@@ -18,20 +18,20 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
 
 @class MaplyRemoteTileFetcher;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRenderTarget.h
index 82b283f..5f6034c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRenderTarget.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRenderTarget.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyTexture.h>
 
 typedef NS_ENUM(NSUInteger,MaplyMipmapType) {
     /// Don't generate a mipmap
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRotateDelegate.h
index 2cb073b..2cb073b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyRotateDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyRotateDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyScreenLabel.h
index 3893d2f..f0c00e6 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenLabel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyScreenLabel.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 @class MaplyVectorObject;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyScreenMarker.h
index 3481876..8ed1bab 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenMarker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyScreenMarker.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 @class MaplyVectorObject;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyScreenObject.h
index 48028ae..4779746 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyScreenObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyScreenObject.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /** 
     The Maply Screen Object is used to build up a more complex screen object from multiple pieces.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyShader.h
index 45e309e..45e309e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShader.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyShader.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyShape.h
index baed55f..51dc1eb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyShape.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyShape.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyTexture.h>
 
 /** 
     Maply Shape is the base class for the actual shape objects.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySharedAttributes.h
index 00bd24d..00bd24d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySharedAttributes.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySharedAttributes.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySimpleTileFetcher.h
index f500c68..78307c2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySimpleTileFetcher.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySimpleTileFetcher.h
@@ -18,7 +18,7 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
 
 /** Simple Tile Fetcher is meant for sub classing.
  
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyStarsModel.h
index 951afbc..0cbf7aa 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyStarsModel.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyStarsModel.h
@@ -17,8 +17,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
 
 /** 
     The Stars Model parses and then displays a star field.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySticker.h
index 91e886b..5ccf386 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySticker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySticker.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /** 
     Stickers are rectangles placed on the globe with an image.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySun.h
index c106a09..a7722eb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplySun.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplySun.h
@@ -17,9 +17,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyLight.h>
 
 /** 
     Utility for calculating sun position and shading info.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTapDelegate.h
index 34589f1..2acf077 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTapDelegate.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
+#import <WhirlyGlobe/MaplyTapMessage.h>
 
 /** Maply tap gesture delegate responds to a tap
  by sending out a notification.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTapMessage.h
index 6500e2f..6500e2f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTapMessage.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTapMessage.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTexture.h
index d9eb9df..d9eb9df 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTexture.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTexture.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTextureBuilder.h
index 74d842c..74d842c 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTextureBuilder.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTextureBuilder.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTileSourceNew.h
index 8100007..8c5bcd0 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTileSourceNew.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTileSourceNew.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyImageTile.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /**
  This represents the indentifier for a unique tile in the pyramid.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTouchCancelAnimationDelegate.h
index 74c1391..74c1391 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTouchCancelAnimationDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTouchCancelAnimationDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTwoFingerTapDelegate.h
index ad373c8..0e8fe6e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyTwoFingerTapDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyTwoFingerTapDelegate.h
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
 
 @interface MaplyTwoFingerTapDelegate : MaplyZoomGestureDelegate
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyUpdateLayer.h
index 4ff9ede..772cea1 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyUpdateLayer.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyUpdateLayer.h
@@ -18,12 +18,12 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 @class MaplyUpdateLayer;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVariableTarget.h
index d6ba490..9259826 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVariableTarget.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVariableTarget.h
@@ -19,9 +19,9 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
 
 /**
     A variable target manages two pass rendering for one type of variable.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorObject.h
index e85aeb4..80b2ca4 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorObject.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorObject.h
@@ -18,8 +18,8 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 @class MaplyBaseViewController;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorStyle.h
index cecf6d9..2d30fab 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorStyle.h
@@ -17,8 +17,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 @class MaplyVectorTileData;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorStyleSimple.h
index 3543e30..ccb309e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorStyleSimple.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorStyleSimple.h
@@ -17,7 +17,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 /** 
     Simple default style to see something in vector tile data.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileLineStyle.h
index ce3984a..f56dd07 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileLineStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileLineStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the line style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileMarkerStyle.h
index 9dac65a..994307e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileMarkerStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileMarkerStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the marker style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTilePolygonStyle.h
index 509916a..4d9d81f 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTilePolygonStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTilePolygonStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the polygon style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileStyle.h
index c917859..5f4eed2 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileStyle.h
@@ -17,7 +17,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
 
 /** The Maply Vector Tile Style is an internal representation of the style JSON coming out
     of a Maply Vector Tile database.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileTextStyle.h
index b69b826..59b53c3 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVectorTileTextStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVectorTileTextStyle.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** 
     Implementation of the text style symbolizer for Maply Vector Tiles.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVertexAttribute.h
index 07e220a..07e220a 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyVertexAttribute.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyVertexAttribute.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyViewController.h
index fc5b2eb..c49ae41 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyViewController.h
@@ -17,13 +17,13 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 @class MaplyControllerLayer;
 @class MaplyViewController;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyViewTracker.h
index b54b45c..9317c00 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyViewTracker.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyViewTracker.h
@@ -19,7 +19,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /** 
     The View Tracker associates a view with a geographic location.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyWMSTileSource.h
index 0c25ea3..4b9d317 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyWMSTileSource.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyWMSTileSource.h
@@ -16,8 +16,8 @@
  *  limitations under the License.
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
 
 /** A bounding box for a specific CRS in that coordinate
     system.  This is part of the Web Map Server parser.
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyZoomGestureDelegate.h
index 442a976..442a976 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyZoomGestureDelegate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MaplyZoomGestureDelegate.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapnikStyle.h
index 3f489ef..22e4cf0 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyle.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapnikStyle.h
@@ -19,7 +19,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
+#import <WhirlyGlobe/MapnikStyleRule.h>
 
 @interface MapnikStyle : NSObject
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapnikStyleRule.h
index f462857..f462857 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleRule.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapnikStyleRule.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapnikStyleSet.h
index 0d615f5..86c54e7 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MapnikStyleSet.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/MapnikStyleSet.h
@@ -20,7 +20,7 @@
 
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 @class MaplyVectorStyleSettings;
 
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/NSData+Zlib.h
index 4a28f18..4a28f18 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSData+Zlib.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/NSData+Zlib.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/NSDictionary+StyleRules.h
index 9c4ab96..9c4ab96 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/NSDictionary+StyleRules.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/NSDictionary+StyleRules.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDExpressions.h
index 43a042d..43a042d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDExpressions.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDExpressions.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDOperators.h
index 2457979..746695e 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDOperators.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDOperators.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
+#import <WhirlyGlobe/SLDExpressions.h>
 
 /** @brief Base class for elements of ogc:comparisonOps or ogc:logicOps.
  
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDStyleSet.h
index 2000b20..4e705cf 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDStyleSet.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDStyleSet.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
 
 /** @brief Class corresponding to the sld:NamedLayer element
  @see http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd for SLD v1.1.0
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDSymbolizers.h
index 4eb7151..78e2acb 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDSymbolizers.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDSymbolizers.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 @class DDXMLNode;
 @class DDXMLElement;
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
 
 /** @brief Base class for Symbolizer elements
  @see http://schemas.opengis.net/se/1.1.0/Symbolizer.xsd for SLD v1.1.0
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDWellKnownMarkers.h
index cdb4cc8..cdb4cc8 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/SLDWellKnownMarkers.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/SLDWellKnownMarkers.h
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WGCoordinate.h
index 39b882f..8b79f7b 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WGCoordinate.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WGCoordinate.h
@@ -18,7 +18,7 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
 
 /// WhirlyGlobe just takes geo coordinates.
 /// This contains lon and lat values in the x and y fields.
diff --git a/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WhirlyGlobe.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WhirlyGlobe.h
new file mode 100644
index 0000000..4fc8123
--- /dev/null
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WhirlyGlobe.h
@@ -0,0 +1,121 @@
+//
+//  WhirlyGlobeMaplyComponent.h
+//  WhirlyGlobeMaplyComponent
+//
+//  Created by Steve Gifford on 6/29/16.
+//  Copyright © 2016-2019 mousebird consulting.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT double WhirlyGlobeMaplyComponentVersionNumber;
+
+//! Project version string for WhirlyGlobeMaplyComponent.
+FOUNDATION_EXPORT const unsigned char WhirlyGlobeMaplyComponentVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <WhirlyGlobeMaplyComponent/PublicHeader.h>
+
+#import <WhirlyGlobe/GeographicLib_ObjC.h>
+#import <WhirlyGlobe/GeoJSONSource.h>
+#import <WhirlyGlobe/GlobeDoubleTapDelegate.h>
+#import <WhirlyGlobe/GlobeDoubleTapDragDelegate.h>
+#import <WhirlyGlobe/GlobePanDelegate.h>
+#import <WhirlyGlobe/GlobePinchDelegate.h>
+#import <WhirlyGlobe/GlobeRotateDelegate.h>
+#import <WhirlyGlobe/GlobeTapDelegate.h>
+#import <WhirlyGlobe/GlobeTiltDelegate.h>
+#import <WhirlyGlobe/GlobeTwoFingerTapDelegate.h>
+#import <WhirlyGlobe/MapboxVectorInterpreter.h>
+#import <WhirlyGlobe/MapboxVectorStyleSet.h>
+#import <WhirlyGlobe/MapboxVectorTiles.h>
+#import <WhirlyGlobe/Maply3DTouchPreviewDatasource.h>
+#import <WhirlyGlobe/Maply3dTouchPreviewDelegate.h>
+#import <WhirlyGlobe/MaplyActiveObject.h>
+#import <WhirlyGlobe/MaplyAnnotation.h>
+#import <WhirlyGlobe/MaplyAtmosphere.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyBillboard.h>
+#import <WhirlyGlobe/MaplyBridge.h>
+#import <WhirlyGlobe/MaplyBridge.h>
+#import <WhirlyGlobe/MaplyCluster.h>
+#import <WhirlyGlobe/MaplyColorRampGenerator.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyComponentObject.h>
+#import <WhirlyGlobe/MaplyControllerLayer.h>
+#import <WhirlyGlobe/MaplyCoordinate.h>
+#import <WhirlyGlobe/MaplyCoordinateSystem.h>
+#import <WhirlyGlobe/MaplyDoubleTapDelegate.h>
+#import <WhirlyGlobe/MaplyDoubleTapDragDelegate.h>
+#import <WhirlyGlobe/MaplyGeomBuilder.h>
+#import <WhirlyGlobe/MaplyGeomModel.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/MaplyIconManager.h>
+#import <WhirlyGlobe/MaplyImageTile.h>
+#import <WhirlyGlobe/MaplyLabel.h>
+#import <WhirlyGlobe/MaplyLight.h>
+#import <WhirlyGlobe/MaplyLocationTracker.h>
+#import <WhirlyGlobe/MaplyMarker.h>
+#import <WhirlyGlobe/MaplyMatrix.h>
+#import <WhirlyGlobe/MaplyMBTileFetcher.h>
+#import <WhirlyGlobe/MaplyMoon.h>
+#import <WhirlyGlobe/MaplyPanDelegate.h>
+#import <WhirlyGlobe/MaplyParticleSystem.h>
+#import <WhirlyGlobe/MaplyPinchDelegate.h>
+#import <WhirlyGlobe/MaplyPoints.h>
+#import <WhirlyGlobe/MaplyQuadImageFrameLoader.h>
+#import <WhirlyGlobe/MaplyQuadImageLoader.h>
+#import <WhirlyGlobe/MaplyQuadLoader.h>
+#import <WhirlyGlobe/MaplyQuadPagingLoader.h>
+#import <WhirlyGlobe/MaplyQuadSampler.h>
+#import <WhirlyGlobe/MaplyRemoteTileFetcher.h>
+#import <WhirlyGlobe/MaplyRenderController.h>
+#import <WhirlyGlobe/MaplyRenderTarget.h>
+#import <WhirlyGlobe/MaplyRotateDelegate.h>
+#import <WhirlyGlobe/MaplyScreenLabel.h>
+#import <WhirlyGlobe/MaplyScreenMarker.h>
+#import <WhirlyGlobe/MaplyScreenObject.h>
+#import <WhirlyGlobe/MaplyShader.h>
+#import <WhirlyGlobe/MaplyShape.h>
+#import <WhirlyGlobe/MaplySharedAttributes.h>
+#import <WhirlyGlobe/MaplySimpleTileFetcher.h>
+#import <WhirlyGlobe/MaplyStarsModel.h>
+#import <WhirlyGlobe/MaplySticker.h>
+#import <WhirlyGlobe/MaplySun.h>
+#import <WhirlyGlobe/MaplyTapDelegate.h>
+#import <WhirlyGlobe/MaplyTapMessage.h>
+#import <WhirlyGlobe/MaplyTexture.h>
+#import <WhirlyGlobe/MaplyTextureBuilder.h>
+#import <WhirlyGlobe/MaplyTileSourceNew.h>
+#import <WhirlyGlobe/MaplyTouchCancelAnimationDelegate.h>
+#import <WhirlyGlobe/MaplyTwoFingerTapDelegate.h>
+#import <WhirlyGlobe/MaplyUpdateLayer.h>
+#import <WhirlyGlobe/MaplyVariableTarget.h>
+#import <WhirlyGlobe/MaplyVectorObject.h>
+#import <WhirlyGlobe/MaplyVectorStyle.h>
+#import <WhirlyGlobe/MaplyVectorStyleSimple.h>
+#import <WhirlyGlobe/MaplyVectorTileLineStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileMarkerStyle.h>
+#import <WhirlyGlobe/MaplyVectorTilePolygonStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileStyle.h>
+#import <WhirlyGlobe/MaplyVectorTileTextStyle.h>
+#import <WhirlyGlobe/MaplyVertexAttribute.h>
+#import <WhirlyGlobe/MaplyViewController.h>
+#import <WhirlyGlobe/MaplyViewTracker.h>
+#import <WhirlyGlobe/MaplyWMSTileSource.h>
+#import <WhirlyGlobe/MaplyZoomGestureDelegate.h>
+#import <WhirlyGlobe/MapnikStyle.h>
+#import <WhirlyGlobe/MapnikStyleRule.h>
+#import <WhirlyGlobe/MapnikStyleSet.h>
+#import <WhirlyGlobe/NSData+Zlib.h>
+#import <WhirlyGlobe/NSDictionary+StyleRules.h>
+#import <WhirlyGlobe/SLDExpressions.h>
+#import <WhirlyGlobe/SLDOperators.h>
+#import <WhirlyGlobe/SLDStyleSet.h>
+#import <WhirlyGlobe/SLDSymbolizers.h>
+#import <WhirlyGlobe/SLDWellKnownMarkers.h>
+#import <WhirlyGlobe/WGCoordinate.h>
+#import <WhirlyGlobe/WhirlyGlobeComponent.h>
+#import <WhirlyGlobe/WhirlyGlobeComponent.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WhirlyGlobeComponent.h
index 5142734..babfdf7 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeComponent.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WhirlyGlobeComponent.h
@@ -18,6 +18,6 @@
  *
  */
 
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
+#import <WhirlyGlobe/MaplyComponent.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WhirlyGlobeViewController.h
index ae3c444..f2e3b82 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeViewController.h
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Headers/WhirlyGlobeViewController.h
@@ -19,8 +19,8 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
+#import <WhirlyGlobe/MaplyGlobeRenderController.h>
+#import <WhirlyGlobe/MaplyBaseViewController.h>
 
 @class WGViewControllerLayer;
 @class WhirlyGlobeViewController;
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Info.plist b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Info.plist
index 5e73e17..ea42d3d 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Info.plist
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Info.plist
diff --git a/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Modules/module.modulemap b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Modules/module.modulemap
new file mode 100644
index 0000000..2e32255
--- /dev/null
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module WhirlyGlobe {
+  umbrella header "WhirlyGlobe.h"
+
+  export *
+  module * { export * }
+}
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/WhirlyGlobe
index 589100d..fa83d49 100755
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/WhirlyGlobeMaplyComponent
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/WhirlyGlobe
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/_CodeSignature/CodeResources b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/_CodeSignature/CodeResources
index 1441796..f543d38 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/_CodeSignature/CodeResources
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/_CodeSignature/CodeResources
@@ -10,11 +10,11 @@
 		</data>
 		<key>Headers/GeoJSONSource.h</key>
 		<data>
-		937zuFWkc1QBB4G3Hgth718qkcE=
+		LgA8/zXMMeKdKW3zxzpAUNas5Pg=
 		</data>
 		<key>Headers/GeographicLib_ObjC.h</key>
 		<data>
-		wi0hbesUhx7xqv0FV6rJxu0rs/A=
+		vvYiKYxDtAiMYN/u/YEXcBQHIkU=
 		</data>
 		<key>Headers/GlobeDoubleTapDelegate.h</key>
 		<data>
@@ -22,7 +22,7 @@
 		</data>
 		<key>Headers/GlobeDoubleTapDragDelegate.h</key>
 		<data>
-		xStPD+muKbR+h9e3w6ajP11LUSs=
+		aGn3LTkOY2QQkvkYARVnfBDJCd0=
 		</data>
 		<key>Headers/GlobePanDelegate.h</key>
 		<data>
@@ -42,7 +42,7 @@
 		</data>
 		<key>Headers/GlobeTiltDelegate.h</key>
 		<data>
-		sWfGRmGRT/hpG8wl993hXlG+tR0=
+		DKcqjI/lagwYouaR3oFSvSnW7NI=
 		</data>
 		<key>Headers/GlobeTwoFingerTapDelegate.h</key>
 		<data>
@@ -50,15 +50,15 @@
 		</data>
 		<key>Headers/MapboxVectorInterpreter.h</key>
 		<data>
-		WLuGcosoeQMKdq8JuJEGUnNnkE4=
+		vqYj/dA84E9CS5m13xGveqcTihE=
 		</data>
 		<key>Headers/MapboxVectorStyleSet.h</key>
 		<data>
-		K+4Brx0I5wiD/W9yWP7LIQNXZyE=
+		1e0IoJI7mdOAXbVZEHwI1834IN8=
 		</data>
 		<key>Headers/MapboxVectorTiles.h</key>
 		<data>
-		0VqWE9nrKxw/P/51anQ3TMNn/9U=
+		T03CMKrst3X19A5JRguOHbbxzHY=
 		</data>
 		<key>Headers/Maply3DTouchPreviewDatasource.h</key>
 		<data>
@@ -66,7 +66,7 @@
 		</data>
 		<key>Headers/Maply3dTouchPreviewDelegate.h</key>
 		<data>
-		GhyXHa4AgXMAFuq3LU0ttD1Dly0=
+		COf8NPwTN++qEtYf5HoN+YynbAA=
 		</data>
 		<key>Headers/MaplyActiveObject.h</key>
 		<data>
@@ -74,27 +74,27 @@
 		</data>
 		<key>Headers/MaplyAnnotation.h</key>
 		<data>
-		bwTVeyclnU18fBTQMkCXxGInwVs=
+		DENhMxzyMrdyA3rmD4wxhHQXZUc=
 		</data>
 		<key>Headers/MaplyAtmosphere.h</key>
 		<data>
-		vpmM4chkSjVfshM9MhOOopXAZf8=
+		0Wh7aJqUst7dEnKtUQiRzBaOm8c=
 		</data>
 		<key>Headers/MaplyBaseViewController.h</key>
 		<data>
-		laIE4y5bJtCZpWkNtwhZlaRTAC8=
+		fycHRK4lcY7Gqr/XIxQ+QK6pQ3o=
 		</data>
 		<key>Headers/MaplyBillboard.h</key>
 		<data>
-		t+0yZyuc8uq+j8Z5Yktc5n7GUS4=
+		foaM36UndN6ktQSWEGXbSlSnHP4=
 		</data>
 		<key>Headers/MaplyBridge.h</key>
 		<data>
-		LdS+E0jZeW+78EUBIl+BmD/QHEw=
+		IQisyU6tFk5AxBYO5uvguFbOGTM=
 		</data>
 		<key>Headers/MaplyCluster.h</key>
 		<data>
-		IfPMUJU7Cjhu4ThUtr9i30+kS+Q=
+		NgHOFpEXCmyIx1I5yCIZjm4x3lQ=
 		</data>
 		<key>Headers/MaplyColorRampGenerator.h</key>
 		<data>
@@ -102,7 +102,7 @@
 		</data>
 		<key>Headers/MaplyComponent.h</key>
 		<data>
-		dVdP2Q/AT4dQkntL6pIoL1cUrdA=
+		aTrskuGy0HsfToFdc7Q/PBn5BHk=
 		</data>
 		<key>Headers/MaplyComponentObject.h</key>
 		<data>
@@ -114,59 +114,59 @@
 		</data>
 		<key>Headers/MaplyCoordinate.h</key>
 		<data>
-		8Bjz2ahBYo5zsMMYDKbe6bhwdtI=
+		jwXLto2HZh6WTVXeQN8HF29cUkE=
 		</data>
 		<key>Headers/MaplyCoordinateSystem.h</key>
 		<data>
-		kILANaUh7pnsL1l/aWJdyv4pzqs=
+		fryDolWUeDFPAiVqwclbd+G99NA=
 		</data>
 		<key>Headers/MaplyDoubleTapDelegate.h</key>
 		<data>
-		XGNWfVk2gdn8mt+NaC7No9eiOlY=
+		DP2Jlf+groPWvm/FC9CAimL/Xus=
 		</data>
 		<key>Headers/MaplyDoubleTapDragDelegate.h</key>
 		<data>
-		d7fr4Z6uqBWvvzmGrNYxuA5G/Do=
+		gVO+/8DLhGszf41vqwMjGQ6aNrc=
 		</data>
 		<key>Headers/MaplyGeomBuilder.h</key>
 		<data>
-		r6R0mhvncgqfdAz4ip4Lr7ZmXYo=
+		lfWLOY9Dch+FIkUgV9Jq/oNbmRM=
 		</data>
 		<key>Headers/MaplyGeomModel.h</key>
 		<data>
-		UapH92S1iiGjWQuyp/bngpU0i5c=
+		EMNoj8u9ya0ghQ3kd7x+0BPuAOQ=
 		</data>
 		<key>Headers/MaplyGlobeRenderController.h</key>
 		<data>
-		y3zV9QoBuXrLSPV+ZoqcHgtKuOk=
+		g8xwuLHA4KXSYVeXnEkTfiQjUs4=
 		</data>
 		<key>Headers/MaplyIconManager.h</key>
 		<data>
-		nK7FXvdaNNJlMG2gkme0mvLrQCc=
+		bZjq3dGY5Dn7A2ARUSAzfKs1qAI=
 		</data>
 		<key>Headers/MaplyImageTile.h</key>
 		<data>
-		ZZmLOCDB9e7GFGkszefkC/aXn38=
+		bOolPRB/KV2Fc3MR99sE3N8Iu44=
 		</data>
 		<key>Headers/MaplyLabel.h</key>
 		<data>
-		D8Qv7leEaKdKu4FAyfBci+ubZiY=
+		SxR2NNygJPXHjZPINZqwYamEKNk=
 		</data>
 		<key>Headers/MaplyLight.h</key>
 		<data>
-		sKyD68yinBeEZPs8TEukTYp2W9c=
+		T175ocnZF0SZCIQgB34uYPtSBFo=
 		</data>
 		<key>Headers/MaplyLocationTracker.h</key>
 		<data>
-		Tfi92LCIdwR+FJfYOJHPy3E/v24=
+		Njq0LDl+OZDMyTmvOUHW7D1X81w=
 		</data>
 		<key>Headers/MaplyMBTileFetcher.h</key>
 		<data>
-		cnXHxCPZD/FivXeYoK/4525mnzU=
+		zx8wfOSfZn4OavqGJopn17JTBJ0=
 		</data>
 		<key>Headers/MaplyMarker.h</key>
 		<data>
-		QdlpRu30qMHHhagOfxX1z4kf2jk=
+		3EWsdjno1Qp1WC9GIcpGZ39Gie0=
 		</data>
 		<key>Headers/MaplyMatrix.h</key>
 		<data>
@@ -174,7 +174,7 @@
 		</data>
 		<key>Headers/MaplyMoon.h</key>
 		<data>
-		4Xt5665zNpl5AE16Gh7ZYM5aIUo=
+		Ao/E3lTrwLZNVqnSP2qmuNlh4fo=
 		</data>
 		<key>Headers/MaplyPanDelegate.h</key>
 		<data>
@@ -182,47 +182,47 @@
 		</data>
 		<key>Headers/MaplyParticleSystem.h</key>
 		<data>
-		n7FrS8/yNdRLvZSk9dVG7eulxh4=
+		rH7ITb14S/5rOPHnij+LSaNtqUs=
 		</data>
 		<key>Headers/MaplyPinchDelegate.h</key>
 		<data>
-		nin3Yyzz5GIcMDYL5cPD0ZSv2Tg=
+		5pDDYHdu0j+0wy6VnUThMUxqFT8=
 		</data>
 		<key>Headers/MaplyPoints.h</key>
 		<data>
-		V860eYyJPBC5Z66zRSQdeoahJHo=
+		YUlvzKWD3RoLEUoyCZZSamPfOxg=
 		</data>
 		<key>Headers/MaplyQuadImageFrameLoader.h</key>
 		<data>
-		A9iSacaxRYqA7uZWgIlTWDA7bW0=
+		Xq9E0sG9SsG2/8JO1fipJDHDV8k=
 		</data>
 		<key>Headers/MaplyQuadImageLoader.h</key>
 		<data>
-		8LkkWx3WfQGVO94r8r109ZQe80I=
+		RIywCYQo15UMAGMDBuEryjmZICU=
 		</data>
 		<key>Headers/MaplyQuadLoader.h</key>
 		<data>
-		nJOeQ62UtLOKFwTYGqyV3vZt2oI=
+		wi4+vRVhbtrly5zz+YnDudR5Mis=
 		</data>
 		<key>Headers/MaplyQuadPagingLoader.h</key>
 		<data>
-		+coy3fyJrIsHClyEMZCgDEvb9Us=
+		J1S5i1QCUBfiqSlu4znrLgAVz3s=
 		</data>
 		<key>Headers/MaplyQuadSampler.h</key>
 		<data>
-		e7/dyK5Dev6qeUPuMqU3EoGU/q8=
+		1u6Yr5wNRtezpTL82Jb/3G9MXqc=
 		</data>
 		<key>Headers/MaplyRemoteTileFetcher.h</key>
 		<data>
-		sBW6ZE4BgyloyEsN1FKwdZ/gPp4=
+		4wbuMKUEnSxKFxeWtPViezCMOfQ=
 		</data>
 		<key>Headers/MaplyRenderController.h</key>
 		<data>
-		BNk++voDMy9ildkdMmAUiK1/g6U=
+		QhabKAk+zzoKcpc9NnNf68cUAH4=
 		</data>
 		<key>Headers/MaplyRenderTarget.h</key>
 		<data>
-		TXoMwuhTR7zuTQFcn26qxB8auKY=
+		nw0Ry0ObhrOAoz7mBw8uKtV6DAc=
 		</data>
 		<key>Headers/MaplyRotateDelegate.h</key>
 		<data>
@@ -230,15 +230,15 @@
 		</data>
 		<key>Headers/MaplyScreenLabel.h</key>
 		<data>
-		oj7/vmKOCcR2tebFPSm0+LD6muY=
+		D7nyk9jPnSrhyW8kkVuHpgxANBc=
 		</data>
 		<key>Headers/MaplyScreenMarker.h</key>
 		<data>
-		VZ56mE8IOEkjEMvAngUdecjarNQ=
+		EvPoYfsHB6ALZksm2y57+fDyFtY=
 		</data>
 		<key>Headers/MaplyScreenObject.h</key>
 		<data>
-		C7UC0uvQf3a2fpACbODlm2tix/I=
+		Z9CjZejNveRMBNNoNVZOCiwr2W8=
 		</data>
 		<key>Headers/MaplyShader.h</key>
 		<data>
@@ -246,7 +246,7 @@
 		</data>
 		<key>Headers/MaplyShape.h</key>
 		<data>
-		uneK25mhPQg4dHV2QR1IzSnFCe0=
+		LwJ8z7LXdAg5X7vkQiveVy1fd0M=
 		</data>
 		<key>Headers/MaplySharedAttributes.h</key>
 		<data>
@@ -254,23 +254,23 @@
 		</data>
 		<key>Headers/MaplySimpleTileFetcher.h</key>
 		<data>
-		R4vw2zDAYDnEcMpNef2xK6UGzNs=
+		OGik7ZgAStfwiikE4GZgVLprI5o=
 		</data>
 		<key>Headers/MaplyStarsModel.h</key>
 		<data>
-		I3isMTXLSsH/WEeOlENufJeI44k=
+		lcOVa3whA5Gqi1wPiJ/HqX6l+PI=
 		</data>
 		<key>Headers/MaplySticker.h</key>
 		<data>
-		enz/waha8xpb3IFnm03qjnDQ1gI=
+		GQeKonzo/SCpnKgsrXMxQ/9QGmM=
 		</data>
 		<key>Headers/MaplySun.h</key>
 		<data>
-		3U74Fiduk+nqrWgSoiaaiCMd298=
+		g1ZGNWMtQjeK+3njt9PacWK+Fhw=
 		</data>
 		<key>Headers/MaplyTapDelegate.h</key>
 		<data>
-		diOK0TbP1CXUksxX37tLxXmjDB8=
+		h/rF9s44ynPv89d1t83fMeTcjrg=
 		</data>
 		<key>Headers/MaplyTapMessage.h</key>
 		<data>
@@ -286,7 +286,7 @@
 		</data>
 		<key>Headers/MaplyTileSourceNew.h</key>
 		<data>
-		Q50UqYfnOFixtkarc7GgLr0X3HI=
+		G6AlGHWA6Nk6iFeb0r/vEynXSP4=
 		</data>
 		<key>Headers/MaplyTouchCancelAnimationDelegate.h</key>
 		<data>
@@ -294,47 +294,47 @@
 		</data>
 		<key>Headers/MaplyTwoFingerTapDelegate.h</key>
 		<data>
-		qKPSoCHimn9NO1ZYnb6m8+Bs7p0=
+		D80ilgRdvPdLKrEFkozNMaKj4SM=
 		</data>
 		<key>Headers/MaplyUpdateLayer.h</key>
 		<data>
-		9JKBY+zNKBaFIDPP+DOnA8BVnbU=
+		9knK1FIs87qq1yVUun9xaztS6QY=
 		</data>
 		<key>Headers/MaplyVariableTarget.h</key>
 		<data>
-		sMPC450ZY6ZRgJVGvGOflstxRFw=
+		/61immMlIupRvzfJWz1tYxcraZM=
 		</data>
 		<key>Headers/MaplyVectorObject.h</key>
 		<data>
-		lAk2Q3lXJun/2KNqbBssKKocvf0=
+		bAAZbcyvau9qA82J8RCwVHGV2Gw=
 		</data>
 		<key>Headers/MaplyVectorStyle.h</key>
 		<data>
-		uUWc22f6STb7UnrcEyg2N01lqLE=
+		IAvxdja11PthV+JxVVTMpAr8c8Q=
 		</data>
 		<key>Headers/MaplyVectorStyleSimple.h</key>
 		<data>
-		A1HV9J2gHYMGVehLcN2BTU1LwB8=
+		eGMCXQr7MA71oViOYZS4pJJXLEU=
 		</data>
 		<key>Headers/MaplyVectorTileLineStyle.h</key>
 		<data>
-		bIOr+1Wh+WDzf8jLF4y+N1vRgCE=
+		ihYSW3diBLxmwZFHYXGxJ1M93Yg=
 		</data>
 		<key>Headers/MaplyVectorTileMarkerStyle.h</key>
 		<data>
-		N1TIgSolZa/x48Fp7ZQ4FPo6kcQ=
+		6AJPn0IqWnHEweqrXqcea1rGqIY=
 		</data>
 		<key>Headers/MaplyVectorTilePolygonStyle.h</key>
 		<data>
-		J2tM5FFefDD5as2elNI7JVQZezE=
+		c82UUTbYlwWqfcc2GCI/k0DngS0=
 		</data>
 		<key>Headers/MaplyVectorTileStyle.h</key>
 		<data>
-		dqMwJcpfeWq57aGFuVpzOJsVCBg=
+		AseQkQ3U2ms/h2CzR2KKcuBAbUY=
 		</data>
 		<key>Headers/MaplyVectorTileTextStyle.h</key>
 		<data>
-		doEljzxWF5K95Oy3P2pOzGXXCeI=
+		JdZodkdB5PNYXBBPdfhlKB9fj6E=
 		</data>
 		<key>Headers/MaplyVertexAttribute.h</key>
 		<data>
@@ -342,15 +342,15 @@
 		</data>
 		<key>Headers/MaplyViewController.h</key>
 		<data>
-		hyE5IoF47F8m8WtrBhCjA0HEsOQ=
+		BwnVhW9NBG3bHDbXZu+AEnsVi+0=
 		</data>
 		<key>Headers/MaplyViewTracker.h</key>
 		<data>
-		J1pPLfjOaWAYCJNiSRbwwppWfaw=
+		HHZm4YOW7/LfCwJDw6WllCvNeRc=
 		</data>
 		<key>Headers/MaplyWMSTileSource.h</key>
 		<data>
-		IuDijOCRB2DsjKEnIGBeZ5JNPpU=
+		ZEfPCMDXDA9eLRL/E8iH26d7UQg=
 		</data>
 		<key>Headers/MaplyZoomGestureDelegate.h</key>
 		<data>
@@ -358,7 +358,7 @@
 		</data>
 		<key>Headers/MapnikStyle.h</key>
 		<data>
-		pPxP9zN7RyXXWka1aTc8B7SVN9w=
+		eglIp84Ak1EJ5oqzTozufYKBXM8=
 		</data>
 		<key>Headers/MapnikStyleRule.h</key>
 		<data>
@@ -366,7 +366,7 @@
 		</data>
 		<key>Headers/MapnikStyleSet.h</key>
 		<data>
-		vgq0mYNtPuQBRHDc3NJqhlHnhXw=
+		S3CCf2O8Qry0Opa3HHSCzLBmQYs=
 		</data>
 		<key>Headers/NSData+Zlib.h</key>
 		<data>
@@ -382,15 +382,15 @@
 		</data>
 		<key>Headers/SLDOperators.h</key>
 		<data>
-		YvWTgLCIF5yjz61K6WyzcDW+CtA=
+		fjKIOK81kTGZHa7D77bJdH6aP/M=
 		</data>
 		<key>Headers/SLDStyleSet.h</key>
 		<data>
-		wWIJ23sN0O+LUCM4JlB1wtkEG1A=
+		YdtAyFFfZ9oaA1r50cMoJOanb60=
 		</data>
 		<key>Headers/SLDSymbolizers.h</key>
 		<data>
-		FhQLrH9s1bTxGJs3ZUAyjkd46kg=
+		pY3xXv3c5oQpXQRHiQa/o7OG1Vk=
 		</data>
 		<key>Headers/SLDWellKnownMarkers.h</key>
 		<data>
@@ -398,27 +398,27 @@
 		</data>
 		<key>Headers/WGCoordinate.h</key>
 		<data>
-		REsmTre6QdPnJq3au42JyOnicjc=
+		suZCi5mh+PDAMlznHA04sKs4sVA=
 		</data>
-		<key>Headers/WhirlyGlobeComponent.h</key>
+		<key>Headers/WhirlyGlobe.h</key>
 		<data>
-		bwdezuwBxjv+fQBqWtLD0aC04u0=
+		0OfglihgL9viXMmHGPcNRj86Iqg=
 		</data>
-		<key>Headers/WhirlyGlobeMaplyComponent.h</key>
+		<key>Headers/WhirlyGlobeComponent.h</key>
 		<data>
-		WSYB8LU4bDMUiufeha0G4rWdaEs=
+		upSrdYysRKk9xfsCOg/H9rkAkU4=
 		</data>
 		<key>Headers/WhirlyGlobeViewController.h</key>
 		<data>
-		jR220Or+oVvIToUnAapk826eXHY=
+		1rW/PC30PuhdaWDhbv/kntO/B/c=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		+4BGxzLsdf7vW/Dx9wGuDODqXvU=
+		uw22+UUExVfPrZSQBgmmjH6HLes=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
-		1T0ltU0zboDAiMub6gKuHoacj7c=
+		QstvNn+FqXqasRFV481t/Rqtdag=
 		</data>
 		<key>default.metallib</key>
 		<data>
@@ -438,14 +438,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			BR9FQVudT17atfZjlNa0RGg/HdtiwDR9miRdwtxA1T0=
+			+xDbQmKdukZ8fMLAVCt9EZrpMGHcBUUhyFTjw5WfYLs=
 			</data>
 		</dict>
 		<key>Headers/GeographicLib_ObjC.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			EwkqPPmw+FhUv/t2zEjM5YDp1dtDNoTSTsfSj/6Kn2g=
+			TEjfMnsQh4CV4Et4ABEQdZUzanLIQosur/A5tmzbIR8=
 			</data>
 		</dict>
 		<key>Headers/GlobeDoubleTapDelegate.h</key>
@@ -459,7 +459,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			4vppNK67pWkTQhJyN0QmPuHngMAr5j/3AkziNXt3NMs=
+			CO4E4+LubyAH34Y4tUCaCUcCUCZ9w5DMmWfxSxvkh00=
 			</data>
 		</dict>
 		<key>Headers/GlobePanDelegate.h</key>
@@ -494,7 +494,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			XneMslqShuBE+7Of4lZKK0dZTy/NMxPMDp4jwJKhyUE=
+			YBN3ftV/G/fWkKbzOZsN/vC2oCx+Ss4QtlzGeOe34q0=
 			</data>
 		</dict>
 		<key>Headers/GlobeTwoFingerTapDelegate.h</key>
@@ -508,21 +508,21 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			3tBMW6v+Lbt9J58yXHcWd7ExJQ/Y/cwzHqE8ndcsuPU=
+			pFGtyh7a3qeJtzLstJo6UeaJhMa6d7wGXo7FMJxcC88=
 			</data>
 		</dict>
 		<key>Headers/MapboxVectorStyleSet.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			8iFoK4bjwg8LEcKllmv/Zj2i1Ee3O7+H8QhXwCP2So4=
+			lIW34sd4+c0YN4BGIpRDxYsdw9/ErHT2HrfHfNJTAkE=
 			</data>
 		</dict>
 		<key>Headers/MapboxVectorTiles.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fHS2g1b2GslAdBouT5ik99j22t9kzKz0+dOqqBy1qNU=
+			7IwCtF+38RXYOr+pFY8JoFQU9pTVECyBuRqyXfnNBwI=
 			</data>
 		</dict>
 		<key>Headers/Maply3DTouchPreviewDatasource.h</key>
@@ -536,7 +536,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			RGt2NCZA98UKbW5BAf+NqqyfGtBwlRmQScU6oWaC4Ns=
+			hXq/vx/4Bysz1mLKAXkEkmgJBbB5tQfDoZ8F0byUqAE=
 			</data>
 		</dict>
 		<key>Headers/MaplyActiveObject.h</key>
@@ -550,42 +550,42 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			Bp67CxFhiBs4uvgMN18vron8OQmULAcvCf0jc1hgJxQ=
+			/CQWYQp3oWtD4lm1C1yLCKlYipz8Getlh0Agtmc4ktM=
 			</data>
 		</dict>
 		<key>Headers/MaplyAtmosphere.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			40ZachVmaxjBEF9Vz73G7sXEgvb5VATH0KERCa26yAA=
+			3kc12oK9rBbUWvwZrMznOlq9uvxAo45njGZPrd/R3ns=
 			</data>
 		</dict>
 		<key>Headers/MaplyBaseViewController.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			PcZI8sJVG8mlDg4rLwfPBZ9GR5Vwp6W8FGLT9MU/zY4=
+			51fqXP150XKzoTDzMlckAt9snbwwrk43yl0yQCfFSX8=
 			</data>
 		</dict>
 		<key>Headers/MaplyBillboard.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			7g7wp0EX25Q9mJmBqYSrhxDWlaFKQCF6AgMqwP382aM=
+			h7EwZij2VsXcI9voAnbTRMYulPIL8KgKV5cANs74KOM=
 			</data>
 		</dict>
 		<key>Headers/MaplyBridge.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			+e9eonOgnFVgdnMxGIIYupk10bIEvlbLXx2oa46hq0w=
+			xGcf6VmwfQ2mxcsxU378LnHSM/Zj8WCCmtiPgJhqQs4=
 			</data>
 		</dict>
 		<key>Headers/MaplyCluster.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			yj9U4huuAQRwL0XeqKFw07/WDRRsG6yRc5bkggDgWRY=
+			5dhp3ZAReYOBDANb5/COTzOs+FhJFtyH6T+QNcY+xV4=
 			</data>
 		</dict>
 		<key>Headers/MaplyColorRampGenerator.h</key>
@@ -599,7 +599,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			7qAtCsTC9zGeQdXXscusy0cDzxz/4lFpjadkLRQcmTM=
+			VBsBepQblE0wrg1Ey5tUW0FmwSEEMPeecKCs/+k3+J0=
 			</data>
 		</dict>
 		<key>Headers/MaplyComponentObject.h</key>
@@ -620,98 +620,98 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			Sr+8g1mVH5mhKiDpsl8dTYcwxI4yqFU0HtVeOHGxqO0=
+			1IKJWN5QZKHfbANvk9Y8cm3J6e8JvSPpQCAU86IhUHk=
 			</data>
 		</dict>
 		<key>Headers/MaplyCoordinateSystem.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			55C8OPhmu9z1Xq2UNAYGReWIuZkKResLLDPxD3kr8xE=
+			O/A7VOAx9X3c0LSCQrneukaA+g7P69/z7H3ThdyH+lA=
 			</data>
 		</dict>
 		<key>Headers/MaplyDoubleTapDelegate.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			jRAnvC9YJkLDDuHOw88K26PnutShjtj0nv0rY95Xj1k=
+			PUs6aAebADMMG8wRujLE79AwDitmYtoMDrCf4oPXjD4=
 			</data>
 		</dict>
 		<key>Headers/MaplyDoubleTapDragDelegate.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			5auRA9mLEKoKeiN1QH6b3bpg4a+fQG6oHlGI6NGDU2o=
+			EvgCT13fuVnAswk1h+e/4i3/Y4TPFAct9uM/V6rn+gA=
 			</data>
 		</dict>
 		<key>Headers/MaplyGeomBuilder.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			Ms2AmBsL8UX7x/HXBzyCQt5mLxw1V0vUkEECy0wyqcI=
+			gX5c3WKTpuKupJLJbER1MaHeEUG2GAHkF9/OjMdfda8=
 			</data>
 		</dict>
 		<key>Headers/MaplyGeomModel.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			rOSDj8Q6345wdWHbnzUzpp5023Rvx7Vcjgcpv3e6PIc=
+			y/x8fUQPo6cQsZcWQJz+T8r6Iz3hGiwGY01oO4K4Hc0=
 			</data>
 		</dict>
 		<key>Headers/MaplyGlobeRenderController.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			xPWd0rkE7GaS19VtE/CPjtA14glNqURmy6yzF6CvUHc=
+			mlMRbr00SoH4QlV86vGbTYEr7qNaxWYZCMBAJ9hPuLw=
 			</data>
 		</dict>
 		<key>Headers/MaplyIconManager.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			kqPQ5fKmnYIbvYZgFwZJWzIHX6629tSap8S5FX98hJ0=
+			oRcUygcc2v50zd1Evw7X+ycBgUPaJq5HsO6ogVbDhWU=
 			</data>
 		</dict>
 		<key>Headers/MaplyImageTile.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			7u0wIwfiZm/uO5vpmWr3NO7gu6qRFvKvBHiVPwYZeX4=
+			zYlOLFnFHjDVNFeKNiFu1vqB/kXkrWMTbGdGGYYBlM8=
 			</data>
 		</dict>
 		<key>Headers/MaplyLabel.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			c5m4eVs3tUFd0QDzdCVKoQmytZy/GNO9iBvl1TME3bg=
+			J3hneVCxIJpDmxWsRnMujBN39WL/9FIizbNfOQrIvsI=
 			</data>
 		</dict>
 		<key>Headers/MaplyLight.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			zJl6mJBZzqe1UynfO31NurLj8ijKVzlOIJc+s6xM/O8=
+			ViyKqxfQyux0YhTTv3+fnycW/mh8bZHIBVCcDTskUk8=
 			</data>
 		</dict>
 		<key>Headers/MaplyLocationTracker.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			GE8hzHSI0oLxAP2eKd0JiYJHKBvUnTcunqpAYu4Ds1Q=
+			cLIyps4X+fD1gq3mzM/zt2mGmiNkAxy6rLsWTQQmbRY=
 			</data>
 		</dict>
 		<key>Headers/MaplyMBTileFetcher.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			yJQH80FSlLNs5ILAXu8zgppOap/MyHrpE8JVuSiKB4w=
+			OWHw9MB+aF2JaYf9Es9weeU+amWN64wHDJLX6BWxAeU=
 			</data>
 		</dict>
 		<key>Headers/MaplyMarker.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			wOXO2utU9tXmRtkYsxmCXlz0wpfZTucHxB3UtcPJ6ws=
+			x51Fh8QdDHYDJAmOlF5/UbYO1hYLM/nKv0LVcDqxE/A=
 			</data>
 		</dict>
 		<key>Headers/MaplyMatrix.h</key>
@@ -725,7 +725,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			mql0HTjPDgAWlhPeGoTCGi/l8bpTFlfsL3ezawdSiwc=
+			IUc/HkR/PdA+OluPdFCd2J6Rg5hCJvsD0MyM4o9U3/A=
 			</data>
 		</dict>
 		<key>Headers/MaplyPanDelegate.h</key>
@@ -739,77 +739,77 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			BWRUq+olSAQIq2Y24Nj7OLzoQFZkGlG4EAFG8yVOPr4=
+			ibXQsPvrWYgg81034GXnoNH+KAHPWQfE87ffwdVYqwA=
 			</data>
 		</dict>
 		<key>Headers/MaplyPinchDelegate.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			9bI+2DoZnptTq2h04H9tKp2Y+/D6ilv/GYX4wKSa6m8=
+			7+KuGC4yiRdG8G8kKVqid7gLPClzry0J4HHj+Oigm94=
 			</data>
 		</dict>
 		<key>Headers/MaplyPoints.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			XJBXbONYn2YK+S+AEMPu7EOxIdJ63P/r05Lce/TlZDk=
+			me3/3IvJiSqw51bNG7SdV7DiIZzK5hT4j6jz7JAxTHY=
 			</data>
 		</dict>
 		<key>Headers/MaplyQuadImageFrameLoader.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			neKxj+ttdZVRdc70Mw1cjiOIU/Kqlz0YWzyncOXOT0c=
+			/lrDXF/sVJi+NLGWXOJLqZy2xAT2YsXSUIAfab44TkU=
 			</data>
 		</dict>
 		<key>Headers/MaplyQuadImageLoader.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			wv63ffphBCXeMY2Uz2j28i7gjyStZrpE3bx01+Z6IZ4=
+			eM1278XKgcx9WSKj+0CZnfTTUssKkwD8sLItfl4VOcY=
 			</data>
 		</dict>
 		<key>Headers/MaplyQuadLoader.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			RB5eAEloaf9af+AVyhtCsnSOMFMPU5Jgx0WZH5X6E/A=
+			ArLI5Rb+dISvBYw+2SeEZSOzeKXDo02yYziMbwA0L2s=
 			</data>
 		</dict>
 		<key>Headers/MaplyQuadPagingLoader.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			wo60Bn721xYnksFF+4AP1zKAgka6DXE2is3F+jG3JFc=
+			zvi9WA26Tpt5Dfm348aCF+hhw9y5qpyy+/Cb8xSAUqk=
 			</data>
 		</dict>
 		<key>Headers/MaplyQuadSampler.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			OgXj+sk51fobG1zO5syFvMaPW3+YcU5TV+KlZLskdWc=
+			Uk0RbKCZ0YqfEIAhegrWIOngNtT5vTDmUdQYoU7Ydms=
 			</data>
 		</dict>
 		<key>Headers/MaplyRemoteTileFetcher.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			UnQYFM5Yor/CBrUNN4v1l4y7oc6gpToMibVmS+w9m0g=
+			xP5txG+d59lH20dpklzMvkI+JnXX0bVz96dnPlyC2es=
 			</data>
 		</dict>
 		<key>Headers/MaplyRenderController.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			pEK6F6Dm2XoXKB6TKzj8n1BtjtrIwcS8NsCWAG9fvW0=
+			jkV7AZst7ZiI+lCh5ouLsBI4ny0OLGiNeqKE1eXUxn4=
 			</data>
 		</dict>
 		<key>Headers/MaplyRenderTarget.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			5nhoiPd48ouIE+/Bf3kLIUlZmMh22R0wKIZPaAX7H/M=
+			Cgr3oig2a3Juk/ai+1NY7XDqZ8rnZbVoh5NDRqulw7k=
 			</data>
 		</dict>
 		<key>Headers/MaplyRotateDelegate.h</key>
@@ -823,21 +823,21 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			6JZwaHM68zOo8hwxihchc+mcjUKFuS8DvXcf1Zk5rMc=
+			8TEpV1UopSMfbi89/Xv62k/79UfKXhN3hDirzEIDAlc=
 			</data>
 		</dict>
 		<key>Headers/MaplyScreenMarker.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			wCwfHq+VUJcC05JQvSzEEeBDBVAYGGJh8ddkI+npTBs=
+			KMCPtRy0D2mRlhcMPW9iGmesxoU1nDR82m4lnIYIf5g=
 			</data>
 		</dict>
 		<key>Headers/MaplyScreenObject.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			D0N/0wBSrS+g1Vctrl1hopQuca0XXeCmdnCjG/Xf+pQ=
+			SNhtIDv/e8IH009nAEhKXlCtx2w/r9sIAZduGR0tI+Q=
 			</data>
 		</dict>
 		<key>Headers/MaplyShader.h</key>
@@ -851,7 +851,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			3etFggI8Z9OSaF+jmg+hXm0AJXXWhs3LuBp8aID82V8=
+			Fr5L83AFUeWLyPY/vbE97kNmKfiJvG1eH89gktBkslM=
 			</data>
 		</dict>
 		<key>Headers/MaplySharedAttributes.h</key>
@@ -865,35 +865,35 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			tWG4E+EUgw0/ZFufAApUC5UeMDJf7PNz/85mr5sTGXk=
+			vwjVgn6r3uLu00ja20QpIEDNElsGnM4ovDoezO924/E=
 			</data>
 		</dict>
 		<key>Headers/MaplyStarsModel.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			3s96Ghh0R9uzzrxCpzvc1BRDOBrZfoAU85LI1+kBF4c=
+			s61IdFjZ0C25zpNBdIizcay6olAFBqU8HEaf+1Rw9iI=
 			</data>
 		</dict>
 		<key>Headers/MaplySticker.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			MkAnRDlKB5JbkmXvZ0Mef3UV7T4/k+e/Dgz5T2cVaGc=
+			wTcOPPrbW8iYuQoCYVMFq/E3tqpIghxpBNpmbIIeGGE=
 			</data>
 		</dict>
 		<key>Headers/MaplySun.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			aBFBB37VeV3COc9QRDslifQnwCJJt//ae7BjHmYDCEA=
+			yhCRhcLjCAhbQRKphWqwwKFv4xJgysH3B2pk6wOvRkE=
 			</data>
 		</dict>
 		<key>Headers/MaplyTapDelegate.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			7CoA/hJBug69a4EBeJ6Wi/iqPznGtxcxHdNDMmmzHiw=
+			fiToltTYJEErdgxaENC0n4e6styYjUGfH9jekubsES0=
 			</data>
 		</dict>
 		<key>Headers/MaplyTapMessage.h</key>
@@ -921,7 +921,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			c2GDTSIOHz4HeWgwBCe7aGRGGoudMeyLdPmnokSS96g=
+			CcMpZuSo/ak4RrdETcxW16KBI6Scdlf7ZKtCmlI0U4M=
 			</data>
 		</dict>
 		<key>Headers/MaplyTouchCancelAnimationDelegate.h</key>
@@ -935,77 +935,77 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			9jIozUkZs1+S0LxO4BFonQmWw1M0mRbxZh+GnNcISqM=
+			LwnGTZwbfM20W2h5OcSLUqeo5Wb9Ksnmp0ZpXG72xrs=
 			</data>
 		</dict>
 		<key>Headers/MaplyUpdateLayer.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			XZoM2hcfC5TOChF+p6ft/MViS90KguMBV0GD+EupLZ4=
+			sc/LtxXRK5DPxT7oYeU2M3YSRdJDg4qi/HRbayYS/8Y=
 			</data>
 		</dict>
 		<key>Headers/MaplyVariableTarget.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			j8VYJkwbPQdTB4kxx70+csEKxvKU0KyaEpjmXFoG4+c=
+			P6s8ax4O2fB3vXZB0RPXzpfWkQW/5eRrBEcU0q+emc0=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorObject.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			bO67LMvnkAebp4CuTyRh++5eejskrKlXPB4CipSsOgE=
+			HD7ZqOoKvpz+ydIyi5hIhW50YV3k8fzmzLVjF6e5U6Y=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorStyle.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			X9l3QkebUyCol3IYa2XyrEO2A+7cjh3QQyZbQ+MJIec=
+			RfCyYLq+OxOhby18gzpv+9Oso4IqCVTwxjE/dsfTiVo=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorStyleSimple.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			pTY/7uS72HHO7CB0yVtNuRD2ZvFP/VkegCLyzvchuL8=
+			0Tr50lVWpWhMg2sjl1neg6SEv3IQMxR3Pth4xSkDobE=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorTileLineStyle.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			KmyJ4LCP+ADvVNbbzbc8ZRYgOR6D3Z3nOWFPoq2+6h4=
+			eGY4B5TAGK4xfrhyeIyt0gNcLEjTl2WLv52GZG2Kb+c=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorTileMarkerStyle.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			MROAiyS5kOem3S8qsqDpJ/20cJwynZKldl8CFWRiJVg=
+			QhWjTRIfdTC+HIF0Fga5ar4y8DGEfoDRKoegrzoH2vs=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorTilePolygonStyle.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			LmK8mewi+r/hk6RQTpG6058b2+RxPAhXsmjfgBDi9hU=
+			J0BcN9AiqOE++O/9CmU9fIh7ybdohL6FndPxn2YoBQU=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorTileStyle.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			f4jJGM8ase6IDBqBESN0rg/OlbFCCGWJt6Qt+pDLCrU=
+			rdXUdNpaSiFxvujEjocQU1FnqTEGlTWxhLHc0HrLlVM=
 			</data>
 		</dict>
 		<key>Headers/MaplyVectorTileTextStyle.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			Ma3Ak55xQ0x4vwYOdlV/PRx24QxlEXxdYO9RQSW69+Q=
+			tZ/5NtWQUlaIBwKt8NcZ54lemt8bhwK1QXt26G/Azco=
 			</data>
 		</dict>
 		<key>Headers/MaplyVertexAttribute.h</key>
@@ -1019,21 +1019,21 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			4tccbvPLHo0FuUi/pT0yvC93/bxVDNCDxYsUzoSOO1Q=
+			Saqrl8nkXSrB8lH518Hkn2jfjBM1k8TOYPPPwm/9+kQ=
 			</data>
 		</dict>
 		<key>Headers/MaplyViewTracker.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			7FbbNMPiU1IgaNzCMaKAHJEM+FPPGOJKf61JTytgWWc=
+			Nl9YJvmsP9hWNbtq/a9klfxjpFaR7SKZgL8B/rmHcLk=
 			</data>
 		</dict>
 		<key>Headers/MaplyWMSTileSource.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			2LILAvTZMnJeWhE55HmKRf+j/s47LYOJSCZHVXySBKM=
+			ajYRUf7mBmI5tDQT6owqu+eI2XAZ9LxP75NknRnz8O4=
 			</data>
 		</dict>
 		<key>Headers/MaplyZoomGestureDelegate.h</key>
@@ -1047,7 +1047,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			S3gBj95xXb8guxlIUBmDjjjbqGZlP01IGiRbJ7/bRNU=
+			PiZpoDV6VXvof6njrzxwOnHhWxbdgdmBwd/Zdub07jM=
 			</data>
 		</dict>
 		<key>Headers/MapnikStyleRule.h</key>
@@ -1061,7 +1061,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			8lR03NUWRHH4FR9bORDOBhqN4e/9B6NK6mkwRahpPNg=
+			2VwRhwHcVwd5t6ZeFIMktdKk9e1TQMv7CoQWI3gCxtk=
 			</data>
 		</dict>
 		<key>Headers/NSData+Zlib.h</key>
@@ -1089,21 +1089,21 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			wa8KTavISBxIHU40jvxMCnao552tDWqqzBsBnwyvpi8=
+			CVZVkqI8F95vU0q5Qg6HVXE7aBLBSNEotEYarsE82Ic=
 			</data>
 		</dict>
 		<key>Headers/SLDStyleSet.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			QQ0v0kSrA2medfFHwe2Oy3sNa8cibG/VLcJi4p5z1Ps=
+			C+vXyX33RLYODYJvGz1sLH8hlN/XeO0xCJhAdQrdRjw=
 			</data>
 		</dict>
 		<key>Headers/SLDSymbolizers.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			FgMEE0T3xnDtLrFYmE9Aqy9d76FnuRhL2E/oy2sARtQ=
+			+b9hFQFx3vasBtTpxOvJ4SovnrnBL18JBziRWLt6vyo=
 			</data>
 		</dict>
 		<key>Headers/SLDWellKnownMarkers.h</key>
@@ -1117,35 +1117,35 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			qtSkqYi/2qiDH55BR6PeJi5/7tfcvDm/mNrm4GWCzEk=
+			bhCCO7BoVhqlxGESHz9ODX/kNirEJ/7wjSCK09q2nwA=
 			</data>
 		</dict>
-		<key>Headers/WhirlyGlobeComponent.h</key>
+		<key>Headers/WhirlyGlobe.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			oxvPzm1dMVY33QZ0D3kG1n7fI0m5XXttw0hgxjoCatE=
+			MfSeR4N6wWUxK13sZie8AEzxCJUd6XBefFBkgffous8=
 			</data>
 		</dict>
-		<key>Headers/WhirlyGlobeMaplyComponent.h</key>
+		<key>Headers/WhirlyGlobeComponent.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			j+jwTmZLwWVb3tIMYEXjaNu4ZGvWbXVJIOTt1UsA08E=
+			AF84tc7f51e97Zyi2KKgkFmgkxRJwGxdFjv6V73biak=
 			</data>
 		</dict>
 		<key>Headers/WhirlyGlobeViewController.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			oE7ShvtD5UPiD/LdcTHU3X/XxC3u30VKXxAIrhESilY=
+			MJNKHq8MCDUb7/jgXJkb35WzrOpE5mPNJsT+9RVBHXA=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			07zKiWkZBXgx32pzc10uPMUrkT+4D4AQHAzU0p3By5g=
+			W4RtgQMRvmRp5PtONuef68cOyp4dSlBf+laTyIyU2j4=
 			</data>
 		</dict>
 		<key>default.metallib</key>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/default.metallib b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/default.metallib
index 3f65869..3f65869 100644
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/default.metallib
+++ b/iosApp/WhirlyGlobe.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobe.framework/default.metallib
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
deleted file mode 100644
index 8dcb73c..0000000
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  MaplyComponent.h
- *  MaplyComponent
- *
- *  Created by Steve Gifford on 9/6/12.
- *  Copyright 2012-2022 mousebird consulting
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-
-#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
-#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
-#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplySun.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
-
-#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
-#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
-#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
-#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
-#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
-
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
deleted file mode 100644
index e15c8e8..0000000
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-//  WhirlyGlobeMaplyComponent.h
-//  WhirlyGlobeMaplyComponent
-//
-//  Created by Steve Gifford on 6/29/16.
-//  Copyright © 2016-2019 mousebird consulting.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for WhirlyGlobeMaplyComponent.
-FOUNDATION_EXPORT double WhirlyGlobeMaplyComponentVersionNumber;
-
-//! Project version string for WhirlyGlobeMaplyComponent.
-FOUNDATION_EXPORT const unsigned char WhirlyGlobeMaplyComponentVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <WhirlyGlobeMaplyComponent/PublicHeader.h>
-
-#import <WhirlyGlobeMaplyComponent/GeographicLib_ObjC.h>
-#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
-#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDragDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobePanDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeRotateDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeTiltDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeTwoFingerTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
-#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
-#import <WhirlyGlobeMaplyComponent/Maply3dTouchPreviewDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDragDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
-#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPanDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPinchDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRotateDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
-#import <WhirlyGlobeMaplyComponent/MaplySun.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTouchCancelAnimationDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTwoFingerTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
-#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
-#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
-#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
-#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
-#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
-#import <WhirlyGlobeMaplyComponent/WGCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
deleted file mode 100644
index 85d15cc..0000000
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module WhirlyGlobeMaplyComponent {
-  umbrella header "WhirlyGlobeMaplyComponent.h"
-
-  export *
-  module * { export * }
-}
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
deleted file mode 100644
index 8dcb73c..0000000
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/MaplyComponent.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  MaplyComponent.h
- *  MaplyComponent
- *
- *  Created by Steve Gifford on 9/6/12.
- *  Copyright 2012-2022 mousebird consulting
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-
-#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
-#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
-#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplySun.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
-
-#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
-#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
-#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
-#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
-
-#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
-#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
-
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
deleted file mode 100644
index e15c8e8..0000000
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Headers/WhirlyGlobeMaplyComponent.h
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-//  WhirlyGlobeMaplyComponent.h
-//  WhirlyGlobeMaplyComponent
-//
-//  Created by Steve Gifford on 6/29/16.
-//  Copyright © 2016-2019 mousebird consulting.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for WhirlyGlobeMaplyComponent.
-FOUNDATION_EXPORT double WhirlyGlobeMaplyComponentVersionNumber;
-
-//! Project version string for WhirlyGlobeMaplyComponent.
-FOUNDATION_EXPORT const unsigned char WhirlyGlobeMaplyComponentVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <WhirlyGlobeMaplyComponent/PublicHeader.h>
-
-#import <WhirlyGlobeMaplyComponent/GeographicLib_ObjC.h>
-#import <WhirlyGlobeMaplyComponent/GeoJSONSource.h>
-#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeDoubleTapDragDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobePanDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobePinchDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeRotateDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeTiltDelegate.h>
-#import <WhirlyGlobeMaplyComponent/GlobeTwoFingerTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorInterpreter.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/MapboxVectorTiles.h>
-#import <WhirlyGlobeMaplyComponent/Maply3DTouchPreviewDatasource.h>
-#import <WhirlyGlobeMaplyComponent/Maply3dTouchPreviewDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyActiveObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAnnotation.h>
-#import <WhirlyGlobeMaplyComponent/MaplyAtmosphere.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBaseViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBillboard.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
-#import <WhirlyGlobeMaplyComponent/MaplyBridge.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCluster.h>
-#import <WhirlyGlobeMaplyComponent/MaplyColorRampGenerator.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponent.h>
-#import <WhirlyGlobeMaplyComponent/MaplyComponentObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyControllerLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyCoordinateSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyDoubleTapDragDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomBuilder.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGeomModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyGlobeRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyIconManager.h>
-#import <WhirlyGlobeMaplyComponent/MaplyImageTile.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLight.h>
-#import <WhirlyGlobeMaplyComponent/MaplyLocationTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMatrix.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMBTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyMoon.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPanDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyParticleSystem.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPinchDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyPoints.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageFrameLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadImageLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadPagingLoader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyQuadSampler.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRemoteTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRenderTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyRotateDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenLabel.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenMarker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyScreenObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShader.h>
-#import <WhirlyGlobeMaplyComponent/MaplyShape.h>
-#import <WhirlyGlobeMaplyComponent/MaplySharedAttributes.h>
-#import <WhirlyGlobeMaplyComponent/MaplySimpleTileFetcher.h>
-#import <WhirlyGlobeMaplyComponent/MaplyStarsModel.h>
-#import <WhirlyGlobeMaplyComponent/MaplySticker.h>
-#import <WhirlyGlobeMaplyComponent/MaplySun.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTapMessage.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTexture.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTextureBuilder.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTileSourceNew.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTouchCancelAnimationDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyTwoFingerTapDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MaplyUpdateLayer.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVariableTarget.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorObject.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorStyleSimple.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileLineStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileMarkerStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTilePolygonStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVectorTileTextStyle.h>
-#import <WhirlyGlobeMaplyComponent/MaplyVertexAttribute.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewController.h>
-#import <WhirlyGlobeMaplyComponent/MaplyViewTracker.h>
-#import <WhirlyGlobeMaplyComponent/MaplyWMSTileSource.h>
-#import <WhirlyGlobeMaplyComponent/MaplyZoomGestureDelegate.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyle.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleRule.h>
-#import <WhirlyGlobeMaplyComponent/MapnikStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/NSData+Zlib.h>
-#import <WhirlyGlobeMaplyComponent/NSDictionary+StyleRules.h>
-#import <WhirlyGlobeMaplyComponent/SLDExpressions.h>
-#import <WhirlyGlobeMaplyComponent/SLDOperators.h>
-#import <WhirlyGlobeMaplyComponent/SLDStyleSet.h>
-#import <WhirlyGlobeMaplyComponent/SLDSymbolizers.h>
-#import <WhirlyGlobeMaplyComponent/SLDWellKnownMarkers.h>
-#import <WhirlyGlobeMaplyComponent/WGCoordinate.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeComponent.h>
-#import <WhirlyGlobeMaplyComponent/WhirlyGlobeViewController.h>
diff --git a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap b/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
deleted file mode 100644
index 85d15cc..0000000
--- a/iosApp/WhirlyGlobeMaplyComponent.xcframework/ios-arm64_x86_64-simulator/WhirlyGlobeMaplyComponent.framework/Modules/module.modulemap
+++ /dev/null
@@ -1,6 +0,0 @@
-framework module WhirlyGlobeMaplyComponent {
-  umbrella header "WhirlyGlobeMaplyComponent.h"
-
-  export *
-  module * { export * }
-}
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
index 9f2f41f..821ffb6 100644
--- a/iosApp/iosApp.xcodeproj/project.pbxproj
+++ b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -15,12 +15,9 @@
 		E33A236527A530F300DD647F /* SmallLabelStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A236427A530F300DD647F /* SmallLabelStyle.swift */; };
 		E33A236727A64E4500DD647F /* MarkerTransformations.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A236627A64E4500DD647F /* MarkerTransformations.swift */; };
 		E33A236A27A6898700DD647F /* SwiftUIX in Frameworks */ = {isa = PBXBuildFile; productRef = E33A236927A6898700DD647F /* SwiftUIX */; };
-		E33A236D27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */; };
-		E33A236E27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E33A237127A7553500DD647F /* MapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A237027A7553500DD647F /* MapView.swift */; };
 		E33A237327A7581A00DD647F /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = E33A237227A7581A00DD647F /* Utils.swift */; };
 		E34A2F4827A7878200AD8AEB /* HyperlinkText.swift in Sources */ = {isa = PBXBuildFile; fileRef = E34A2F4727A7878200AD8AEB /* HyperlinkText.swift */; };
-		E34A2F4B27A7881200AD8AEB /* SwiftUIFlowLayout in Frameworks */ = {isa = PBXBuildFile; productRef = E34A2F4A27A7881200AD8AEB /* SwiftUIFlowLayout */; };
 		E34A2F4D27A7DB2200AD8AEB /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E34A2F4C27A7DB2200AD8AEB /* Localizable.strings */; };
 		E36DF77B27AB740C003C561C /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E36DF77927AB740C003C561C /* MapViewController.swift */; };
 		E36DF77C27AB740C003C561C /* MapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E36DF77A27AB740C003C561C /* MapViewController.xib */; };
@@ -29,6 +26,8 @@
 		E38F241C27A26DD70069FC45 /* RootViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38F241B27A26DD70069FC45 /* RootViewModel.swift */; };
 		E38F241E27A270D50069FC45 /* UnitsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38F241D27A270D50069FC45 /* UnitsView.swift */; };
 		E38F242027A27B550069FC45 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E38F241F27A27B550069FC45 /* LoadingView.swift */; };
+		E396281D27AF5723005D070E /* WhirlyGlobe.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E396281B27AF56BA005D070E /* WhirlyGlobe.xcframework */; };
+		E396281E27AF5723005D070E /* WhirlyGlobe.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E396281B27AF56BA005D070E /* WhirlyGlobe.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E39ABC4327A4E88C00965D05 /* UnitsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E39ABC4227A4E88C00965D05 /* UnitsViewModel.swift */; };
 		E39ABC4627A4EBD500965D05 /* DevicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E39ABC4527A4EBD500965D05 /* DevicesView.swift */; };
 		E39ABC4827A4EDEC00965D05 /* DeviceRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = E39ABC4727A4EDEC00965D05 /* DeviceRow.swift */; };
@@ -42,7 +41,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				E33A236E27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Embed Frameworks */,
+				E396281E27AF5723005D070E /* WhirlyGlobe.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -59,7 +58,6 @@
 		E33A235F27A4FD2C00DD647F /* UnitMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitMapView.swift; sourceTree = "<group>"; };
 		E33A236427A530F300DD647F /* SmallLabelStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallLabelStyle.swift; sourceTree = "<group>"; };
 		E33A236627A64E4500DD647F /* MarkerTransformations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkerTransformations.swift; sourceTree = "<group>"; };
-		E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = WhirlyGlobeMaplyComponent.xcframework; sourceTree = "<group>"; };
 		E33A237027A7553500DD647F /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = "<group>"; };
 		E33A237227A7581A00DD647F /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
 		E34A2F4727A7878200AD8AEB /* HyperlinkText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HyperlinkText.swift; sourceTree = "<group>"; };
@@ -71,6 +69,7 @@
 		E38F241B27A26DD70069FC45 /* RootViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewModel.swift; sourceTree = "<group>"; };
 		E38F241D27A270D50069FC45 /* UnitsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitsView.swift; sourceTree = "<group>"; };
 		E38F241F27A27B550069FC45 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
+		E396281B27AF56BA005D070E /* WhirlyGlobe.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = WhirlyGlobe.xcframework; sourceTree = "<group>"; };
 		E39ABC4227A4E88C00965D05 /* UnitsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitsViewModel.swift; sourceTree = "<group>"; };
 		E39ABC4527A4EBD500965D05 /* DevicesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DevicesView.swift; sourceTree = "<group>"; };
 		E39ABC4727A4EDEC00965D05 /* DeviceRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceRow.swift; sourceTree = "<group>"; };
@@ -82,9 +81,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E33A236D27A7545500DD647F /* WhirlyGlobeMaplyComponent.xcframework in Frameworks */,
 				E33A236A27A6898700DD647F /* SwiftUIX in Frameworks */,
-				E34A2F4B27A7881200AD8AEB /* SwiftUIFlowLayout in Frameworks */,
+				E396281D27AF5723005D070E /* WhirlyGlobe.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -137,7 +135,7 @@
 		7555FFB0242A642200829871 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				E33A236B27A7543700DD647F /* WhirlyGlobeMaplyComponent.xcframework */,
+				E396281B27AF56BA005D070E /* WhirlyGlobe.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -246,7 +244,6 @@
 			name = iosApp;
 			packageProductDependencies = (
 				E33A236927A6898700DD647F /* SwiftUIX */,
-				E34A2F4A27A7881200AD8AEB /* SwiftUIFlowLayout */,
 			);
 			productName = iosApp;
 			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
@@ -280,7 +277,6 @@
 			mainGroup = 7555FF72242A565900829871;
 			packageReferences = (
 				E33A236827A6898700DD647F /* XCRemoteSwiftPackageReference "SwiftUIX" */,
-				E34A2F4927A7881200AD8AEB /* XCRemoteSwiftPackageReference "swiftui-flow-layout" */,
 			);
 			productRefGroup = 7555FF7C242A565900829871 /* Products */;
 			projectDirPath = "";
@@ -567,14 +563,6 @@
 				kind = branch;
 			};
 		};
-		E34A2F4927A7881200AD8AEB /* XCRemoteSwiftPackageReference "swiftui-flow-layout" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/globulus/swiftui-flow-layout";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -583,11 +571,6 @@
 			package = E33A236827A6898700DD647F /* XCRemoteSwiftPackageReference "SwiftUIX" */;
 			productName = SwiftUIX;
 		};
-		E34A2F4A27A7881200AD8AEB /* SwiftUIFlowLayout */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = E34A2F4927A7881200AD8AEB /* XCRemoteSwiftPackageReference "swiftui-flow-layout" */;
-			productName = SwiftUIFlowLayout;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 7555FF73242A565900829871 /* Project object */;
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 01275f3..9e38855 100644
--- a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -2,15 +2,6 @@
   "object": {
     "pins": [
       {
-        "package": "SwiftUIFlowLayout",
-        "repositoryURL": "https://github.com/globulus/swiftui-flow-layout",
-        "state": {
-          "branch": null,
-          "revision": "96f9a3fdb83fd0b73525f6324b8a35ef0dc235fd",
-          "version": "1.0.4"
-        }
-      },
-      {
         "package": "SwiftUIX",
         "repositoryURL": "https://github.com/ivan-avalos/SwiftUIX",
         "state": {
diff --git a/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme b/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
new file mode 100644
index 0000000..5b29c0a
--- /dev/null
+++ b/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1320"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7555FF7A242A565900829871"
+               BuildableName = "iosApp.app"
+               BlueprintName = "iosApp"
+               ReferencedContainer = "container:iosApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7555FF7A242A565900829871"
+            BuildableName = "iosApp.app"
+            BlueprintName = "iosApp"
+            ReferencedContainer = "container:iosApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7555FF7A242A565900829871"
+            BuildableName = "iosApp.app"
+            BlueprintName = "iosApp"
+            ReferencedContainer = "container:iosApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/iosApp/iosApp/Map/MapView.swift b/iosApp/iosApp/Map/MapView.swift
index 2c86c3b..f9757f4 100644
--- a/iosApp/iosApp/Map/MapView.swift
+++ b/iosApp/iosApp/Map/MapView.swift
@@ -17,7 +17,7 @@
  */
 import SwiftUI
 import Combine
-import WhirlyGlobeMaplyComponent
+import WhirlyGlobe
 import shared
 
 struct MapView: UIViewControllerRepresentable {
diff --git a/iosApp/iosApp/Map/MapViewController.swift b/iosApp/iosApp/Map/MapViewController.swift
index 207d0d0..32c21cf 100644
--- a/iosApp/iosApp/Map/MapViewController.swift
+++ b/iosApp/iosApp/Map/MapViewController.swift
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import UIKit
-import WhirlyGlobeMaplyComponent
+import WhirlyGlobe
 import shared
 
 typealias MarkerCallback = (Int32?) -> ()
diff --git a/iosApp/iosApp/Shared/Utils.swift b/iosApp/iosApp/Shared/Utils.swift
index 5a06d8f..9b473a5 100644
--- a/iosApp/iosApp/Shared/Utils.swift
+++ b/iosApp/iosApp/Shared/Utils.swift
@@ -17,7 +17,7 @@
  */
 import Foundation
 import CryptoKit
-import WhirlyGlobeMaplyComponent
+import WhirlyGlobe
 import shared
 
 class Utils {
diff --git a/iosApp/iosApp/Units/UnitsViewModel.swift b/iosApp/iosApp/Units/UnitsViewModel.swift
index 8cf4aae..b657675 100644
--- a/iosApp/iosApp/Units/UnitsViewModel.swift
+++ b/iosApp/iosApp/Units/UnitsViewModel.swift
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import Foundation
-import WhirlyGlobeMaplyComponent
+import WhirlyGlobe
 import shared
 
 class UnitsViewModel: ObservableObject {