Updates after package reorganization.