Work on the 2nd refactor, rebuild the Pdf Object classes