Refactoring: controllers removed from global scope to APP.Ctrls