Move some things around.

Wanted to clean up some definitions, for example.