Clean code and reorganize.
Add mail capabilities.