Refactor: clean up class names and comments, organize into new groups.