Added subfolders to viewmodel