Update imports to point to new locations.