Renaming more things. Packaging it as zip.