replaced some "private" classes with something ...

makes more sense.