Fix up import locations.
Changelog.