Resolve folder name conflicts in View, app to App, remove sections of deleted classes.