solidified modal, added collapse, organized folder structure