Commonize data location. Adjust script to match