Renamed classes, modified visibility for internal classes