Make some fields and methods private.
Make several classes package local instead of public.