diff --git a/ios/Classes/AppleMapsFlutterPlugin.h b/ios/Classes/AppleMapsFlutterPlugin.h
deleted file mode 100644
index 7ca9bfbc..00000000
--- a/ios/Classes/AppleMapsFlutterPlugin.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#import <Flutter/Flutter.h>
-
-@interface AppleMapsFlutterPlugin : NSObject<FlutterPlugin>
-@end
diff --git a/ios/Classes/AppleMapsFlutterPlugin.m b/ios/Classes/AppleMapsFlutterPlugin.m
deleted file mode 100644
index 13164091..00000000
--- a/ios/Classes/AppleMapsFlutterPlugin.m
+++ /dev/null
@@ -1,8 +0,0 @@
-#import "AppleMapsFlutterPlugin.h"
-#import <apple_maps_flutter/apple_maps_flutter-Swift.h>
-
-@implementation AppleMapsFlutterPlugin
-+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-  [SwiftAppleMapsFlutterPlugin registerWithRegistrar:registrar];
-}
-@end
diff --git a/ios/apple_maps_flutter.podspec b/ios/apple_maps_flutter.podspec
index 1bad1794..3a4d5171 100644
--- a/ios/apple_maps_flutter.podspec
+++ b/ios/apple_maps_flutter.podspec
@@ -12,8 +12,7 @@ A new flutter plugin project.
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Your Company' => 'email@example.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
+  s.source_files = 'apple_maps_flutter/Sources/apple_maps_flutter/**/*'
   s.dependency 'Flutter'
 
   s.ios.deployment_target = '9.0'
