Refactoring data-entities structure.