Folders updated and neatened for marking