Fixed build script
Fixed package script