Renaming and restructuring project