Changes from refactoring Wrapper/Provider classes to their own package.