Part 2 updates and restructure