Move all public types into lib