Oneof refactor 2 (#126)

* move classes up another level

* simplify test fixture class names

* replace some string literals of discriminators and object ids with a variable or call to a class name