Reorganize most contained views in main to match changes in book