move bundle o.e.s.model.location to o.e.s.core.location