More validation for email form and started organizing subfolders
resolved conflict and fixed subfolders