Adjusts for new package folders