Move all source files to `Sources/` and rename WireGuardKit targets

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

diff --git a/WireGuard/.swiftlint.yml b/.swiftlint.yml
similarity index 100%
rename from WireGuard/.swiftlint.yml
rename to .swiftlint.yml

diff --git a/Package.swift b/Package.swift
index 816d924a7e6482512e51ffd49ddcf331fdb6dbd2..7b04c878f715714487b31447a72ef5571435e660 100644 (file)
--- a/Package.swift
+++ b/Package.swift
@@ -10,24 +10,21 @@ let package = Package(
         .iOS(.v12)
     ],
     products: [
-        .library(name: "WireGuardKit", targets: ["WireGuardKit"])
+        .library(name: "WireGuardKit", targets: ["WireGuardKitSwift"])
     ],
     dependencies: [],
     targets: [
         .target(
-            name: "WireGuardKit",
-            dependencies: ["libwg-go", "WireGuardKitCTarget"],
-            path: "WireGuardKit/Sources/WireGuardKit"
+            name: "WireGuardKitSwift",
+            dependencies: ["WireGuardKitGo", "WireGuardKitC"]
         ),
         .target(
-            name: "WireGuardKitCTarget",
-            dependencies: [],
-            path: "WireGuardKit/Sources/WireGuardKitCTarget"
+            name: "WireGuardKitC",
+            dependencies: []
         ),
         .target(
-            name: "libwg-go",
+            name: "WireGuardKitGo",
             dependencies: [],
-            path: "WireGuardKit/Sources/libwg-go",
             linkerSettings: [.linkedLibrary("wg-go")]
         )
     ]

diff --git a/README.md b/README.md
index 3b2d53b419cb9ddbc2261173c8d8dd07d80c8d8e..8f40140464c1cc5f3b95464339bacb8dcdb877d5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ $ open ./WireGuard/WireGuard.xcodeproj
      the "External Build Tool Configuration":
      
      ```
-     $BUILD_DIR/../../SourcePackages/checkouts/wireguard-apple/wireguard-go-bridge
+     $BUILD_DIR/../../SourcePackages/checkouts/Sources/WireGuardGo
      ```
      
    - Switch to "Build Settings" and find `SDKROOT`.

diff --git a/WireGuard/Shared/FileManager+Extension.swift b/Sources/Shared/FileManager+Extension.swift
similarity index 100%
rename from WireGuard/Shared/FileManager+Extension.swift
rename to Sources/Shared/FileManager+Extension.swift

diff --git a/WireGuard/Shared/Keychain.swift b/Sources/Shared/Keychain.swift
similarity index 100%
rename from WireGuard/Shared/Keychain.swift
rename to Sources/Shared/Keychain.swift

diff --git a/WireGuard/Shared/Logging/Logger.swift b/Sources/Shared/Logging/Logger.swift
similarity index 100%
rename from WireGuard/Shared/Logging/Logger.swift
rename to Sources/Shared/Logging/Logger.swift

diff --git a/WireGuard/Shared/Logging/ringlogger.c b/Sources/Shared/Logging/ringlogger.c
similarity index 100%
rename from WireGuard/Shared/Logging/ringlogger.c
rename to Sources/Shared/Logging/ringlogger.c

diff --git a/WireGuard/Shared/Logging/ringlogger.h b/Sources/Shared/Logging/ringlogger.h
similarity index 100%
rename from WireGuard/Shared/Logging/ringlogger.h
rename to Sources/Shared/Logging/ringlogger.h

diff --git a/WireGuard/Shared/Logging/test_ringlogger.c b/Sources/Shared/Logging/test_ringlogger.c
similarity index 100%
rename from WireGuard/Shared/Logging/test_ringlogger.c
rename to Sources/Shared/Logging/test_ringlogger.c

diff --git a/WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift b/Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift
similarity index 100%
rename from WireGuard/Shared/Model/NETunnelProviderProtocol+Extension.swift
rename to Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift

diff --git a/WireGuard/Shared/Model/String+ArrayConversion.swift b/Sources/Shared/Model/String+ArrayConversion.swift
similarity index 100%
rename from WireGuard/Shared/Model/String+ArrayConversion.swift
rename to Sources/Shared/Model/String+ArrayConversion.swift

diff --git a/WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift b/Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
similarity index 100%
rename from WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
rename to Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift

diff --git a/WireGuard/WireGuard/Base.lproj/InfoPlist.strings b/Sources/WireGuardApp/Base.lproj/InfoPlist.strings
similarity index 100%
rename from WireGuard/WireGuard/Base.lproj/InfoPlist.strings
rename to Sources/WireGuardApp/Base.lproj/InfoPlist.strings

diff --git a/WireGuard/WireGuard/Base.lproj/Localizable.strings b/Sources/WireGuardApp/Base.lproj/Localizable.strings
similarity index 100%
rename from WireGuard/WireGuard/Base.lproj/Localizable.strings
rename to Sources/WireGuardApp/Base.lproj/Localizable.strings

diff --git a/WireGuard/WireGuard/Config/Config.xcconfig b/Sources/WireGuardApp/Config/Config.xcconfig
similarity index 100%
rename from WireGuard/WireGuard/Config/Config.xcconfig
rename to Sources/WireGuardApp/Config/Config.xcconfig

diff --git a/WireGuard/WireGuard/Config/Developer.xcconfig.template b/Sources/WireGuardApp/Config/Developer.xcconfig.template
similarity index 100%
rename from WireGuard/WireGuard/Config/Developer.xcconfig.template
rename to Sources/WireGuardApp/Config/Developer.xcconfig.template

diff --git a/WireGuard/WireGuard/Config/Version.xcconfig b/Sources/WireGuardApp/Config/Version.xcconfig
similarity index 100%
rename from WireGuard/WireGuard/Config/Version.xcconfig
rename to Sources/WireGuardApp/Config/Version.xcconfig

diff --git a/WireGuard/WireGuard/LocalizationHelper.swift b/Sources/WireGuardApp/LocalizationHelper.swift
similarity index 100%
rename from WireGuard/WireGuard/LocalizationHelper.swift
rename to Sources/WireGuardApp/LocalizationHelper.swift

diff --git a/WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_22x29.png b/Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_22x29.png
similarity index 100%
rename from WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_22x29.png
rename to Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_22x29.png

diff --git a/WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_320x320.png b/Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_320x320.png
similarity index 100%
rename from WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_320x320.png
rename to Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_320x320.png

diff --git a/WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_44x58.png b/Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_44x58.png
similarity index 100%
rename from WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_44x58.png
rename to Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_44x58.png

diff --git a/WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_64x64.png b/Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_64x64.png
similarity index 100%
rename from WireGuard/WireGuard/Resources/DocumentIcons/wireguard_doc_logo_64x64.png
rename to Sources/WireGuardApp/Resources/DocumentIcons/wireguard_doc_logo_64x64.png

