make everything package-private
public methods before protected
public methods before protected
Merge pull request #55 from rdwallis/nopub

make everything package-private