Moving to CQRS namespacing