diff --git a/WireGuard/WireGuard/Tunnel/ActivateOnDemandOption.swift b/Sources/WireGuardApp/Tunnel/ActivateOnDemandOption.swift
similarity index 100%
rename from WireGuard/WireGuard/Tunnel/ActivateOnDemandOption.swift
rename to Sources/WireGuardApp/Tunnel/ActivateOnDemandOption.swift

diff --git a/WireGuard/WireGuard/Tunnel/MockTunnels.swift b/Sources/WireGuardApp/Tunnel/MockTunnels.swift
similarity index 100%
rename from WireGuard/WireGuard/Tunnel/MockTunnels.swift
rename to Sources/WireGuardApp/Tunnel/MockTunnels.swift

diff --git a/WireGuard/WireGuard/Tunnel/TunnelConfiguration+UapiConfig.swift b/Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift
similarity index 100%
rename from WireGuard/WireGuard/Tunnel/TunnelConfiguration+UapiConfig.swift
rename to Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift

diff --git a/WireGuard/WireGuard/Tunnel/TunnelErrors.swift b/Sources/WireGuardApp/Tunnel/TunnelErrors.swift
similarity index 100%
rename from WireGuard/WireGuard/Tunnel/TunnelErrors.swift
rename to Sources/WireGuardApp/Tunnel/TunnelErrors.swift

diff --git a/WireGuard/WireGuard/Tunnel/TunnelStatus.swift b/Sources/WireGuardApp/Tunnel/TunnelStatus.swift
similarity index 100%
rename from WireGuard/WireGuard/Tunnel/TunnelStatus.swift
rename to Sources/WireGuardApp/Tunnel/TunnelStatus.swift

diff --git a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift
similarity index 100%
rename from WireGuard/WireGuard/Tunnel/TunnelsManager.swift
rename to Sources/WireGuardApp/Tunnel/TunnelsManager.swift

diff --git a/WireGuard/WireGuard/UI/ActivateOnDemandViewModel.swift b/Sources/WireGuardApp/UI/ActivateOnDemandViewModel.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/ActivateOnDemandViewModel.swift
rename to Sources/WireGuardApp/UI/ActivateOnDemandViewModel.swift

diff --git a/WireGuard/WireGuard/UI/ErrorPresenterProtocol.swift b/Sources/WireGuardApp/UI/ErrorPresenterProtocol.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/ErrorPresenterProtocol.swift
rename to Sources/WireGuardApp/UI/ErrorPresenterProtocol.swift

diff --git a/WireGuard/WireGuard/UI/LogViewHelper.swift b/Sources/WireGuardApp/UI/LogViewHelper.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/LogViewHelper.swift
rename to Sources/WireGuardApp/UI/LogViewHelper.swift

diff --git a/WireGuard/WireGuard/UI/PrivateDataConfirmation.swift b/Sources/WireGuardApp/UI/PrivateDataConfirmation.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/PrivateDataConfirmation.swift
rename to Sources/WireGuardApp/UI/PrivateDataConfirmation.swift

diff --git a/WireGuard/WireGuard/UI/TunnelImporter.swift b/Sources/WireGuardApp/UI/TunnelImporter.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/TunnelImporter.swift
rename to Sources/WireGuardApp/UI/TunnelImporter.swift

diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/Sources/WireGuardApp/UI/TunnelViewModel.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/TunnelViewModel.swift
rename to Sources/WireGuardApp/UI/TunnelViewModel.swift

diff --git a/WireGuard/WireGuard/UI/iOS/AppDelegate.swift b/Sources/WireGuardApp/UI/iOS/AppDelegate.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/AppDelegate.swift
rename to Sources/WireGuardApp/UI/iOS/AppDelegate.swift

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@1x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@1x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@1x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x-1.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x-1.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x-1.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x-1.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@2x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@3x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@3x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_20pt@3x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@1x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@1x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@1x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x-1.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x-1.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x-1.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x-1.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@2x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@3x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@3x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_29pt@3x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@1x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@1x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@1x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x-1.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x-1.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x-1.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x-1.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@2x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@3x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@3x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_40pt@3x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@2x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@2x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@2x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@3x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@3x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_60pt@3x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@1x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@1x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@1x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@2x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@2x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_76pt@2x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_83.5pt@2x.png b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_83.5pt@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_83.5pt@2x.png
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/AppIcon.appiconset/wireguard_logo_83.5pt@2x.png

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/Contents.json b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/Contents.json
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/Contents.json

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/wireguard.imageset/Contents.json b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/wireguard.imageset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/wireguard.imageset/Contents.json
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/wireguard.imageset/Contents.json

diff --git a/WireGuard/WireGuard/UI/iOS/Assets.xcassets/wireguard.imageset/wireguard.pdf b/Sources/WireGuardApp/UI/iOS/Assets.xcassets/wireguard.imageset/wireguard.pdf
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Assets.xcassets/wireguard.imageset/wireguard.pdf
rename to Sources/WireGuardApp/UI/iOS/Assets.xcassets/wireguard.imageset/wireguard.pdf

diff --git a/WireGuard/WireGuard/UI/iOS/Base.lproj/LaunchScreen.storyboard b/Sources/WireGuardApp/UI/iOS/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Base.lproj/LaunchScreen.storyboard
rename to Sources/WireGuardApp/UI/iOS/Base.lproj/LaunchScreen.storyboard

diff --git a/WireGuard/WireGuard/UI/iOS/ConfirmationAlertPresenter.swift b/Sources/WireGuardApp/UI/iOS/ConfirmationAlertPresenter.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ConfirmationAlertPresenter.swift
rename to Sources/WireGuardApp/UI/iOS/ConfirmationAlertPresenter.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift b/Sources/WireGuardApp/UI/iOS/ErrorPresenter.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ErrorPresenter.swift
rename to Sources/WireGuardApp/UI/iOS/ErrorPresenter.swift

diff --git a/WireGuard/WireGuard/UI/iOS/Info.plist b/Sources/WireGuardApp/UI/iOS/Info.plist
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/Info.plist
rename to Sources/WireGuardApp/UI/iOS/Info.plist

diff --git a/WireGuard/WireGuard/UI/iOS/QuickActionItem.swift b/Sources/WireGuardApp/UI/iOS/QuickActionItem.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/QuickActionItem.swift
rename to Sources/WireGuardApp/UI/iOS/QuickActionItem.swift

diff --git a/WireGuard/WireGuard/UI/iOS/RecentTunnelsTracker.swift b/Sources/WireGuardApp/UI/iOS/RecentTunnelsTracker.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/RecentTunnelsTracker.swift
rename to Sources/WireGuardApp/UI/iOS/RecentTunnelsTracker.swift

