diff --git a/README.md b/README.md
index ff19b7f7038d4bb2eb4e0472c8cbc6bf5912371b..71bfb04f2214c5ccbe34b6da3f6f04d8d4f9bd75 100644
--- a/README.md
+++ b/README.md
@@ -171,13 +171,13 @@ 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/dgraph/uidassigner
+$ cd $GOPATH/src/github.com/dgraph-io/dgraph/dgraph/dgraphassigner
 
 # 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
+$ go build . && ./dgraphassigner --numInstances 2 --instanceIdx 0 --rdfgzips $BENCHMARK_REPO/data/rdf-films.gz,$BENCHMARK_REPO/data/names.gz --uids ~/dgraph/uids/u0
 
 # And either later, or on another server, run instance 1.
-$ go build . && ./uidassigner --numInstances 2 --instanceIdx 1 --rdfgzips $BENCHMARK_REPO/data/rdf-films.gz,$BENCHMARK_REPO/data/names.gz --uids ~/dgraph/uids/u1
+$ go build . && ./dgraphassigner --numInstances 2 --instanceIdx 1 --rdfgzips $BENCHMARK_REPO/data/rdf-films.gz,$BENCHMARK_REPO/data/names.gz --uids ~/dgraph/uids/u1
 ```
 
 Once the shards are generated, you need to merge them before the second pass. If you ran this as a single instance, merging isn't required.
@@ -193,10 +193,10 @@ 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/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
+$ cd $GOPATH/src/github.com/dgraph-io/dgraph/dgraph/dgraphloader
+$ go build . && ./dgraphloader --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 . && ./dgraphloader --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 . && ./dgraphloader --numInstances 3 --instanceIdx 2 --rdfgzips $BENCHMARK_REPO/data/names.gz,$BENCHMARK_REPO/data/rdf-films.gz --uids ~/dgraph/uasync.final --postings ~/dgraph/p2
 ```
 You can run these over multiple machines, or just one after another.
 
diff --git a/client/example/.gitignore b/client/dgraphclient-go/.gitignore
similarity index 100%
rename from client/example/.gitignore
rename to client/dgraphclient-go/.gitignore
diff --git a/client/example/main.go b/client/dgraphclient-go/main.go
similarity index 100%
rename from client/example/main.go
rename to client/dgraphclient-go/main.go
diff --git a/dgraph/uidassigner/.gitignore b/dgraph/dgraphassigner/.gitignore
similarity index 100%
rename from dgraph/uidassigner/.gitignore
rename to dgraph/dgraphassigner/.gitignore
diff --git a/dgraph/uidassigner/README.txt b/dgraph/dgraphassigner/README.txt
similarity index 100%
rename from dgraph/uidassigner/README.txt
rename to dgraph/dgraphassigner/README.txt
diff --git a/dgraph/uidassigner/main.go b/dgraph/dgraphassigner/main.go
similarity index 100%
rename from dgraph/uidassigner/main.go
rename to dgraph/dgraphassigner/main.go
diff --git a/dgraph/uidassigner/main_test.go b/dgraph/dgraphassigner/main_test.go
similarity index 100%
rename from dgraph/uidassigner/main_test.go
rename to dgraph/dgraphassigner/main_test.go
diff --git a/dgraph/loader/.gitignore b/dgraph/dgraphloader/.gitignore
similarity index 100%
rename from dgraph/loader/.gitignore
rename to dgraph/dgraphloader/.gitignore
diff --git a/dgraph/loader/README.md b/dgraph/dgraphloader/README.md
similarity index 100%
rename from dgraph/loader/README.md
rename to dgraph/dgraphloader/README.md
diff --git a/dgraph/loader/main.go b/dgraph/dgraphloader/main.go
similarity index 100%
rename from dgraph/loader/main.go
rename to dgraph/dgraphloader/main.go
diff --git a/dgraph/loader/main_test.go b/dgraph/dgraphloader/main_test.go
similarity index 100%
rename from dgraph/loader/main_test.go
rename to dgraph/dgraphloader/main_test.go
diff --git a/dgraph/loader/test_input b/dgraph/dgraphloader/test_input
similarity index 100%
rename from dgraph/loader/test_input
rename to dgraph/dgraphloader/test_input