Fixed Packaging script and files to allow make reset-gaia to work