diff --git a/WireGuard/WireGuard/UI/iOS/UITableViewCell+Reuse.swift b/Sources/WireGuardApp/UI/iOS/UITableViewCell+Reuse.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/UITableViewCell+Reuse.swift
rename to Sources/WireGuardApp/UI/iOS/UITableViewCell+Reuse.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/BorderedTextButton.swift b/Sources/WireGuardApp/UI/iOS/View/BorderedTextButton.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/BorderedTextButton.swift
rename to Sources/WireGuardApp/UI/iOS/View/BorderedTextButton.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/ButtonCell.swift b/Sources/WireGuardApp/UI/iOS/View/ButtonCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/ButtonCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/ButtonCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/CheckmarkCell.swift b/Sources/WireGuardApp/UI/iOS/View/CheckmarkCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/CheckmarkCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/CheckmarkCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/ChevronCell.swift b/Sources/WireGuardApp/UI/iOS/View/ChevronCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/ChevronCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/ChevronCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/EditableTextCell.swift b/Sources/WireGuardApp/UI/iOS/View/EditableTextCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/EditableTextCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/EditableTextCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/KeyValueCell.swift b/Sources/WireGuardApp/UI/iOS/View/KeyValueCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/KeyValueCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/KeyValueCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/SwitchCell.swift b/Sources/WireGuardApp/UI/iOS/View/SwitchCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/SwitchCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/SwitchCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/TextCell.swift b/Sources/WireGuardApp/UI/iOS/View/TextCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/TextCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/TextCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/TunnelEditKeyValueCell.swift b/Sources/WireGuardApp/UI/iOS/View/TunnelEditKeyValueCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/TunnelEditKeyValueCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/TunnelEditKeyValueCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift b/Sources/WireGuardApp/UI/iOS/View/TunnelListCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/View/TunnelListCell.swift
rename to Sources/WireGuardApp/UI/iOS/View/TunnelListCell.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/LogViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/LogViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/LogViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/LogViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/MainViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/MainViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/MainViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/QRScanViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/QRScanViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/QRScanViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/QRScanViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/SSIDOptionDetailTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionDetailTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/SSIDOptionDetailTableViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionDetailTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/SSIDOptionEditTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionEditTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/SSIDOptionEditTableViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/SSIDOptionEditTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/SettingsTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/SettingsTableViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/TunnelDetailTableViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/TunnelEditTableViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/ViewController/TunnelsListTableViewController.swift
rename to Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/iOS/WireGuard.entitlements b/Sources/WireGuardApp/UI/iOS/WireGuard.entitlements
similarity index 100%
rename from WireGuard/WireGuard/UI/iOS/WireGuard.entitlements
rename to Sources/WireGuardApp/UI/iOS/WireGuard.entitlements

diff --git a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift b/Sources/WireGuardApp/UI/macOS/AppDelegate.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/AppDelegate.swift
rename to Sources/WireGuardApp/UI/macOS/AppDelegate.swift

diff --git a/WireGuard/WireGuard/UI/macOS/Application.swift b/Sources/WireGuardApp/UI/macOS/Application.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Application.swift
rename to Sources/WireGuardApp/UI/macOS/Application.swift

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon128.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon128.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon128.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon128.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon16.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon16.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon16.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon16.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256-1.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256-1.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256-1.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256-1.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon256.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32-1.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32-1.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32-1.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32-1.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon32.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512-1.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512-1.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512-1.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512-1.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon512.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon64.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon64.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon64.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/AppIcon.appiconset/WireGuardMacAppIcon64.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/Contents.json b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/Contents.json
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/Contents.json

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/Contents.json b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/Contents.json
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/Contents.json

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@1x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@1x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@1x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@2x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@2x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@2x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@3x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@3x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIcon.imageset/StatusBarIcon@3x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/Contents.json b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/Contents.json
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/Contents.json

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@1x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@1x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@1x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@2x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@2x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@2x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@3x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@3x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDimmed.imageset/StatusBarIconDimmed@3x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/Contents.json b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/Contents.json
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/Contents.json

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@1x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@1x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@1x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@2x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@2x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@2x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@3x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@3x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot1.imageset/StatusBarIconDot1@3x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/Contents.json b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/Contents.json
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/Contents.json

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@1x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@1x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@1x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@2x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@2x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@2x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@3x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@3x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot2.imageset/StatusBarIconDot2@3x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/Contents.json b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/Contents.json
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/Contents.json
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/Contents.json

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@1x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@1x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@1x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@1x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@2x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@2x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@2x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@2x.png

diff --git a/WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@3x.png b/Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@3x.png
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@3x.png
rename to Sources/WireGuardApp/UI/macOS/Assets.xcassets/StatusBarIconDot3.imageset/StatusBarIconDot3@3x.png

diff --git a/WireGuard/WireGuard/UI/macOS/ErrorPresenter.swift b/Sources/WireGuardApp/UI/macOS/ErrorPresenter.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ErrorPresenter.swift
rename to Sources/WireGuardApp/UI/macOS/ErrorPresenter.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ImportPanelPresenter.swift b/Sources/WireGuardApp/UI/macOS/ImportPanelPresenter.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ImportPanelPresenter.swift
rename to Sources/WireGuardApp/UI/macOS/ImportPanelPresenter.swift

diff --git a/WireGuard/WireGuard/UI/macOS/Info.plist b/Sources/WireGuardApp/UI/macOS/Info.plist
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/Info.plist
rename to Sources/WireGuardApp/UI/macOS/Info.plist

diff --git a/WireGuard/WireGuard/UI/macOS/LaunchedAtLoginDetector.swift b/Sources/WireGuardApp/UI/macOS/LaunchedAtLoginDetector.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/LaunchedAtLoginDetector.swift
rename to Sources/WireGuardApp/UI/macOS/LaunchedAtLoginDetector.swift

diff --git a/WireGuard/WireGuard/UI/macOS/LoginItemHelper/Info.plist b/Sources/WireGuardApp/UI/macOS/LoginItemHelper/Info.plist
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/LoginItemHelper/Info.plist
rename to Sources/WireGuardApp/UI/macOS/LoginItemHelper/Info.plist

diff --git a/WireGuard/WireGuard/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements b/Sources/WireGuardApp/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements
rename to Sources/WireGuardApp/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements

diff --git a/WireGuard/WireGuard/UI/macOS/LoginItemHelper/main.m b/Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/LoginItemHelper/main.m
rename to Sources/WireGuardApp/UI/macOS/LoginItemHelper/main.m

diff --git a/WireGuard/WireGuard/UI/macOS/MacAppStoreUpdateDetector.swift b/Sources/WireGuardApp/UI/macOS/MacAppStoreUpdateDetector.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/MacAppStoreUpdateDetector.swift
rename to Sources/WireGuardApp/UI/macOS/MacAppStoreUpdateDetector.swift

diff --git a/WireGuard/WireGuard/UI/macOS/MainMenu.swift b/Sources/WireGuardApp/UI/macOS/MainMenu.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/MainMenu.swift
rename to Sources/WireGuardApp/UI/macOS/MainMenu.swift

