Convert upstream to current directory structure