More reorg and some prep work on the broken quests