Migrate to new packaging system