Refactoring of the core vs modules