Moved Battery widgets out of main widget class
Rearrange and tidy code