Refactor: moved entity repositories from Entity to EntityRepository