Move to new external import paths.