Update directory's to be non-location specific