Correct import paths