reorg into single dir