Fixed some entity issues

* Also fixed main composer json file, added both repos in replacement block