Refactor things

Lets move things around to make me feel better.