Fixed some entity issues

* Also fixed main composer json file, added both repos in replacement block
i just wonder since i see some projects like sylius doing a trait for this and segregating the interface perhaps for persistence or for DDD