reorg file structure