Refactored Widgets Module as per class design