fixed zip structure; project name now set to scratch id; small other
changes