Massive directory reorg