changed folder layout/added new locations/updated old ones