consolidating code and files