Fixing the mvvm files