Revert "Make refactoring of Entity Repositories, complete implementation of"

This reverts commit 1b6f84af84205a79b711cb47c6ea391d4e40ebac.
Revert "Revert "Make refactoring of Entity Repositories, complete implementation of""

This reverts commit 4e1da14696d162bc426f05d5298edf938fdb675c.