Moved misplaced classes into their spot.