rewiring under hood harness

Following, looking to simplify wiring under hood. :popcorn: