Moving out some more functions.
Bumping to 2.0.0.

This finally has all of the stuff split out.