Remove duplicate patches, combine batteries

Combine batteries into one folder.