Move declaration of classes in post init : is needed to know about other
plugins and further work on data injection compatibility
Merge branch '1.6-create-postinit'