Merge pull request #62 from kirill-kornyakov/another-restructure-before-lab2

Fixed paths to projects
Added my implementation on MVVM
Some code cleaning
Another iteration of code cleaning
Switched to org.junit.Assert