Update to new pkg locations