Restructure and renaming