refactor gapi/gapiClient for IoC
rename gapiClient and break out imap module