Lots of changes to structure.