diff --git a/maplibre_gl/ios/Assets/.gitkeep b/maplibre_gl/ios/Assets/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/maplibre_gl/ios/maplibre_gl.podspec b/maplibre_gl/ios/maplibre_gl.podspec
index cface905a..ebbdf1afd 100644
--- a/maplibre_gl/ios/maplibre_gl.podspec
+++ b/maplibre_gl/ios/maplibre_gl.podspec
@@ -12,10 +12,10 @@ A new Flutter plugin.
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Your Company' => 'email@example.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'maplibre_gl_ios/Sources/maplibre_gl_ios/**/*'
+  s.source_files = 'maplibre_gl/Sources/maplibre_gl/**/*'
   s.dependency 'Flutter'
   # When updating the dependency version,
-  # make sure to also update the version Package.swift.
+  # make sure to also update the version in Package.swift.
   s.dependency 'MapLibre', '6.5.0'
   s.swift_version = '5.0'
   s.ios.deployment_target = '12.0'
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Package.swift b/maplibre_gl/ios/maplibre_gl/Package.swift
similarity index 72%
rename from maplibre_gl/ios/maplibre_gl_ios/Package.swift
rename to maplibre_gl/ios/maplibre_gl/Package.swift
index 5b8137991..9d0bd87f2 100644
--- a/maplibre_gl/ios/maplibre_gl_ios/Package.swift
+++ b/maplibre_gl/ios/maplibre_gl/Package.swift
@@ -4,25 +4,26 @@
 import PackageDescription
 
 let package = Package(
-    name: "maplibre_gl_ios",
+    name: "maplibre_gl",
     platforms: [
         .iOS("12.0"),
     ],
     products: [
-        .library(name: "maplibre-gl-ios", targets: ["maplibre_gl_ios"])
+        .library(name: "maplibre-gl", targets: ["maplibre_gl"])
     ],
     dependencies: [
         // When updating the dependency version,
+        // make sure to also update the version in maplibre_gl.podspec.
         .package(url: "https://github.com/maplibre/maplibre-gl-native-distribution.git", exact: "6.5.0"),
     ],
     targets: [
         .target(
-            name: "maplibre_gl_ios",
+            name: "maplibre_gl",
             dependencies: [
                 .product(name: "MapLibre", package: "maplibre-gl-native-distribution")
             ],
             cSettings: [
-                .headerSearchPath("include/maplibre_gl_ios")
+                .headerSearchPath("include/maplibre_gl")
             ]
         )
     ]
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Constants.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Constants.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Constants.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Constants.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Convert.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Convert.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Convert.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Convert.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Enums.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Enums.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Enums.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Enums.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Extensions.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Extensions.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/Extensions.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/Extensions.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/LayerPropertyConverter.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/LayerPropertyConverter.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/LayerPropertyConverter.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/LayerPropertyConverter.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MGLMapView+setLanguage.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MGLMapView+setLanguage.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MGLMapView+setLanguage.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MGLMapView+setLanguage.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapController.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapController.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapController.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapController.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapFactory.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapFactory.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapFactory.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapFactory.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapOptionsSink.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapOptionsSink.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapOptionsSink.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapOptionsSink.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapsPlugin.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapsPlugin.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MapLibreMapsPlugin.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MapLibreMapsPlugin.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MethodCallError.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MethodCallError.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/MethodCallError.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/MethodCallError.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineChannelHandler.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineChannelHandler.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineChannelHandler.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineChannelHandler.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineManagerUtils.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineManagerUtils.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineManagerUtils.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineManagerUtils.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflinePackDownloadManager.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflinePackDownloadManager.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflinePackDownloadManager.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflinePackDownloadManager.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineRegion.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineRegion.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineRegion.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineRegion.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineRegionDefinition.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineRegionDefinition.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/OfflineRegionDefinition.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/OfflineRegionDefinition.swift
diff --git a/maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/SourcePropertyConverter.swift b/maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/SourcePropertyConverter.swift
similarity index 100%
rename from maplibre_gl/ios/maplibre_gl_ios/Sources/maplibre_gl_ios/SourcePropertyConverter.swift
rename to maplibre_gl/ios/maplibre_gl/Sources/maplibre_gl/SourcePropertyConverter.swift