Changed repo directory back to email/name

Fixes #133 
Note : this includes the refactored tests from #137