Moving stuff around to start OAuth1 support.