Reorg dir struc