Update POM.xml a bit
Cleanup code that needs more planning
Add base for mail
move bases for mail
Docs and some other minor things. Pending implementation