renaming and structuring