moving handlers to module files.