rename module to widget. Cleaning up misc
cleaning up