diff --git a/metadata/service/server/router.yml b/metadata/service/server/amqp/router.yml
similarity index 100%
rename from metadata/service/server/router.yml
rename to metadata/service/server/amqp/router.yml
diff --git a/metadata/service/server/shipper.yml b/metadata/service/server/amqp/shipper.yml
similarity index 100%
rename from metadata/service/server/shipper.yml
rename to metadata/service/server/amqp/shipper.yml