Renaming layout to structures