diff --git a/src/github.com/matrix-org/dendrite/appservice/README.md b/appservice/README.md
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/README.md
rename to appservice/README.md
diff --git a/src/github.com/matrix-org/dendrite/appservice/api/query.go b/appservice/api/query.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/api/query.go
rename to appservice/api/query.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/appservice.go b/appservice/appservice.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/appservice.go
rename to appservice/appservice.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/consumers/roomserver.go
rename to appservice/consumers/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/query/query.go b/appservice/query/query.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/query/query.go
rename to appservice/query/query.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/routing/routing.go b/appservice/routing/routing.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/routing/routing.go
rename to appservice/routing/routing.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/storage/appservice_events_table.go b/appservice/storage/appservice_events_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/storage/appservice_events_table.go
rename to appservice/storage/appservice_events_table.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/storage/storage.go b/appservice/storage/storage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/storage/storage.go
rename to appservice/storage/storage.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/storage/txn_id_counter_table.go b/appservice/storage/txn_id_counter_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/storage/txn_id_counter_table.go
rename to appservice/storage/txn_id_counter_table.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/types/types.go b/appservice/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/types/types.go
rename to appservice/types/types.go
diff --git a/src/github.com/matrix-org/dendrite/appservice/workers/transaction_scheduler.go b/appservice/workers/transaction_scheduler.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/appservice/workers/transaction_scheduler.go
rename to appservice/workers/transaction_scheduler.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/README.md b/clientapi/README.md
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/README.md
rename to clientapi/README.md
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/auth.go b/clientapi/auth/auth.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/auth.go
rename to clientapi/auth/auth.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/account.go b/clientapi/auth/authtypes/account.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/account.go
rename to clientapi/auth/authtypes/account.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/device.go b/clientapi/auth/authtypes/device.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/device.go
rename to clientapi/auth/authtypes/device.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/flow.go b/clientapi/auth/authtypes/flow.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/flow.go
rename to clientapi/auth/authtypes/flow.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/logintypes.go b/clientapi/auth/authtypes/logintypes.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/logintypes.go
rename to clientapi/auth/authtypes/logintypes.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/membership.go b/clientapi/auth/authtypes/membership.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/membership.go
rename to clientapi/auth/authtypes/membership.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/profile.go b/clientapi/auth/authtypes/profile.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/profile.go
rename to clientapi/auth/authtypes/profile.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/threepid.go b/clientapi/auth/authtypes/threepid.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/authtypes/threepid.go
rename to clientapi/auth/authtypes/threepid.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/account_data_table.go b/clientapi/auth/storage/accounts/account_data_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/account_data_table.go
rename to clientapi/auth/storage/accounts/account_data_table.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/accounts_table.go b/clientapi/auth/storage/accounts/accounts_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/accounts_table.go
rename to clientapi/auth/storage/accounts/accounts_table.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/filter_table.go b/clientapi/auth/storage/accounts/filter_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/filter_table.go
rename to clientapi/auth/storage/accounts/filter_table.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/membership_table.go b/clientapi/auth/storage/accounts/membership_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/membership_table.go
rename to clientapi/auth/storage/accounts/membership_table.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/profile_table.go b/clientapi/auth/storage/accounts/profile_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/profile_table.go
rename to clientapi/auth/storage/accounts/profile_table.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/storage.go b/clientapi/auth/storage/accounts/storage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/storage.go
rename to clientapi/auth/storage/accounts/storage.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/threepid_table.go b/clientapi/auth/storage/accounts/threepid_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/threepid_table.go
rename to clientapi/auth/storage/accounts/threepid_table.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go b/clientapi/auth/storage/devices/devices_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go
rename to clientapi/auth/storage/devices/devices_table.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go b/clientapi/auth/storage/devices/storage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go
rename to clientapi/auth/storage/devices/storage.go
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/consumers/roomserver.go b/clientapi/consumers/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/consumers/roomserver.go
rename to clientapi/consumers/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/httputil/httputil.go b/clientapi/httputil/httputil.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/httputil/httputil.go
rename to clientapi/httputil/httputil.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/httputil/parse.go b/clientapi/httputil/parse.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/httputil/parse.go
rename to clientapi/httputil/parse.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/jsonerror/jsonerror.go b/clientapi/jsonerror/jsonerror.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/jsonerror/jsonerror.go
rename to clientapi/jsonerror/jsonerror.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/jsonerror/jsonerror_test.go b/clientapi/jsonerror/jsonerror_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/jsonerror/jsonerror_test.go
rename to clientapi/jsonerror/jsonerror_test.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/producers/roomserver.go b/clientapi/producers/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/producers/roomserver.go
rename to clientapi/producers/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/producers/syncapi.go b/clientapi/producers/syncapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/producers/syncapi.go
rename to clientapi/producers/syncapi.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/producers/typingserver.go b/clientapi/producers/typingserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/producers/typingserver.go
rename to clientapi/producers/typingserver.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/producers/userupdate.go b/clientapi/producers/userupdate.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/producers/userupdate.go
rename to clientapi/producers/userupdate.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/account_data.go b/clientapi/routing/account_data.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/account_data.go
rename to clientapi/routing/account_data.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/createroom.go b/clientapi/routing/createroom.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/createroom.go
rename to clientapi/routing/createroom.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/device.go b/clientapi/routing/device.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/device.go
rename to clientapi/routing/device.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/directory.go b/clientapi/routing/directory.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/directory.go
rename to clientapi/routing/directory.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/filter.go b/clientapi/routing/filter.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/filter.go
rename to clientapi/routing/filter.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/joinroom.go
rename to clientapi/routing/joinroom.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/login.go b/clientapi/routing/login.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/login.go
rename to clientapi/routing/login.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/logout.go b/clientapi/routing/logout.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/logout.go
rename to clientapi/routing/logout.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/membership.go b/clientapi/routing/membership.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/membership.go
rename to clientapi/routing/membership.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/memberships.go b/clientapi/routing/memberships.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/memberships.go
rename to clientapi/routing/memberships.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/profile.go b/clientapi/routing/profile.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/profile.go
rename to clientapi/routing/profile.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/register.go b/clientapi/routing/register.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/register.go
rename to clientapi/routing/register.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/register_test.go b/clientapi/routing/register_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/register_test.go
rename to clientapi/routing/register_test.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go b/clientapi/routing/routing.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
rename to clientapi/routing/routing.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/sendevent.go b/clientapi/routing/sendevent.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/sendevent.go
rename to clientapi/routing/sendevent.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/sendtyping.go b/clientapi/routing/sendtyping.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/sendtyping.go
rename to clientapi/routing/sendtyping.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/threepid.go b/clientapi/routing/threepid.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/threepid.go
rename to clientapi/routing/threepid.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/voip.go b/clientapi/routing/voip.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/voip.go
rename to clientapi/routing/voip.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/whoami.go b/clientapi/routing/whoami.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/routing/whoami.go
rename to clientapi/routing/whoami.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/threepid/invites.go b/clientapi/threepid/invites.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/threepid/invites.go
rename to clientapi/threepid/invites.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/threepid/threepid.go b/clientapi/threepid/threepid.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/threepid/threepid.go
rename to clientapi/threepid/threepid.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/userutil/userutil.go b/clientapi/userutil/userutil.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/userutil/userutil.go
rename to clientapi/userutil/userutil.go
diff --git a/src/github.com/matrix-org/dendrite/clientapi/userutil/userutil_test.go b/clientapi/userutil/userutil_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/clientapi/userutil/userutil_test.go
rename to clientapi/userutil/userutil_test.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/client-api-proxy/main.go b/cmd/client-api-proxy/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/client-api-proxy/main.go
rename to cmd/client-api-proxy/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/create-account/main.go b/cmd/create-account/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/create-account/main.go
rename to cmd/create-account/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go b/cmd/create-room-events/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/create-room-events/main.go
rename to cmd/create-room-events/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-appservice-server/main.go b/cmd/dendrite-appservice-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-appservice-server/main.go
rename to cmd/dendrite-appservice-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-client-api-server/main.go
rename to cmd/dendrite-client-api-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-federation-api-server/main.go
rename to cmd/dendrite-federation-api-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-federation-sender-server/main.go b/cmd/dendrite-federation-sender-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-federation-sender-server/main.go
rename to cmd/dendrite-federation-sender-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go b/cmd/dendrite-media-api-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-media-api-server/main.go
rename to cmd/dendrite-media-api-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
rename to cmd/dendrite-monolith-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go b/cmd/dendrite-public-rooms-api-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-public-rooms-api-server/main.go
rename to cmd/dendrite-public-rooms-api-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go b/cmd/dendrite-room-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-room-server/main.go
rename to cmd/dendrite-room-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go b/cmd/dendrite-sync-api-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server/main.go
rename to cmd/dendrite-sync-api-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-typing-server/main.go b/cmd/dendrite-typing-server/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/dendrite-typing-server/main.go
rename to cmd/dendrite-typing-server/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/federation-api-proxy/main.go b/cmd/federation-api-proxy/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/federation-api-proxy/main.go
rename to cmd/federation-api-proxy/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/generate-keys/main.go b/cmd/generate-keys/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/generate-keys/main.go
rename to cmd/generate-keys/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/kafka-producer/main.go b/cmd/kafka-producer/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/kafka-producer/main.go
rename to cmd/kafka-producer/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests/TESTS.md b/cmd/mediaapi-integration-tests/TESTS.md
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests/TESTS.md
rename to cmd/mediaapi-integration-tests/TESTS.md
diff --git a/src/github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests/main.go b/cmd/mediaapi-integration-tests/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests/main.go
rename to cmd/mediaapi-integration-tests/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests/totem.jpg b/cmd/mediaapi-integration-tests/totem.jpg
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests/totem.jpg
rename to cmd/mediaapi-integration-tests/totem.jpg
diff --git a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go b/cmd/roomserver-integration-tests/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
rename to cmd/roomserver-integration-tests/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/main.go b/cmd/syncserver-integration-tests/main.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/main.go
rename to cmd/syncserver-integration-tests/main.go
diff --git a/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/testdata.go b/cmd/syncserver-integration-tests/testdata.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/testdata.go
rename to cmd/syncserver-integration-tests/testdata.go
diff --git a/src/github.com/matrix-org/dendrite/common/basecomponent/base.go b/common/basecomponent/base.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/basecomponent/base.go
rename to common/basecomponent/base.go
diff --git a/src/github.com/matrix-org/dendrite/common/basecomponent/flags.go b/common/basecomponent/flags.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/basecomponent/flags.go
rename to common/basecomponent/flags.go
diff --git a/src/github.com/matrix-org/dendrite/common/config/appservice.go b/common/config/appservice.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/config/appservice.go
rename to common/config/appservice.go
diff --git a/src/github.com/matrix-org/dendrite/common/config/config.go b/common/config/config.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/config/config.go
rename to common/config/config.go
diff --git a/src/github.com/matrix-org/dendrite/common/config/config_test.go b/common/config/config_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/config/config_test.go
rename to common/config/config_test.go
diff --git a/src/github.com/matrix-org/dendrite/common/consumers.go b/common/consumers.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/consumers.go
rename to common/consumers.go
diff --git a/src/github.com/matrix-org/dendrite/common/eventcontent.go b/common/eventcontent.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/eventcontent.go
rename to common/eventcontent.go
diff --git a/src/github.com/matrix-org/dendrite/common/events.go b/common/events.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/events.go
rename to common/events.go
diff --git a/src/github.com/matrix-org/dendrite/common/http/http.go b/common/http/http.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/http/http.go
rename to common/http/http.go
diff --git a/src/github.com/matrix-org/dendrite/common/httpapi.go b/common/httpapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/httpapi.go
rename to common/httpapi.go
diff --git a/src/github.com/matrix-org/dendrite/common/keydb/keydb.go b/common/keydb/keydb.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/keydb/keydb.go
rename to common/keydb/keydb.go
diff --git a/src/github.com/matrix-org/dendrite/common/keydb/keyring.go b/common/keydb/keyring.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/keydb/keyring.go
rename to common/keydb/keyring.go
diff --git a/src/github.com/matrix-org/dendrite/common/keydb/server_key_table.go b/common/keydb/server_key_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/keydb/server_key_table.go
rename to common/keydb/server_key_table.go
diff --git a/src/github.com/matrix-org/dendrite/common/log.go b/common/log.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/log.go
rename to common/log.go
diff --git a/src/github.com/matrix-org/dendrite/common/partition_offset_table.go b/common/partition_offset_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/partition_offset_table.go
rename to common/partition_offset_table.go
diff --git a/src/github.com/matrix-org/dendrite/common/sql.go b/common/sql.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/sql.go
rename to common/sql.go
diff --git a/src/github.com/matrix-org/dendrite/common/test/client.go b/common/test/client.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/test/client.go
rename to common/test/client.go
diff --git a/src/github.com/matrix-org/dendrite/common/test/config.go b/common/test/config.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/test/config.go
rename to common/test/config.go
diff --git a/src/github.com/matrix-org/dendrite/common/test/kafka.go b/common/test/kafka.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/test/kafka.go
rename to common/test/kafka.go
diff --git a/src/github.com/matrix-org/dendrite/common/test/server.go b/common/test/server.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/test/server.go
rename to common/test/server.go
diff --git a/src/github.com/matrix-org/dendrite/common/test/slice.go b/common/test/slice.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/test/slice.go
rename to common/test/slice.go
diff --git a/src/github.com/matrix-org/dendrite/common/transactions/transactions.go b/common/transactions/transactions.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/transactions/transactions.go
rename to common/transactions/transactions.go
diff --git a/src/github.com/matrix-org/dendrite/common/transactions/transactions_test.go b/common/transactions/transactions_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/transactions/transactions_test.go
rename to common/transactions/transactions_test.go
diff --git a/src/github.com/matrix-org/dendrite/common/types.go b/common/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/common/types.go
rename to common/types.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/federationapi.go b/federationapi/federationapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/federationapi.go
rename to federationapi/federationapi.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/backfill.go b/federationapi/routing/backfill.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/backfill.go
rename to federationapi/routing/backfill.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/devices.go b/federationapi/routing/devices.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/devices.go
rename to federationapi/routing/devices.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/events.go b/federationapi/routing/events.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/events.go
rename to federationapi/routing/events.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/invite.go b/federationapi/routing/invite.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/invite.go
rename to federationapi/routing/invite.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/join.go b/federationapi/routing/join.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/join.go
rename to federationapi/routing/join.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/keys.go b/federationapi/routing/keys.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/keys.go
rename to federationapi/routing/keys.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/leave.go b/federationapi/routing/leave.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/leave.go
rename to federationapi/routing/leave.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/missingevents.go b/federationapi/routing/missingevents.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/missingevents.go
rename to federationapi/routing/missingevents.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/profile.go b/federationapi/routing/profile.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/profile.go
rename to federationapi/routing/profile.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/query.go b/federationapi/routing/query.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/query.go
rename to federationapi/routing/query.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/routing.go b/federationapi/routing/routing.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/routing.go
rename to federationapi/routing/routing.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/send.go b/federationapi/routing/send.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/send.go
rename to federationapi/routing/send.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/state.go b/federationapi/routing/state.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/state.go
rename to federationapi/routing/state.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/threepid.go b/federationapi/routing/threepid.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/threepid.go
rename to federationapi/routing/threepid.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/routing/version.go b/federationapi/routing/version.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/routing/version.go
rename to federationapi/routing/version.go
diff --git a/src/github.com/matrix-org/dendrite/federationapi/types/types.go b/federationapi/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationapi/types/types.go
rename to federationapi/types/types.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver.go
rename to federationsender/consumers/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver_test.go b/federationsender/consumers/roomserver_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/consumers/roomserver_test.go
rename to federationsender/consumers/roomserver_test.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/consumers/typingserver.go b/federationsender/consumers/typingserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/consumers/typingserver.go
rename to federationsender/consumers/typingserver.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/federationsender.go b/federationsender/federationsender.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/federationsender.go
rename to federationsender/federationsender.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/queue/destinationqueue.go b/federationsender/queue/destinationqueue.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/queue/destinationqueue.go
rename to federationsender/queue/destinationqueue.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/queue/queue.go b/federationsender/queue/queue.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/queue/queue.go
rename to federationsender/queue/queue.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/storage/joined_hosts_table.go b/federationsender/storage/joined_hosts_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/storage/joined_hosts_table.go
rename to federationsender/storage/joined_hosts_table.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/storage/room_table.go b/federationsender/storage/room_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/storage/room_table.go
rename to federationsender/storage/room_table.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/storage/storage.go b/federationsender/storage/storage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/storage/storage.go
rename to federationsender/storage/storage.go
diff --git a/src/github.com/matrix-org/dendrite/federationsender/types/types.go b/federationsender/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/federationsender/types/types.go
rename to federationsender/types/types.go
diff --git a/go.mod b/go.mod
new file mode 100644
index 000000000..4ab381206
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,65 @@
+module github.com/matrix-org/dendrite
+
+require (
+	github.com/Shopify/sarama v0.0.0-20170127151855-574d3147eee3
+	github.com/alecthomas/gometalinter v2.0.2+incompatible
+	github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf
+	github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
+	github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a
+	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd
+	github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b
+	github.com/davecgh/go-spew v1.1.0
+	github.com/eapache/go-resiliency v0.0.0-20160104191539-b86b1ec0dd42
+	github.com/eapache/go-xerial-snappy v0.0.0-20160609142408-bb955e01b934
+	github.com/eapache/queue v1.1.0
+	github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b
+	github.com/golang/snappy v0.0.0-20170119014723-7db9049039a0
+	github.com/google/shlex v0.0.0-20150127133951-6f45313302b9
+	github.com/gorilla/context v1.1.1
+	github.com/gorilla/mux v1.3.0
+	github.com/jaegertracing/jaeger-client-go v0.0.0-20170921145708-3ad49a1d839b
+	github.com/jaegertracing/jaeger-lib v0.0.0-20170920222118-21a3da6d66fe
+	github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6
+	github.com/lib/pq v0.0.0-20170918175043-23da1db4f16d
+	github.com/matrix-org/dugong v0.0.0-20171220115018-ea0a4690a0d5
+	github.com/matrix-org/gomatrix v0.0.0-20171003113848-a7fc80c8060c
+	github.com/matrix-org/gomatrixserverlib v0.0.0-20181109104322-1c2cbc0872f0
+	github.com/matrix-org/naffka v0.0.0-20171115094957-662bfd0841d0
+	github.com/matrix-org/util v0.0.0-20171013132526-8b1c8ab81986
+	github.com/matttproud/golang_protobuf_extensions v1.0.1
+	github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5
+	github.com/nicksnyder/go-i18n v1.8.1
+	github.com/opentracing/opentracing-go v0.0.0-20170806192116-8ebe5d4e236e
+	github.com/pelletier/go-toml v0.0.0-20170904195809-1d6b12b7cb29
+	github.com/pierrec/lz4 v0.0.0-20161206202305-5c9560bfa9ac
+	github.com/pierrec/xxHash v0.0.0-20160112165351-5a004441f897
+	github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17
+	github.com/pmezard/go-difflib v1.0.0
+	github.com/prometheus/client_golang v0.0.0-20180519192340-c51dc758d4bb
+	github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335
+	github.com/prometheus/common v0.0.0-20170108231212-dd2f054febf4
+	github.com/prometheus/procfs v0.0.0-20170128160123-1878d9fbb537
+	github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5
+	github.com/sirupsen/logrus v0.0.0-20170822132746-89742aefa4b2
+	github.com/stretchr/testify v0.0.0-20170809224252-890a5c3458b4
+	github.com/tidwall/gjson v1.0.2
+	github.com/tidwall/match v0.0.0-20171002075945-1731857f09b1
+	github.com/tidwall/sjson v1.0.0
+	github.com/uber-go/atomic v1.3.0
+	github.com/uber/jaeger-client-go v2.15.0+incompatible
+	github.com/uber/jaeger-lib v1.5.0
+	github.com/uber/tchannel-go v0.0.0-20170927010734-b3e26487e291
+	go.uber.org/atomic v1.3.0
+	go.uber.org/multierr v0.0.0-20170829224307-fb7d312c2c04
+	go.uber.org/zap v1.7.1
+	golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
+	golang.org/x/net v0.0.0-20170927055102-0a9397675ba3
+	golang.org/x/sys v0.0.0-20171012164349-43eea11bc926
+	gopkg.in/Shopify/sarama.v1 v1.11.0
+	gopkg.in/airbrake/gobrake.v2 v2.0.9
+	gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20170727041045-23bcc3c4eae3
+	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2
+	gopkg.in/h2non/bimg.v1 v1.0.18
+	gopkg.in/macaroon.v2 v2.0.0
+	gopkg.in/yaml.v2 v2.0.0-20171116090243-287cf08546ab
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 000000000..0a5d0cb0b
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,100 @@
+github.com/Shopify/sarama v0.0.0-20170127151855-574d3147eee3 h1:j6BAEHYn1kUyW2j7kY0mOJ/R8A0qWwXpvUAEHGemm/g=
+github.com/Shopify/sarama v0.0.0-20170127151855-574d3147eee3/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/alecthomas/gometalinter v2.0.2+incompatible/go.mod h1:qfIpQGGz3d+NmgyPBqv+LSh50emm1pt72EtcX2vKYQk=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a h1:BtpsbiV638WQZwhA98cEZw2BsbnQJrbd0BI7tsy0W1c=
+github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/eapache/go-resiliency v0.0.0-20160104191539-b86b1ec0dd42 h1:f8ERmXYuaC+kCSv2w+y3rBK/oVu6If4DEm3jywJJ0hc=
+github.com/eapache/go-resiliency v0.0.0-20160104191539-b86b1ec0dd42/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20160609142408-bb955e01b934 h1:oGLoaVIefp3tiOgi7+KInR/nNPvEpPM6GFo+El7fd14=
+github.com/eapache/go-xerial-snappy v0.0.0-20160609142408-bb955e01b934/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b h1:fE/yi9pibxGEc0gSJuEShcsBXE2d5FW3OudsjE9tKzQ=
+github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.0-20170119014723-7db9049039a0 h1:FMElzTwkd/2jQ2QzLEzt97JRgvFhYhnYiaQSwZ7tuyU=
+github.com/golang/snappy v0.0.0-20170119014723-7db9049039a0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/shlex v0.0.0-20150127133951-6f45313302b9/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.3.0 h1:HwSEKGN6U5T2aAQTfu5pW8fiwjSp3IgwdRbkICydk/c=
+github.com/gorilla/mux v1.3.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/jaegertracing/jaeger-client-go v0.0.0-20170921145708-3ad49a1d839b/go.mod h1:HWG7INeOG1ZE17I/S8eeb+svquXmBS/hf1Obi6hJUyQ=
+github.com/jaegertracing/jaeger-lib v0.0.0-20170920222118-21a3da6d66fe/go.mod h1:VqeqQrZmZr9G4WdLw4ei9tAHU54iJRkfoFHvTTQn4jQ=
+github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 h1:KAZ1BW2TCmT6PRihDPpocIy1QTtsAsrx6TneU/4+CMg=
+github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
+github.com/lib/pq v0.0.0-20170918175043-23da1db4f16d h1:Hdtccv31GWxWoCzWsIhZXy5NxEktzAkA8lywhTKu8O4=
+github.com/lib/pq v0.0.0-20170918175043-23da1db4f16d/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/matrix-org/dugong v0.0.0-20171220115018-ea0a4690a0d5 h1:nMX2t7hbGF0NYDYySx0pCqEKGKAeZIiSqlWSspetlhY=
+github.com/matrix-org/dugong v0.0.0-20171220115018-ea0a4690a0d5/go.mod h1:NgPCr+UavRGH6n5jmdX8DuqFZ4JiCWIJoZiuhTRLSUg=
+github.com/matrix-org/gomatrix v0.0.0-20171003113848-a7fc80c8060c h1:aZap604NyBGhAUE0CyNHz6+Pryye5A5mHnYyO4KPPW8=
+github.com/matrix-org/gomatrix v0.0.0-20171003113848-a7fc80c8060c/go.mod h1:3fxX6gUjWyI/2Bt7J1OLhpCzOfO/bB3AiX0cJtEKud0=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20181109104322-1c2cbc0872f0 h1:3UzhmERBbis4ZaB3imEbZwtDjGz/oVRC2cLLEajCzJA=
+github.com/matrix-org/gomatrixserverlib v0.0.0-20181109104322-1c2cbc0872f0/go.mod h1:YHyhIQUmuXyKtoVfDUMk/DyU93Taamlu6nPZkij/JtA=
+github.com/matrix-org/naffka v0.0.0-20171115094957-662bfd0841d0 h1:p7WTwG+aXM86+yVrYAiCMW3ZHSmotVvuRbjtt3jC+4A=
+github.com/matrix-org/naffka v0.0.0-20171115094957-662bfd0841d0/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A=
+github.com/matrix-org/util v0.0.0-20171013132526-8b1c8ab81986 h1:TiWl4hLvezAhRPM8tPcPDFTysZ7k4T/1J4GPp/iqlZo=
+github.com/matrix-org/util v0.0.0-20171013132526-8b1c8ab81986/go.mod h1:lePuOiXLNDott7NZfnQvJk0lAZ5HgvIuWGhel6J+RLA=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY=
+github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
+github.com/nicksnyder/go-i18n v1.8.1/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q=
+github.com/opentracing/opentracing-go v0.0.0-20170806192116-8ebe5d4e236e h1:4cOVGAdR+woaUwhk6bgWI9ESJQDTaJMr8U4OJlT3J0Q=
+github.com/opentracing/opentracing-go v0.0.0-20170806192116-8ebe5d4e236e/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/pelletier/go-toml v0.0.0-20170904195809-1d6b12b7cb29/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pierrec/lz4 v0.0.0-20161206202305-5c9560bfa9ac h1:tKcxwAA5OHUQjL6sWsuCIcP9OnzN+RwKfvomtIOsfy8=
+github.com/pierrec/lz4 v0.0.0-20161206202305-5c9560bfa9ac/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/xxHash v0.0.0-20160112165351-5a004441f897 h1:jp3jc/PyyTrTKjJJ6rWnhTbmo7tGgBFyG9AL5FIrO1I=
+github.com/pierrec/xxHash v0.0.0-20160112165351-5a004441f897/go.mod h1:w2waW5Zoa/Wc4Yqe0wgrIYAGKqRMf7czn2HNKXmuL+I=
+github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17 h1:chPfVn+gpAM5CTpTyVU9j8J+xgRGwmoDlNDLjKnJiYo=
+github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.0.0-20180519192340-c51dc758d4bb h1:ghXIh3jvLRo/h3y2O7wBgcmH1th5NXQ4XHwK5CgI//I=
+github.com/prometheus/client_golang v0.0.0-20180519192340-c51dc758d4bb/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 h1:0E/5GnGmzoDCtmzTycjGDWW33H0UBmAhR0h+FC8hWLs=
+github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20170108231212-dd2f054febf4 h1:bZG2YNnM/Fjd3kiqaVt13Apkhzz24wBKlxQ+URiggXk=
+github.com/prometheus/common v0.0.0-20170108231212-dd2f054febf4/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20170128160123-1878d9fbb537 h1:Lp8kgy0YtdO1HXuD85DBJ0xGMbfoiVWRMDyKSOo7v9g=
+github.com/prometheus/procfs v0.0.0-20170128160123-1878d9fbb537/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5 h1:gwcdIpH6NU2iF8CmcqD+CP6+1CkRBOhHaPR+iu6raBY=
+github.com/rcrowley/go-metrics v0.0.0-20161128210544-1f30fe9094a5/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/sirupsen/logrus v0.0.0-20170822132746-89742aefa4b2 h1:+8J/sCAVv2Y9Ct1BKszDFJEVWv6Aynr2O4FYGUg6+Mc=
+github.com/sirupsen/logrus v0.0.0-20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
+github.com/stretchr/testify v0.0.0-20170809224252-890a5c3458b4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/tidwall/gjson v1.0.2 h1:5BsM7kyEAHAUGEGDkEKO9Mdyiuw6QQ6TSDdarP0Nnmk=
+github.com/tidwall/gjson v1.0.2/go.mod h1:c/nTNbUr0E0OrXEhq1pwa8iEgc2DOt4ZZqAt1HtCkPA=
+github.com/tidwall/match v0.0.0-20171002075945-1731857f09b1 h1:pWIN9LOlFRCJFqWIOEbHLvY0WWJddsjH2FQ6N0HKZdU=
+github.com/tidwall/match v0.0.0-20171002075945-1731857f09b1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+github.com/tidwall/sjson v1.0.0 h1:hOrzQPtGKlKAudQVmU43GkxEgG8TOgKyiKUyb7sE0rs=
+github.com/tidwall/sjson v1.0.0/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y=
+github.com/uber-go/atomic v1.3.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
+github.com/uber/jaeger-client-go v2.15.0+incompatible h1:NP3qsSqNxh8VYr956ur1N/1C1PjvOJnJykCzcD5QHbk=
+github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
+github.com/uber/jaeger-lib v1.5.0 h1:OHbgr8l656Ub3Fw5k9SWnBfIEwvoHQ+W2y+Aa9D1Uyo=
+github.com/uber/jaeger-lib v1.5.0/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
+github.com/uber/tchannel-go v0.0.0-20170927010734-b3e26487e291/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo=
+go.uber.org/atomic v1.3.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v0.0.0-20170829224307-fb7d312c2c04/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.7.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
+golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20170927055102-0a9397675ba3 h1:tTDpczhDVjW6WN3DinzKcw5juwkDTVn22I7MNlfxSXM=
+golang.org/x/net v0.0.0-20170927055102-0a9397675ba3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20171012164349-43eea11bc926 h1:PY6OU86NqbyZiOzaPnDw6oOjAGtYQqIua16z6y9QkwE=
+golang.org/x/sys v0.0.0-20171012164349-43eea11bc926/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+gopkg.in/Shopify/sarama.v1 v1.11.0 h1:/3kaCyeYaPbr59IBjeqhIcUOB1vXlIVqXAYa5g5C5F0=
+gopkg.in/Shopify/sarama.v1 v1.11.0/go.mod h1:AxnvoaevB2nBjNK17cG61A3LleFcWFwVBHBt+cot4Oc=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20170727041045-23bcc3c4eae3/go.mod h1:3HH7i1SgMqlzxCcBmUHW657sD4Kvv9sC3HpL3YukzwA=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/h2non/bimg.v1 v1.0.18/go.mod h1:PgsZL7dLwUbsGm1NYps320GxGgvQNTnecMCZqxV11So=
+gopkg.in/macaroon.v2 v2.0.0/go.mod h1:+I6LnTMkm/uV5ew/0nsulNjL16SK4+C8yDmRUzHR17I=
+gopkg.in/yaml.v2 v2.0.0-20171116090243-287cf08546ab h1:yZ6iByf7GKeJ3gsd1Dr/xaj1DyJ//wxKX1Cdh8LhoAw=
+gopkg.in/yaml.v2 v2.0.0-20171116090243-287cf08546ab/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/README.md b/mediaapi/README.md
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/README.md
rename to mediaapi/README.md
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/bimg-96x96-crop.jpg b/mediaapi/bimg-96x96-crop.jpg
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/bimg-96x96-crop.jpg
rename to mediaapi/bimg-96x96-crop.jpg
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/fileutils/fileutils.go b/mediaapi/fileutils/fileutils.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/fileutils/fileutils.go
rename to mediaapi/fileutils/fileutils.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/mediaapi.go b/mediaapi/mediaapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/mediaapi.go
rename to mediaapi/mediaapi.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/nfnt-96x96-crop.jpg b/mediaapi/nfnt-96x96-crop.jpg
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/nfnt-96x96-crop.jpg
rename to mediaapi/nfnt-96x96-crop.jpg
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/routing/download.go b/mediaapi/routing/download.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/routing/download.go
rename to mediaapi/routing/download.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/routing/routing.go b/mediaapi/routing/routing.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/routing/routing.go
rename to mediaapi/routing/routing.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/routing/upload.go b/mediaapi/routing/upload.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/routing/upload.go
rename to mediaapi/routing/upload.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/storage/media_repository_table.go b/mediaapi/storage/media_repository_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/storage/media_repository_table.go
rename to mediaapi/storage/media_repository_table.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/storage/prepare.go b/mediaapi/storage/prepare.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/storage/prepare.go
rename to mediaapi/storage/prepare.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/storage/sql.go b/mediaapi/storage/sql.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/storage/sql.go
rename to mediaapi/storage/sql.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/storage/storage.go b/mediaapi/storage/storage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/storage/storage.go
rename to mediaapi/storage/storage.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/storage/thumbnail_table.go b/mediaapi/storage/thumbnail_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/storage/thumbnail_table.go
rename to mediaapi/storage/thumbnail_table.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer.go b/mediaapi/thumbnailer/thumbnailer.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer.go
rename to mediaapi/thumbnailer/thumbnailer.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_bimg.go b/mediaapi/thumbnailer/thumbnailer_bimg.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_bimg.go
rename to mediaapi/thumbnailer/thumbnailer_bimg.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_nfnt.go b/mediaapi/thumbnailer/thumbnailer_nfnt.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/thumbnailer/thumbnailer_nfnt.go
rename to mediaapi/thumbnailer/thumbnailer_nfnt.go
diff --git a/src/github.com/matrix-org/dendrite/mediaapi/types/types.go b/mediaapi/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/mediaapi/types/types.go
rename to mediaapi/types/types.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/README.md b/publicroomsapi/README.md
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/README.md
rename to publicroomsapi/README.md
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/consumers/roomserver.go
rename to publicroomsapi/consumers/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/directory/directory.go b/publicroomsapi/directory/directory.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/directory/directory.go
rename to publicroomsapi/directory/directory.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/directory/public_rooms.go b/publicroomsapi/directory/public_rooms.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/directory/public_rooms.go
rename to publicroomsapi/directory/public_rooms.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/publicroomsapi.go b/publicroomsapi/publicroomsapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/publicroomsapi.go
rename to publicroomsapi/publicroomsapi.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/routing/routing.go b/publicroomsapi/routing/routing.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/routing/routing.go
rename to publicroomsapi/routing/routing.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/storage/prepare.go b/publicroomsapi/storage/prepare.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/storage/prepare.go
rename to publicroomsapi/storage/prepare.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/storage/public_rooms_table.go b/publicroomsapi/storage/public_rooms_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/storage/public_rooms_table.go
rename to publicroomsapi/storage/public_rooms_table.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/storage/storage.go b/publicroomsapi/storage/storage.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/storage/storage.go
rename to publicroomsapi/storage/storage.go
diff --git a/src/github.com/matrix-org/dendrite/publicroomsapi/types/types.go b/publicroomsapi/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/publicroomsapi/types/types.go
rename to publicroomsapi/types/types.go
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/alias/alias.go b/roomserver/alias/alias.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/alias/alias.go
rename to roomserver/alias/alias.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/api/alias.go b/roomserver/api/alias.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/api/alias.go
rename to roomserver/api/alias.go
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/api/output.go b/roomserver/api/output.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/api/output.go
rename to roomserver/api/output.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/api/query.go b/roomserver/api/query.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/api/query.go
rename to roomserver/api/query.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/auth/auth.go b/roomserver/auth/auth.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/auth/auth.go
rename to roomserver/auth/auth.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/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/input.go b/roomserver/input/input.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/input.go
rename to roomserver/input/input.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go b/roomserver/input/latest_events.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go
rename to roomserver/input/latest_events.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/membership.go b/roomserver/input/membership.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/input/membership.go
rename to roomserver/input/membership.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/query/query.go b/roomserver/query/query.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/query/query.go
rename to roomserver/query/query.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/query/query_test.go b/roomserver/query/query_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/query/query_test.go
rename to roomserver/query/query_test.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/roomserver.go b/roomserver/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/roomserver.go
rename to roomserver/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/state/state.go b/roomserver/state/state.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/state/state.go
rename to roomserver/state/state.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/state/state_test.go b/roomserver/state/state_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/state/state_test.go
rename to roomserver/state/state_test.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/invite_table.go b/roomserver/storage/invite_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/invite_table.go
rename to roomserver/storage/invite_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/membership_table.go b/roomserver/storage/membership_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/membership_table.go
rename to roomserver/storage/membership_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/prepare.go b/roomserver/storage/prepare.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/prepare.go
rename to roomserver/storage/prepare.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/previous_events_table.go b/roomserver/storage/previous_events_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/previous_events_table.go
rename to roomserver/storage/previous_events_table.go
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/room_aliases_table.go b/roomserver/storage/room_aliases_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/room_aliases_table.go
rename to roomserver/storage/room_aliases_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_block_table_test.go b/roomserver/storage/state_block_table_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/state_block_table_test.go
rename to roomserver/storage/state_block_table_test.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/storage/transactions_table.go b/roomserver/storage/transactions_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/roomserver/storage/transactions_table.go
rename to roomserver/storage/transactions_table.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
diff --git a/src/github.com/matrix-org/dendrite/syncapi/README.md b/syncapi/README.md
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/README.md
rename to syncapi/README.md
diff --git a/src/github.com/matrix-org/dendrite/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/consumers/clientapi.go
rename to syncapi/consumers/clientapi.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/consumers/roomserver.go
rename to syncapi/consumers/roomserver.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/routing/routing.go b/syncapi/routing/routing.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/routing/routing.go
rename to syncapi/routing/routing.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/routing/state.go b/syncapi/routing/state.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/routing/state.go
rename to syncapi/routing/state.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/account_data_table.go b/syncapi/storage/account_data_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/storage/account_data_table.go
rename to syncapi/storage/account_data_table.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/current_room_state_table.go b/syncapi/storage/current_room_state_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/storage/current_room_state_table.go
rename to syncapi/storage/current_room_state_table.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/invites_table.go b/syncapi/storage/invites_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/storage/invites_table.go
rename to syncapi/storage/invites_table.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go b/syncapi/storage/output_room_events_table.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/storage/output_room_events_table.go
rename to syncapi/storage/output_room_events_table.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go b/syncapi/storage/syncserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
rename to syncapi/storage/syncserver.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go b/syncapi/sync/notifier.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go
rename to syncapi/sync/notifier.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/sync/notifier_test.go b/syncapi/sync/notifier_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/sync/notifier_test.go
rename to syncapi/sync/notifier_test.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/sync/request.go b/syncapi/sync/request.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/sync/request.go
rename to syncapi/sync/request.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
rename to syncapi/sync/requestpool.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/sync/userstream.go b/syncapi/sync/userstream.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/sync/userstream.go
rename to syncapi/sync/userstream.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/syncapi.go b/syncapi/syncapi.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/syncapi.go
rename to syncapi/syncapi.go
diff --git a/src/github.com/matrix-org/dendrite/syncapi/types/types.go b/syncapi/types/types.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/syncapi/types/types.go
rename to syncapi/types/types.go
diff --git a/src/github.com/matrix-org/dendrite/typingserver/api/input.go b/typingserver/api/input.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/typingserver/api/input.go
rename to typingserver/api/input.go
diff --git a/src/github.com/matrix-org/dendrite/typingserver/api/output.go b/typingserver/api/output.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/typingserver/api/output.go
rename to typingserver/api/output.go
diff --git a/src/github.com/matrix-org/dendrite/typingserver/cache/cache.go b/typingserver/cache/cache.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/typingserver/cache/cache.go
rename to typingserver/cache/cache.go
diff --git a/src/github.com/matrix-org/dendrite/typingserver/cache/cache_test.go b/typingserver/cache/cache_test.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/typingserver/cache/cache_test.go
rename to typingserver/cache/cache_test.go
diff --git a/src/github.com/matrix-org/dendrite/typingserver/input/input.go b/typingserver/input/input.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/typingserver/input/input.go
rename to typingserver/input/input.go
diff --git a/src/github.com/matrix-org/dendrite/typingserver/typingserver.go b/typingserver/typingserver.go
similarity index 100%
rename from src/github.com/matrix-org/dendrite/typingserver/typingserver.go
rename to typingserver/typingserver.go