Switched to using Guice for no other reason than to learn another DI framework.  Refactored project structure, and simplified mail notifications.