renames and structure