reorganization and renaming