refactoring controllers as per the domain classses