Modified the SquareGen to first create Squares, then Blocks and then Buildings. The Blocks have several buildings and put a margin for the street to be added.
Collateral bugs: For some reason the buildings are no longer spawned on the right side when reaching near the edge of a Square. Could not find a fix for this.
I'm not site if I can stop tracking these, but I guess so