Improve separation of document class and python semantic constructs. This

will allow us to have a class of smaller documents as well.