Email sender made into singleton.

Add/Remove build modules implemented as well.