Moving soupbuffet helper class from builder to src/common