massive changes

1. Refactoring
2. Mail service ALFA