Move queues to their own packages