Update for new package layout