Completely rebuild package

Completely rebuild package