Added several new classes to help navigate the internals.
Merge branch 'master'
Added/improved internal classes.