move all handlers to one package