diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..be9db84
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.build
+.vscode
+.DS_Store
diff --git a/Package.swift b/Package.swift
index 51d59e1..4e950f8 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,10 +1,18 @@
-// swift-tools-version:3.0.2
+// swift-tools-version:4.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "CCairo",
-    pkgConfig: "cairo",
-    providers: [.Brew("cairo"), .Apt("libcairo-dev")]
+    products: [
+        .library(name: "CCairo", targets: ["CCairo"])
+    ],
+    targets: [
+        .systemLibrary(
+            name: "CCairo",
+            pkgConfig: "cairo",
+            providers: [.brew(["cairo"]), .apt(["libcairo2-dev"])]
+        )
+    ]
 )
diff --git a/module.modulemap b/Sources/CCairo/module.modulemap
similarity index 100%
rename from module.modulemap
rename to Sources/CCairo/module.modulemap
diff --git a/shim.h b/Sources/CCairo/shim.h
similarity index 100%
rename from shim.h
rename to Sources/CCairo/shim.h