Replace FolderTypeModel with distinct FolderModel.

Close.