Merged streets
Renamed/refactored all the things