moved files, made some updates to BaseViewModel