Move city to Address module and add query cities functions