diff --git a/.travis.yml b/.travis.yml
index 611686a..13bc728 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode9
 
 install: true
 script:
diff --git a/LambdaKit.podspec b/LambdaKit.podspec
index 9967169..21ed0ff 100644
--- a/LambdaKit.podspec
+++ b/LambdaKit.podspec
@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.watchos.deployment_target = '3.0'
 
-  s.ios.source_files = 'Source/*.swift'
-  s.watchos.source_files = 'Source/NSObject*.swift', 'Source/CLLocationManager*.swift'
+  s.ios.source_files = 'Sources/LambdaKit/*.swift'
+  s.watchos.source_files = 'Sources/LambdaKit/NSObject*.swift', 'Source/LambdaKit/CLLocationManager*.swift'
 end
diff --git a/Makefile b/Makefile
index e391ec8..798d4f6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PROJECT ?= LambdaKit.xcodeproj
 .PHONY: build project
 
 build: $(PROJECT)
-	xcodebuild -project LambdaKit.xcodeproj -configuration Release clean build
+	xcodebuild -project LambdaKit.xcodeproj -configuration Release clean build -scheme LambdaKit-Package
 
 project: $(PROJECT)
 
diff --git a/Package.swift b/Package.swift
index c733ac7..266029f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,5 +1,4 @@
+// swift-tools-version:4.0
 import PackageDescription
 
-let package = Package(
-    name: "LambdaKit"
-)
+let package = Package(name: "LambdaKit", targets: [.target(name: "LambdaKit")])
diff --git a/Source/AVAudioPlayer+LambdaKit.swift b/Sources/LambdaKit/AVAudioPlayer+LambdaKit.swift
similarity index 100%
rename from Source/AVAudioPlayer+LambdaKit.swift
rename to Sources/LambdaKit/AVAudioPlayer+LambdaKit.swift
diff --git a/Source/AVSpeechSynthesizer+LambdaKit.swift b/Sources/LambdaKit/AVSpeechSynthesizer+LambdaKit.swift
similarity index 100%
rename from Source/AVSpeechSynthesizer+LambdaKit.swift
rename to Sources/LambdaKit/AVSpeechSynthesizer+LambdaKit.swift
diff --git a/Source/CADisplayLink+LambdaKit.swift b/Sources/LambdaKit/CADisplayLink+LambdaKit.swift
similarity index 100%
rename from Source/CADisplayLink+LambdaKit.swift
rename to Sources/LambdaKit/CADisplayLink+LambdaKit.swift
diff --git a/Source/CLLocationManager+LambdaKit.swift b/Sources/LambdaKit/CLLocationManager+LambdaKit.swift
similarity index 100%
rename from Source/CLLocationManager+LambdaKit.swift
rename to Sources/LambdaKit/CLLocationManager+LambdaKit.swift
diff --git a/Source/MFMailComposeViewController+LambdaKit.swift b/Sources/LambdaKit/MFMailComposeViewController+LambdaKit.swift
similarity index 100%
rename from Source/MFMailComposeViewController+LambdaKit.swift
rename to Sources/LambdaKit/MFMailComposeViewController+LambdaKit.swift
diff --git a/Source/MFMessageComposeViewController+LambdaKit.swift b/Sources/LambdaKit/MFMessageComposeViewController+LambdaKit.swift
similarity index 100%
rename from Source/MFMessageComposeViewController+LambdaKit.swift
rename to Sources/LambdaKit/MFMessageComposeViewController+LambdaKit.swift
diff --git a/Source/NSObject+LambdaKit.swift b/Sources/LambdaKit/NSObject+LambdaKit.swift
similarity index 100%
rename from Source/NSObject+LambdaKit.swift
rename to Sources/LambdaKit/NSObject+LambdaKit.swift
diff --git a/Source/Timer+LambdaKit.swift b/Sources/LambdaKit/Timer+LambdaKit.swift
similarity index 100%
rename from Source/Timer+LambdaKit.swift
rename to Sources/LambdaKit/Timer+LambdaKit.swift
diff --git a/Source/UIBarButtonItem+LambdaKit.swift b/Sources/LambdaKit/UIBarButtonItem+LambdaKit.swift
similarity index 100%
rename from Source/UIBarButtonItem+LambdaKit.swift
rename to Sources/LambdaKit/UIBarButtonItem+LambdaKit.swift
diff --git a/Source/UIControl+LambdaKit.swift b/Sources/LambdaKit/UIControl+LambdaKit.swift
similarity index 100%
rename from Source/UIControl+LambdaKit.swift
rename to Sources/LambdaKit/UIControl+LambdaKit.swift
diff --git a/Source/UIGestureRecognizer+LambdaKit.swift b/Sources/LambdaKit/UIGestureRecognizer+LambdaKit.swift
similarity index 100%
rename from Source/UIGestureRecognizer+LambdaKit.swift
rename to Sources/LambdaKit/UIGestureRecognizer+LambdaKit.swift
diff --git a/Source/UIImagePickerController+LambdaKit.swift b/Sources/LambdaKit/UIImagePickerController+LambdaKit.swift
similarity index 100%
rename from Source/UIImagePickerController+LambdaKit.swift
rename to Sources/LambdaKit/UIImagePickerController+LambdaKit.swift
diff --git a/Source/UIWebView+LambdaKit.swift b/Sources/LambdaKit/UIWebView+LambdaKit.swift
similarity index 100%
rename from Source/UIWebView+LambdaKit.swift
rename to Sources/LambdaKit/UIWebView+LambdaKit.swift