fix for JAL-1775 (and reorganise imports)