2.2.0: New substructure

• Merged PR #8: Refactor document substructure, fixing issue #6 (handling
  of special characters . and $) while doing so.
  (@thekid)