Add models for Folder and File.  Consolidate Folder Collection List and
File Collection List into Folder Content Collection