renamed to MVA and updated to Model View Adapter patterns