Added ViewModelBase & EntityBase

Minor refactoring & project structure clean up