Email service now working, ConnectionProvider moved to Service

Change-Id: Ie098fe8b9d992c03b04c1a48dedb406d0c02bc30