Removed Core.Utils and Core.Builders from the namespace