Add DriveModel. Merge FileTypeCache into FileInfo class.