reorganise setup to avoid problem with windows updates