Reorganise imports