Make the package-private classes public