diff --git a/ios/apple_maps_flutter/Package.swift b/ios/apple_maps_flutter/Package.swift
new file mode 100644
index 00000000..46586c78
--- /dev/null
+++ b/ios/apple_maps_flutter/Package.swift
@@ -0,0 +1,19 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+  name: "apple_maps_flutter",
+  platforms: [
+    .iOS(.v15),
+  ],
+  products: [
+    .library(name: "apple-maps-flutter", targets: ["apple_maps_flutter"]),
+  ],
+  targets: [
+    .target(
+      name: "apple_maps_flutter",
+      path: "Sources/apple_maps_flutter"
+    ),
+  ]
+)
diff --git a/ios/Classes/Annotations/AnnotationController.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/AnnotationController.swift
similarity index 100%
rename from ios/Classes/Annotations/AnnotationController.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/AnnotationController.swift
diff --git a/ios/Classes/Annotations/AnnotationDelegate.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/AnnotationDelegate.swift
similarity index 100%
rename from ios/Classes/Annotations/AnnotationDelegate.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/AnnotationDelegate.swift
diff --git a/ios/Classes/Annotations/AnnotationIcon.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/AnnotationIcon.swift
similarity index 100%
rename from ios/Classes/Annotations/AnnotationIcon.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/AnnotationIcon.swift
diff --git a/ios/Classes/Annotations/FlutterAnnotation.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/FlutterAnnotation.swift
similarity index 100%
rename from ios/Classes/Annotations/FlutterAnnotation.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/FlutterAnnotation.swift
diff --git a/ios/Classes/Annotations/FlutterAnnotationView.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/FlutterAnnotationView.swift
similarity index 100%
rename from ios/Classes/Annotations/FlutterAnnotationView.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Annotations/FlutterAnnotationView.swift
diff --git a/ios/Classes/MapView/AppleMapController.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/AppleMapController.swift
similarity index 100%
rename from ios/Classes/MapView/AppleMapController.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/AppleMapController.swift
diff --git a/ios/Classes/MapView/AppleMapsViewFactory.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/AppleMapsViewFactory.swift
similarity index 100%
rename from ios/Classes/MapView/AppleMapsViewFactory.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/AppleMapsViewFactory.swift
diff --git a/ios/Classes/MapView/FlutterMapView.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/FlutterMapView.swift
similarity index 100%
rename from ios/Classes/MapView/FlutterMapView.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/FlutterMapView.swift
diff --git a/ios/Classes/MapView/MapViewExtension.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/MapViewExtension.swift
similarity index 100%
rename from ios/Classes/MapView/MapViewExtension.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/MapView/MapViewExtension.swift
diff --git a/ios/Classes/Overlays/FlutterOverlay.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/FlutterOverlay.swift
similarity index 100%
rename from ios/Classes/Overlays/FlutterOverlay.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/FlutterOverlay.swift
diff --git a/ios/Classes/Overlays/Polygons/FlutterPolygon.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polygons/FlutterPolygon.swift
similarity index 100%
rename from ios/Classes/Overlays/Polygons/FlutterPolygon.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polygons/FlutterPolygon.swift
diff --git a/ios/Classes/Overlays/Polygons/PolygonController.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polygons/PolygonController.swift
similarity index 100%
rename from ios/Classes/Overlays/Polygons/PolygonController.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polygons/PolygonController.swift
diff --git a/ios/Classes/Overlays/Polygons/PolygonDelegate.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polygons/PolygonDelegate.swift
similarity index 100%
rename from ios/Classes/Overlays/Polygons/PolygonDelegate.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polygons/PolygonDelegate.swift
diff --git a/ios/Classes/Overlays/Polylines/FlutterPolyline.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polylines/FlutterPolyline.swift
similarity index 100%
rename from ios/Classes/Overlays/Polylines/FlutterPolyline.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polylines/FlutterPolyline.swift
diff --git a/ios/Classes/Overlays/Polylines/PolylineController.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polylines/PolylineController.swift
similarity index 100%
rename from ios/Classes/Overlays/Polylines/PolylineController.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polylines/PolylineController.swift
diff --git a/ios/Classes/Overlays/Polylines/PolylineDelegate.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polylines/PolylineDelegate.swift
similarity index 100%
rename from ios/Classes/Overlays/Polylines/PolylineDelegate.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/Polylines/PolylineDelegate.swift
diff --git a/ios/Classes/Overlays/circles/CircleController.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/circles/CircleController.swift
similarity index 100%
rename from ios/Classes/Overlays/circles/CircleController.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/circles/CircleController.swift
diff --git a/ios/Classes/Overlays/circles/CircleDelegate.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/circles/CircleDelegate.swift
similarity index 100%
rename from ios/Classes/Overlays/circles/CircleDelegate.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/circles/CircleDelegate.swift
diff --git a/ios/Classes/Overlays/circles/FlutterCircle.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/circles/FlutterCircle.swift
similarity index 86%
rename from ios/Classes/Overlays/circles/FlutterCircle.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/circles/FlutterCircle.swift
index 7371b32b..c4901bbf 100644
--- a/ios/Classes/Overlays/circles/FlutterCircle.swift
+++ b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Overlays/circles/FlutterCircle.swift
@@ -34,7 +34,15 @@ class FlutterCircle: MKCircle {
     }
     
     static func == (lhs: FlutterCircle, rhs: FlutterCircle) -> Bool {
-        return lhs.strokeColor == rhs.strokeColor && lhs.fillColor == rhs.fillColor && lhs.isConsumingTapEvents == rhs.isConsumingTapEvents && lhs.strokeWidth ==  rhs.strokeWidth && lhs.isVisible == rhs.isVisible && lhs.zIndex == rhs.zIndex && lhs.coordinate.latitude == rhs.coordinate.latitude && lhs.coordinate.longitude == rhs.coordinate.longitude
+        return lhs.circleRadius == rhs.circleRadius &&
+            lhs.strokeColor == rhs.strokeColor &&
+            lhs.fillColor == rhs.fillColor &&
+            lhs.isConsumingTapEvents == rhs.isConsumingTapEvents &&
+            lhs.strokeWidth == rhs.strokeWidth &&
+            lhs.isVisible == rhs.isVisible &&
+            lhs.zIndex == rhs.zIndex &&
+            lhs.coordinate.latitude == rhs.coordinate.latitude &&
+            lhs.coordinate.longitude == rhs.coordinate.longitude
     }
     
     static func != (lhs: FlutterCircle, rhs: FlutterCircle) -> Bool {
diff --git a/ios/Classes/SwiftAppleMapsFlutterPlugin.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/SwiftAppleMapsFlutterPlugin.swift
similarity index 75%
rename from ios/Classes/SwiftAppleMapsFlutterPlugin.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/SwiftAppleMapsFlutterPlugin.swift
index b14df79e..0354289f 100644
--- a/ios/Classes/SwiftAppleMapsFlutterPlugin.swift
+++ b/ios/apple_maps_flutter/Sources/apple_maps_flutter/SwiftAppleMapsFlutterPlugin.swift
@@ -1,7 +1,7 @@
 import Flutter
 import UIKit
 
-public class SwiftAppleMapsFlutterPlugin: NSObject, FlutterPlugin {
+public class AppleMapsFlutterPlugin: NSObject, FlutterPlugin {
     var factory: AppleMapViewFactory
     public init(with registrar: FlutterPluginRegistrar) {
         factory = AppleMapViewFactory(withRegistrar: registrar)
@@ -9,6 +9,6 @@ public class SwiftAppleMapsFlutterPlugin: NSObject, FlutterPlugin {
     }
     
     public static func register(with registrar: FlutterPluginRegistrar) {
-        registrar.addApplicationDelegate(SwiftAppleMapsFlutterPlugin(with: registrar))
+        registrar.addApplicationDelegate(AppleMapsFlutterPlugin(with: registrar))
     }
 }
diff --git a/ios/Classes/Utils/JsonConversion.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Utils/JsonConversion.swift
similarity index 100%
rename from ios/Classes/Utils/JsonConversion.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Utils/JsonConversion.swift
diff --git a/ios/Classes/Utils/TouchHandler.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Utils/TouchHandler.swift
similarity index 100%
rename from ios/Classes/Utils/TouchHandler.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Utils/TouchHandler.swift
diff --git a/ios/Classes/Utils/Utils.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/Utils/Utils.swift
similarity index 100%
rename from ios/Classes/Utils/Utils.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/Utils/Utils.swift
diff --git a/ios/Classes/models/SnapshotOptions.swift b/ios/apple_maps_flutter/Sources/apple_maps_flutter/models/SnapshotOptions.swift
similarity index 100%
rename from ios/Classes/models/SnapshotOptions.swift
rename to ios/apple_maps_flutter/Sources/apple_maps_flutter/models/SnapshotOptions.swift