clean up and begin change from widgets to modules