#8: Standardize data locations in preparation for data containerization