Moving handlers into a separate file