FLUID-4907: Moved primaryBuilder to a subcomponent

Using the primary builder as a subcomponent of builder instead of being used as a grade. This works around the FLUID-5101. Also updated the demo to be initialized in manner more closely aligned with what we'd expect an integrator to use.