ModelViewManager refactoring
86 files changed