First step on refactoring of introducing mvvmfx