End of refactoring of the module