[Improvement] Split location into location and sublocation

It might be nice to split the location into a location and sub-location. We might simply want to add a field in the location database to do this.