Feature/major content reorg

Major reorganization of the content, as well as some new bits.