Added new classes for new architecture of application.
Some changes in architecture, half done migrations.
Merge remote-tracking branch 'origin/master'