Converted controllers to namespaced layout