Consolidate FILES and FILESINFO tables into only one