structure & renaming