Data structures are ready for refactoring.
New data model is completed
Renamings and movings
The conversion of old model to the new one is added (probably incomplete).