Updated controller and services locations\namespaces, more updates underway