diff --git a/Demo/Info.plist b/Demo/Info.plist
deleted file mode 100644
index d7680ac..0000000
--- a/Demo/Info.plist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015-2016 Daniel Leping (dileping). All rights reserved.</string>
-</dict>
-</plist>
diff --git a/Demo/Package.swift b/Demo/Package.swift
new file mode 100644
index 0000000..35f427f
--- /dev/null
+++ b/Demo/Package.swift
@@ -0,0 +1,29 @@
+//===--- Package.swift -----------------------------------------------------===//
+//
+//Copyright (c) 2015-2016 Daniel Leping (dileping)
+//
+//This file is part of Swift Express.
+//
+//Swift Express is free software: you can redistribute it and/or modify
+//it under the terms of the GNU Lesser General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+//
+//Swift Express is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU Lesser General Public License for more details.
+//
+//You should have received a copy of the GNU Lesser General Public License
+//along with Swift Express.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+import PackageDescription
+
+let package = Package(
+    name: "Demo",
+    dependencies: [
+        .Package(url: "../", majorVersion: 0, minor: 3)
+    ]
+)
diff --git a/Demo/main.swift b/Demo/Sources/app/main.swift
similarity index 100%
rename from Demo/main.swift
rename to Demo/Sources/app/main.swift
diff --git a/Package.swift b/Package.swift
index e356ba5..2d38e96 100644
--- a/Package.swift
+++ b/Package.swift
@@ -23,23 +23,12 @@ import PackageDescription
 
 let package = Package(
     name: "Express",
-   
-    targets: [
-        Target(
-            name: "Express"
-        ),
-        Target(
-        	name:"Demo", 
-        	dependencies:[.Target(name:"Express")]
-        )
-    ],
     dependencies: [
-    	.Package(url: "https://github.com/reactive-swift/Future.git", majorVersion: 0, minor: 2),
-    	.Package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", majorVersion: 15),
-    	.Package(url: "https://github.com/crossroadlabs/PathToRegex.git", majorVersion: 0, minor: 4),
-    	.Package(url: "https://github.com/kylef/Stencil.git", majorVersion: 0, minor: 8),
-        .Package(url: "https://github.com/IBM-Swift/GRMustache.swift", majorVersion: 1, minor: 5),
-    	.Package(url: "https://github.com/crossroadlabs/CEVHTP.git", majorVersion: 0, minor: 4),
-    ],
-    exclude: ["doc"]
+        .Package(url: "https://github.com/reactive-swift/Future.git", majorVersion: 0, minor: 2),
+        .Package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", majorVersion: 16),
+        .Package(url: "https://github.com/crossroadlabs/PathToRegex.git", majorVersion: 0, minor: 4),
+        .Package(url: "https://github.com/kylef/Stencil.git", majorVersion: 0, minor: 8),
+        .Package(url: "https://github.com/IBM-Swift/GRMustache.swift", majorVersion: 1, minor: 7),
+        .Package(url: "https://github.com/crossroadlabs/CEVHTP.git", majorVersion: 0, minor: 4),
+    ]
 )
