diff --git a/Package.swift b/Package.swift
index e8fc9b1..5a7616f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,5 +1,13 @@
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(
-    name: "OrderedSet"
+    name: "OrderedSet",
+    products: [
+        .library(name: "OrderedSet", targets: ["OrderedSet"])
+    ],
+    targets: [
+        .target(name: "OrderedSet", dependencies: []),
+        .testTarget(name: "OrderedSetTests", dependencies: ["OrderedSet"])
+    ]
 )
diff --git a/Sources/Functions.swift b/Sources/OrderedSet/Functions.swift
similarity index 100%
rename from Sources/Functions.swift
rename to Sources/OrderedSet/Functions.swift
diff --git a/Sources/OrderedSet+Array.swift b/Sources/OrderedSet/OrderedSet+Array.swift
similarity index 100%
rename from Sources/OrderedSet+Array.swift
rename to Sources/OrderedSet/OrderedSet+Array.swift
diff --git a/Sources/OrderedSet+CustomStringConvertible.swift b/Sources/OrderedSet/OrderedSet+CustomStringConvertible.swift
similarity index 100%
rename from Sources/OrderedSet+CustomStringConvertible.swift
rename to Sources/OrderedSet/OrderedSet+CustomStringConvertible.swift
diff --git a/Sources/OrderedSet+Set.swift b/Sources/OrderedSet/OrderedSet+Set.swift
similarity index 100%
rename from Sources/OrderedSet+Set.swift
rename to Sources/OrderedSet/OrderedSet+Set.swift
diff --git a/Sources/OrderedSet.h b/Sources/OrderedSet/OrderedSet.h
similarity index 100%
rename from Sources/OrderedSet.h
rename to Sources/OrderedSet/OrderedSet.h
diff --git a/Sources/OrderedSet.swift b/Sources/OrderedSet/OrderedSet.swift
similarity index 100%
rename from Sources/OrderedSet.swift
rename to Sources/OrderedSet/OrderedSet.swift
diff --git a/Tests/OrderedSetTests.swift b/Tests/OrderedSetTests/OrderedSetTests.swift
similarity index 100%
rename from Tests/OrderedSetTests.swift
rename to Tests/OrderedSetTests/OrderedSetTests.swift