cleaning classes files and adding mail plugin