Dir structure reorg