Refactoring controllers and services, using objects instead clousures. Work in progress..