refafactored to use xml and added folder notion