diff --git a/permission_handler/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift b/permission_handler/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift
new file mode 100644
index 000000000..62e7b11aa
--- /dev/null
+++ b/permission_handler/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift
@@ -0,0 +1,3 @@
+//
+//  Generated file. Do not edit.
+//
diff --git a/permission_handler/example/lib/main.dart b/permission_handler/example/lib/main.dart
index e37e51302..6158fa313 100644
--- a/permission_handler/example/lib/main.dart
+++ b/permission_handler/example/lib/main.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: no_logic_in_create_state
+
 import 'dart:io';
 
 import 'package:baseflow_plugin_template/baseflow_plugin_template.dart';
diff --git a/permission_handler_apple/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift b/permission_handler_apple/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift
new file mode 100644
index 000000000..29ff07d5b
--- /dev/null
+++ b/permission_handler_apple/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift
@@ -0,0 +1,25 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+//
+//  Generated file. Do not edit.
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "FlutterGeneratedPluginSwiftPackage",
+    platforms: [
+        .iOS("12.0")
+    ],
+    products: [
+        .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"])
+    ],
+    dependencies: [
+        
+    ],
+    targets: [
+        .target(
+            name: "FlutterGeneratedPluginSwiftPackage"
+        )
+    ]
+)
diff --git a/permission_handler_apple/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift b/permission_handler_apple/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift
new file mode 100644
index 000000000..62e7b11aa
--- /dev/null
+++ b/permission_handler_apple/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift
@@ -0,0 +1,3 @@
+//
+//  Generated file. Do not edit.
+//
diff --git a/permission_handler_apple/example/ios/Runner.xcodeproj/project.pbxproj b/permission_handler_apple/example/ios/Runner.xcodeproj/project.pbxproj
index 705be7680..ff050b152 100644
--- a/permission_handler_apple/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/permission_handler_apple/example/ios/Runner.xcodeproj/project.pbxproj
@@ -7,13 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		129BF328E0390291AA305797 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAB3253F7957E00908622CEE /* Pods_Runner.framework */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		B501E7F22BA22C455255CE2E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C446183715B92022DDB68882 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -33,10 +34,11 @@
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		6849A6556C6BC683F18F9B9B /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		862A53EA392D32566500E869 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		7EE257A395789F5F681D58ED /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -44,9 +46,8 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C446183715B92022DDB68882 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		CEA40B36DE135D81D16B7399 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		DA7CB50DE8057A7A8D126AC9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		B7474CB10F6F83070DA7D3FC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		CAB3253F7957E00908622CEE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F6BD02742B56D78D00C59EAA /* RunnerDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerDebug.entitlements; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -55,7 +56,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B501E7F22BA22C455255CE2E /* Pods_Runner.framework in Frameworks */,
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
+				129BF328E0390291AA305797 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -65,21 +67,13 @@
 		2982F40ECD3DD26A4434B596 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				CEA40B36DE135D81D16B7399 /* Pods-Runner.debug.xcconfig */,
