fix line order in prepare
create upstream directory. init/clean script for upstream tree users