More reorganization
Finish reorg, tweak documentation and building