Made more classes in the model package private.