make everything package-private

The big diff on this file is because I replaced tabs with spaces.