Api public

changes from public to non public classes