Refactor the Queues interface and object model to its new namespace