Move mixing into VObj
Refactor classes into separate modules