Remove FileBuilder, finish PdfBuilder implementation