reorganized battery folder in a way that makes more sense