Consolidate to single file