Changed directory tree.
Refactor mvvm