Further moved functionality into pyruntime.
Minor change to the download tool.