Extract inner class to one visible inside the same package.