diff --git a/Library/Resources/Files/package b/Library/Resources/Files/package
index 8043ab3..a06a7a1 100644
--- a/Library/Resources/Files/package
+++ b/Library/Resources/Files/package
@@ -3,13 +3,13 @@
 import PackageDescription
 
 let package = Package(
-    name: "{{HB_PACKAGE_NAME}}",
+    name: "App",
     platforms: [
         .macOS(.v10_15)
     ],
     products: [
         .executable(name: "app", targets: ["App"]),
-        .library(name: "AppInfrastructure", targets: ["AppInfrastructure"])
+        .library(name: "AppLibrary", targets: ["AppLibrary"])
     ],
     dependencies: [
         .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
@@ -19,29 +19,27 @@ let package = Package(
         .executableTarget(
             name: "App",
             dependencies: [
-                .byName(name: "AppInfrastructure"),
+                .product(name: "ArgumentParser", package: "swift-argument-parser"),
+                .product(name: "Hummingbird", package: "hummingbird"),
+                .target(name: "AppLibrary")
+            ],
+            path: "App"
+        ),
+        .target(
+            name: "AppLibrary",
+            dependencies: [
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "Hummingbird", package: "hummingbird")
             ],
-            path: "Sources/App"
-        ),
-        .target(
-            name: "AppInfrastructure",
-            dependencies: [
-                .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "Hummingbird", package: "hummingbird"),
-            ],
-            path: "Sources/AppInfrastructure"
+            path: "Library"
         ),
         .testTarget(
             name: "AppTests",
             dependencies: [
-                dependencies: [
-                    .byName(name: "AppInfrastructure"),
-                    .product(name: "HummingbirdTesting", package: "hummingbird")
-                ]
+                .product(name: "HummingbirdTesting", package: "hummingbird"),
+                .target(name: "AppLibrary")
             ],
-            path: "Tests/App"
+            path: "Test"
         )
     ]
 )