rework of folder, subfolders added n.b still work in progress