Fix import paths.
Remove core dependencies.