Refactor import after moving files about