diff --git a/Express/Action.swift b/Sources/Express/Action.swift
similarity index 100%
rename from Express/Action.swift
rename to Sources/Express/Action.swift
diff --git a/Express/AnyContent+FormUrlEncoded.swift b/Sources/Express/AnyContent+FormUrlEncoded.swift
similarity index 100%
rename from Express/AnyContent+FormUrlEncoded.swift
rename to Sources/Express/AnyContent+FormUrlEncoded.swift
diff --git a/Express/AnyContent+JSON.swift b/Sources/Express/AnyContent+JSON.swift
similarity index 100%
rename from Express/AnyContent+JSON.swift
rename to Sources/Express/AnyContent+JSON.swift
diff --git a/Express/AnyContent+MultipartFormData.swift b/Sources/Express/AnyContent+MultipartFormData.swift
similarity index 100%
rename from Express/AnyContent+MultipartFormData.swift
rename to Sources/Express/AnyContent+MultipartFormData.swift
diff --git a/Express/AnyContent+XML.swift b/Sources/Express/AnyContent+XML.swift
similarity index 100%
rename from Express/AnyContent+XML.swift
rename to Sources/Express/AnyContent+XML.swift
diff --git a/Express/AnyContent.swift b/Sources/Express/AnyContent.swift
similarity index 100%
rename from Express/AnyContent.swift
rename to Sources/Express/AnyContent.swift
diff --git a/Express/CacheControl.swift b/Sources/Express/CacheControl.swift
similarity index 100%
rename from Express/CacheControl.swift
rename to Sources/Express/CacheControl.swift
diff --git a/Express/Content.swift b/Sources/Express/Content.swift
similarity index 100%
rename from Express/Content.swift
rename to Sources/Express/Content.swift
diff --git a/Express/EVHTP.swift b/Sources/Express/EVHTP.swift
similarity index 100%
rename from Express/EVHTP.swift
rename to Sources/Express/EVHTP.swift
diff --git a/Express/ErrorHandler.swift b/Sources/Express/ErrorHandler.swift
similarity index 100%
rename from Express/ErrorHandler.swift
rename to Sources/Express/ErrorHandler.swift
diff --git a/Express/Errors.swift b/Sources/Express/Errors.swift
similarity index 100%
rename from Express/Errors.swift
rename to Sources/Express/Errors.swift
diff --git a/Express/EventExecutionContext.swift b/Sources/Express/EventExecutionContext.swift
similarity index 100%
rename from Express/EventExecutionContext.swift
rename to Sources/Express/EventExecutionContext.swift
diff --git a/Express/ExecutionContext.swift b/Sources/Express/ExecutionContext.swift
similarity index 100%
rename from Express/ExecutionContext.swift
rename to Sources/Express/ExecutionContext.swift
diff --git a/Express/Express.swift b/Sources/Express/Express.swift
similarity index 100%
rename from Express/Express.swift
rename to Sources/Express/Express.swift
diff --git a/Express/ExpressServer.swift b/Sources/Express/ExpressServer.swift
similarity index 100%
rename from Express/ExpressServer.swift
rename to Sources/Express/ExpressServer.swift
diff --git a/Express/ExpressSugar.swift b/Sources/Express/ExpressSugar.swift
similarity index 100%
rename from Express/ExpressSugar.swift
rename to Sources/Express/ExpressSugar.swift
diff --git a/Express/Functional.swift b/Sources/Express/Functional.swift
similarity index 100%
rename from Express/Functional.swift
rename to Sources/Express/Functional.swift
diff --git a/Express/Headers.swift b/Sources/Express/Headers.swift
similarity index 100%
rename from Express/Headers.swift
rename to Sources/Express/Headers.swift
diff --git a/Express/HttpMethod.swift b/Sources/Express/HttpMethod.swift
similarity index 100%
rename from Express/HttpMethod.swift
rename to Sources/Express/HttpMethod.swift
diff --git a/Express/HttpServer.swift b/Sources/Express/HttpServer.swift
similarity index 100%
rename from Express/HttpServer.swift
rename to Sources/Express/HttpServer.swift
diff --git a/Express/Info.plist b/Sources/Express/Info.plist
similarity index 100%
rename from Express/Info.plist
rename to Sources/Express/Info.plist
diff --git a/Express/JsonView.swift b/Sources/Express/JsonView.swift
similarity index 100%
rename from Express/JsonView.swift
rename to Sources/Express/JsonView.swift
diff --git a/Express/MIME.swift b/Sources/Express/MIME.swift
similarity index 100%
rename from Express/MIME.swift
rename to Sources/Express/MIME.swift
diff --git a/Express/MustacheViewEngine.swift b/Sources/Express/MustacheViewEngine.swift
similarity index 100%
rename from Express/MustacheViewEngine.swift
rename to Sources/Express/MustacheViewEngine.swift
diff --git a/Express/RegexUrlMatcher.swift b/Sources/Express/RegexUrlMatcher.swift
similarity index 100%
rename from Express/RegexUrlMatcher.swift
rename to Sources/Express/RegexUrlMatcher.swift
diff --git a/Express/Request.swift b/Sources/Express/Request.swift
similarity index 100%
rename from Express/Request.swift
rename to Sources/Express/Request.swift
diff --git a/Express/Response.swift b/Sources/Express/Response.swift
similarity index 100%
rename from Express/Response.swift
rename to Sources/Express/Response.swift
diff --git a/Express/Router.swift b/Sources/Express/Router.swift
similarity index 100%
rename from Express/Router.swift
rename to Sources/Express/Router.swift
diff --git a/Express/Server.swift b/Sources/Express/Server.swift
similarity index 100%
rename from Express/Server.swift
rename to Sources/Express/Server.swift
diff --git a/Express/Static.swift b/Sources/Express/Static.swift
similarity index 100%
rename from Express/Static.swift
rename to Sources/Express/Static.swift
diff --git a/Express/StatusCode.swift b/Sources/Express/StatusCode.swift
similarity index 100%
rename from Express/StatusCode.swift
rename to Sources/Express/StatusCode.swift
diff --git a/Express/StencilViewEngine.swift b/Sources/Express/StencilViewEngine.swift
similarity index 100%
rename from Express/StencilViewEngine.swift
rename to Sources/Express/StencilViewEngine.swift
diff --git a/Express/Streams+Headers.swift b/Sources/Express/Streams+Headers.swift
similarity index 100%
rename from Express/Streams+Headers.swift
rename to Sources/Express/Streams+Headers.swift
diff --git a/Express/Streams.swift b/Sources/Express/Streams.swift
similarity index 100%
rename from Express/Streams.swift
rename to Sources/Express/Streams.swift
diff --git a/Express/Transaction.swift b/Sources/Express/Transaction.swift
similarity index 100%
rename from Express/Transaction.swift
rename to Sources/Express/Transaction.swift
diff --git a/Express/UrlMatcher.swift b/Sources/Express/UrlMatcher.swift
similarity index 100%
rename from Express/UrlMatcher.swift
rename to Sources/Express/UrlMatcher.swift
diff --git a/Express/Utils.swift b/Sources/Express/Utils.swift
similarity index 100%
rename from Express/Utils.swift
rename to Sources/Express/Utils.swift
diff --git a/Express/View.swift b/Sources/Express/View.swift
similarity index 100%
rename from Express/View.swift
rename to Sources/Express/View.swift
diff --git a/Express/ViewEngine.swift b/Sources/Express/ViewEngine.swift
similarity index 100%
rename from Express/ViewEngine.swift
rename to Sources/Express/ViewEngine.swift
diff --git a/Express/Views.swift b/Sources/Express/Views.swift
similarity index 100%
rename from Express/Views.swift
rename to Sources/Express/Views.swift