reorg directory structure