Consolidating some of the files