Restructure before lab2

Preparing before making my own pull request with lab2 (MVVM)