Changed repo directory back to email/name

Note : this includes the refactored tests from #137