Move files and refine wscript (minor)