rename Building #street -> #street_name
add building groups