diff --git a/.swift-version b/.swift-version
new file mode 100644
index 0000000..e69de29
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..919434a
--- /dev/null
+++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 0000000..0f27acc
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "Regex",
+        "repositoryURL": "https://github.com/crossroadlabs/Regex.git",
+        "state": {
+          "branch": null,
+          "revision": "166728756082a9cac6e4aed3ebbce8e41cb3a945",
+          "version": "1.2.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
index 0023dc4..3101718 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,3 +1,5 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
 //===--- Package.swift ------------------------------------------------===//
 //
 //Copyright (c) 2016 Daniel Leping (dileping)
@@ -23,13 +25,23 @@ import PackageDescription
 
 let package = Package(
     name: "PathToRegex",
-    targets: [
-        Target(
-            name: "PathToRegex"
-        )
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "PathToRegex",
+            targets: ["PathToRegex"]),
     ],
     dependencies: [
-        .Package(url: "https://github.com/crossroadlabs/Regex.git", from: "1.2.0")
+        .package(
+            url: "https://github.com/crossroadlabs/Regex.git",
+            from: "1.2.0")
     ],
-    exclude: ["Carthage"]
+    targets: [
+        .target(
+            name: "PathToRegex",
+            dependencies: []),
+        .testTarget(
+            name: "PathToRegexTests",
+            dependencies: ["PathToRegex"])
+    ]
 )
diff --git a/PathToRegex/Info.plist b/Sources/PathToRegex/Info.plist
similarity index 100%
rename from PathToRegex/Info.plist
rename to Sources/PathToRegex/Info.plist
diff --git a/PathToRegex/PathToRegex.swift b/Sources/PathToRegex/PathToRegex.swift
similarity index 100%
rename from PathToRegex/PathToRegex.swift
rename to Sources/PathToRegex/PathToRegex.swift