fixing visibility of classes and methods