refactor OrgClient.java , move https client to seperated class