split files, reorg file structure