Add namespacing to controllers