more dir reorg