diff --git a/WireGuard/WireGuard/UI/macOS/NSColor+Hex.swift b/Sources/WireGuardApp/UI/macOS/NSColor+Hex.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/NSColor+Hex.swift
rename to Sources/WireGuardApp/UI/macOS/NSColor+Hex.swift

diff --git a/WireGuard/WireGuard/UI/macOS/NSTableView+Reuse.swift b/Sources/WireGuardApp/UI/macOS/NSTableView+Reuse.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/NSTableView+Reuse.swift
rename to Sources/WireGuardApp/UI/macOS/NSTableView+Reuse.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ParseError+WireGuardAppError.swift b/Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ParseError+WireGuardAppError.swift
rename to Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift

diff --git a/WireGuard/WireGuard/UI/macOS/StatusItemController.swift b/Sources/WireGuardApp/UI/macOS/StatusItemController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/StatusItemController.swift
rename to Sources/WireGuardApp/UI/macOS/StatusItemController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift b/Sources/WireGuardApp/UI/macOS/StatusMenu.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/StatusMenu.swift
rename to Sources/WireGuardApp/UI/macOS/StatusMenu.swift

diff --git a/WireGuard/WireGuard/UI/macOS/TunnelsTracker.swift b/Sources/WireGuardApp/UI/macOS/TunnelsTracker.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/TunnelsTracker.swift
rename to Sources/WireGuardApp/UI/macOS/TunnelsTracker.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/ButtonRow.swift b/Sources/WireGuardApp/UI/macOS/View/ButtonRow.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/ButtonRow.swift
rename to Sources/WireGuardApp/UI/macOS/View/ButtonRow.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextColorTheme.swift b/Sources/WireGuardApp/UI/macOS/View/ConfTextColorTheme.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/ConfTextColorTheme.swift
rename to Sources/WireGuardApp/UI/macOS/View/ConfTextColorTheme.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift b/Sources/WireGuardApp/UI/macOS/View/ConfTextStorage.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
rename to Sources/WireGuardApp/UI/macOS/View/ConfTextStorage.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextView.swift b/Sources/WireGuardApp/UI/macOS/View/ConfTextView.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/ConfTextView.swift
rename to Sources/WireGuardApp/UI/macOS/View/ConfTextView.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/DeleteTunnelsConfirmationAlert.swift b/Sources/WireGuardApp/UI/macOS/View/DeleteTunnelsConfirmationAlert.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/DeleteTunnelsConfirmationAlert.swift
rename to Sources/WireGuardApp/UI/macOS/View/DeleteTunnelsConfirmationAlert.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/KeyValueRow.swift b/Sources/WireGuardApp/UI/macOS/View/KeyValueRow.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/KeyValueRow.swift
rename to Sources/WireGuardApp/UI/macOS/View/KeyValueRow.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/LogViewCell.swift b/Sources/WireGuardApp/UI/macOS/View/LogViewCell.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/LogViewCell.swift
rename to Sources/WireGuardApp/UI/macOS/View/LogViewCell.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/OnDemandWiFiControls.swift b/Sources/WireGuardApp/UI/macOS/View/OnDemandWiFiControls.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/OnDemandWiFiControls.swift
rename to Sources/WireGuardApp/UI/macOS/View/OnDemandWiFiControls.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/TunnelListRow.swift b/Sources/WireGuardApp/UI/macOS/View/TunnelListRow.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/TunnelListRow.swift
rename to Sources/WireGuardApp/UI/macOS/View/TunnelListRow.swift

diff --git a/WireGuard/WireGuard/UI/macOS/View/highlighter.c b/Sources/WireGuardApp/UI/macOS/View/highlighter.c
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/highlighter.c
rename to Sources/WireGuardApp/UI/macOS/View/highlighter.c

diff --git a/WireGuard/WireGuard/UI/macOS/View/highlighter.h b/Sources/WireGuardApp/UI/macOS/View/highlighter.h
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/View/highlighter.h
rename to Sources/WireGuardApp/UI/macOS/View/highlighter.h

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/ButtonedDetailViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/ButtonedDetailViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ViewController/ButtonedDetailViewController.swift
rename to Sources/WireGuardApp/UI/macOS/ViewController/ButtonedDetailViewController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/LogViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/LogViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ViewController/LogViewController.swift
rename to Sources/WireGuardApp/UI/macOS/ViewController/LogViewController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/ManageTunnelsRootViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ViewController/ManageTunnelsRootViewController.swift
rename to Sources/WireGuardApp/UI/macOS/ViewController/ManageTunnelsRootViewController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ViewController/TunnelDetailTableViewController.swift
rename to Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelEditViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift
rename to Sources/WireGuardApp/UI/macOS/ViewController/TunnelEditViewController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelsListTableViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelsListTableViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ViewController/TunnelsListTableViewController.swift
rename to Sources/WireGuardApp/UI/macOS/ViewController/TunnelsListTableViewController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/UnusableTunnelDetailViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/UnusableTunnelDetailViewController.swift
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/ViewController/UnusableTunnelDetailViewController.swift
rename to Sources/WireGuardApp/UI/macOS/ViewController/UnusableTunnelDetailViewController.swift

diff --git a/WireGuard/WireGuard/UI/macOS/WireGuard.entitlements b/Sources/WireGuardApp/UI/macOS/WireGuard.entitlements
similarity index 100%
rename from WireGuard/WireGuard/UI/macOS/WireGuard.entitlements
rename to Sources/WireGuardApp/UI/macOS/WireGuard.entitlements

diff --git a/WireGuard/WireGuard/WireGuard-Bridging-Header.h b/Sources/WireGuardApp/WireGuard-Bridging-Header.h
similarity index 100%
rename from WireGuard/WireGuard/WireGuard-Bridging-Header.h
rename to Sources/WireGuardApp/WireGuard-Bridging-Header.h

diff --git a/WireGuard/WireGuard/WireGuardAppError.swift b/Sources/WireGuardApp/WireGuardAppError.swift
similarity index 100%
rename from WireGuard/WireGuard/WireGuardAppError.swift
rename to Sources/WireGuardApp/WireGuardAppError.swift

diff --git a/WireGuard/WireGuard/WireGuardResult.swift b/Sources/WireGuardApp/WireGuardResult.swift
similarity index 100%
rename from WireGuard/WireGuard/WireGuardResult.swift
rename to Sources/WireGuardApp/WireGuardResult.swift

diff --git a/WireGuard/WireGuard/ZipArchive/3rdparty/minizip/MiniZip64_info.txt b/Sources/WireGuardApp/ZipArchive/3rdparty/minizip/MiniZip64_info.txt
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/3rdparty/minizip/MiniZip64_info.txt
rename to Sources/WireGuardApp/ZipArchive/3rdparty/minizip/MiniZip64_info.txt

