2.0: ZIP Packages support almost finished