Restructure filesystem, view model