Additionally, break out the analog stick mapping to the same file. This will make more sense soon when I change where the analog mapping is called from, but want this refactor in separately for testing.
