massive restructuring of data files; edited spatialvectors testst