refactoring controllers to ES6 - finished