Moved DocumentBuilder to root package