Fixed some entity issues

* Also fixed main composer json file, added both repos in replacement block
Sure it is, you are right. Things MUST be discussed as much as possible :)

Thanks for your reports @cordoval