Rename and reorganize widgetset