restructuring to add in folders