Rearrage some files to flatten out structure.