reordering directory structure and adding email.html