Merge "Refactor widget folder"