Refactor code
Add email address to page
Rename factory files