Reorg and documentation