Thanks fort he query. Not a simple task though, because aerial imagery cannot show where these units start and end, so there's no accurate method of obtaining the mappable geometry. I would suggest the better option is to retain the existing larger builgings, but add nodes in the known locations of shops; this is quite standard practice where different POIs share a building.