Moved SpanBuilder into the BSD licenced library, where it's supposed to be. I say this is fine to do.