Integrating qv_exp package into qvs, trying to unify codebase