reorganized dataset locations, more script automation