vvmoss to vvm refactoring