-				862A53EA392D32566500E869 /* Pods-Runner.release.xcconfig */,
-				DA7CB50DE8057A7A8D126AC9 /* Pods-Runner.profile.xcconfig */,
+				B7474CB10F6F83070DA7D3FC /* Pods-Runner.debug.xcconfig */,
+				7EE257A395789F5F681D58ED /* Pods-Runner.release.xcconfig */,
+				6849A6556C6BC683F18F9B9B /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		7EF8E4A69F95E4BF7F747BE9 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				C446183715B92022DDB68882 /* Pods_Runner.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -98,7 +92,7 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				2982F40ECD3DD26A4434B596 /* Pods */,
-				7EF8E4A69F95E4BF7F747BE9 /* Frameworks */,
+				F4F4FFF3F7F622A32B465B7B /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -126,6 +120,14 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		F4F4FFF3F7F622A32B465B7B /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				CAB3253F7957E00908622CEE /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -133,21 +135,24 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				5CF31A8C72B66ABB365E813D /* [CP] Check Pods Manifest.lock */,
+				59107802EEC5D20C8665B0FF /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				D38B08CB85942E5D11545EE3 /* [CP] Embed Pods Frameworks */,
-				A7B07F67421488A414C73AAD /* [CP] Copy Pods Resources */,
+				62A5B1B56A709B1DEA463D61 /* [CP] Embed Pods Frameworks */,
+				6FA299C930ED5D0EAB8A4A43 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
@@ -176,6 +181,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -216,7 +224,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		5CF31A8C72B66ABB365E813D /* [CP] Check Pods Manifest.lock */ = {
+		59107802EEC5D20C8665B0FF /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -238,22 +246,24 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		62A5B1B56A709B1DEA463D61 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "Run Script";
-			outputPaths = (
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
-		A7B07F67421488A414C73AAD /* [CP] Copy Pods Resources */ = {
+		6FA299C930ED5D0EAB8A4A43 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -270,22 +280,20 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D38B08CB85942E5D11545EE3 /* [CP] Embed Pods Frameworks */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			inputPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			name = "Run Script";
+			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -594,6 +602,20 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
diff --git a/permission_handler_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/permission_handler_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index e67b2808a..7120d2eaf 100644
--- a/permission_handler_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/permission_handler_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
diff --git a/permission_handler_apple/example/ios/Runner/AppDelegate.swift b/permission_handler_apple/example/ios/Runner/AppDelegate.swift
index 70693e4a8..b63630348 100644
--- a/permission_handler_apple/example/ios/Runner/AppDelegate.swift
+++ b/permission_handler_apple/example/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
diff --git a/permission_handler_apple/ios/.gitignore b/permission_handler_apple/ios/.gitignore
index 710ec6cf1..e7750659f 100644
--- a/permission_handler_apple/ios/.gitignore
+++ b/permission_handler_apple/ios/.gitignore
@@ -13,6 +13,7 @@ GeneratedPluginRegistrant.h
 GeneratedPluginRegistrant.m
 
 .generated/
+permission_handler_apple/.build
 
 *.pbxuser
 *.mode1v3
diff --git a/permission_handler_apple/ios/permission_handler_apple.podspec b/permission_handler_apple/ios/permission_handler_apple.podspec
index 81210cb8a..0ad846963 100644
--- a/permission_handler_apple/ios/permission_handler_apple.podspec
+++ b/permission_handler_apple/ios/permission_handler_apple.podspec
@@ -12,12 +12,11 @@ Permission plugin for Flutter. This plugin provides a cross-platform (iOS, Andro
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Baseflow' => 'hello@baseflow.com' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
-  s.public_header_files = 'Classes/**/*.h'
+  s.public_header_files = 'permission_handler_apple/Sources/**/*.h'
+  s.source_files = 'permission_handler_apple/Sources/**/*'
   s.dependency 'Flutter'
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '12.0'
   s.static_framework = true
-  s.resource_bundles = {'permission_handler_apple_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'permission_handler_apple_privacy' => ['permission_handler_apple/Sources/PrivacyInfo.xcprivacy']}
 end
-
diff --git a/permission_handler_apple/ios/permission_handler_apple/Package.swift b/permission_handler_apple/ios/permission_handler_apple/Package.swift
new file mode 100644
index 000000000..5282c788c
--- /dev/null
+++ b/permission_handler_apple/ios/permission_handler_apple/Package.swift
@@ -0,0 +1,47 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+import Foundation
+
+let environmentVariables = ProcessInfo.processInfo.environment
+
+let permissionDefines: [CSetting] = [
+    .define("PERMISSION_EVENTS", to: environmentVariables["PERMISSION_EVENTS"] ?? "0"),
+    .define("PERMISSION_EVENTS_FULL_ACCESS", to: environmentVariables["PERMISSION_EVENTS_FULL_ACCESS"] ?? "0"),
+    .define("PERMISSION_REMINDERS", to: environmentVariables["PERMISSION_REMINDERS"] ?? "0"),
+    .define("PERMISSION_CONTACTS", to: environmentVariables["PERMISSION_CONTACTS"] ?? "0"),
+    .define("PERMISSION_CAMERA", to: environmentVariables["PERMISSION_CAMERA"] ?? "0"),
+    .define("PERMISSION_MICROPHONE", to: environmentVariables["PERMISSION_MICROPHONE"] ?? "0"),
+    .define("PERMISSION_SPEECH_RECOGNIZER", to: environmentVariables["PERMISSION_SPEECH_RECOGNIZER"] ?? "0"),
+    .define("PERMISSION_PHOTOS", to: environmentVariables["PERMISSION_PHOTOS"] ?? "0"),
+    .define("PERMISSION_LOCATION", to: environmentVariables["PERMISSION_LOCATION"] ?? "0"),
+    .define("PERMISSION_LOCATION_WHENINUSE", to: environmentVariables["PERMISSION_LOCATION_WHENINUSE"] ?? "0"),
+    .define("PERMISSION_NOTIFICATIONS", to: environmentVariables["PERMISSION_NOTIFICATIONS"] ?? "0"),
+    .define("PERMISSION_MEDIA_LIBRARY", to: environmentVariables["PERMISSION_MEDIA_LIBRARY"] ?? "0"),
+    .define("PERMISSION_SENSORS", to: environmentVariables["PERMISSION_SENSORS"] ?? "0"),
+    .define("PERMISSION_BLUETOOTH", to: environmentVariables["PERMISSION_BLUETOOTH"] ?? "0"),
+    .define("PERMISSION_APP_TRACKING_TRANSPARENCY", to: environmentVariables["PERMISSION_APP_TRACKING_TRANSPARENCY"] ?? "0"),
+    .define("PERMISSION_CRITICAL_ALERTS", to: environmentVariables["PERMISSION_CRITICAL_ALERTS"] ?? "0"),
+    .define("PERMISSION_ASSISTANT", to: environmentVariables["PERMISSION_ASSISTANT"] ?? "0")
+]
+
+let package = Package(
+    name: "permission_handler_apple",
+    platforms: [
+        .iOS("12.0")
+    ],
+    products: [
+        .library(name: "permission-handler-apple", targets: ["permission_handler_apple"])
+    ],
+    targets: [
+        .target(
+            name: "permission_handler_apple",
+            resources: [
+                .process("PrivacyInfo.xcprivacy"),
+            ],
+            cSettings: [
+                .headerSearchPath("include/permission_handler_apple")
+            ] + permissionDefines
+        )
+    ]
+)
diff --git a/permission_handler_apple/ios/Classes/PermissionHandlerPlugin.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PermissionHandlerPlugin.m
similarity index 97%
rename from permission_handler_apple/ios/Classes/PermissionHandlerPlugin.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PermissionHandlerPlugin.m
index cfbad93cb..122eacaa2 100644
--- a/permission_handler_apple/ios/Classes/PermissionHandlerPlugin.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PermissionHandlerPlugin.m
@@ -1,4 +1,4 @@
-#import "PermissionHandlerPlugin.h"
+#import "./include/permission_handler_apple/PermissionHandlerPlugin.h"
 
 
 @implementation PermissionHandlerPlugin {
diff --git a/permission_handler_apple/ios/Classes/PermissionManager.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PermissionManager.m
similarity index 98%
rename from permission_handler_apple/ios/Classes/PermissionManager.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PermissionManager.m
index 6bba48cae..924785108 100644
--- a/permission_handler_apple/ios/Classes/PermissionManager.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PermissionManager.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "PermissionManager.h"
+#import "./include/permission_handler_apple/PermissionManager.h"
 
 @implementation PermissionManager {
     NSMutableArray <id <PermissionStrategy>> *_strategyInstances;
diff --git a/permission_handler_apple/ios/Resources/PrivacyInfo.xcprivacy b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PrivacyInfo.xcprivacy
similarity index 100%
rename from permission_handler_apple/ios/Resources/PrivacyInfo.xcprivacy
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/PrivacyInfo.xcprivacy
diff --git a/permission_handler_apple/ios/Classes/strategies/AppTrackingTransparencyPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/AppTrackingTransparencyPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/AppTrackingTransparencyPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/AppTrackingTransparencyPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/AssistantPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/AssistantPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/AssistantPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/AssistantPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/AudioVideoPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/AudioVideoPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/AudioVideoPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/AudioVideoPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/BackgroundRefreshStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/BackgroundRefreshStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/BackgroundRefreshStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/BackgroundRefreshStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/BluetoothPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/BluetoothPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/BluetoothPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/BluetoothPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/util/Codec.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/Codec.h
similarity index 99%
rename from permission_handler_apple/ios/Classes/util/Codec.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/Codec.h
index ad930a490..39c2e2ab9 100644
--- a/permission_handler_apple/ios/Classes/util/Codec.h
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/Codec.h
@@ -4,6 +4,7 @@
 //
 
 #import <Foundation/Foundation.h>
+
 #import "PermissionHandlerEnums.h"
 
 @interface Codec : NSObject
diff --git a/permission_handler_apple/ios/Classes/strategies/ContactPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/ContactPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/ContactPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/ContactPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/CriticalAlertsPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/CriticalAlertsPermissionStrategy.h
similarity index 95%
rename from permission_handler_apple/ios/Classes/strategies/CriticalAlertsPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/CriticalAlertsPermissionStrategy.h
index 44b857f48..a28dd9559 100644
--- a/permission_handler_apple/ios/Classes/strategies/CriticalAlertsPermissionStrategy.h
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/CriticalAlertsPermissionStrategy.h
@@ -7,6 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import "PermissionStrategy.h"
+#import <UIKit/UIKit.h>
 
 #if PERMISSION_CRITICAL_ALERTS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/EventPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/EventPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/EventPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/EventPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/LocationPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/LocationPermissionStrategy.h
similarity index 96%
rename from permission_handler_apple/ios/Classes/strategies/LocationPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/LocationPermissionStrategy.h
index 52bcc89dc..2a1b4924d 100644
--- a/permission_handler_apple/ios/Classes/strategies/LocationPermissionStrategy.h
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/LocationPermissionStrategy.h
@@ -9,6 +9,7 @@
 #if PERMISSION_LOCATION || PERMISSION_LOCATION_WHENINUSE || PERMISSION_LOCATION_ALWAYS
 
 #import <CoreLocation/CoreLocation.h>
+#import <UIKit/UIKit.h>
 
 @interface LocationPermissionStrategy : NSObject <PermissionStrategy, CLLocationManagerDelegate>
 - (instancetype)initWithLocationManager;
diff --git a/permission_handler_apple/ios/Classes/strategies/MediaLibraryPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/MediaLibraryPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/MediaLibraryPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/MediaLibraryPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/NotificationPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/NotificationPermissionStrategy.h
similarity index 95%
rename from permission_handler_apple/ios/Classes/strategies/NotificationPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/NotificationPermissionStrategy.h
index df5a795d6..79dc02455 100644
--- a/permission_handler_apple/ios/Classes/strategies/NotificationPermissionStrategy.h
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/NotificationPermissionStrategy.h
@@ -11,6 +11,7 @@
 #if PERMISSION_NOTIFICATIONS
 
 #import <UserNotifications/UserNotifications.h>
+#import <UIKit/UIKit.h>
 
 @interface NotificationPermissionStrategy : NSObject <PermissionStrategy>
 
diff --git a/permission_handler_apple/ios/Classes/PermissionHandlerEnums.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionHandlerEnums.h
similarity index 92%
rename from permission_handler_apple/ios/Classes/PermissionHandlerEnums.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionHandlerEnums.h
index c153dc500..98506f570 100644
--- a/permission_handler_apple/ios/Classes/PermissionHandlerEnums.h
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionHandlerEnums.h
@@ -8,6 +8,8 @@
 // ios: [PermissionGroupCalendar, PermissionGroupCalendarWriteOnly]
 // Info.plist: [NSCalendarsUsageDescription, NSCalendarWriteOnlyAccessUsageDescription]
 // dart: PermissionGroup.calendar
+#include <Foundation/Foundation.h>
+
 #ifndef PERMISSION_EVENTS
     #define PERMISSION_EVENTS 0
 #endif
@@ -123,8 +125,8 @@
     #define PERMISSION_EVENTS_FULL_ACCESS 0
 #endif
 
-typedef NS_ENUM(int, PermissionGroup) {
-    PermissionGroupCalendar = 0,
+typedef NS_ENUM(NSInteger, PermissionGroup) {
+    PermissionGroupCalendar,
     PermissionGroupCamera,
     PermissionGroupContacts,
     PermissionGroupLocation,
@@ -166,17 +168,17 @@ typedef NS_ENUM(int, PermissionGroup) {
     PermissionGroupBackgroundRefresh
 };
 
-typedef NS_ENUM(int, PermissionStatus) {
-    PermissionStatusDenied = 0,
-    PermissionStatusGranted = 1,
-    PermissionStatusRestricted = 2,
-    PermissionStatusLimited = 3,
-    PermissionStatusPermanentlyDenied = 4,
-    PermissionStatusProvisional = 5,
+typedef NS_ENUM(NSInteger, PermissionStatus) {
+    PermissionStatusDenied,
+    PermissionStatusGranted,
+    PermissionStatusRestricted,
+    PermissionStatusLimited,
+    PermissionStatusPermanentlyDenied,
+    PermissionStatusProvisional,
 };
 
-typedef NS_ENUM(int, ServiceStatus) {
-    ServiceStatusDisabled = 0,
+typedef NS_ENUM(NSInteger, ServiceStatus) {
+    ServiceStatusDisabled,
     ServiceStatusEnabled,
     ServiceStatusNotApplicable,
 };
diff --git a/permission_handler_apple/ios/Classes/PermissionHandlerPlugin.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionHandlerPlugin.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/PermissionHandlerPlugin.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionHandlerPlugin.h
diff --git a/permission_handler_apple/ios/Classes/PermissionManager.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionManager.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/PermissionManager.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionManager.h
diff --git a/permission_handler_apple/ios/Classes/strategies/PermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionStrategy.h
similarity index 99%
rename from permission_handler_apple/ios/Classes/strategies/PermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionStrategy.h
index eb03075b0..316aff080 100644
--- a/permission_handler_apple/ios/Classes/strategies/PermissionStrategy.h
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PermissionStrategy.h
@@ -4,6 +4,7 @@
 //
 
 #import <Foundation/Foundation.h>
+
 #import "PermissionHandlerEnums.h"
 
 typedef void (^ServiceStatusHandler)(ServiceStatus serviceStatus);
diff --git a/permission_handler_apple/ios/Classes/strategies/PhonePermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PhonePermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/PhonePermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PhonePermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/PhotoPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PhotoPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/PhotoPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/PhotoPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/SensorPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/SensorPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/SensorPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/SensorPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/SpeechPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/SpeechPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/SpeechPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/SpeechPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/StoragePermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/StoragePermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/StoragePermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/StoragePermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/UnknownPermissionStrategy.h b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/UnknownPermissionStrategy.h
similarity index 100%
rename from permission_handler_apple/ios/Classes/strategies/UnknownPermissionStrategy.h
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/include/permission_handler_apple/UnknownPermissionStrategy.h
diff --git a/permission_handler_apple/ios/Classes/strategies/AppTrackingTransparencyPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AppTrackingTransparencyPermissionStrategy.m
similarity index 95%
rename from permission_handler_apple/ios/Classes/strategies/AppTrackingTransparencyPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AppTrackingTransparencyPermissionStrategy.m
index 11af3e17a..9819b04af 100644
--- a/permission_handler_apple/ios/Classes/strategies/AppTrackingTransparencyPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AppTrackingTransparencyPermissionStrategy.m
@@ -5,7 +5,7 @@
 //  Created by Jan-Derk on 21/05/2021.
 //
 
-#import "AppTrackingTransparencyPermissionStrategy.h"
+#import "../include/permission_handler_apple/AppTrackingTransparencyPermissionStrategy.h"
 
 #if PERMISSION_APP_TRACKING_TRANSPARENCY
 
@@ -61,4 +61,3 @@ @implementation AppTrackingTransparencyPermissionStrategy
 @end
 
 #endif
-
diff --git a/permission_handler_apple/ios/Classes/strategies/AssistantPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AssistantPermissionStrategy.m
similarity index 95%
rename from permission_handler_apple/ios/Classes/strategies/AssistantPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AssistantPermissionStrategy.m
index e143517ef..45d70a7ef 100644
--- a/permission_handler_apple/ios/Classes/strategies/AssistantPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AssistantPermissionStrategy.m
@@ -5,7 +5,7 @@
 //  Created by Baptiste Dupuch (dupuchba) on Tue Sep  5 08:50:04 2023
 //
 
-#import "AssistantPermissionStrategy.h"
+#import "../include/permission_handler_apple/AssistantPermissionStrategy.h"
 
 #if PERMISSION_ASSISTANT
 
diff --git a/permission_handler_apple/ios/Classes/strategies/AudioVideoPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AudioVideoPermissionStrategy.m
similarity index 97%
rename from permission_handler_apple/ios/Classes/strategies/AudioVideoPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AudioVideoPermissionStrategy.m
index 4226783ea..d6dca0148 100644
--- a/permission_handler_apple/ios/Classes/strategies/AudioVideoPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/AudioVideoPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "AudioVideoPermissionStrategy.h"
+#import "../include/permission_handler_apple/AudioVideoPermissionStrategy.h"
 
 #if PERMISSION_CAMERA | PERMISSION_MICROPHONE
 
diff --git a/permission_handler_apple/ios/Classes/strategies/BackgroundRefreshStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/BackgroundRefreshStrategy.m
similarity index 92%
rename from permission_handler_apple/ios/Classes/strategies/BackgroundRefreshStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/BackgroundRefreshStrategy.m
index b72329514..cad30110e 100644
--- a/permission_handler_apple/ios/Classes/strategies/BackgroundRefreshStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/BackgroundRefreshStrategy.m
@@ -5,7 +5,8 @@
 //  Created by Sebastian Roth on 28/09/2023.
 //
 
-#import "BackgroundRefreshStrategy.h"
+#import "../include/permission_handler_apple/BackgroundRefreshStrategy.h"
+#import <UIKit/UIKit.h>
 
 @implementation BackgroundRefreshStrategy
 
diff --git a/permission_handler_apple/ios/Classes/strategies/BluetoothPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/BluetoothPermissionStrategy.m
similarity index 98%
rename from permission_handler_apple/ios/Classes/strategies/BluetoothPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/BluetoothPermissionStrategy.m
index ffd0a0d04..3f02c45c0 100644
--- a/permission_handler_apple/ios/Classes/strategies/BluetoothPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/BluetoothPermissionStrategy.m
@@ -5,7 +5,7 @@
 //  Created by Rene Floor on 12/03/2021.
 //
 
-#import "BluetoothPermissionStrategy.h"
+#import "../include/permission_handler_apple/BluetoothPermissionStrategy.h"
 
 #if PERMISSION_BLUETOOTH
 
diff --git a/permission_handler_apple/ios/Classes/strategies/ContactPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/ContactPermissionStrategy.m
similarity index 97%
rename from permission_handler_apple/ios/Classes/strategies/ContactPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/ContactPermissionStrategy.m
index abae99fa3..e8dcead47 100644
--- a/permission_handler_apple/ios/Classes/strategies/ContactPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/ContactPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "ContactPermissionStrategy.h"
+#import "../include/permission_handler_apple/ContactPermissionStrategy.h"
 
 #if PERMISSION_CONTACTS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/CriticalAlertsPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/CriticalAlertsPermissionStrategy.m
similarity index 96%
rename from permission_handler_apple/ios/Classes/strategies/CriticalAlertsPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/CriticalAlertsPermissionStrategy.m
index 180566d02..199beda3b 100644
--- a/permission_handler_apple/ios/Classes/strategies/CriticalAlertsPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/CriticalAlertsPermissionStrategy.m
@@ -5,7 +5,7 @@
 //  Created by Neal Soni on 2021/6/8.
 //
 
-#import "CriticalAlertsPermissionStrategy.h"
+#import "../include/permission_handler_apple/CriticalAlertsPermissionStrategy.h"
 
 #if PERMISSION_CRITICAL_ALERTS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/EventPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/EventPermissionStrategy.m
similarity index 98%
rename from permission_handler_apple/ios/Classes/strategies/EventPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/EventPermissionStrategy.m
index 41baccbc0..9e750aa1c 100644
--- a/permission_handler_apple/ios/Classes/strategies/EventPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/EventPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "EventPermissionStrategy.h"
+#import "../include/permission_handler_apple/EventPermissionStrategy.h"
 
 #if PERMISSION_EVENTS | PERMISSION_EVENTS_FULL_ACCESS | PERMISSION_REMINDERS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/LocationPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/LocationPermissionStrategy.m
similarity index 99%
rename from permission_handler_apple/ios/Classes/strategies/LocationPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/LocationPermissionStrategy.m
index 76fbf632d..0ada02ccd 100644
--- a/permission_handler_apple/ios/Classes/strategies/LocationPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/LocationPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "LocationPermissionStrategy.h"
+#import "../include/permission_handler_apple/LocationPermissionStrategy.h"
 
 #if PERMISSION_LOCATION || PERMISSION_LOCATION_WHENINUSE || PERMISSION_LOCATION_ALWAYS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/MediaLibraryPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/MediaLibraryPermissionStrategy.m
similarity index 96%
rename from permission_handler_apple/ios/Classes/strategies/MediaLibraryPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/MediaLibraryPermissionStrategy.m
index 76cf39974..abcf55190 100644
--- a/permission_handler_apple/ios/Classes/strategies/MediaLibraryPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/MediaLibraryPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "MediaLibraryPermissionStrategy.h"
+#import "../include/permission_handler_apple/MediaLibraryPermissionStrategy.h"
 
 #if PERMISSION_MEDIA_LIBRARY
 
diff --git a/permission_handler_apple/ios/Classes/strategies/NotificationPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/NotificationPermissionStrategy.m
similarity index 97%
rename from permission_handler_apple/ios/Classes/strategies/NotificationPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/NotificationPermissionStrategy.m
index 85ce12e4d..7b5b3da60 100644
--- a/permission_handler_apple/ios/Classes/strategies/NotificationPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/NotificationPermissionStrategy.m
@@ -5,7 +5,7 @@
 //  Created by Tong on 2019/10/21.
 //
 
-#import "NotificationPermissionStrategy.h"
+#import "../include/permission_handler_apple/NotificationPermissionStrategy.h"
 
 #if PERMISSION_NOTIFICATIONS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/PhonePermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/PhonePermissionStrategy.m
similarity index 95%
rename from permission_handler_apple/ios/Classes/strategies/PhonePermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/PhonePermissionStrategy.m
index 37222849d..4a4f3f5b1 100644
--- a/permission_handler_apple/ios/Classes/strategies/PhonePermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/PhonePermissionStrategy.m
@@ -7,8 +7,9 @@
 
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #import <CoreTelephony/CTCarrier.h>
+#import <UIKit/UIKit.h>
 
-#import "PhonePermissionStrategy.h"
+#import "../include/permission_handler_apple/PhonePermissionStrategy.h"
 
 @implementation PhonePermissionStrategy
 
diff --git a/permission_handler_apple/ios/Classes/strategies/PhotoPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/PhotoPermissionStrategy.m
similarity index 97%
rename from permission_handler_apple/ios/Classes/strategies/PhotoPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/PhotoPermissionStrategy.m
index a0cb5193d..bb97093c0 100644
--- a/permission_handler_apple/ios/Classes/strategies/PhotoPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/PhotoPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "PhotoPermissionStrategy.h"
+#import "../include/permission_handler_apple/PhotoPermissionStrategy.h"
 
 #if PERMISSION_PHOTOS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/SensorPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/SensorPermissionStrategy.m
similarity index 96%
rename from permission_handler_apple/ios/Classes/strategies/SensorPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/SensorPermissionStrategy.m
index 21764fd72..1878e22ee 100644
--- a/permission_handler_apple/ios/Classes/strategies/SensorPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/SensorPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "SensorPermissionStrategy.h"
+#import "../include/permission_handler_apple/SensorPermissionStrategy.h"
 
 #if PERMISSION_SENSORS
 
diff --git a/permission_handler_apple/ios/Classes/strategies/SpeechPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/SpeechPermissionStrategy.m
similarity index 96%
rename from permission_handler_apple/ios/Classes/strategies/SpeechPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/SpeechPermissionStrategy.m
index e34765385..aaa14a567 100644
--- a/permission_handler_apple/ios/Classes/strategies/SpeechPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/SpeechPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "SpeechPermissionStrategy.h"
+#import "../include/permission_handler_apple/SpeechPermissionStrategy.h"
 
 #if PERMISSION_SPEECH_RECOGNIZER
 
diff --git a/permission_handler_apple/ios/Classes/strategies/StoragePermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/StoragePermissionStrategy.m
similarity index 91%
rename from permission_handler_apple/ios/Classes/strategies/StoragePermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/StoragePermissionStrategy.m
index 2bc4f721a..dfb04760c 100644
--- a/permission_handler_apple/ios/Classes/strategies/StoragePermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/StoragePermissionStrategy.m
@@ -5,7 +5,7 @@
 //  Created by Frank Gregor on 06.11.19.
 //
 
-#import "StoragePermissionStrategy.h"
+#import "../include/permission_handler_apple/StoragePermissionStrategy.h"
 
 @implementation StoragePermissionStrategy
 
diff --git a/permission_handler_apple/ios/Classes/strategies/UnknownPermissionStrategy.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/UnknownPermissionStrategy.m
similarity index 90%
rename from permission_handler_apple/ios/Classes/strategies/UnknownPermissionStrategy.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/UnknownPermissionStrategy.m
index 44bc6bc1e..aa5b75308 100644
--- a/permission_handler_apple/ios/Classes/strategies/UnknownPermissionStrategy.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/strategies/UnknownPermissionStrategy.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "UnknownPermissionStrategy.h"
+#import "../include/permission_handler_apple/UnknownPermissionStrategy.h"
 
 
 @implementation UnknownPermissionStrategy
diff --git a/permission_handler_apple/ios/Classes/util/Codec.m b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/util/Codec.m
similarity index 94%
rename from permission_handler_apple/ios/Classes/util/Codec.m
rename to permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/util/Codec.m
index a7447fe01..df1af732d 100644
--- a/permission_handler_apple/ios/Classes/util/Codec.m
+++ b/permission_handler_apple/ios/permission_handler_apple/Sources/permission_handler_apple/util/Codec.m
@@ -3,7 +3,7 @@
 // Copyright (c) 2019 The Chromium Authors. All rights reserved.
 //
 
-#import "Codec.h"
+#import "../include/permission_handler_apple/Codec.h"
 
 @implementation Codec
 + (PermissionGroup)decodePermissionGroupFrom:(NSNumber *)event {