reorg and documentation