- Added some refactor on the zip file