Controllers refactoring.
Merge branch 'ew-dev'