Make source structure more standard, merge macrun.sh with run,.sh