Reorganize uml
Merge pull request #39 from chdemko/master

Reorganize uml