Refactoring of a good part of the application...