Moved widgets to separate folder