Revert import paths