Folder structure updated and spool holder added