rename StreetExpander to Streets and house some methods there