Changed public classes to private