reorganize, add email mockup