restructuring and renaming