Minor internal restructure.
Merge pull request #101 from richard-willowit/version70

Minor internal restructure.