final refactor of vvmoss into vvm