Folder reorganization and PDF addition