refactor VOs to Model for clarity - standardize object hierarchy