diff --git a/.gitignore b/.gitignore
index b5cc9e8b9..643e33f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ pubspec_overrides.yaml
 cmake-build-debug/
 .vs/
 **/.flutter-plugins-dependencies
+.build/
+.swiftpm/
diff --git a/packages/gamepads_darwin/macos/gamepads_darwin.podspec b/packages/gamepads_darwin/macos/gamepads_darwin.podspec
index 8b5c981e5..b145e16e0 100644
--- a/packages/gamepads_darwin/macos/gamepads_darwin.podspec
+++ b/packages/gamepads_darwin/macos/gamepads_darwin.podspec
@@ -14,10 +14,10 @@ MacOS implementation of gamepads, a Flutter plugin to handle gamepad input acros
   s.author           = { 'Luan' => 'luan@blue-fire.xyz' }
 
   s.source           = { :path => '.' }
-  s.source_files     = 'Classes/**/*'
+  s.source_files     = 'gamepads_darwin/Sources/gamepads_darwin/**/*.swift'
   s.dependency 'FlutterMacOS'
 
-  s.platform = :osx, '10.11'
+  s.platform = :osx, '10.15'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
   s.swift_version = '5.0'
 end
diff --git a/packages/gamepads_darwin/macos/gamepads_darwin/Package.swift b/packages/gamepads_darwin/macos/gamepads_darwin/Package.swift
new file mode 100644
index 000000000..6d74ca87a
--- /dev/null
+++ b/packages/gamepads_darwin/macos/gamepads_darwin/Package.swift
@@ -0,0 +1,24 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "gamepads_darwin",
+    platforms: [
+        .macOS("10.15")
+    ],
+    products: [
+        .library(name: "gamepads-darwin", targets: ["gamepads_darwin"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "gamepads_darwin",
+            dependencies: [],
+            linkerSettings: [
+                .linkedFramework("GameController")
+            ]
+        )
+    ]
+)
diff --git a/packages/gamepads_darwin/macos/Classes/GamepadsDarwinPlugin.swift b/packages/gamepads_darwin/macos/gamepads_darwin/Sources/gamepads_darwin/GamepadsDarwinPlugin.swift
similarity index 100%
rename from packages/gamepads_darwin/macos/Classes/GamepadsDarwinPlugin.swift
rename to packages/gamepads_darwin/macos/gamepads_darwin/Sources/gamepads_darwin/GamepadsDarwinPlugin.swift
diff --git a/packages/gamepads_darwin/macos/Classes/GamepadsListener.swift b/packages/gamepads_darwin/macos/gamepads_darwin/Sources/gamepads_darwin/GamepadsListener.swift
similarity index 100%
rename from packages/gamepads_darwin/macos/Classes/GamepadsListener.swift
rename to packages/gamepads_darwin/macos/gamepads_darwin/Sources/gamepads_darwin/GamepadsListener.swift
diff --git a/packages/gamepads_ios/ios/gamepads_ios.podspec b/packages/gamepads_ios/ios/gamepads_ios.podspec
index d7c297b36..9b7ecf7bb 100644
--- a/packages/gamepads_ios/ios/gamepads_ios.podspec
+++ b/packages/gamepads_ios/ios/gamepads_ios.podspec
@@ -13,9 +13,9 @@ iOS implementation of gamepads, a Flutter plugin to handle gamepad input across
   s.license          = { :file => '../LICENSE' }
   s.author           = { 'Luan' => 'luan@blue-fire.xyz' }
   s.source           = { :path => '.' }
-  s.source_files = 'Classes/**/*'
+  s.source_files = 'gamepads_ios/Sources/gamepads_ios/**/*.swift'
   s.dependency 'Flutter'
-  s.platform = :ios, '11.0'
+  s.platform = :ios, '13.0'
 
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
diff --git a/packages/gamepads_ios/ios/gamepads_ios/Package.swift b/packages/gamepads_ios/ios/gamepads_ios/Package.swift
new file mode 100644
index 000000000..b17c3f535
--- /dev/null
+++ b/packages/gamepads_ios/ios/gamepads_ios/Package.swift
@@ -0,0 +1,24 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "gamepads_ios",
+    platforms: [
+        .iOS("13.0")
+    ],
+    products: [
+        .library(name: "gamepads-ios", targets: ["gamepads_ios"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "gamepads_ios",
+            dependencies: [],
+            linkerSettings: [
+                .linkedFramework("GameController")
+            ]
+        )
+    ]
+)
diff --git a/packages/gamepads_ios/ios/Classes/GamepadsIosPlugin.swift b/packages/gamepads_ios/ios/gamepads_ios/Sources/gamepads_ios/GamepadsIosPlugin.swift
similarity index 100%
rename from packages/gamepads_ios/ios/Classes/GamepadsIosPlugin.swift
rename to packages/gamepads_ios/ios/gamepads_ios/Sources/gamepads_ios/GamepadsIosPlugin.swift
diff --git a/packages/gamepads_ios/ios/Classes/GamepadsListener.swift b/packages/gamepads_ios/ios/gamepads_ios/Sources/gamepads_ios/GamepadsListener.swift
similarity index 100%
rename from packages/gamepads_ios/ios/Classes/GamepadsListener.swift
rename to packages/gamepads_ios/ios/gamepads_ios/Sources/gamepads_ios/GamepadsListener.swift