To help newer players find what they can and maybe should build, having infrastructure buildings intermixed with normal base buildings (e.g. in material buffer) does not help.
I would prefer them to be separated like the wrought products category and potentially having a separate background color for the icon.
Also it would be nice for infrastructure buildings to show the upkeep materials they can use in the buildings buffer.