Refactoring of PDF classes and design changes of PDFs