diff --git a/src/github.com/matrix-org/dendrite/clientapi/clientapi.go b/src/github.com/matrix-org/dendrite/cmd/clientapi/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/clientapi.go
rename to src/github.com/matrix-org/dendrite/cmd/clientapi/main.go
diff --git a/src/github.com/matrix-org/dendrite/tools/create-room-events/main.go b/src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/tools/create-room-events/main.go
rename to src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go
diff --git a/src/github.com/matrix-org/dendrite/tools/kafka-producer/main.go b/src/github.com/matrix-org/dendrite/cmd/kafka-producer/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/tools/kafka-producer/main.go
rename to src/github.com/matrix-org/dendrite/cmd/kafka-producer/main.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/roomserver-integration-tests/main.go b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/roomserver-integration-tests/main.go
rename to src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/roomserver/roomserver.go b/src/github.com/matrix-org/dendrite/cmd/roomserver/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/roomserver/roomserver.go
rename to src/github.com/matrix-org/dendrite/cmd/roomserver/main.go
diff --git a/travis-test.sh b/travis-test.sh
index b3ed18cf..bf19612c 100755
--- a/travis-test.sh
+++ b/travis-test.sh
@@ -3,8 +3,8 @@
 set -eu
 
 # Check that the servers build
-gb build github.com/matrix-org/dendrite/roomserver/roomserver
-gb build github.com/matrix-org/dendrite/roomserver/roomserver-integration-tests
+gb build github.com/matrix-org/dendrite/cmd/roomserver
+gb build github.com/matrix-org/dendrite/cmd/roomserver-integration-tests
 
 # Run the pre commit hooks
 ./hooks/pre-commit