renamed a couple of files related to email