diff --git a/WireGuard/WireGuard/ZipArchive/3rdparty/minizip/ioapi.c b/Sources/WireGuardApp/ZipArchive/3rdparty/minizip/ioapi.c
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/3rdparty/minizip/ioapi.c
rename to Sources/WireGuardApp/ZipArchive/3rdparty/minizip/ioapi.c

diff --git a/WireGuard/WireGuard/ZipArchive/3rdparty/minizip/ioapi.h b/Sources/WireGuardApp/ZipArchive/3rdparty/minizip/ioapi.h
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/3rdparty/minizip/ioapi.h
rename to Sources/WireGuardApp/ZipArchive/3rdparty/minizip/ioapi.h

diff --git a/WireGuard/WireGuard/ZipArchive/3rdparty/minizip/unzip.c b/Sources/WireGuardApp/ZipArchive/3rdparty/minizip/unzip.c
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/3rdparty/minizip/unzip.c
rename to Sources/WireGuardApp/ZipArchive/3rdparty/minizip/unzip.c

diff --git a/WireGuard/WireGuard/ZipArchive/3rdparty/minizip/unzip.h b/Sources/WireGuardApp/ZipArchive/3rdparty/minizip/unzip.h
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/3rdparty/minizip/unzip.h
rename to Sources/WireGuardApp/ZipArchive/3rdparty/minizip/unzip.h

diff --git a/WireGuard/WireGuard/ZipArchive/3rdparty/minizip/zip.c b/Sources/WireGuardApp/ZipArchive/3rdparty/minizip/zip.c
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/3rdparty/minizip/zip.c
rename to Sources/WireGuardApp/ZipArchive/3rdparty/minizip/zip.c

diff --git a/WireGuard/WireGuard/ZipArchive/3rdparty/minizip/zip.h b/Sources/WireGuardApp/ZipArchive/3rdparty/minizip/zip.h
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/3rdparty/minizip/zip.h
rename to Sources/WireGuardApp/ZipArchive/3rdparty/minizip/zip.h

diff --git a/WireGuard/WireGuard/ZipArchive/ZipArchive.swift b/Sources/WireGuardApp/ZipArchive/ZipArchive.swift
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/ZipArchive.swift
rename to Sources/WireGuardApp/ZipArchive/ZipArchive.swift

diff --git a/WireGuard/WireGuard/ZipArchive/ZipExporter.swift b/Sources/WireGuardApp/ZipArchive/ZipExporter.swift
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/ZipExporter.swift
rename to Sources/WireGuardApp/ZipArchive/ZipExporter.swift

diff --git a/WireGuard/WireGuard/ZipArchive/ZipImporter.swift b/Sources/WireGuardApp/ZipArchive/ZipImporter.swift
similarity index 100%
rename from WireGuard/WireGuard/ZipArchive/ZipImporter.swift
rename to Sources/WireGuardApp/ZipArchive/ZipImporter.swift

diff --git a/WireGuard/WireGuard/de.lproj/Localizable.strings b/Sources/WireGuardApp/de.lproj/Localizable.strings
similarity index 100%
rename from WireGuard/WireGuard/de.lproj/Localizable.strings
rename to Sources/WireGuardApp/de.lproj/Localizable.strings

diff --git a/WireGuard/WireGuard/it.lproj/Localizable.strings b/Sources/WireGuardApp/it.lproj/Localizable.strings
similarity index 100%
rename from WireGuard/WireGuard/it.lproj/Localizable.strings
rename to Sources/WireGuardApp/it.lproj/Localizable.strings

diff --git a/WireGuard/WireGuard/ja.lproj/Localizable.strings b/Sources/WireGuardApp/ja.lproj/Localizable.strings
similarity index 100%
rename from WireGuard/WireGuard/ja.lproj/Localizable.strings
rename to Sources/WireGuardApp/ja.lproj/Localizable.strings

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/include/WireGuardKitCTarget.h b/Sources/WireGuardKitC/include/WireGuardKitCTarget.h
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKitCTarget/include/WireGuardKitCTarget.h
rename to Sources/WireGuardKitC/include/WireGuardKitCTarget.h

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/key.c b/Sources/WireGuardKitC/key.c
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKitCTarget/key.c
rename to Sources/WireGuardKitC/key.c

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/key.h b/Sources/WireGuardKitC/key.h
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKitCTarget/key.h
rename to Sources/WireGuardKitC/key.h

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap b/Sources/WireGuardKitC/module.modulemap
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap
rename to Sources/WireGuardKitC/module.modulemap

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/x25519.c b/Sources/WireGuardKitC/x25519.c
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKitCTarget/x25519.c
rename to Sources/WireGuardKitC/x25519.c

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/x25519.h b/Sources/WireGuardKitC/x25519.h
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKitCTarget/x25519.h
rename to Sources/WireGuardKitC/x25519.h

diff --git a/wireguard-go-bridge/.gitignore b/Sources/WireGuardKitGo/.gitignore
similarity index 100%
rename from wireguard-go-bridge/.gitignore
rename to Sources/WireGuardKitGo/.gitignore

diff --git a/wireguard-go-bridge/Makefile b/Sources/WireGuardKitGo/Makefile
similarity index 100%
rename from wireguard-go-bridge/Makefile
rename to Sources/WireGuardKitGo/Makefile

diff --git a/wireguard-go-bridge/api-ios.go b/Sources/WireGuardKitGo/api-ios.go
similarity index 100%
rename from wireguard-go-bridge/api-ios.go
rename to Sources/WireGuardKitGo/api-ios.go

diff --git a/WireGuardKit/Sources/libwg-go/dummy.c b/Sources/WireGuardKitGo/dummy.c
similarity index 100%
rename from WireGuardKit/Sources/libwg-go/dummy.c
rename to Sources/WireGuardKitGo/dummy.c

diff --git a/wireguard-go-bridge/go.mod b/Sources/WireGuardKitGo/go.mod
similarity index 100%
rename from wireguard-go-bridge/go.mod
rename to Sources/WireGuardKitGo/go.mod

diff --git a/wireguard-go-bridge/go.sum b/Sources/WireGuardKitGo/go.sum
similarity index 100%
rename from wireguard-go-bridge/go.sum
rename to Sources/WireGuardKitGo/go.sum

diff --git a/wireguard-go-bridge/goruntime-boottime-over-monotonic.diff b/Sources/WireGuardKitGo/goruntime-boottime-over-monotonic.diff
similarity index 100%
rename from wireguard-go-bridge/goruntime-boottime-over-monotonic.diff
rename to Sources/WireGuardKitGo/goruntime-boottime-over-monotonic.diff

diff --git a/Sources/WireGuardKitGo/module.modulemap b/Sources/WireGuardKitGo/module.modulemap
new file mode 100644 (file)
index 0000000..2ca3916
--- /dev/null
+++ b/Sources/WireGuardKitGo/module.modulemap
@@ -0,0 +1,5 @@
+module WireGuardKitGo {
+    umbrella header "wireguard.h"
+    link "wg-go"
+    export *
+}

