Converted the wrappers to directly extending the impls.
More refactoring of impl, including collapsing some of the package structure.