And update to use correct import paths.