Fixed it to use the new package format