Adding data directory, removing locations.