diff --git a/example.js b/examples/example.js
similarity index 100%
rename from example.js
rename to examples/example.js
diff --git a/examples/example_auth.js b/examples/example_auth.js
new file mode 100644
index 0000000000..475d973c49
--- /dev/null
+++ b/examples/example_auth.js
@@ -0,0 +1,28 @@
+var redis  = require("./index"),
+    client = redis.createClient();
+
+redis.debug_mode = true;
+
+client.on("connect", function () {
+    client.auth("somepass", redis.print);
+
+    client.sadd("bigset", "some shit");
+    client.sadd("bigset", "some other shit");
+    client.sadd("bigset", 1);
+    client.sadd("bigset", 2);
+    client.sadd("bigset", 3);
+    client.sadd("bigset", 4);
+
+    client.multi([
+        ["smembers", ["bigset"], function (err, res) {
+            console.log("1: " + res.toString());
+        }]// ,
+        //     ["smembers", ["bigset"], function (err, res) {
+        //         console.log("2: " + res.toString());
+        //     }],
+        //     ["smembers", ["bigset"], function (err, res) {
+        //         console.log("3: " + res.toString());
+        //     }]
+    ]);
+//    client.smembers("bigset", redis.print);
+});
\ No newline at end of file
diff --git a/example_file.js b/examples/example_file.js
similarity index 100%
rename from example_file.js
rename to examples/example_file.js
diff --git a/examples/example_multi.js b/examples/example_multi.js
new file mode 100644
index 0000000000..d5e930fd90
--- /dev/null
+++ b/examples/example_multi.js
@@ -0,0 +1,40 @@
+var redis  = require("./index"),
+    client = redis.createClient(), set_size = 20;
+
+client.sadd("bigset", "a member");
+client.sadd("bigset", "another member");
+
+while (set_size > 0) {
+    client.sadd("bigset", "member " + set_size);
+    set_size -= 1;
+}
+
+// multi chain with an individual callback
+client.multi()
+    .scard("bigset")
+    .smembers("bigset")
+    .keys("*", function (err, replies) {
+        client.mget(replies, redis.print);
+    })
+    .dbsize()
+    .exec(function (err, replies) {
+        console.log("MULTI got " + replies.length + " replies");
+        replies.forEach(function (reply, index) {
+            console.log("Reply " + index + ": " + reply.toString());
+        });
+    });
+
+client.set("incr thing", 100);
+
+// start a separate command queue for multie
+var multi = client.multi();
+multi.incr("incr thing", redis.print);
+multi.incr("incr other thing", redis.print);
+
+// runs immediately
+client.get("incr thing", redis.print); // 100
+
+// drains multi queue and runs atomically
+multi.exec(function (err, replies) {
+    console.log(replies); // 101, 3
+});
diff --git a/example_pub_sub.js b/examples/example_pub_sub.js
similarity index 100%
rename from example_pub_sub.js
rename to examples/example_pub_sub.js
diff --git a/buffer_bench.js b/tests/buffer_bench.js
similarity index 100%
rename from buffer_bench.js
rename to tests/buffer_bench.js
diff --git a/test_start_stop.js b/tests/test_start_stop.js
similarity index 100%
rename from test_start_stop.js
rename to tests/test_start_stop.js