Added email verification

Moved some files to Private views
Fixed Merge conflicts