Reorganized Location Targets code