Got rid of wrapping classes and chose better class names...