Changed visibility of some classes