Refactoring model classes
Merge branch 'master' of https://github.com/rdurham1007/vsparser