Update build process to make debugging easier
Make zip creation neater