refactoring entity and orm
refactoring entity/orm and docblocks