Converted widgets to folder level