diff --git a/wireguard-go-bridge/wireguard.h b/Sources/WireGuardKitGo/wireguard.h
similarity index 100%
rename from wireguard-go-bridge/wireguard.h
rename to Sources/WireGuardKitGo/wireguard.h

diff --git a/WireGuardKit/Sources/WireGuardKit/Array+ConcurrentMap.swift b/Sources/WireGuardKitSwift/Array+ConcurrentMap.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/Array+ConcurrentMap.swift
rename to Sources/WireGuardKitSwift/Array+ConcurrentMap.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/DNSResolver.swift b/Sources/WireGuardKitSwift/DNSResolver.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/DNSResolver.swift
rename to Sources/WireGuardKitSwift/DNSResolver.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/DNSServer.swift b/Sources/WireGuardKitSwift/DNSServer.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/DNSServer.swift
rename to Sources/WireGuardKitSwift/DNSServer.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/Endpoint.swift b/Sources/WireGuardKitSwift/Endpoint.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/Endpoint.swift
rename to Sources/WireGuardKitSwift/Endpoint.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/IPAddress+AddrInfo.swift b/Sources/WireGuardKitSwift/IPAddress+AddrInfo.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/IPAddress+AddrInfo.swift
rename to Sources/WireGuardKitSwift/IPAddress+AddrInfo.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/IPAddressRange.swift b/Sources/WireGuardKitSwift/IPAddressRange.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/IPAddressRange.swift
rename to Sources/WireGuardKitSwift/IPAddressRange.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/InterfaceConfiguration.swift b/Sources/WireGuardKitSwift/InterfaceConfiguration.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/InterfaceConfiguration.swift
rename to Sources/WireGuardKitSwift/InterfaceConfiguration.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift b/Sources/WireGuardKitSwift/PacketTunnelSettingsGenerator.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
rename to Sources/WireGuardKitSwift/PacketTunnelSettingsGenerator.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/PeerConfiguration.swift b/Sources/WireGuardKitSwift/PeerConfiguration.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/PeerConfiguration.swift
rename to Sources/WireGuardKitSwift/PeerConfiguration.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/PrivateKey.swift b/Sources/WireGuardKitSwift/PrivateKey.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/PrivateKey.swift
rename to Sources/WireGuardKitSwift/PrivateKey.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/TunnelConfiguration.swift b/Sources/WireGuardKitSwift/TunnelConfiguration.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/TunnelConfiguration.swift
rename to Sources/WireGuardKitSwift/TunnelConfiguration.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift b/Sources/WireGuardKitSwift/WireGuardAdapter.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/WireGuardAdapter.swift
rename to Sources/WireGuardKitSwift/WireGuardAdapter.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift b/Sources/WireGuardKitSwift/WireGuardKit.swift
similarity index 100%
rename from WireGuardKit/Sources/WireGuardKit/WireGuardKit.swift
rename to Sources/WireGuardKitSwift/WireGuardKit.swift

diff --git a/WireGuard/WireGuardNetworkExtension/ErrorNotifier.swift b/Sources/WireGuardNetworkExtension/ErrorNotifier.swift
similarity index 100%
rename from WireGuard/WireGuardNetworkExtension/ErrorNotifier.swift
rename to Sources/WireGuardNetworkExtension/ErrorNotifier.swift

diff --git a/WireGuard/WireGuardNetworkExtension/Info.plist b/Sources/WireGuardNetworkExtension/Info.plist
similarity index 100%
rename from WireGuard/WireGuardNetworkExtension/Info.plist
rename to Sources/WireGuardNetworkExtension/Info.plist

diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/Sources/WireGuardNetworkExtension/PacketTunnelProvider.swift
similarity index 100%
rename from WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
rename to Sources/WireGuardNetworkExtension/PacketTunnelProvider.swift

diff --git a/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h b/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h
similarity index 100%
rename from WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h
rename to Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h

diff --git a/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements b/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements
similarity index 100%
rename from WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements
rename to Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements

diff --git a/WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements b/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements
similarity index 100%
rename from WireGuard/WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements
rename to Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements

diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard.xcodeproj/project.pbxproj
similarity index 96%
rename from WireGuard/WireGuard.xcodeproj/project.pbxproj
rename to WireGuard.xcodeproj/project.pbxproj
index 107c2a6587487466730c23a45ab9af7031452bd2..97bea2e3523c8688b2ac004eb8f7cf1aa6f02c38 100644 (file)
--- a/WireGuard/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard.xcodeproj/project.pbxproj
@@ -260,7 +260,7 @@
                6F0F44C8222D55BB00B0FF04 /* TextCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextCell.swift; sourceTree = "<group>"; };
                6F0F44CA222D55FD00B0FF04 /* EditableTextCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableTextCell.swift; sourceTree = "<group>"; };
                6F1075632258AE9800D78929 /* DeleteTunnelsConfirmationAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteTunnelsConfirmationAlert.swift; sourceTree = "<group>"; };
-               6F16F46F243DB55600AA141B /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = WireGuard/ja.lproj/Localizable.strings; sourceTree = "<group>"; };
+               6F16F46F243DB55600AA141B /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = Sources/WireGuardApp/ja.lproj/Localizable.strings; sourceTree = "<group>"; };
                6F19D30322402B8700A126F2 /* ConfirmationAlertPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmationAlertPresenter.swift; sourceTree = "<group>"; };
                6F2449E7226587B80047B9E9 /* MacAppStoreUpdateDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacAppStoreUpdateDetector.swift; sourceTree = "<group>"; };
                6F29A9422278518D00DC6A6B /* RecentTunnelsTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentTunnelsTracker.swift; sourceTree = "<group>"; };
@@ -282,7 +282,7 @@
                6F628C40217F47DB003482A3 /* TunnelDetailTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelDetailTableViewController.swift; sourceTree = "<group>"; };
                6F6483E6229293300075BA15 /* LaunchedAtLoginDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchedAtLoginDetector.swift; sourceTree = "<group>"; };
                6F689999218043390012E523 /* WireGuard-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WireGuard-Bridging-Header.h"; sourceTree = "<group>"; };
-               6F70E20D221058DF008BDFB4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = WireGuard/Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+               6F70E20D221058DF008BDFB4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Sources/WireGuardApp/Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                6F70E22922106A2D008BDFB4 /* WireGuardLoginItemHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WireGuardLoginItemHelper.app; sourceTree = BUILT_PRODUCTS_DIR; };
                6F70E23222106A31008BDFB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                6F70E23922109BEF008BDFB4 /* LoginItemHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LoginItemHelper.entitlements; sourceTree = "<group>"; };
@@ -297,8 +297,8 @@
                6F8F0D7022258153000E8335 /* ActivateOnDemandViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivateOnDemandViewModel.swift; sourceTree = "<group>"; };
                6F8F0D7322267AD2000E8335 /* ChevronCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChevronCell.swift; sourceTree = "<group>"; };
                6F8F0D7622267C57000E8335 /* SSIDOptionEditTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SSIDOptionEditTableViewController.swift; sourceTree = "<group>"; };
-               6F8F9C692441DBEF00BF8B8F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = WireGuard/it.lproj/Localizable.strings; sourceTree = "<group>"; };
-               6F8F9C6A2441DD0300BF8B8F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = WireGuard/de.lproj/Localizable.strings; sourceTree = "<group>"; };
+               6F8F9C692441DBEF00BF8B8F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = Sources/WireGuardApp/it.lproj/Localizable.strings; sourceTree = "<group>"; };
+               6F8F9C6A2441DD0300BF8B8F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = Sources/WireGuardApp/de.lproj/Localizable.strings; sourceTree = "<group>"; };
                6F907C9B224663A2003CED21 /* LogViewHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogViewHelper.swift; sourceTree = "<group>"; };
                6F919EC2218A2AE90023B400 /* ErrorPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorPresenter.swift; sourceTree = "<group>"; };
                6F919ED5218C65C50023B400 /* wireguard_doc_logo_22x29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wireguard_doc_logo_22x29.png; sourceTree = "<group>"; };
@@ -339,7 +339,7 @@
                6FDEF7FF21863C0100D8FBF6 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
                6FDEF801218646B900D8FBF6 /* ZipArchive.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZipArchive.swift; sourceTree = "<group>"; };
                6FDEF805218725D200D8FBF6 /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsTableViewController.swift; sourceTree = "<group>"; };
-               6FE1765521C90BBE002690EA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = WireGuard/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
+               6FE1765521C90BBE002690EA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Sources/WireGuardApp/Base.lproj/Localizable.strings; sourceTree = "<group>"; };
                6FE1765921C90E87002690EA /* LocalizationHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationHelper.swift; sourceTree = "<group>"; };
                6FE254FA219C10800028284D /* ZipImporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZipImporter.swift; sourceTree = "<group>"; };
                6FE254FE219C60290028284D /* ZipExporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZipExporter.swift; sourceTree = "<group>"; };
@@ -451,7 +451,7 @@
                        path = View;
                        sourceTree = "<group>";
                };
-               6F5D0C1B218352EF000F85AD /* WireGuardNetworkExtension */ = {
+               6F5D0C1B218352EF000F85AD /* Sources/WireGuardNetworkExtension */ = {
                        isa = PBXGroup;
                        children = (
                                6F5D0C1E218352EF000F85AD /* Info.plist */,
@@ -461,10 +461,10 @@
                                6FFA5D9F21958ECC0001E2F7 /* ErrorNotifier.swift */,
                                5892BF9F25558288000E678D /* PacketTunnelProvider.swift */,
                        );
-                       path = WireGuardNetworkExtension;
+                       path = Sources/WireGuardNetworkExtension;
                        sourceTree = "<group>";
                };
-               6F5D0C432183B4A4000F85AD /* Shared */ = {
+               6F5D0C432183B4A4000F85AD /* Sources/Shared */ = {
                        isa = PBXGroup;
                        children = (
                                6FF3526A21C23F720008484E /* Logging */,
@@ -472,7 +472,7 @@
                                6F5A2B4421AFDE020081EDD8 /* FileManager+Extension.swift */,
                                6B5C5E26220A48D30024272E /* Keychain.swift */,
                        );
-                       path = Shared;
+                       path = Sources/Shared;
                        sourceTree = "<group>";
                };
                6F70E22A22106A2D008BDFB4 /* LoginItemHelper */ = {
@@ -648,9 +648,9 @@
                        children = (
                                6F70E20C221058DF008BDFB4 /* InfoPlist.strings */,
                                6FE1765421C90BBE002690EA /* Localizable.strings */,
-                               6F5D0C432183B4A4000F85AD /* Shared */,
-                               6FF4AC16211EC46F002C96EB /* WireGuard */,
-                               6F5D0C1B218352EF000F85AD /* WireGuardNetworkExtension */,
+                               6F5D0C432183B4A4000F85AD /* Sources/Shared */,
+                               6FF4AC16211EC46F002C96EB /* Sources/WireGuardApp */,
+                               6F5D0C1B218352EF000F85AD /* Sources/WireGuardNetworkExtension */,
                                6FF4AC15211EC46F002C96EB /* Products */,
                                6FF4AC452120B9E0002C96EB /* Frameworks */,
                        );
@@ -668,7 +668,7 @@
                        name = Products;
                        sourceTree = "<group>";
                };
-               6FF4AC16211EC46F002C96EB /* WireGuard */ = {
+               6FF4AC16211EC46F002C96EB /* Sources/WireGuardApp */ = {
                        isa = PBXGroup;
                        children = (
                                6F919ED3218C65C50023B400 /* Resources */,
@@ -681,7 +681,7 @@
                                6FF4AC2B211EC776002C96EB /* Config.xcconfig */,
                                6F689999218043390012E523 /* WireGuard-Bridging-Header.h */,
                        );
-                       path = WireGuard;
+                       path = Sources/WireGuardApp;
                        sourceTree = "<group>";
                };
                6FF4AC452120B9E0002C96EB /* Frameworks */ = {
@@ -703,7 +703,7 @@
                        buildPhases = (
                        );
                        buildToolPath = /usr/bin/make;
-                       buildWorkingDirectory = "$BUILD_DIR/../../SourcePackages/checkouts/wireguard-apple/wireguard-go-bridge";
+                       buildWorkingDirectory = $BUILD_DIR/../../SourcePackages/checkouts/Sources/WireGuardGo;
                        dependencies = (
                        );
                        name = WireGuardGoBridgemacOS;
@@ -717,7 +717,7 @@
                        buildPhases = (
                        );
                        buildToolPath = /usr/bin/make;
-                       buildWorkingDirectory = "$BUILD_DIR/../../SourcePackages/checkouts/wireguard-apple/wireguard-go-bridge";
+                       buildWorkingDirectory = $BUILD_DIR/../../SourcePackages/checkouts/Sources/WireGuardGo;
                        dependencies = (
                        );
                        name = WireGuardGoBridgeiOS;
@@ -1317,10 +1317,10 @@
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
                                CLANG_ENABLE_MODULES = YES;
-                               CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements;
                                CODE_SIGN_IDENTITY = "iPhone Developer";
                                ENABLE_BITCODE = NO;
-                               INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
@@ -1329,7 +1329,7 @@
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
                                PRODUCT_NAME = WireGuardNetworkExtension;
                                SKIP_INSTALL = YES;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
+                               SWIFT_OBJC_BRIDGING_HEADER = "Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
                                SWIFT_VERSION = 5.0;
                        };
                        name = Debug;
@@ -1339,10 +1339,10 @@
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
                                CLANG_ENABLE_MODULES = YES;
-                               CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_iOS.entitlements;
                                CODE_SIGN_IDENTITY = "iPhone Developer";
                                ENABLE_BITCODE = NO;
-                               INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
@@ -1351,7 +1351,7 @@
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_IOS).network-extension";
                                PRODUCT_NAME = WireGuardNetworkExtension;
                                SKIP_INSTALL = YES;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
+                               SWIFT_OBJC_BRIDGING_HEADER = "Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
                                SWIFT_VERSION = 5.0;
                        };
                        name = Release;
@@ -1359,9 +1359,9 @@
                6F70E23422106A31008BDFB4 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CODE_SIGN_ENTITLEMENTS = WireGuard/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardApp/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               INFOPLIST_FILE = WireGuard/UI/macOS/LoginItemHelper/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardApp/UI/macOS/LoginItemHelper/Info.plist;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS).login-item-helper";
                                PRODUCT_NAME = WireGuardLoginItemHelper;
                                SDKROOT = macosx;
