Move AMQP service to extension and refactor