move handlers into own directory
split handlers into two files
load both files
small refactor