Updates to motivations, reorg