Fully integrate DocX reader and convert DocX reader to use builder

As discussed by email. Let me know what you think of the changes.