Change some class from public to internal