begin moving things between Core and Builders for #2045 - Factory should now only depend on Core