Major changes to the structure.