diff --git a/swift/FlatBuffers.podspec b/FlatBuffers.podspec
similarity index 80%
rename from swift/FlatBuffers.podspec
rename to FlatBuffers.podspec
index 0a6a038b7ac..145f935588d 100644
--- a/swift/FlatBuffers.podspec
+++ b/FlatBuffers.podspec
@@ -11,11 +11,11 @@ Pod::Spec.new do |s|
   s.homepage         = 'https://github.com/google/flatbuffers'
   s.license          = { :type => 'Apache2.0', :file => 'LICENSE' }
   s.author           = { 'mustii' => 'mustii@mmk.one' }
-  s.source           = { :git => 'https://github.com/mustiikhalil/flatbuffers.git', :tag => s.version.to_s, :submodules => true }
+  s.source           = { :git => 'https://github.com/google/flatbuffers.git', :tag => s.version.to_s, :submodules => true }
 
   s.ios.deployment_target = '11.0'
   s.osx.deployment_target = '10.14'
 
   s.swift_version = '5.0'
-  s.source_files = 'Sources/Flatbuffers/*.swift'
+  s.source_files = 'swift/Sources/Flatbuffers/*.swift'
 end
diff --git a/swift/Package.swift b/Package.swift
similarity index 97%
rename from swift/Package.swift
rename to Package.swift
index d2d2d5c6f07..982277a9214 100644
--- a/swift/Package.swift
+++ b/Package.swift
@@ -32,5 +32,6 @@ let package = Package(
     .target(
       name: "FlatBuffers",
       dependencies: [],
+      path: "swift/Sources",
       exclude: ["Documentation.docc/Resources/code/swift"]),
   ])
diff --git a/swift/Package@swift-5.5.swift b/Package@swift-5.5.swift
similarity index 94%
rename from swift/Package@swift-5.5.swift
rename to Package@swift-5.5.swift
index 3cfdcf6024d..3c2e13092a9 100644
--- a/swift/Package@swift-5.5.swift
+++ b/Package@swift-5.5.swift
@@ -31,6 +31,7 @@ let package = Package(
   targets: [
     .target(
       name: "FlatBuffers",
-      dependencies: []),
+      dependencies: [],
+      path: "swift/Sources")
   ])
 
diff --git a/swift/README.md b/swift/README.md
index 6984fa8a433..cbacbf4f9c9 100644
--- a/swift/README.md
+++ b/swift/README.md
@@ -1,15 +1,11 @@
 FlatBuffers swift can be found in both SPM
 
-`.package(url: "https://github.com/mustiikhalil/flatbuffers.git", from: "X.Y.Z"),`
+`.package(url: "https://github.com/google/flatbuffers.git", from: "X.Y.Z"),`
 
 and Cocoapods
 
 `pod 'FlatBuffers'`
 
-### Notes
-
-1- To report any error please use the main repository.
-
 ### Contribute
 
 1- Always run `swift test --generate-linuxmain` whenever new test functions are added or removed
\ No newline at end of file
diff --git a/tests/swift/Wasm.tests/Package.swift b/tests/swift/Wasm.tests/Package.swift
index 6d3b1645a6e..bd32307ef1d 100644
--- a/tests/swift/Wasm.tests/Package.swift
+++ b/tests/swift/Wasm.tests/Package.swift
@@ -23,7 +23,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../../swift"),
+    .package(path: "../../.."),
   ],
   targets: [
     .target(
diff --git a/tests/swift/benchmarks/Package.swift b/tests/swift/benchmarks/Package.swift
index d7114932b72..c4913b784ac 100644
--- a/tests/swift/benchmarks/Package.swift
+++ b/tests/swift/benchmarks/Package.swift
@@ -23,7 +23,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../../swift"),
+    .package(path: "../../.."),
     .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
   ],
   targets: [
diff --git a/tests/swift/tests/Package.swift b/tests/swift/tests/Package.swift
index 64fcd540297..8b91712b4dc 100644
--- a/tests/swift/tests/Package.swift
+++ b/tests/swift/tests/Package.swift
@@ -24,7 +24,7 @@ let package = Package(
     .macOS(.v10_14),
   ],
   dependencies: [
-    .package(path: "../../../swift"),
+    .package(path: "../../.."),
     .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1"),
   ],
   targets: [