diff --git a/README.md b/README.md
index cee4269c7438931a89cb295192d82321049e9d90..ff19b7f7038d4bb2eb4e0472c8cbc6bf5912371b 100644
--- a/README.md
+++ b/README.md
@@ -70,9 +70,9 @@ $ docker run -t -i -v /somedir:/dgraph -p 80:8080 dgraph/dgraph:latest
 Now that you're within the Docker instance, you can start the server.
 ```
 $ mkdir /dgraph/m # Ensure mutations directory exists.
-$ server --mutations /dgraph/m --postings /dgraph/p --uids /dgraph/u
+$ dgraph --mutations /dgraph/m --postings /dgraph/p --uids /dgraph/u
 ```
-There are some more options that you can change. Run `server --help` to look at them.
+There are some more options that you can change. Run `dgraph --help` to look at them.
 
 Run some mutations and query the server, like so:
 ```
@@ -105,9 +105,9 @@ $ tar -xzvf postings.tar.gz -C $DIR
 ```
 For quick testing, you can bring up 3 different processes of DGraph. You can of course, also set this up across multiple servers.
 ```
-go build . && ./server --instanceIdx 0 --mutations $DIR/m0 --port 8080 --postings $DIR/p0 --workers ":12345,:12346,:12347" --uids $DIR/uasync.final --workerport ":12345" &
-go build . && ./server --instanceIdx 1 --mutations $DIR/m1 --port 8082 --postings $DIR/p1 --workers ":12345,:12346,:12347" --workerport ":12346" &
-go build . && ./server --instanceIdx 2 --mutations $DIR/m2 --port 8084 --postings $DIR/p2 --workers ":12345,:12346,:12347" --workerport ":12347" &
+go build . && ./dgraph --instanceIdx 0 --mutations $DIR/m0 --port 8080 --postings $DIR/p0 --workers ":12345,:12346,:12347" --uids $DIR/uasync.final --workerport ":12345" &
+go build . && ./dgraph --instanceIdx 1 --mutations $DIR/m1 --port 8082 --postings $DIR/p1 --workers ":12345,:12346,:12347" --workerport ":12346" &
+go build . && ./dgraph --instanceIdx 2 --mutations $DIR/m2 --port 8084 --postings $DIR/p2 --workers ":12345,:12346,:12347" --workerport ":12347" &
 ```
 Now you can run any of the queries mentioned in [Test Queries](https://github.com/dgraph-io/dgraph/wiki/Test-Queries).
 You can hit any of the 3 processes, they'll produce the same results.
@@ -171,7 +171,7 @@ You can run this either as a single instance, or over multiple instances.
 
 Here we set number of instances to 2.
 ```
-$ cd $GOPATH/src/github.com/dgraph-io/dgraph/server/uidassigner
+$ cd $GOPATH/src/github.com/dgraph-io/dgraph/dgraph/uidassigner
 
 # Run instance 0.
 $ go build . && ./uidassigner --numInstances 2 --instanceIdx 0 --rdfgzips $BENCHMARK_REPO/data/rdf-films.gz,$BENCHMARK_REPO/data/names.gz --uids ~/dgraph/uids/u0
@@ -193,7 +193,7 @@ Now that we have assigned UIDs for all the entities, the data is ready to be loa
 
 Let's do this step with 3 instances.
 ```
-$ cd $GOPATH/src/github.com/dgraph-io/dgraph/server/loader
+$ cd $GOPATH/src/github.com/dgraph-io/dgraph/dgraph/loader
 $ go build . && ./loader --numInstances 3 --instanceIdx 0 --rdfgzips $BENCHMARK_REPO/data/names.gz,$BENCHMARK_REPO/data/rdf-films.gz --uids ~/dgraph/uasync.final --postings ~/dgraph/p0
 $ go build . && ./loader --numInstances 3 --instanceIdx 1 --rdfgzips $BENCHMARK_REPO/data/names.gz,$BENCHMARK_REPO/data/rdf-films.gz --uids ~/dgraph/uasync.final --postings ~/dgraph/p1
 $ go build . && ./loader --numInstances 3 --instanceIdx 2 --rdfgzips $BENCHMARK_REPO/data/names.gz,$BENCHMARK_REPO/data/rdf-films.gz --uids ~/dgraph/uasync.final --postings ~/dgraph/p2
diff --git a/server/.gitignore b/dgraph/.gitignore
similarity index 100%
rename from server/.gitignore
rename to dgraph/.gitignore
diff --git a/server/loader/.gitignore b/dgraph/loader/.gitignore
similarity index 100%
rename from server/loader/.gitignore
rename to dgraph/loader/.gitignore
diff --git a/server/loader/README.md b/dgraph/loader/README.md
similarity index 100%
rename from server/loader/README.md
rename to dgraph/loader/README.md
diff --git a/server/loader/main.go b/dgraph/loader/main.go
similarity index 100%
rename from server/loader/main.go
rename to dgraph/loader/main.go
diff --git a/server/loader/main_test.go b/dgraph/loader/main_test.go
similarity index 100%
rename from server/loader/main_test.go
rename to dgraph/loader/main_test.go
diff --git a/server/loader/test_input b/dgraph/loader/test_input
similarity index 100%
rename from server/loader/test_input
rename to dgraph/loader/test_input
diff --git a/server/main.go b/dgraph/main.go
similarity index 100%
rename from server/main.go
rename to dgraph/main.go
diff --git a/server/main_test.go b/dgraph/main_test.go
similarity index 100%
rename from server/main_test.go
rename to dgraph/main_test.go
diff --git a/server/notes.txt b/dgraph/notes.txt
similarity index 100%
rename from server/notes.txt
rename to dgraph/notes.txt
diff --git a/server/testdata.nq b/dgraph/testdata.nq
similarity index 100%
rename from server/testdata.nq
rename to dgraph/testdata.nq
diff --git a/server/testrun.sh b/dgraph/testrun.sh
similarity index 100%
rename from server/testrun.sh
rename to dgraph/testrun.sh
diff --git a/server/thoughts.md b/dgraph/thoughts.md
similarity index 100%
rename from server/thoughts.md
rename to dgraph/thoughts.md
diff --git a/server/uidassigner/.gitignore b/dgraph/uidassigner/.gitignore
similarity index 100%
rename from server/uidassigner/.gitignore
rename to dgraph/uidassigner/.gitignore
diff --git a/server/uidassigner/README.txt b/dgraph/uidassigner/README.txt
similarity index 100%
rename from server/uidassigner/README.txt
rename to dgraph/uidassigner/README.txt
diff --git a/server/uidassigner/main.go b/dgraph/uidassigner/main.go
similarity index 100%
rename from server/uidassigner/main.go
rename to dgraph/uidassigner/main.go
diff --git a/server/uidassigner/main_test.go b/dgraph/uidassigner/main_test.go
similarity index 100%
rename from server/uidassigner/main_test.go
rename to dgraph/uidassigner/main_test.go