Use public classes whenever possible

@DeepDiver1975 @karlitschek