Changed locations structure

Changed object structure