Issue 24 : simplify modeling with only instances of kind / state / property

Maxime Lefrançoisrequested to merge
issue-24 into develop-v2.1.1

Merge request reports