controllers refactoring
Merge pull request #2 from Dipress/task/refactoring_controllers

controllers refactoring