#21938726722099: Refactor to organize better the classes for second time