Make all classes except program public
Merge branch 'master' into tokenization