Using John's 1/2/3 groups where ones are the negatives, twos are the positives and threes are the jumpers, I have labelled your existing setup, and how you'd wire your new setup. Not sure if you need both jumpers (3A and 3B) in parallel but certainly can't hurt.
Before you disconnect anything I would suggest putting masking tape labels on each cable so you don't lose track of where they go.