Fix up import paths