Reorganized some classes for style and some minor documentation changes.