New architecture of the model

See UML diagram. The description will be added soon