Changed locations to work for Amqp