Split battery handling into separate class(es)

Note that there are some functional changes. As such, there may be regressions. However, more likely we are fixing bugs in the process (like really odd time estimations after resume and such).