Slight reorg of the components. Starting to think about RabbitMQ.