move handlers into a package