restructure app and add email to contact form