[Refactor] change entity namespace