ENH: directory reorg