diff --git a/Makefile b/Makefile
index 41424bc..7d90111 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,8 @@
-test:
-	gypkg gen test/test.gyp
-	make -C test/out/ -j8
-	./test/out/Release/uv_link_t-test
+test: dist
+	./out/Release/uv_link_t-test
 
-example:
-	gypkg gen example/example.gyp
-	make -C example/out/ -j8
-	./example/out/Release/uv_link_t-example
+example: dist
+	./out/Release/uv_link_t-example
 
 dist:
 	gypkg gen uv_link_t.gyp
diff --git a/example/example.gyp b/example/example.gyp
deleted file mode 100644
index ebe1d48..0000000
--- a/example/example.gyp
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "targets": [{
-    "target_name": "uv_link_t-example",
-    "type": "executable",
-
-    "include_dirs": [
-      "src"
-    ],
-
-    "variables": {
-      "gypkg_deps": [
-        "git://github.com/libuv/libuv.git@^1.9.0 => uv.gyp:libuv",
-      ],
-    },
-
-    "dependencies": [
-      "<!@(gypkg deps <(gypkg_deps))",
-      "../uv_link_t.gyp:uv_link_t",
-    ],
-
-    "sources": [
-      "src/main.c",
-      "src/middle.c",
-    ],
-  }],
-}
diff --git a/example/options.gypi b/example/options.gypi
deleted file mode 120000
index 9b18bce..0000000
--- a/example/options.gypi
+++ /dev/null
@@ -1 +0,0 @@
-../options.gypi
\ No newline at end of file
diff --git a/test/options.gypi b/test/options.gypi
deleted file mode 120000
index 9b18bce..0000000
--- a/test/options.gypi
+++ /dev/null
@@ -1 +0,0 @@
-../options.gypi
\ No newline at end of file
diff --git a/test/test.gyp b/test/test.gyp
deleted file mode 100644
index 736115a..0000000
--- a/test/test.gyp
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "targets": [{
-    "target_name": "uv_link_t-test",
-    "type": "executable",
-
-    "include_dirs": [
-      "src"
-    ],
-
-    "variables": {
-      "gypkg_deps": [
-        "git://github.com/libuv/libuv.git@^1.9.0 => uv.gyp:libuv",
-      ],
-    },
-
-    "dependencies": [
-      "<!@(gypkg deps <(gypkg_deps))",
-      "../uv_link_t.gyp:uv_link_t",
-    ],
-
-    "sources": [
-      "src/main.c",
-      "src/test-uv-link-source-t.c",
-      "src/test-uv-link-observer-t.c",
-      "src/test-defaults.c",
-      "src/test-close.c",
-      "src/test-strerror.c",
-    ],
-  }],
-}
diff --git a/uv_link_t.gyp b/uv_link_t.gyp
index 246cc44..1f6294c 100644
--- a/uv_link_t.gyp
+++ b/uv_link_t.gyp
@@ -1,4 +1,10 @@
 {
+  "variables": {
+      "gypkg_deps": [
+        "git://github.com/libuv/libuv.git@^1.9.0 => uv.gyp:libuv",
+      ],
+  },
+
   "targets": [{
     "target_name": "uv_link_t",
     "type": "<!(gypkg type)",
@@ -7,12 +13,6 @@
       "include_dirs": [ "include" ],
     },
 
-    "variables": {
-      "gypkg_deps": [
-        "git://github.com/libuv/libuv.git@^1.9.0 => uv.gyp:libuv",
-      ],
-    },
-
     "dependencies": [
       "<!@(gypkg deps <(gypkg_deps))"
     ],
@@ -27,5 +27,43 @@
       "src/uv_link_observer_t.c",
       "src/uv_link_source_t.c",
     ],
+  }, {
+    "target_name": "uv_link_t-test",
+    "type": "executable",
+
+    "include_dirs": [
+      "test/src"
+    ],
+
+    "dependencies": [
+      "<!@(gypkg deps <(gypkg_deps))",
+      "uv_link_t",
+    ],
+
+    "sources": [
+      "test/src/main.c",
+      "test/src/test-uv-link-source-t.c",
+      "test/src/test-uv-link-observer-t.c",
+      "test/src/test-defaults.c",
+      "test/src/test-close.c",
+      "test/src/test-strerror.c",
+    ],
+  }, {
+    "target_name": "uv_link_t-example",
+    "type": "executable",
+
+    "include_dirs": [
+      "example/src"
+    ],
+
+    "dependencies": [
+      "<!@(gypkg deps <(gypkg_deps))",
+      "uv_link_t",
+    ],
+
+    "sources": [
+      "example/src/main.c",
+      "example/src/middle.c",
+    ],
   }],
 }