Move some code across modules
Add support for netrc
Add caching for thesaurus requests