Moved files around + BaseViewModel