removed unused views
added model group
partially refactorized code
Merge branch 'temp2' into develop
Merge branch 'develop'