Move classes around, more javadoc

A little confusing at the moment, admittedly. But slowly getting there.