Refactoring: Now the project has 6 different modules each with its own concern to deal with