Refactor, data model, new entities selection.
Reorganisation.