Renaming and more strucuture