restored cleanup.sh & package.sh