refactor handlers structure for #52
Merge remote-tracking branch 'origin/master'