package rename
added service for mailing
some cleanup