starting the refactoring
Merge pull request #5 from varvara889/refactor-handlers

starting the refactoring