From 2790a2aac2684572ba0727b68be2c307cd43a50f Mon Sep 17 00:00:00 2001
From: Davide <keeshux@gmail.com>
Date: Sun, 3 Nov 2024 13:16:13 +0100
Subject: [PATCH] Merge AppLibrary into CommonLibrary (#806)

CommonLibrary barely used as standalone, almost always together with
AppLibrary.
---
 .../xcschemes/AppLibraryTests.xcscheme        |  53 ------
 ...ITests.xcscheme => CommonLibrary.xcscheme} |  37 ++--
 .../xcschemes/Library-Package.xcscheme        | 169 ++++++++++++++++++
 ...AppLibrary.xcscheme => UILibrary.xcscheme} |  12 +-
 Passepartout/Library/Package.resolved         |   2 +-
 Passepartout/Library/Package.swift            |  34 ++--
 .../CDProfileRepositoryV3.swift               |   2 +-
 .../AppUIMain/Business/ProfileImporter.swift  |   2 +-
 .../AppUIMain/Domain/Issue+Metadata.swift     |   1 -
 .../Sources/AppUIMain/Domain/Issue.swift      |   2 -
 .../ProfileManager+Extensions.swift           |   2 +-
 .../Views/About/AboutRouterView.swift         |   1 -
 .../AppUIMain/Views/About/AboutView.swift     |   1 -
 .../AppUIMain/Views/App/AddProfileMenu.swift  |   2 +-
 .../AppUIMain/Views/App/AppCoordinator.swift  |   1 -
 .../AppUIMain/Views/App/AppToolbar.swift      |   2 +-
 .../Views/App/InstalledProfileView.swift      |   2 +-
 .../AppUIMain/Views/App/ProfileCardView.swift |   2 +-
 .../Views/App/ProfileContainerView.swift      |   2 +-
 .../Views/App/ProfileContextMenu.swift        |   2 +-
 .../Views/App/ProfileDuplicateButton.swift    |   2 +-
 .../AppUIMain/Views/App/ProfileGridView.swift |   2 +-
 .../Views/App/ProfileImporterModifier.swift   |   2 +-
 .../AppUIMain/Views/App/ProfileListView.swift |   2 +-
 .../Views/App/ProfileRemoveButton.swift       |   2 +-
 .../AppUIMain/Views/App/ProfileRowView.swift  |   2 +-
 .../Views/App/ProviderEntitySelector.swift    |   2 +-
 .../Views/App/TunnelRestartButton.swift       |   2 +-
 .../Views/AppMenu/macOS/AppMenu.swift         |   2 +-
 .../Views/AppMenu/macOS/AppMenuImage.swift    |   2 +-
 .../Views/Diagnostics/DebugLogView.swift      |   1 -
 .../Views/Diagnostics/DiagnosticsView.swift   |   1 -
 .../Views/Diagnostics/ReportIssueButton.swift |   2 +-
 .../Views/Modules/OnDemandView.swift          |   2 +-
 .../AppUIMain/Views/Modules/OpenVPNView.swift |   2 +-
 .../Views/Paywall/PaywallModifier.swift       |   2 +-
 .../AppUIMain/Views/Paywall/PaywallView.swift |   2 +-
 .../Views/Profile/ProfileCoordinator.swift    |   2 +-
 .../Views/Profile/StorageSection.swift        |   2 +-
 .../Profile/iOS/ProfileEditView+iOS.swift     |   2 +-
 .../Provider/ProviderContentModifier.swift    |   2 +-
 .../Views/Provider/VPNFiltersView.swift       |   2 +-
 .../Provider/VPNProviderContentModifier.swift |   2 +-
 .../Provider/VPNProviderServerView.swift      |   1 -
 .../iOS/VPNProviderServerView+iOS.swift       |   1 -
 .../Views/Settings/SettingsSectionGroup.swift |   1 -
 .../Views/Settings/SettingsView.swift         |   2 +-
 .../AppUITV/Views/App/AppCoordinator.swift    |   2 +-
 .../Views/Profile/ActiveProfileView.swift     |   2 +-
 .../Views/Profile/ProfileListView.swift       |   2 +-
 .../AppUITV/Views/Profile/ProfileView.swift   |   2 +-
 .../Business/ExtendedTunnel.swift             |   1 -
 .../Business/InMemoryProfileRepository.swift  |   0
 .../Business/NEProfileRepository.swift        |   1 -
 .../Business/ProfileManager.swift             |   0
 .../Business/ProfileProcessor.swift           |   0
 .../Business/ProfileRepository.swift          |   0
 .../IAP/AppFeature.swift                      |   0
 .../IAP/AppFeatureProviding.swift             |   0
 .../IAP/AppProduct+Donations.swift            |   0
 .../IAP/AppProduct+Features.swift             |   0
 .../IAP/AppProduct+Providers.swift            |   0
 .../IAP/AppProduct.swift                      |   1 -
 .../IAP/AppProductHelper.swift                |   0
 .../IAP/AppReceiptReader.swift                |   0
 .../IAP/AppUserLevel.swift                    |   0
 .../IAP/IAPManager.swift                      |   0
 .../IAP/KvittoReceiptReader.swift             |   0
 .../IAP/PaywallReason.swift                   |   0
 .../Mock/MockAppProductHelper.swift           |   0
 .../Mock/MockAppReceiptReader.swift           |   0
 .../UILibrary/Business/AppContext.swift       |   1 -
 .../UILibrary/Business/ProfileEditor.swift    |   1 -
 .../Extensions/View+Environment.swift         |   1 -
 .../Library/Sources/UILibrary/Mock/Mock.swift |   2 +-
 .../Protocols/AppCoordinatorConforming.swift  |   2 +-
 .../TunnelInstallationProviding.swift         |   2 +-
 .../UILibrary/Theme/Theme+Extensions.swift    |   2 +-
 .../Modules/OpenVPNView+Credentials.swift     |   2 +-
 .../Views/UI/ConnectionStatusText.swift       |   2 +-
 .../Views/UI/TunnelToggleButton.swift         |   2 +-
 .../Tests/AppUIMainTests/IssueTests.swift     |   2 +-
 .../AppUIMainTests/ProfileImporterTests.swift |   2 +-
 .../ExtendedTunnelTests.swift                 |   2 +-
 .../IAPManagerTests.swift                     |   2 +-
 .../ProfileManagerTests.swift                 |   2 +-
 .../UILibraryTests/ProfileEditorTests.swift   |   2 +-
 87 files changed, 263 insertions(+), 157 deletions(-)
 delete mode 100644 Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibraryTests.xcscheme
 rename Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/{AppUITests.xcscheme => CommonLibrary.xcscheme} (67%)
 create mode 100644 Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/Library-Package.xcscheme
 rename Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/{AppLibrary.xcscheme => UILibrary.xcscheme} (88%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Business/ExtendedTunnel.swift (99%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Business/InMemoryProfileRepository.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Business/NEProfileRepository.swift (99%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Business/ProfileManager.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Business/ProfileProcessor.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Business/ProfileRepository.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppFeature.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppFeatureProviding.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppProduct+Donations.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppProduct+Features.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppProduct+Providers.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppProduct.swift (98%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppProductHelper.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppReceiptReader.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/AppUserLevel.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/IAPManager.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/KvittoReceiptReader.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/IAP/PaywallReason.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Mock/MockAppProductHelper.swift (100%)
 rename Passepartout/Library/Sources/{AppLibrary => CommonLibrary}/Mock/MockAppReceiptReader.swift (100%)
 rename Passepartout/Library/Tests/{AppLibraryTests => CommonLibraryTests}/ExtendedTunnelTests.swift (98%)
 rename Passepartout/Library/Tests/{AppLibraryTests => CommonLibraryTests}/IAPManagerTests.swift (99%)
 rename Passepartout/Library/Tests/{AppLibraryTests => CommonLibraryTests}/ProfileManagerTests.swift (97%)

diff --git a/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibraryTests.xcscheme b/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibraryTests.xcscheme
deleted file mode 100644
index 1b973eed..00000000
--- a/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibraryTests.xcscheme
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1540"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AppLibraryTests"
-               BuildableName = "AppLibraryTests"
-               BlueprintName = "AppLibraryTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppUITests.xcscheme b/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/CommonLibrary.xcscheme
similarity index 67%
rename from Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppUITests.xcscheme
rename to Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/CommonLibrary.xcscheme
index 0324c794..ccca9aff 100644
--- a/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppUITests.xcscheme
+++ b/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/CommonLibrary.xcscheme
@@ -6,6 +6,22 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
       buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CommonLibrary"
+               BuildableName = "CommonLibrary"
+               BlueprintName = "CommonLibrary"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
@@ -13,18 +29,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AppUITests"
-               BuildableName = "AppUITests"
-               BlueprintName = "AppUITests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -43,6 +47,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CommonLibrary"
+            BuildableName = "CommonLibrary"
+            BlueprintName = "CommonLibrary"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/Library-Package.xcscheme b/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/Library-Package.xcscheme
new file mode 100644
index 00000000..082343e1
--- /dev/null
+++ b/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/Library-Package.xcscheme
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AppUI"
+               BuildableName = "AppUI"
+               BlueprintName = "AppUI"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AppUIMain"
+               BuildableName = "AppUIMain"
+               BlueprintName = "AppUIMain"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AppUITV"
+               BuildableName = "AppUITV"
+               BlueprintName = "AppUITV"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CommonLibrary"
+               BuildableName = "CommonLibrary"
+               BlueprintName = "CommonLibrary"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "TunnelLibrary"
+               BuildableName = "TunnelLibrary"
+               BlueprintName = "TunnelLibrary"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "UILibrary"
+               BuildableName = "UILibrary"
+               BlueprintName = "UILibrary"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AppUIMainTests"
+               BuildableName = "AppUIMainTests"
+               BlueprintName = "AppUIMainTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CommonLibraryTests"
+               BuildableName = "CommonLibraryTests"
+               BlueprintName = "CommonLibraryTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "UILibraryTests"
+               BuildableName = "UILibraryTests"
+               BlueprintName = "UILibraryTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AppUI"
+            BuildableName = "AppUI"
+            BlueprintName = "AppUI"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibrary.xcscheme b/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/UILibrary.xcscheme
similarity index 88%
rename from Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibrary.xcscheme
rename to Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/UILibrary.xcscheme
index 315c2296..7ab6b803 100644
--- a/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/AppLibrary.xcscheme
+++ b/Passepartout/Library/.swiftpm/xcode/xcshareddata/xcschemes/UILibrary.xcscheme
@@ -15,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "AppLibrary"
-               BuildableName = "AppLibrary"
-               BlueprintName = "AppLibrary"
+               BlueprintIdentifier = "UILibrary"
+               BuildableName = "UILibrary"
+               BlueprintName = "UILibrary"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -50,9 +50,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "AppLibrary"
-            BuildableName = "AppLibrary"
-            BlueprintName = "AppLibrary"
+            BlueprintIdentifier = "UILibrary"
+            BuildableName = "UILibrary"
+            BlueprintName = "UILibrary"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>
diff --git a/Passepartout/Library/Package.resolved b/Passepartout/Library/Package.resolved
index 8be5350d..a94953c7 100644
--- a/Passepartout/Library/Package.resolved
+++ b/Passepartout/Library/Package.resolved
@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
       "state" : {
-        "revision" : "e95c7b54dc11e744d9b40a722fccf752436ac0ef"
+        "revision" : "b32b63ab8e09883f965737bb6214dfb81e38283a"
       }
     },
     {
diff --git a/Passepartout/Library/Package.swift b/Passepartout/Library/Package.swift
index 7039f7b5..d9267d22 100644
--- a/Passepartout/Library/Package.swift
+++ b/Passepartout/Library/Package.swift
@@ -13,10 +13,6 @@ let package = Package(
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
-        .library(
-            name: "AppLibrary",
-            targets: ["AppLibrary"]
-        ),
         .library(
             name: "AppUI",
             targets: ["AppUI"]
@@ -29,6 +25,10 @@ let package = Package(
             name: "AppUITV",
             targets: ["AppUITV"]
         ),
+        .library(
+            name: "CommonLibrary",
+            targets: ["CommonLibrary"]
+        ),
         .library(
             name: "TunnelLibrary",
             targets: ["CommonLibrary"]
@@ -61,7 +61,7 @@ let package = Package(
             name: "AppDataProfiles",
             dependencies: [
                 "AppData",
-                "AppLibrary"
+                "CommonLibrary"
             ],
             resources: [
                 .process("Profiles.xcdatamodeld")
@@ -71,20 +71,12 @@ let package = Package(
             name: "AppDataProviders",
             dependencies: [
                 "AppData",
-                "AppLibrary"
+                "CommonLibrary"
             ],
             resources: [
                 .process("Providers.xcdatamodeld")
             ]
         ),
-        .target(
-            name: "AppLibrary",
-            dependencies: [
-                "CommonLibrary",
-                "CommonUtils",
-                "Kvitto"
-            ]
-        ),
         .target(
             name: "AppUI",
             dependencies: [
@@ -116,6 +108,8 @@ let package = Package(
         .target(
             name: "CommonLibrary",
             dependencies: [
+                "CommonUtils",
+                "Kvitto",
                 .product(name: "PassepartoutKit", package: "passepartoutkit-source"),
                 .product(name: "PassepartoutOpenVPNOpenSSL", package: "passepartoutkit-source-openvpn-openssl"),
                 .product(name: "PassepartoutWireGuardGo", package: "passepartoutkit-source-wireguard-go")
@@ -142,21 +136,21 @@ let package = Package(
             dependencies: [
                 "AppDataProfiles",
                 "AppDataProviders",
-                "AppLibrary",
-                "CommonAPI"
+                "CommonAPI",
+                "CommonLibrary"
             ],
             resources: [
                 .process("Resources")
             ]
         ),
-        .testTarget(
-            name: "AppLibraryTests",
-            dependencies: ["AppLibrary"]
-        ),
         .testTarget(
             name: "AppUIMainTests",
             dependencies: ["AppUIMain"]
         ),
+        .testTarget(
+            name: "CommonLibraryTests",
+            dependencies: ["CommonLibrary"]
+        ),
         .testTarget(
             name: "UILibraryTests",
             dependencies: ["UILibrary"]
diff --git a/Passepartout/Library/Sources/AppDataProfiles/CDProfileRepositoryV3.swift b/Passepartout/Library/Sources/AppDataProfiles/CDProfileRepositoryV3.swift
index b960dcc1..1649924d 100644
--- a/Passepartout/Library/Sources/AppDataProfiles/CDProfileRepositoryV3.swift
+++ b/Passepartout/Library/Sources/AppDataProfiles/CDProfileRepositoryV3.swift
@@ -24,8 +24,8 @@
 //
 
 import AppData
-import AppLibrary
 import Combine
+import CommonLibrary
 import CommonUtils
 import CoreData
 import Foundation
diff --git a/Passepartout/Library/Sources/AppUIMain/Business/ProfileImporter.swift b/Passepartout/Library/Sources/AppUIMain/Business/ProfileImporter.swift
index 78f65f96..af10af87 100644
--- a/Passepartout/Library/Sources/AppUIMain/Business/ProfileImporter.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Business/ProfileImporter.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import Foundation
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Domain/Issue+Metadata.swift b/Passepartout/Library/Sources/AppUIMain/Domain/Issue+Metadata.swift
index cf858466..838a7498 100644
--- a/Passepartout/Library/Sources/AppUIMain/Domain/Issue+Metadata.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Domain/Issue+Metadata.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonLibrary
 import Foundation
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Domain/Issue.swift b/Passepartout/Library/Sources/AppUIMain/Domain/Issue.swift
index a4cf5526..ddb33e21 100644
--- a/Passepartout/Library/Sources/AppUIMain/Domain/Issue.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Domain/Issue.swift
@@ -25,7 +25,6 @@
 
 #if os(iOS)
 
-import AppLibrary
 import CommonLibrary
 import Foundation
 import PassepartoutKit
@@ -34,7 +33,6 @@ import UIKit
 #else
 
 import AppKit
-import AppLibrary
 import CommonLibrary
 import Foundation
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Extensions/ProfileManager+Extensions.swift b/Passepartout/Library/Sources/AppUIMain/Extensions/ProfileManager+Extensions.swift
index 65fcbdeb..8fd15a09 100644
--- a/Passepartout/Library/Sources/AppUIMain/Extensions/ProfileManager+Extensions.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Extensions/ProfileManager+Extensions.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import Foundation
 import PassepartoutKit
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/About/AboutRouterView.swift b/Passepartout/Library/Sources/AppUIMain/Views/About/AboutRouterView.swift
index fb16a56e..8f174b80 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/About/AboutRouterView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/About/AboutRouterView.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonLibrary
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/About/AboutView.swift b/Passepartout/Library/Sources/AppUIMain/Views/About/AboutView.swift
index b83d09d3..47d5ef0c 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/About/AboutView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/About/AboutView.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonLibrary
 import CommonUtils
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/AddProfileMenu.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/AddProfileMenu.swift
index 85d0d02c..aef00aba 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/AddProfileMenu.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/AddProfileMenu.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
index bc2389ae..ff063cf5 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonLibrary
 import CommonUtils
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/AppToolbar.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/AppToolbar.swift
index dbff5a42..eaa30fc8 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/AppToolbar.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/AppToolbar.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/InstalledProfileView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/InstalledProfileView.swift
index bd34730e..5cd648cb 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/InstalledProfileView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/InstalledProfileView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift
index 2af0d212..434508fe 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContainerView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContainerView.swift
index bb75cf53..fc9ea079 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContainerView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContainerView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift
index af6f3fe0..bdfb1c9f 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileContextMenu.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileDuplicateButton.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileDuplicateButton.swift
index cbfd072d..80025238 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileDuplicateButton.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileDuplicateButton.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileGridView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileGridView.swift
index 62957a9a..9d0da23f 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileGridView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileGridView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileImporterModifier.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileImporterModifier.swift
index bfd4c8a7..63db66dc 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileImporterModifier.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileImporterModifier.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileListView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileListView.swift
index c57beaf1..1cb8c62f 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileListView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileListView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRemoveButton.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRemoveButton.swift
index 44075c08..0924e40c 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRemoveButton.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRemoveButton.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRowView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRowView.swift
index ff82bd75..65a35420 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRowView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRowView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProviderEntitySelector.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProviderEntitySelector.swift
index aea5b94d..fd971681 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/ProviderEntitySelector.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/ProviderEntitySelector.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/TunnelRestartButton.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/TunnelRestartButton.swift
index c42f8ad6..bfa5477a 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/TunnelRestartButton.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/TunnelRestartButton.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift b/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift
index 3e662d7b..6fea7d30 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenu.swift
@@ -25,8 +25,8 @@
 
 #if os(macOS)
 
-import AppLibrary
 import Combine
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenuImage.swift b/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenuImage.swift
index 559e022b..5443adaf 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenuImage.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/AppMenu/macOS/AppMenuImage.swift
@@ -25,7 +25,7 @@
 
 #if os(macOS)
 
-import AppLibrary
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DebugLogView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DebugLogView.swift
index cf35e262..47a6d16b 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DebugLogView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DebugLogView.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonLibrary
 import CommonUtils
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DiagnosticsView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DiagnosticsView.swift
index ad32f4f9..856ad133 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DiagnosticsView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/DiagnosticsView.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonLibrary
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/ReportIssueButton.swift b/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/ReportIssueButton.swift
index 9f528b2f..4213f4fd 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/ReportIssueButton.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Diagnostics/ReportIssueButton.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OnDemandView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OnDemandView.swift
index b8b82303..a15af91c 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OnDemandView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OnDemandView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift
index 00165fe0..c523a792 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import CPassepartoutOpenVPNOpenSSL
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallModifier.swift b/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallModifier.swift
index 2847ca5e..842726fe 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallModifier.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallModifier.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import SwiftUI
 
 struct PaywallModifier: ViewModifier {
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallView.swift
index 852c8ded..1efef7c2 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Paywall/PaywallView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import SwiftUI
 
 struct PaywallView: View {
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift b/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
index f390ed93..26b7a8ad 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Profile/StorageSection.swift b/Passepartout/Library/Sources/AppUIMain/Views/Profile/StorageSection.swift
index 865c9beb..5a51b0bb 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Profile/StorageSection.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Profile/StorageSection.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import SwiftUI
 
 struct StorageSection: View {
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Profile/iOS/ProfileEditView+iOS.swift b/Passepartout/Library/Sources/AppUIMain/Views/Profile/iOS/ProfileEditView+iOS.swift
index a9849937..1134d119 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Profile/iOS/ProfileEditView+iOS.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Profile/iOS/ProfileEditView+iOS.swift
@@ -25,7 +25,7 @@
 
 #if os(iOS)
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Provider/ProviderContentModifier.swift b/Passepartout/Library/Sources/AppUIMain/Views/Provider/ProviderContentModifier.swift
index dac59ee7..e0c4c38e 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Provider/ProviderContentModifier.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Provider/ProviderContentModifier.swift
@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonAPI
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNFiltersView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNFiltersView.swift
index 2b8a7eab..b1856d49 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNFiltersView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNFiltersView.swift
@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import Combine
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderContentModifier.swift b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderContentModifier.swift
index e9e76c89..620b1017 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderContentModifier.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderContentModifier.swift
@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonAPI
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift
index 6e9c3068..2a44f5d8 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Provider/VPNProviderServerView.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonAPI
 import CommonLibrary
 import CommonUtils
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Provider/iOS/VPNProviderServerView+iOS.swift b/Passepartout/Library/Sources/AppUIMain/Views/Provider/iOS/VPNProviderServerView+iOS.swift
index 6d2c3fdc..58e7d8e4 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Provider/iOS/VPNProviderServerView+iOS.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Provider/iOS/VPNProviderServerView+iOS.swift
@@ -25,7 +25,6 @@
 
 #if os(iOS)
 
-import AppLibrary
 import CommonAPI
 import CommonLibrary
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsSectionGroup.swift b/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsSectionGroup.swift
index 6ea94354..84effaa9 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsSectionGroup.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsSectionGroup.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import CommonLibrary
 import CommonUtils
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsView.swift
index f1fed795..d634311a 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Settings/SettingsView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import SwiftUI
 
 public struct SettingsView: View {
diff --git a/Passepartout/Library/Sources/AppUITV/Views/App/AppCoordinator.swift b/Passepartout/Library/Sources/AppUITV/Views/App/AppCoordinator.swift
index 7e34bd44..8b0a1029 100644
--- a/Passepartout/Library/Sources/AppUITV/Views/App/AppCoordinator.swift
+++ b/Passepartout/Library/Sources/AppUITV/Views/App/AppCoordinator.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/AppUITV/Views/Profile/ActiveProfileView.swift b/Passepartout/Library/Sources/AppUITV/Views/Profile/ActiveProfileView.swift
index 7569c2a5..26493693 100644
--- a/Passepartout/Library/Sources/AppUITV/Views/Profile/ActiveProfileView.swift
+++ b/Passepartout/Library/Sources/AppUITV/Views/Profile/ActiveProfileView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileListView.swift b/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileListView.swift
index a8c9429c..a4553ce8 100644
--- a/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileListView.swift
+++ b/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileListView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileView.swift b/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileView.swift
index ab124eae..71489bf1 100644
--- a/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileView.swift
+++ b/Passepartout/Library/Sources/AppUITV/Views/Profile/ProfileView.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/AppLibrary/Business/ExtendedTunnel.swift b/Passepartout/Library/Sources/CommonLibrary/Business/ExtendedTunnel.swift
similarity index 99%
rename from Passepartout/Library/Sources/AppLibrary/Business/ExtendedTunnel.swift
rename to Passepartout/Library/Sources/CommonLibrary/Business/ExtendedTunnel.swift
index eac8462e..900ce2a8 100644
--- a/Passepartout/Library/Sources/AppLibrary/Business/ExtendedTunnel.swift
+++ b/Passepartout/Library/Sources/CommonLibrary/Business/ExtendedTunnel.swift
@@ -24,7 +24,6 @@
 //
 
 import Combine
-import CommonLibrary
 import Foundation
 import PassepartoutKit
 
diff --git a/Passepartout/Library/Sources/AppLibrary/Business/InMemoryProfileRepository.swift b/Passepartout/Library/Sources/CommonLibrary/Business/InMemoryProfileRepository.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/Business/InMemoryProfileRepository.swift
rename to Passepartout/Library/Sources/CommonLibrary/Business/InMemoryProfileRepository.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift b/Passepartout/Library/Sources/CommonLibrary/Business/NEProfileRepository.swift
similarity index 99%
rename from Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift
rename to Passepartout/Library/Sources/CommonLibrary/Business/NEProfileRepository.swift
index 71acc20d..17b6bf44 100644
--- a/Passepartout/Library/Sources/AppLibrary/Business/NEProfileRepository.swift
+++ b/Passepartout/Library/Sources/CommonLibrary/Business/NEProfileRepository.swift
@@ -24,7 +24,6 @@
 //
 
 import Combine
-import CommonLibrary
 import Foundation
 import NetworkExtension
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppLibrary/Business/ProfileManager.swift b/Passepartout/Library/Sources/CommonLibrary/Business/ProfileManager.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/Business/ProfileManager.swift
rename to Passepartout/Library/Sources/CommonLibrary/Business/ProfileManager.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/Business/ProfileProcessor.swift b/Passepartout/Library/Sources/CommonLibrary/Business/ProfileProcessor.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/Business/ProfileProcessor.swift
rename to Passepartout/Library/Sources/CommonLibrary/Business/ProfileProcessor.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/Business/ProfileRepository.swift b/Passepartout/Library/Sources/CommonLibrary/Business/ProfileRepository.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/Business/ProfileRepository.swift
rename to Passepartout/Library/Sources/CommonLibrary/Business/ProfileRepository.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppFeature.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppFeature.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppFeature.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppFeature.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppFeatureProviding.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppFeatureProviding.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppFeatureProviding.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppFeatureProviding.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Donations.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Donations.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Donations.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Donations.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Features.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Features.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Features.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Features.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Providers.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Providers.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppProduct+Providers.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct+Providers.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppProduct.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct.swift
similarity index 98%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppProduct.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct.swift
index cc8a867c..7d557add 100644
--- a/Passepartout/Library/Sources/AppLibrary/IAP/AppProduct.swift
+++ b/Passepartout/Library/Sources/CommonLibrary/IAP/AppProduct.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import CommonLibrary
 import CommonUtils
 import Foundation
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppProductHelper.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppProductHelper.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppProductHelper.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppProductHelper.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppReceiptReader.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppReceiptReader.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppReceiptReader.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppReceiptReader.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/AppUserLevel.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/AppUserLevel.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/AppUserLevel.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/AppUserLevel.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/IAPManager.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/IAPManager.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/IAPManager.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/IAPManager.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/KvittoReceiptReader.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/KvittoReceiptReader.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/KvittoReceiptReader.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/KvittoReceiptReader.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/IAP/PaywallReason.swift b/Passepartout/Library/Sources/CommonLibrary/IAP/PaywallReason.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/IAP/PaywallReason.swift
rename to Passepartout/Library/Sources/CommonLibrary/IAP/PaywallReason.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/Mock/MockAppProductHelper.swift b/Passepartout/Library/Sources/CommonLibrary/Mock/MockAppProductHelper.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/Mock/MockAppProductHelper.swift
rename to Passepartout/Library/Sources/CommonLibrary/Mock/MockAppProductHelper.swift
diff --git a/Passepartout/Library/Sources/AppLibrary/Mock/MockAppReceiptReader.swift b/Passepartout/Library/Sources/CommonLibrary/Mock/MockAppReceiptReader.swift
similarity index 100%
rename from Passepartout/Library/Sources/AppLibrary/Mock/MockAppReceiptReader.swift
rename to Passepartout/Library/Sources/CommonLibrary/Mock/MockAppReceiptReader.swift
diff --git a/Passepartout/Library/Sources/UILibrary/Business/AppContext.swift b/Passepartout/Library/Sources/UILibrary/Business/AppContext.swift
index 1418c5d1..94ac8aa9 100644
--- a/Passepartout/Library/Sources/UILibrary/Business/AppContext.swift
+++ b/Passepartout/Library/Sources/UILibrary/Business/AppContext.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import Combine
 import CommonLibrary
 import CommonUtils
diff --git a/Passepartout/Library/Sources/UILibrary/Business/ProfileEditor.swift b/Passepartout/Library/Sources/UILibrary/Business/ProfileEditor.swift
index 0a08ce21..12bd0c8d 100644
--- a/Passepartout/Library/Sources/UILibrary/Business/ProfileEditor.swift
+++ b/Passepartout/Library/Sources/UILibrary/Business/ProfileEditor.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import Combine
 import CommonLibrary
 import Foundation
diff --git a/Passepartout/Library/Sources/UILibrary/Extensions/View+Environment.swift b/Passepartout/Library/Sources/UILibrary/Extensions/View+Environment.swift
index 240cb12f..99aeffce 100644
--- a/Passepartout/Library/Sources/UILibrary/Extensions/View+Environment.swift
+++ b/Passepartout/Library/Sources/UILibrary/Extensions/View+Environment.swift
@@ -23,7 +23,6 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import SwiftUI
 
 @MainActor
diff --git a/Passepartout/Library/Sources/UILibrary/Mock/Mock.swift b/Passepartout/Library/Sources/UILibrary/Mock/Mock.swift
index c6595203..9254b03e 100644
--- a/Passepartout/Library/Sources/UILibrary/Mock/Mock.swift
+++ b/Passepartout/Library/Sources/UILibrary/Mock/Mock.swift
@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import Combine
+import CommonLibrary
 import CommonUtils
 import Foundation
 import PassepartoutKit
diff --git a/Passepartout/Library/Sources/UILibrary/Protocols/AppCoordinatorConforming.swift b/Passepartout/Library/Sources/UILibrary/Protocols/AppCoordinatorConforming.swift
index 05b8201e..4d479813 100644
--- a/Passepartout/Library/Sources/UILibrary/Protocols/AppCoordinatorConforming.swift
+++ b/Passepartout/Library/Sources/UILibrary/Protocols/AppCoordinatorConforming.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import Foundation
 import PassepartoutKit
 
diff --git a/Passepartout/Library/Sources/UILibrary/Protocols/TunnelInstallationProviding.swift b/Passepartout/Library/Sources/UILibrary/Protocols/TunnelInstallationProviding.swift
index 746a7328..5f5bf499 100644
--- a/Passepartout/Library/Sources/UILibrary/Protocols/TunnelInstallationProviding.swift
+++ b/Passepartout/Library/Sources/UILibrary/Protocols/TunnelInstallationProviding.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import Foundation
 import PassepartoutKit
 
diff --git a/Passepartout/Library/Sources/UILibrary/Theme/Theme+Extensions.swift b/Passepartout/Library/Sources/UILibrary/Theme/Theme+Extensions.swift
index 494c77b7..0190fce7 100644
--- a/Passepartout/Library/Sources/UILibrary/Theme/Theme+Extensions.swift
+++ b/Passepartout/Library/Sources/UILibrary/Theme/Theme+Extensions.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
diff --git a/Passepartout/Library/Sources/UILibrary/Views/Modules/OpenVPNView+Credentials.swift b/Passepartout/Library/Sources/UILibrary/Views/Modules/OpenVPNView+Credentials.swift
index e1d7e712..27936059 100644
--- a/Passepartout/Library/Sources/UILibrary/Views/Modules/OpenVPNView+Credentials.swift
+++ b/Passepartout/Library/Sources/UILibrary/Views/Modules/OpenVPNView+Credentials.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/UILibrary/Views/UI/ConnectionStatusText.swift b/Passepartout/Library/Sources/UILibrary/Views/UI/ConnectionStatusText.swift
index dd6c4c5f..772a8a30 100644
--- a/Passepartout/Library/Sources/UILibrary/Views/UI/ConnectionStatusText.swift
+++ b/Passepartout/Library/Sources/UILibrary/Views/UI/ConnectionStatusText.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import Foundation
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Sources/UILibrary/Views/UI/TunnelToggleButton.swift b/Passepartout/Library/Sources/UILibrary/Views/UI/TunnelToggleButton.swift
index 7297b9ae..fb8b2fc3 100644
--- a/Passepartout/Library/Sources/UILibrary/Views/UI/TunnelToggleButton.swift
+++ b/Passepartout/Library/Sources/UILibrary/Views/UI/TunnelToggleButton.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
+import CommonLibrary
 import CommonUtils
 import PassepartoutKit
 import SwiftUI
diff --git a/Passepartout/Library/Tests/AppUIMainTests/IssueTests.swift b/Passepartout/Library/Tests/AppUIMainTests/IssueTests.swift
index cdf2d60d..2417ffc0 100644
--- a/Passepartout/Library/Tests/AppUIMainTests/IssueTests.swift
+++ b/Passepartout/Library/Tests/AppUIMainTests/IssueTests.swift
@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 @testable import AppUIMain
+import CommonLibrary
 import Foundation
 import XCTest
 
diff --git a/Passepartout/Library/Tests/AppUIMainTests/ProfileImporterTests.swift b/Passepartout/Library/Tests/AppUIMainTests/ProfileImporterTests.swift
index 6e35d747..44ba29f8 100644
--- a/Passepartout/Library/Tests/AppUIMainTests/ProfileImporterTests.swift
+++ b/Passepartout/Library/Tests/AppUIMainTests/ProfileImporterTests.swift
@@ -23,9 +23,9 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 @testable import AppUIMain
 import Combine
+import CommonLibrary
 import Foundation
 import PassepartoutKit
 import XCTest
diff --git a/Passepartout/Library/Tests/AppLibraryTests/ExtendedTunnelTests.swift b/Passepartout/Library/Tests/CommonLibraryTests/ExtendedTunnelTests.swift
similarity index 98%
rename from Passepartout/Library/Tests/AppLibraryTests/ExtendedTunnelTests.swift
rename to Passepartout/Library/Tests/CommonLibraryTests/ExtendedTunnelTests.swift
index 854e69de..3971498b 100644
--- a/Passepartout/Library/Tests/AppLibraryTests/ExtendedTunnelTests.swift
+++ b/Passepartout/Library/Tests/CommonLibraryTests/ExtendedTunnelTests.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-@testable import AppLibrary
+@testable import CommonLibrary
 import Foundation
 import PassepartoutKit
 import XCTest
diff --git a/Passepartout/Library/Tests/AppLibraryTests/IAPManagerTests.swift b/Passepartout/Library/Tests/CommonLibraryTests/IAPManagerTests.swift
similarity index 99%
rename from Passepartout/Library/Tests/AppLibraryTests/IAPManagerTests.swift
rename to Passepartout/Library/Tests/CommonLibraryTests/IAPManagerTests.swift
index 1d6cddbf..cf631b37 100644
--- a/Passepartout/Library/Tests/AppLibraryTests/IAPManagerTests.swift
+++ b/Passepartout/Library/Tests/CommonLibraryTests/IAPManagerTests.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-@testable import AppLibrary
+@testable import CommonLibrary
 import Foundation
 import XCTest
 
diff --git a/Passepartout/Library/Tests/AppLibraryTests/ProfileManagerTests.swift b/Passepartout/Library/Tests/CommonLibraryTests/ProfileManagerTests.swift
similarity index 97%
rename from Passepartout/Library/Tests/AppLibraryTests/ProfileManagerTests.swift
rename to Passepartout/Library/Tests/CommonLibraryTests/ProfileManagerTests.swift
index 2b4dcae7..8002fa28 100644
--- a/Passepartout/Library/Tests/AppLibraryTests/ProfileManagerTests.swift
+++ b/Passepartout/Library/Tests/CommonLibraryTests/ProfileManagerTests.swift
@@ -23,7 +23,7 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-@testable import AppLibrary
+@testable import CommonLibrary
 import Foundation
 import XCTest
 
diff --git a/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift b/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift
index 6b5df23d..cc2e28bb 100644
--- a/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift
+++ b/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift
@@ -23,8 +23,8 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-import AppLibrary
 import Combine
+import CommonLibrary
 import Foundation
 import PassepartoutKit
 @testable import UILibrary