Move widgets to separate folder