Final main changes to structure