Major restructuring to alleviate growing pains in upgrading and more tinkering with the widget list and VPN widget.