Remove bad packaging
Add new packaging