Move handlers to a separate subdir