[WIP] Reorg Docs

Going through the docs, updating things to match the reorg branch

Fixes #329
Fixed