We're using various conventions right now, from putting the classes directly in the root package of that module, to putting them in a "test" package, to putting them next to the tests where they are needed.

Let's clean that up.