Reorganization of the classes and same use of the same config file