Newparser 3

Changed the visibility of inner classes. 
Many whitespace changes.