This is related to #235. It is just moving code around to more sensible locations. The branch name is weird because I thought I was gonna write some integration tests on top of this ... but there's too many missing pieces, still, so I'm not gonna right now.