diff --git a/src/github.com/matrix-org/dendrite/clientapi/clientapi.go b/clientapi/clientapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/clientapi.go
rename to clientapi/clientapi.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/readers/sync.go b/clientapi/readers/sync.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/readers/sync.go
rename to clientapi/readers/sync.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go b/clientapi/writers/sendmessage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/writers/sendmessage.go
rename to clientapi/writers/sendmessage.go
diff --git a/hooks/pre-commit b/hooks/pre-commit
index d9ffbfba5..8ab06388b 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -2,8 +2,14 @@
 
 set -eu
 
-golint src/...
-go fmt ./src/...
-go tool vet --shadow ./src
-gocyclo -over 12 src/
+golint roomserver/...
+go fmt ./roomserver/...
+go tool vet --shadow ./roomserver
+gocyclo -over 12 roomserver/
+
+golint clientapi/...
+go fmt ./clientapi/...
+go tool vet --shadow ./clientapi
+gocyclo -over 12 clientapi/
+
 gb test
diff --git a/src/github.com/matrix-org/dendrite/roomserver/README.md b/roomserver/README.md
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/README.md
rename to roomserver/README.md
diff --git a/src/github.com/matrix-org/dendrite/roomserver/api/input.go b/roomserver/api/input.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/api/input.go
rename to roomserver/api/input.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/authevents.go b/roomserver/input/authevents.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/authevents.go
rename to roomserver/input/authevents.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/authevents_test.go b/roomserver/input/authevents_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/authevents_test.go
rename to roomserver/input/authevents_test.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/consumer.go b/roomserver/input/consumer.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/consumer.go
rename to roomserver/input/consumer.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/events.go b/roomserver/input/events.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/events.go
rename to roomserver/input/events.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/state.go b/roomserver/input/state.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/state.go
rename to roomserver/input/state.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/state_test.go b/roomserver/input/state_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/state_test.go
rename to roomserver/input/state_test.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/roomserver/roomserver.go b/roomserver/roomserver/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/roomserver/roomserver.go
rename to roomserver/roomserver/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/event_json_table.go b/roomserver/storage/event_json_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/event_json_table.go
rename to roomserver/storage/event_json_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/event_state_keys_table.go b/roomserver/storage/event_state_keys_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/event_state_keys_table.go
rename to roomserver/storage/event_state_keys_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/event_types_table.go b/roomserver/storage/event_types_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/event_types_table.go
rename to roomserver/storage/event_types_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/events_table.go b/roomserver/storage/events_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/events_table.go
rename to roomserver/storage/events_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/partition_offset_table.go b/roomserver/storage/partition_offset_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/partition_offset_table.go
rename to roomserver/storage/partition_offset_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/rooms_table.go b/roomserver/storage/rooms_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/rooms_table.go
rename to roomserver/storage/rooms_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/sql.go b/roomserver/storage/sql.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/sql.go
rename to roomserver/storage/sql.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/state_block_table.go b/roomserver/storage/state_block_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/state_block_table.go
rename to roomserver/storage/state_block_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/state_snapshot_table.go b/roomserver/storage/state_snapshot_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/state_snapshot_table.go
rename to roomserver/storage/state_snapshot_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/storage.go b/roomserver/storage/storage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/storage.go
rename to roomserver/storage/storage.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/types/types.go b/roomserver/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/types/types.go
rename to roomserver/types/types.go