reorganize by type of thing