Move handlers to their own package