Updates after package reorg.