consolidating everything to one file