Refactored controllers onto the module instead of global