Change structure of classes are related by vagrant.
Merge branch 'master' of github.com:ytnobody/Testament