Renamed BasicServices to EmailServices, small cleanup for file naming consistent with other framework services