Controller modules refactoring