Made more classes package private.