Cleaning up DerMailer Module.php
Refactoring Modules.php files