Refactored  Wifi to allow addons.
More changes to make Wifi extensible