Add namespacing for controllers