diff --git a/examples/.gitignore b/examples/.gitignore
new file mode 100644
index 0000000..37d50db
--- /dev/null
+++ b/examples/.gitignore
@@ -0,0 +1 @@
+dub.selections.json
diff --git a/examples/client/.gitignore b/examples/client/.gitignore
new file mode 100644
index 0000000..b051c6c
--- /dev/null
+++ b/examples/client/.gitignore
@@ -0,0 +1 @@
+client
diff --git a/examples/client/dub.json b/examples/client/dub.json
new file mode 100644
index 0000000..db79aa5
--- /dev/null
+++ b/examples/client/dub.json
@@ -0,0 +1,10 @@
+{
+	"name": "client",
+	"homepage": "https://github.com/trishume/ddbus",
+	"copyright": "Copyright © 2017, Tristan Hume",
+	"authors": ["Tristan Hume"],
+	"targetType": "executable",
+	"dependencies": {
+		"ddbus": {"path": "../../"}
+	}
+}
diff --git a/examples/client/source/client.d b/examples/client/source/client.d
new file mode 100644
index 0000000..4b203a8
--- /dev/null
+++ b/examples/client/source/client.d
@@ -0,0 +1,21 @@
+import std.stdio;
+import ddbus;
+
+void testCall(Connection conn) {
+  for(int i = 0; i < 50; i++) {
+    Message msg =  Message("ca.thume.transience","/ca/thume/transience/screensurface",
+                               "ca.thume.transience.screensurface","testDot");
+    conn.sendBlocking(msg);
+  }
+  Message msg2 = Message("ca.thume.transience","/ca/thume/transience/screensurface",
+                            "ca.thume.transience.screensurface","testPing");
+  Message res = conn.sendWithReplyBlocking(msg2,3000);
+  int result = res.read!int();
+  writeln(result);
+}
+
+void main() {
+  Connection conn = connectToBus();
+  testCall(conn);
+	writeln("It worked!");
+}
diff --git a/examples/server/.gitignore b/examples/server/.gitignore
new file mode 100644
index 0000000..254defd
--- /dev/null
+++ b/examples/server/.gitignore
@@ -0,0 +1 @@
+server
diff --git a/examples/server/dub.json b/examples/server/dub.json
new file mode 100644
index 0000000..8253938
--- /dev/null
+++ b/examples/server/dub.json
@@ -0,0 +1,10 @@
+{
+	"name": "server",
+	"homepage": "https://github.com/trishume/ddbus",
+	"copyright": "Copyright © 2017, Tristan Hume",
+	"authors": ["Tristan Hume"],
+	"targetType": "executable",
+	"dependencies": {
+		"ddbus": {"path": "../../"}
+	}
+}
diff --git a/example.d b/examples/server/source/server.d
similarity index 57%
rename from example.d
rename to examples/server/source/server.d
index 7904cd4..4c9c510 100644
--- a/example.d
+++ b/examples/server/source/server.d
@@ -1,19 +1,6 @@
 import std.stdio;
 import ddbus;
 
-void testCall(Connection conn) {
-  for(int i = 0; i < 50; i++) {
-    Message msg =  Message("ca.thume.transience","/ca/thume/transience/screensurface",
-                               "ca.thume.transience.screensurface","testDot");
-    conn.sendBlocking(msg);
-  }
-  Message msg2 = Message("ca.thume.transience","/ca/thume/transience/screensurface",
-                            "ca.thume.transience.screensurface","testPing");
-  Message res = conn.sendWithReplyBlocking(msg2,3000);
-  int result = res.read!int();
-  writeln(result);
-}
-
 void testServe(Connection conn) {
   auto router = new MessageRouter();
   MessagePattern patt = MessagePattern("/root","ca.thume.test","test");
diff --git a/source/ddbus/package.d b/source/ddbus/package.d
index ba0b271..095bd68 100644
--- a/source/ddbus/package.d
+++ b/source/ddbus/package.d
@@ -1,3 +1,5 @@
+module ddbus;
+
 public import ddbus.thin;
 public import ddbus.router;
 public import ddbus.bus;