Tiny fixes
Moved files
Refactored change email form
Validating current password in form