Shuffled around files and added str methods for location_entity models