Moved CuvolEntry inside Cuvol