Fixed some entity issues

* Also fixed main composer json file, added both repos in replacement block
it is a proposal, discussions are happening. It is not good if you assume things. :blush: keep your good work