diff --git a/src/app/controllers/webhooks/webhook-connect.ts b/src/app/controllers/webhooks/webhook-connect.ts
index 52700d3ac..dc5fcfd60 100644
--- a/src/app/controllers/webhooks/webhook-connect.ts
+++ b/src/app/controllers/webhooks/webhook-connect.ts
@@ -3,7 +3,7 @@ if (process.env.NODE_ENV !== 'production') {
   require('dotenv').config()
 }
 
-import Stripe from '../../../shared/stripe/stripe'
+import Stripe from '../../../client/payment/stripe'
 import { payoutCreated } from '../../../modules/webhooks/payouts'
 import { payoutUpdated } from '../../../modules/webhooks/payouts'
 import { payoutFailed } from '../../../modules/webhooks/payouts'
diff --git a/src/app/controllers/webhooks/webhook-platform.ts b/src/app/controllers/webhooks/webhook-platform.ts
index 7bdf54bb2..6cc0d7132 100644
--- a/src/app/controllers/webhooks/webhook-platform.ts
+++ b/src/app/controllers/webhooks/webhook-platform.ts
@@ -3,7 +3,7 @@ if (process.env.NODE_ENV !== 'production') {
   require('dotenv').config()
 }
 
-const stripe = require('../../../shared/stripe/stripe')()
+const stripe = require('../../../client/payment/stripe').default()
 const chargeSucceeded = require('../../../modules/webhooks/chargeSucceeded')
 const checkoutSessionCompleted = require('../../../modules/webhooks/checkoutSessionCompleted')
 const customerSourceCreated = require('../../../modules/webhooks/customerSourceCreated')
diff --git a/src/client/payment/stripe.ts b/src/client/payment/stripe.ts
new file mode 100644
index 000000000..369d2488e
--- /dev/null
+++ b/src/client/payment/stripe.ts
@@ -0,0 +1,10 @@
+import Stripe from 'stripe'
+
+export default (): any => {
+  const passthroughFetch = (...args: Parameters<typeof fetch>) => fetch(...args)
+
+  return new Stripe(process.env.STRIPE_KEY || '', {
+    httpClient:
+      process.env.NODE_ENV === 'test' ? Stripe.createFetchHttpClient(passthroughFetch) : undefined
+  })
+}
diff --git a/src/modules/orders/orderBuilds.ts b/src/modules/orders/orderBuilds.ts
index 2c8ddeb98..8e956ddf8 100644
--- a/src/modules/orders/orderBuilds.ts
+++ b/src/modules/orders/orderBuilds.ts
@@ -4,7 +4,7 @@ import requestPromise from 'request-promise'
 import URLSearchParams from 'url-search-params'
 import * as URL from 'url'
 import Decimal from 'decimal.js'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import Sendmail from '../mail/mail'
 import { userCustomerCreate } from '../users/userCustomerCreate'
diff --git a/src/modules/orders/orderDetails/orderFetchInvoice.ts b/src/modules/orders/orderDetails/orderFetchInvoice.ts
index b1d9fe00f..109317038 100644
--- a/src/modules/orders/orderDetails/orderFetchInvoice.ts
+++ b/src/modules/orders/orderDetails/orderFetchInvoice.ts
@@ -1,4 +1,4 @@
-import Stripe from '../../../shared/stripe/stripe'
+import Stripe from '../../../client/payment/stripe'
 const stripe = Stripe()
 
 export default async function orderFetchInvoice(sourceId: any) {
diff --git a/src/modules/orders/orderRefund.ts b/src/modules/orders/orderRefund.ts
index b3075ea93..da59400b9 100644
--- a/src/modules/orders/orderRefund.ts
+++ b/src/modules/orders/orderRefund.ts
@@ -2,7 +2,7 @@ import models from '../../models'
 import PaymentMail from '../mail/payment'
 import requestPromise from 'request-promise'
 import { handleAmount } from '../util/handle-amount/handle-amount'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/orders/orderUpdate.ts b/src/modules/orders/orderUpdate.ts
index c0e892123..10615e1ae 100644
--- a/src/modules/orders/orderUpdate.ts
+++ b/src/modules/orders/orderUpdate.ts
@@ -4,7 +4,7 @@ import requestPromise from 'request-promise'
 import URLSearchParams from 'url-search-params'
 import * as URL from 'url'
 
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/paymentRequestPayments/paymentRequestPaymentRefund.ts b/src/modules/paymentRequestPayments/paymentRequestPaymentRefund.ts
index abc5c584a..1188fc716 100644
--- a/src/modules/paymentRequestPayments/paymentRequestPaymentRefund.ts
+++ b/src/modules/paymentRequestPayments/paymentRequestPaymentRefund.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import Stripe from '../../shared/stripe/stripe'
+import Stripe from '../../client/payment/stripe'
 
 const stripe = Stripe()
 const currentModels = models as any
diff --git a/src/modules/paymentRequests/paymentRequestBuilds.ts b/src/modules/paymentRequests/paymentRequestBuilds.ts
index 81f6b9ffb..a533bd1fa 100644
--- a/src/modules/paymentRequests/paymentRequestBuilds.ts
+++ b/src/modules/paymentRequests/paymentRequestBuilds.ts
@@ -1,5 +1,5 @@
 import Models from '../../models'
-import createStripe from '../../shared/stripe/stripe'
+import createStripe from '../../client/payment/stripe'
 import PaymentRequestMail from '../mail/paymentRequest'
 
 const db = Models as any
diff --git a/src/modules/paymentRequests/paymentRequestUpdate.ts b/src/modules/paymentRequests/paymentRequestUpdate.ts
index 21e00a82c..762605261 100644
--- a/src/modules/paymentRequests/paymentRequestUpdate.ts
+++ b/src/modules/paymentRequests/paymentRequestUpdate.ts
@@ -1,4 +1,4 @@
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import Models from '../../models'
 
diff --git a/src/modules/paymentRequestsTransfers/paymentRequestsTransfersFetch.ts b/src/modules/paymentRequestsTransfers/paymentRequestsTransfersFetch.ts
index c18a1a82e..36a5c25db 100644
--- a/src/modules/paymentRequestsTransfers/paymentRequestsTransfersFetch.ts
+++ b/src/modules/paymentRequestsTransfers/paymentRequestsTransfersFetch.ts
@@ -1,5 +1,5 @@
 import requestPromise from 'request-promise'
-import stripe from '../../shared/stripe/stripe'
+import stripe from '../../client/payment/stripe'
 import models from '../../models'
 
 const currentModels = models as any
diff --git a/src/modules/payouts/payoutRequest.ts b/src/modules/payouts/payoutRequest.ts
index e410af08e..18cf150bd 100644
--- a/src/modules/payouts/payoutRequest.ts
+++ b/src/modules/payouts/payoutRequest.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import Stripe from '../../shared/stripe/stripe'
+import Stripe from '../../client/payment/stripe'
 import { handleAmount } from '../util/handle-amount/handle-amount'
 
 const stripe = Stripe()
diff --git a/src/modules/tasks/taskPayment.ts b/src/modules/tasks/taskPayment.ts
index 08d8146ce..1ba9370b2 100644
--- a/src/modules/tasks/taskPayment.ts
+++ b/src/modules/tasks/taskPayment.ts
@@ -1,7 +1,7 @@
 import models from '../../models'
 import TransferMail from '../mail/transfer'
 
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/tasks/taskTransfer.ts b/src/modules/tasks/taskTransfer.ts
index 3ca28bd77..2535ff48e 100644
--- a/src/modules/tasks/taskTransfer.ts
+++ b/src/modules/tasks/taskTransfer.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/tasks/taskUpdate.ts b/src/modules/tasks/taskUpdate.ts
index c32ed3bd2..9af5bec2a 100644
--- a/src/modules/tasks/taskUpdate.ts
+++ b/src/modules/tasks/taskUpdate.ts
@@ -1,6 +1,6 @@
 import models from '../../models'
 import AssignMail from '../mail/assign'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import DeadlineMail from '../mail/deadline'
 import { assignExists as assignExist } from '../assigns'
diff --git a/src/modules/transfers/transferBuilds.ts b/src/modules/transfers/transferBuilds.ts
index 3db00b84d..f56e0ecf8 100644
--- a/src/modules/transfers/transferBuilds.ts
+++ b/src/modules/transfers/transferBuilds.ts
@@ -2,7 +2,7 @@ import models from '../../models'
 
 const currentModels = models as any
 import requestPromise from 'request-promise'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import TransferMail from '../mail/transfer'
 
diff --git a/src/modules/transfers/transferFetch.ts b/src/modules/transfers/transferFetch.ts
index 1c3e104de..e9b32fc88 100644
--- a/src/modules/transfers/transferFetch.ts
+++ b/src/modules/transfers/transferFetch.ts
@@ -2,7 +2,7 @@ import models from '../../models'
 
 const currentModels = models as any
 import requestPromise from 'request-promise'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 export async function transferFetch(id: number) {
diff --git a/src/modules/transfers/transferUpdate.ts b/src/modules/transfers/transferUpdate.ts
index 6e51645a5..2529d4355 100644
--- a/src/modules/transfers/transferUpdate.ts
+++ b/src/modules/transfers/transferUpdate.ts
@@ -2,7 +2,7 @@ import models from '../../models'
 
 const currentModels = models as any
 import requestPromise from 'request-promise'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import TransferMail from '../mail/transfer'
 
diff --git a/src/modules/users/userAccount.ts b/src/modules/users/userAccount.ts
index 78052a17b..3ca028d1f 100644
--- a/src/modules/users/userAccount.ts
+++ b/src/modules/users/userAccount.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/users/userAccountBalance.ts b/src/modules/users/userAccountBalance.ts
index 7910481a0..fa17a9080 100644
--- a/src/modules/users/userAccountBalance.ts
+++ b/src/modules/users/userAccountBalance.ts
@@ -1,4 +1,4 @@
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 type UserAccountBalanceParams = {
diff --git a/src/modules/users/userAccountCountries.ts b/src/modules/users/userAccountCountries.ts
index c0479d764..13d7eca9e 100644
--- a/src/modules/users/userAccountCountries.ts
+++ b/src/modules/users/userAccountCountries.ts
@@ -1,4 +1,4 @@
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import { userAccount as getUserAccount } from './userAccount'
 
diff --git a/src/modules/users/userAccountCreate.ts b/src/modules/users/userAccountCreate.ts
index 690f45fb0..ee93f657f 100644
--- a/src/modules/users/userAccountCreate.ts
+++ b/src/modules/users/userAccountCreate.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/users/userAccountDelete.ts b/src/modules/users/userAccountDelete.ts
index f8e88bee1..768a715cc 100644
--- a/src/modules/users/userAccountDelete.ts
+++ b/src/modules/users/userAccountDelete.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/users/userBankAccount.ts b/src/modules/users/userBankAccount.ts
index 3a86d28f0..f970396e6 100644
--- a/src/modules/users/userBankAccount.ts
+++ b/src/modules/users/userBankAccount.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/users/userBankAccountCreate.ts b/src/modules/users/userBankAccountCreate.ts
index 647f6c49a..1bb52f406 100644
--- a/src/modules/users/userBankAccountCreate.ts
+++ b/src/modules/users/userBankAccountCreate.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import { currencyMap } from '../util/currency-map'
 
diff --git a/src/modules/users/userBankAccountUpdate.ts b/src/modules/users/userBankAccountUpdate.ts
index 93ed54b91..a0afb7781 100644
--- a/src/modules/users/userBankAccountUpdate.ts
+++ b/src/modules/users/userBankAccountUpdate.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/users/userCustomer.ts b/src/modules/users/userCustomer.ts
index bcae4b103..11d3b52e3 100644
--- a/src/modules/users/userCustomer.ts
+++ b/src/modules/users/userCustomer.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/users/userCustomerCreate.ts b/src/modules/users/userCustomerCreate.ts
index e1bcffca7..c2fed79e3 100644
--- a/src/modules/users/userCustomerCreate.ts
+++ b/src/modules/users/userCustomerCreate.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/users/userCustomerUpdate.ts b/src/modules/users/userCustomerUpdate.ts
index cd0454d16..2c0cb1073 100644
--- a/src/modules/users/userCustomerUpdate.ts
+++ b/src/modules/users/userCustomerUpdate.ts
@@ -1,5 +1,5 @@
 import models from '../../models'
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 
 const currentModels = models as any
diff --git a/src/modules/util/customer.ts b/src/modules/util/customer.ts
index 3b7921357..3354ad879 100644
--- a/src/modules/util/customer.ts
+++ b/src/modules/util/customer.ts
@@ -1,4 +1,4 @@
-import stripeModule from '../../shared/stripe/stripe'
+import stripeModule from '../../client/payment/stripe'
 const stripe = stripeModule()
 import models from '../../models'
 
diff --git a/src/modules/walletOrders/walletOrderBuilds.ts b/src/modules/walletOrders/walletOrderBuilds.ts
index 017858af6..ed7990743 100644
--- a/src/modules/walletOrders/walletOrderBuilds.ts
+++ b/src/modules/walletOrders/walletOrderBuilds.ts
@@ -1,4 +1,4 @@
-import stripe from '../../shared/stripe/stripe'
+import stripe from '../../client/payment/stripe'
 import models from '../../models'
 import { createOrUpdateCustomer } from '../util/customer'
 
diff --git a/src/modules/walletOrders/walletOrderFetch.ts b/src/modules/walletOrders/walletOrderFetch.ts
index 196d5bcd5..8e5cc19be 100644
--- a/src/modules/walletOrders/walletOrderFetch.ts
+++ b/src/modules/walletOrders/walletOrderFetch.ts
@@ -1,4 +1,4 @@
-import stripe from '../../shared/stripe/stripe'
+import stripe from '../../client/payment/stripe'
 import models from '../../models'
 
 const currentModels = models as any
diff --git a/src/modules/webhooks/balanceAvailable.js b/src/modules/webhooks/balanceAvailable.js
index d81dc800a..469bddb27 100644
--- a/src/modules/webhooks/balanceAvailable.js
+++ b/src/modules/webhooks/balanceAvailable.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function balanceAvailable(event, req, res) {
diff --git a/src/modules/webhooks/chargeFailed.js b/src/modules/webhooks/chargeFailed.js
index fc4c2f98e..b149484bd 100644
--- a/src/modules/webhooks/chargeFailed.js
+++ b/src/modules/webhooks/chargeFailed.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function chargeFailed(event, paid, status, req, res) {
diff --git a/src/modules/webhooks/charges/chargeDisputeClosed/chargeDisputeClosed.ts b/src/modules/webhooks/charges/chargeDisputeClosed/chargeDisputeClosed.ts
index a34533433..a8cb27e3d 100644
--- a/src/modules/webhooks/charges/chargeDisputeClosed/chargeDisputeClosed.ts
+++ b/src/modules/webhooks/charges/chargeDisputeClosed/chargeDisputeClosed.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import Stripe from '../../../../shared/stripe/stripe'
+import Stripe from '../../../../client/payment/stripe'
 import Models from '../../../../models'
 import { closeDisputeForPaymentRequest } from '../../../../services/payments/disputes/disputeService'
 
diff --git a/src/modules/webhooks/charges/chargeRefunded/chargeRefunded.ts b/src/modules/webhooks/charges/chargeRefunded/chargeRefunded.ts
index 6492ec202..2988d45d4 100644
--- a/src/modules/webhooks/charges/chargeRefunded/chargeRefunded.ts
+++ b/src/modules/webhooks/charges/chargeRefunded/chargeRefunded.ts
@@ -1,4 +1,4 @@
-import Stripe from '../../../../shared/stripe/stripe'
+import Stripe from '../../../../client/payment/stripe'
 import { handleChargeRefundedIssue } from './chargeRefundedIssue'
 import { handleChargeRefundedPaymentRequest } from './chargeRefundedPaymentRequest'
 
diff --git a/src/modules/webhooks/charges/chargeRefunded/chargeRefundedPaymentRequest.ts b/src/modules/webhooks/charges/chargeRefunded/chargeRefundedPaymentRequest.ts
index 6fac5d456..aa159f2c8 100644
--- a/src/modules/webhooks/charges/chargeRefunded/chargeRefundedPaymentRequest.ts
+++ b/src/modules/webhooks/charges/chargeRefunded/chargeRefundedPaymentRequest.ts
@@ -1,6 +1,6 @@
 import Models from '../../../../models'
 import PaymentRequestMail from '../../../mail/paymentRequest'
-import Stripe from '../../../../shared/stripe/stripe'
+import Stripe from '../../../../client/payment/stripe'
 import { handleAmount } from '../../../util/handle-amount/handle-amount'
 
 const stripe = Stripe()
diff --git a/src/modules/webhooks/checkoutSessionCompleted.js b/src/modules/webhooks/checkoutSessionCompleted.js
index 914e79dca..7dfb335b6 100644
--- a/src/modules/webhooks/checkoutSessionCompleted.js
+++ b/src/modules/webhooks/checkoutSessionCompleted.js
@@ -2,7 +2,7 @@
 if (process.env.NODE_ENV !== 'production') {
   require('dotenv').config()
 }
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const models = require('../../models')
 const { handleAmount } = require('../util/handle-amount/handle-amount')
 const PaymentRequestMail = require('../mail/paymentRequest')
diff --git a/src/modules/webhooks/customerSourceCreated.js b/src/modules/webhooks/customerSourceCreated.js
index b541c37d4..c3707766a 100644
--- a/src/modules/webhooks/customerSourceCreated.js
+++ b/src/modules/webhooks/customerSourceCreated.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function customerSourceCreated(event, req, res) {
diff --git a/src/modules/webhooks/invoiceCreated.js b/src/modules/webhooks/invoiceCreated.js
index f5441f74f..e8d325a8c 100644
--- a/src/modules/webhooks/invoiceCreated.js
+++ b/src/modules/webhooks/invoiceCreated.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function invoiceCreated(event, req, res) {
diff --git a/src/modules/webhooks/invoiceFinalized.js b/src/modules/webhooks/invoiceFinalized.js
index d772971cc..ea59dba89 100644
--- a/src/modules/webhooks/invoiceFinalized.js
+++ b/src/modules/webhooks/invoiceFinalized.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function invoiceFinalized(event, req, res) {
diff --git a/src/modules/webhooks/invoicePaid.js b/src/modules/webhooks/invoicePaid.js
index 6bbcbb88f..3a391a6a1 100644
--- a/src/modules/webhooks/invoicePaid.js
+++ b/src/modules/webhooks/invoicePaid.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function invoicePaid(event, req, res) {
diff --git a/src/modules/webhooks/invoicePaymentFailed.js b/src/modules/webhooks/invoicePaymentFailed.js
index 5712a03f9..62326200f 100644
--- a/src/modules/webhooks/invoicePaymentFailed.js
+++ b/src/modules/webhooks/invoicePaymentFailed.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function invoicePaymentFailed(event, req, res) {
diff --git a/src/modules/webhooks/invoicePaymentSucceeded.js b/src/modules/webhooks/invoicePaymentSucceeded.js
index 73381d8b6..4f7417568 100644
--- a/src/modules/webhooks/invoicePaymentSucceeded.js
+++ b/src/modules/webhooks/invoicePaymentSucceeded.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function invoicePaymentSucceeded(event, req, res) {
diff --git a/src/modules/webhooks/invoiceUpdated.js b/src/modules/webhooks/invoiceUpdated.js
index 506cce8da..cd7ce43ae 100644
--- a/src/modules/webhooks/invoiceUpdated.js
+++ b/src/modules/webhooks/invoiceUpdated.js
@@ -3,7 +3,7 @@ const i18n = require('i18n')
 const moment = require('moment')
 const SendMail = require('../mail/mail')
 const WalletMail = require('../mail/wallet')
-const stripe = require('../../shared/stripe/stripe')()
+const stripe = require('../../client/payment/stripe').default()
 const { FAILED_REASON, CURRENCIES, formatStripeAmount } = require('./constants')
 
 module.exports = async function invoiceUpdated(event, req, res) {
diff --git a/src/modules/webhooks/transfers/transferCreated/transferCreatedIssue.ts b/src/modules/webhooks/transfers/transferCreated/transferCreatedIssue.ts
index 2f3a1b80a..331d8c911 100644
--- a/src/modules/webhooks/transfers/transferCreated/transferCreatedIssue.ts
+++ b/src/modules/webhooks/transfers/transferCreated/transferCreatedIssue.ts
@@ -1,7 +1,7 @@
 import Models from '../../../../models'
 import i18n from 'i18n'
 import SendMail from '../../../mail/mail'
-import initStripe from '../../../../shared/stripe/stripe'
+import initStripe from '../../../../client/payment/stripe'
 
 const models = Models as any
 const stripe = initStripe()
diff --git a/src/modules/webhooks/transfers/transferReversed/transferReversed.ts b/src/modules/webhooks/transfers/transferReversed/transferReversed.ts
index 67e5abc53..2eca3955e 100644
--- a/src/modules/webhooks/transfers/transferReversed/transferReversed.ts
+++ b/src/modules/webhooks/transfers/transferReversed/transferReversed.ts
@@ -1,4 +1,4 @@
-import createStripe from '../../../../shared/stripe/stripe'
+import createStripe from '../../../../client/payment/stripe'
 import { transferReversedPaymentRequest } from './transferReversedPaymentRequest'
 import { transferReversedIssue } from './transferReversedIssue'
 
diff --git a/src/mutations/user/updateUser/updateUserAccount.ts b/src/mutations/user/updateUser/updateUserAccount.ts
index 28ccd1950..d3d5c9cf2 100644
--- a/src/mutations/user/updateUser/updateUserAccount.ts
+++ b/src/mutations/user/updateUser/updateUserAccount.ts
@@ -1,4 +1,4 @@
-import Stripe from '../../../shared/stripe/stripe'
+import Stripe from '../../../client/payment/stripe'
 import { type UserParameters } from './updateUser'
 
 const stripe = Stripe()
diff --git a/src/scripts/payouts/payout_sync.ts b/src/scripts/payouts/payout_sync.ts
index d11e9c27e..4466c0c28 100644
--- a/src/scripts/payouts/payout_sync.ts
+++ b/src/scripts/payouts/payout_sync.ts
@@ -1,6 +1,6 @@
 import { Op } from 'sequelize'
 import Models from '../../models'
-import Stripe from '../../shared/stripe/stripe'
+import Stripe from '../../client/payment/stripe'
 
 const models = Models as any
 const stripe = Stripe()
diff --git a/src/scripts/reports/revenue-reports/lib/stripe.ts b/src/scripts/reports/revenue-reports/lib/stripe.ts
index df8f128c5..9e95a6e42 100644
--- a/src/scripts/reports/revenue-reports/lib/stripe.ts
+++ b/src/scripts/reports/revenue-reports/lib/stripe.ts
@@ -1,4 +1,4 @@
-import StripeFactory from '../../../../shared/stripe/stripe'
+import StripeFactory from '../../../../client/payment/stripe'
 import { Charge, Transfer } from './types'
 
 export const stripe: any = StripeFactory()
diff --git a/src/scripts/scripts.js b/src/scripts/scripts.js
index abb50768c..6cdc6f305 100644
--- a/src/scripts/scripts.js
+++ b/src/scripts/scripts.js
@@ -4,7 +4,7 @@ const Promise = require('bluebird')
 const url = require('url')
 const requestPromise = require('request-promise')
 const i18n = require('i18n')
-const stripe = require('../shared/stripe/stripe')()
+const stripe = require('../client/payment/stripe').default()
 const SendMail = require('../modules/mail/mail')
 
 i18n.configure({
diff --git a/src/scripts/sync/sync_payment_requests.ts b/src/scripts/sync/sync_payment_requests.ts
index fa722869e..2e916b24c 100644
--- a/src/scripts/sync/sync_payment_requests.ts
+++ b/src/scripts/sync/sync_payment_requests.ts
@@ -1,4 +1,4 @@
-import Stripe from '../../shared/stripe/stripe'
+import Stripe from '../../client/payment/stripe'
 import Models from '../../models'
 import { UUIDV4 } from 'sequelize'
 import { handleAmount } from '../../modules/util/handle-amount/handle-amount'
diff --git a/src/services/payments/disputes/disputeService.ts b/src/services/payments/disputes/disputeService.ts
index 904fe3eb0..41bc72bbe 100644
--- a/src/services/payments/disputes/disputeService.ts
+++ b/src/services/payments/disputes/disputeService.ts
@@ -1,4 +1,4 @@
-import Stripe from '../../../shared/stripe/stripe'
+import Stripe from '../../../client/payment/stripe'
 import Models from '../../../models'
 import { DisputeDataCreated, DisputeDataWithdrawn, DisputeDataClosed } from './types'
 import PaymentRequestMail from '../../../modules/mail/paymentRequest'
diff --git a/src/shared/stripe/stripe.js b/src/shared/stripe/stripe.js
deleted file mode 100644
index 31f674496..000000000
--- a/src/shared/stripe/stripe.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = () => {
-  const Stripe = require('stripe')
-  const passthroughFetch = (...args) => fetch(...args)
-
-  return new Stripe(process.env.STRIPE_KEY, {
-    httpClient:
-      process.env.NODE_ENV === 'test' ? Stripe.createFetchHttpClient(passthroughFetch) : undefined
-  })
-}
diff --git a/test/order.test.ts b/test/order.test.ts
index d22d5999d..fda2e48f2 100644
--- a/test/order.test.ts
+++ b/test/order.test.ts
@@ -8,7 +8,7 @@ import Models from '../src/models'
 import { registerAndLogin, register, login, truncateModels } from './helpers'
 import { TaskFactory, OrderFactory, WalletFactory, WalletOrderFactory } from './factories'
 import PaymentMail from '../src/modules/mail/payment'
-import stripe from '../src/shared/stripe/stripe'
+import stripe from '../src/client/payment/stripe'
 import customerData from './data/stripe/stripe.customer'
 import invoiceData from './data/stripe/stripe.invoice.basic'