Please pardon the dirt and motor wiring. I've been testing a few motors recently.
Here's my layout, with the switch as mentioned. In this layout I cut the switch, but I put it in the same spot, uncut, with the more traditional layouts.