Refactor - moved 3rd party interaction logic into services folder