Organize more files into reparse_classifier