Rewrite import paths to match upstream repo