Third step for model unify, move ORM back to Entity folder.