@@ -1372,9 +1372,9 @@
                6F70E23522106A31008BDFB4 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CODE_SIGN_ENTITLEMENTS = WireGuard/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardApp/UI/macOS/LoginItemHelper/LoginItemHelper.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               INFOPLIST_FILE = WireGuard/UI/macOS/LoginItemHelper/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardApp/UI/macOS/LoginItemHelper/Info.plist;
                                PRODUCT_BUNDLE_IDENTIFIER = "$(APP_ID_MACOS).login-item-helper";
                                PRODUCT_NAME = WireGuardLoginItemHelper;
                                SDKROOT = macosx;
@@ -1386,10 +1386,10 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CODE_SIGN_ENTITLEMENTS = WireGuard/UI/macOS/WireGuard.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardApp/UI/macOS/WireGuard.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
                                COMBINE_HIDPI_IMAGES = YES;
-                               INFOPLIST_FILE = WireGuard/UI/macOS/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardApp/UI/macOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
@@ -1406,10 +1406,10 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CODE_SIGN_ENTITLEMENTS = WireGuard/UI/macOS/WireGuard.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardApp/UI/macOS/WireGuard.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
                                COMBINE_HIDPI_IMAGES = YES;
-                               INFOPLIST_FILE = WireGuard/UI/macOS/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardApp/UI/macOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
@@ -1426,9 +1426,9 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
-                               CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
@@ -1439,7 +1439,7 @@
                                PRODUCT_NAME = WireGuardNetworkExtension;
                                SDKROOT = macosx;
                                SKIP_INSTALL = YES;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
+                               SWIFT_OBJC_BRIDGING_HEADER = "Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
                                SWIFT_VERSION = 5.0;
                        };
                        name = Debug;
@@ -1448,9 +1448,9 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
-                               CODE_SIGN_ENTITLEMENTS = WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardNetworkExtension/WireGuardNetworkExtension_macOS.entitlements;
                                CODE_SIGN_IDENTITY = "Mac Developer";
-                               INFOPLIST_FILE = WireGuardNetworkExtension/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardNetworkExtension/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
@@ -1461,7 +1461,7 @@
                                PRODUCT_NAME = WireGuardNetworkExtension;
                                SDKROOT = macosx;
                                SKIP_INSTALL = YES;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
+                               SWIFT_OBJC_BRIDGING_HEADER = "Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h";
                                SWIFT_VERSION = 5.0;
                        };
                        name = Release;
@@ -1560,7 +1560,7 @@
                                ONLY_ACTIVE_ARCH = YES;
                                SDKROOT = iphoneos;
                                SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
+                               SWIFT_OBJC_BRIDGING_HEADER = "Sources/WireGuardApp/WireGuard-Bridging-Header.h";
                                SWIFT_OPTIMIZATION_LEVEL = "-Onone";
                                SWIFT_VERSION = 4.2;
                                TARGETED_DEVICE_FAMILY = "1,2";
@@ -1622,7 +1622,7 @@
                                MTL_FAST_MATH = YES;
                                SDKROOT = iphoneos;
                                SWIFT_COMPILATION_MODE = wholemodule;
-                               SWIFT_OBJC_BRIDGING_HEADER = "WireGuard/WireGuard-Bridging-Header.h";
+                               SWIFT_OBJC_BRIDGING_HEADER = "Sources/WireGuardApp/WireGuard-Bridging-Header.h";
                                SWIFT_OPTIMIZATION_LEVEL = "-O";
                                SWIFT_VERSION = 4.2;
                                TARGETED_DEVICE_FAMILY = "1,2";
@@ -1634,9 +1634,9 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CODE_SIGN_ENTITLEMENTS = WireGuard/UI/iOS/WireGuard.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardApp/UI/iOS/WireGuard.entitlements;
                                CODE_SIGN_IDENTITY = "iPhone Developer";
-                               INFOPLIST_FILE = WireGuard/UI/iOS/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardApp/UI/iOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
@@ -1651,9 +1651,9 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               CODE_SIGN_ENTITLEMENTS = WireGuard/UI/iOS/WireGuard.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = Sources/WireGuardApp/UI/iOS/WireGuard.entitlements;
                                CODE_SIGN_IDENTITY = "iPhone Developer";
-                               INFOPLIST_FILE = WireGuard/UI/iOS/Info.plist;
+                               INFOPLIST_FILE = Sources/WireGuardApp/UI/iOS/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/Frameworks",

diff --git a/WireGuard/WireGuard.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/WireGuard.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from WireGuard/WireGuard.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to WireGuard.xcodeproj/project.xcworkspace/contents.xcworkspacedata

diff --git a/WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to WireGuard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
similarity index 100%
rename from WireGuard/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
rename to WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

diff --git a/WireGuard/WireGuard.xcodeproj/xcshareddata/IDETemplateMacros.plist b/WireGuard.xcodeproj/xcshareddata/IDETemplateMacros.plist
similarity index 100%
rename from WireGuard/WireGuard.xcodeproj/xcshareddata/IDETemplateMacros.plist
rename to WireGuard.xcodeproj/xcshareddata/IDETemplateMacros.plist

diff --git a/WireGuardKit/Sources/libwg-go/include/libwg_go.h b/WireGuardKit/Sources/libwg-go/include/libwg_go.h
deleted file mode 100644 (file)
index 55cc00d..0000000
--- a/WireGuardKit/Sources/libwg-go/include/libwg_go.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../../wireguard-go-bridge/wireguard.h"

diff --git a/WireGuardKit/Sources/libwg-go/module.modulemap b/WireGuardKit/Sources/libwg-go/module.modulemap
deleted file mode 100644 (file)
index 9c50624..0000000
--- a/WireGuardKit/Sources/libwg-go/module.modulemap
+++ /dev/null
@@ -1,5 +0,0 @@
-module libwg_go {
-    umbrella header "include/libwg_go.h"
-    link "wg-go"
-    export *
-}