Install & remove keys
Lots more refactor on the zip creation front