complete refactoring from common to vvmoss