diff --git a/README.md b/README.md
index 9252dbd3d7..ab668e9130 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Deno Networking Libraries
+# Deno Standard Modules
 
-[![Build Status](https://travis-ci.com/denoland/deno_net.svg?branch=master)](https://travis-ci.com/denoland/deno_net)
+[![Build Status](https://travis-ci.com/denoland/deno_std.svg?branch=master)](https://travis-ci.com/denoland/deno_std)
 
 Usage:
 
diff --git a/bufio.ts b/net/bufio.ts
similarity index 100%
rename from bufio.ts
rename to net/bufio.ts
diff --git a/bufio_test.ts b/net/bufio_test.ts
similarity index 100%
rename from bufio_test.ts
rename to net/bufio_test.ts
diff --git a/file_server.ts b/net/file_server.ts
similarity index 100%
rename from file_server.ts
rename to net/file_server.ts
diff --git a/file_server_test.ts b/net/file_server_test.ts
similarity index 100%
rename from file_server_test.ts
rename to net/file_server_test.ts
diff --git a/http.ts b/net/http.ts
similarity index 100%
rename from http.ts
rename to net/http.ts
diff --git a/http_bench.ts b/net/http_bench.ts
similarity index 100%
rename from http_bench.ts
rename to net/http_bench.ts
diff --git a/http_status.ts b/net/http_status.ts
similarity index 100%
rename from http_status.ts
rename to net/http_status.ts
diff --git a/http_test.ts b/net/http_test.ts
similarity index 100%
rename from http_test.ts
rename to net/http_test.ts
diff --git a/iotest.ts b/net/iotest.ts
similarity index 100%
rename from iotest.ts
rename to net/iotest.ts
diff --git a/textproto.ts b/net/textproto.ts
similarity index 100%
rename from textproto.ts
rename to net/textproto.ts
diff --git a/textproto_test.ts b/net/textproto_test.ts
similarity index 100%
rename from textproto_test.ts
rename to net/textproto_test.ts
diff --git a/util.ts b/net/util.ts
similarity index 100%
rename from util.ts
rename to net/util.ts
diff --git a/test.ts b/test.ts
old mode 100644
new mode 100755
index 7c395663e8..95003e0adc
--- a/test.ts
+++ b/test.ts
@@ -1,13 +1,14 @@
+#!/usr/bin/env deno --allow-run --allow-net
 import { run } from "deno";
 
-import "./bufio_test.ts";
-import "./http_test.ts";
-import "./textproto_test.ts";
-import { runTests, completePromise } from "./file_server_test.ts";
+import "net/bufio_test.ts";
+import "net/http_test.ts";
+import "net/textproto_test.ts";
+import { runTests, completePromise } from "net/file_server_test.ts";
 
 // file server test
 const fileServer = run({
-  args: ["deno", "--allow-net", "file_server.ts", "."]
+  args: ["deno", "--allow-net", "net/file_server.ts", "."]
 });
 // I am also too lazy to do this properly LOL
 runTests(new Promise(res => setTimeout(res, 5000)));
@@ -15,5 +16,3 @@ runTests(new Promise(res => setTimeout(res, 5000)));
   await completePromise;
   fileServer.close();
 })();
-
-// TODO import "./http_test.ts";