diff --git a/.gitignore b/.gitignore
index e41dfce..3aa5254 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .DS_Store
+*.lock
+*.resolved
 /build
 /.build
 /Packages
diff --git a/.swift-version b/.swift-version
index 8c50098..4d54dad 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-3.1
+4.0.2
diff --git a/.travis.yml b/.travis.yml
index 638df27..5a31a27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,8 @@
 os:
   - linux
-  - osx
 language: generic
 sudo: false
 dist: trusty
-osx_image: xcode8.3
 addons:
   apt:
     sources:
diff --git a/Package.swift b/Package.swift
index 6ca58ef..dfdc469 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,10 +1,17 @@
-// swift-tools-version:3.1
+// swift-tools-version:4.0
 
 import PackageDescription
 
 let package = Package(
     name: "Venice",
+    products: [
+        .library(name: "Venice", targets: ["Venice"])
+    ],
     dependencies: [
-        .Package(url: "https://github.com/Zewo/CLibdill.git", majorVersion: 1)
+        .package(url: "https://github.com/Zewo/CLibdill.git", from: "2.0.0")
+    ],
+    targets: [
+        .target(name: "Venice"),
+        .testTarget(name: "VeniceTests", dependencies: ["Venice"]),
     ]
 )
diff --git a/Sources/Channel.swift b/Sources/Venice/Channel.swift
similarity index 100%
rename from Sources/Channel.swift
rename to Sources/Venice/Channel.swift
diff --git a/Sources/Coroutine.swift b/Sources/Venice/Coroutine.swift
similarity index 100%
rename from Sources/Coroutine.swift
rename to Sources/Venice/Coroutine.swift
diff --git a/Sources/Error.swift b/Sources/Venice/Error.swift
similarity index 100%
rename from Sources/Error.swift
rename to Sources/Venice/Error.swift
diff --git a/Sources/FileDescriptor.swift b/Sources/Venice/FileDescriptor.swift
similarity index 100%
rename from Sources/FileDescriptor.swift
rename to Sources/Venice/FileDescriptor.swift
diff --git a/Sources/Time.swift b/Sources/Venice/Time.swift
similarity index 100%
rename from Sources/Time.swift
rename to Sources/Venice/Time.swift
diff --git a/circle.yml b/circle.yml
index 282a556..d234ab7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,6 @@
+machine:
+  xcode:
+    version: 9.1
 dependencies:
   override:
     - eval "$(curl -sL http://sh.zewo.io/install-libdill.sh)"