Move classification to new file and clean up triage