[*] Reorganization of the code. Creation of several classes.