adds a queue service and refactors namespacing