[FIX] reorganise import