more reorg + doc