Organized by renaming and trimming