Correct import locations