rename classes
whitespace and remove GPL (which I can do as the copyright holder)
got << working; replaced hack with it in test