reorganizing and renaming