Another contributor's e-mail added.

Also some file's structure changes made.