diff --git a/src/graphql/mutation/user.mutation.ts b/framework/vendure/utils/mutations/verify-customer-account-mutation.ts
similarity index 59%
rename from src/graphql/mutation/user.mutation.ts
rename to framework/vendure/utils/mutations/verify-customer-account-mutation.ts
index 40812db19..2df2bc53d 100644
--- a/src/graphql/mutation/user.mutation.ts
+++ b/framework/vendure/utils/mutations/verify-customer-account-mutation.ts
@@ -1,8 +1,5 @@
-import { gql } from 'graphql-request'
-
-
-export const VERIFY_CUSTOMER_ACCOUNT = gql`
-mutation verifyCustomerAccount($token: String!, $password: String) {
+export const verifyCustomerAccountMutaton = /* GraphQL */ `
+  mutation verifyCustomerAccount($token: String!, $password: String) {
   verifyCustomerAccount( token: $token, password: $password) {
       __typename
       ...on CurrentUser {
@@ -16,5 +13,3 @@ mutation verifyCustomerAccount($token: String!, $password: String) {
     }
   }
 `
-
-
diff --git a/src/components/hooks/auth/useActiveCustomer.tsx b/src/components/hooks/auth/useActiveCustomer.tsx
index 4226a15b7..f0f4f6fef 100644
--- a/src/components/hooks/auth/useActiveCustomer.tsx
+++ b/src/components/hooks/auth/useActiveCustomer.tsx
@@ -1,21 +1,10 @@
 import { ActiveCustomerQuery } from '@framework/schema'
-import { gql } from 'graphql-request'
+import { activeCustomerQuery } from '@framework/utils/queries/active-customer-query'
 import gglFetcher from 'src/utils/gglFetcher'
 import useSWR from 'swr'
 
-const query = gql`
-  query activeCustomer {
-    activeCustomer {
-      id
-      firstName
-      lastName
-      emailAddress
-    }
-  }
-`
-
 const useActiveCustomer = () => {
-  const { data, ...rest } = useSWR<ActiveCustomerQuery>([query], gglFetcher)
+  const { data, ...rest } = useSWR<ActiveCustomerQuery>([activeCustomerQuery], gglFetcher)
   return { customer: data?.activeCustomer, ...rest }
 }
 
diff --git a/src/components/hooks/auth/useLogin.tsx b/src/components/hooks/auth/useLogin.tsx
index 0b97e8d8b..d38390004 100644
--- a/src/components/hooks/auth/useLogin.tsx
+++ b/src/components/hooks/auth/useLogin.tsx
@@ -1,4 +1,3 @@
-import { gql } from 'graphql-request'
 import { useState } from 'react'
 import useActiveCustomer from './useActiveCustomer'
 import { CommonError } from 'src/domains/interfaces/CommonError'
@@ -6,21 +5,7 @@ import rawFetcher from 'src/utils/rawFetcher'
 import { LoginMutation } from '@framework/schema'
 import { LOCAL_STORAGE_KEY } from 'src/utils/constanst.utils'
 import { errorMapping } from 'src/utils/errrorMapping'
-
-const query = gql`
-  mutation login($username: String!, $password: String!) {
-    login(username: $username, password: $password) {
-      __typename
-      ... on CurrentUser {
-        id
-      }
-      ... on ErrorResult {
-        errorCode
-        message
-      }
-    }
-  }
-`
+import { loginMutation } from '@framework/utils/mutations/log-in-mutation'
 
 interface LoginInput {
   username: string
@@ -38,7 +23,7 @@ const useLogin = () => {
     setError(null)
     setLoading(true)
     rawFetcher<LoginMutation>({
-      query,
+      query: loginMutation,
       variables: options,
     })
       .then(({ data, headers }) => {
diff --git a/src/components/hooks/auth/useSignup.tsx b/src/components/hooks/auth/useSignup.tsx
index 4842915e1..922460c77 100644
--- a/src/components/hooks/auth/useSignup.tsx
+++ b/src/components/hooks/auth/useSignup.tsx
@@ -1,24 +1,9 @@
-import { gql } from 'graphql-request'
 import { useState } from 'react'
 import useActiveCustomer from './useActiveCustomer'
 import { SignupMutation } from '@framework/schema'
 import fetcher from 'src/utils/fetcher'
 import { CommonError } from 'src/domains/interfaces/CommonError'
-
-const query = gql`
-  mutation signup($input: RegisterCustomerInput!) {
-    registerCustomerAccount(input: $input) {
-      __typename
-      ... on Success {
-        success
-      }
-      ... on ErrorResult {
-        errorCode
-        message
-      }
-    }
-  }
-`
+import { signupMutation } from '@framework/utils/mutations/sign-up-mutation'
 
 interface SignupInput {
   email: string
@@ -39,7 +24,7 @@ const useSignup = () => {
     setError(null)
     setLoading(true)
     fetcher<SignupMutation>({
-      query,
+      query: signupMutation,
       variables: {
         input: {
           firstName,
diff --git a/src/components/hooks/auth/useVerifyCustomer.tsx b/src/components/hooks/auth/useVerifyCustomer.tsx
index af05729a7..181444b51 100644
--- a/src/components/hooks/auth/useVerifyCustomer.tsx
+++ b/src/components/hooks/auth/useVerifyCustomer.tsx
@@ -2,8 +2,8 @@ import { VerifyCustomerAccountMutation } from '@framework/schema'
 import { useState } from 'react'
 import { CommonError } from 'src/domains/interfaces/CommonError'
 import rawFetcher from 'src/utils/rawFetcher'
-import { VERIFY_CUSTOMER_ACCOUNT } from '../../../graphql/mutation'
 import useActiveCustomer from './useActiveCustomer'
+import { verifyCustomerAccountMutaton } from '@framework/utils/mutations/verify-customer-account-mutation'
 
 interface VerifyInput {
   token: string
@@ -22,7 +22,7 @@ const useVerifyCustomer = () => {
     setError(null)
     setLoading(true)
     rawFetcher<VerifyCustomerAccountMutation>({
-      query: VERIFY_CUSTOMER_ACCOUNT,
+      query: verifyCustomerAccountMutaton,
       variables: options,
     })
       .then(({ data }) => {
diff --git a/src/components/modules/verify-customer/VerifyCustomerAccount/VerifyCustomerAccount.tsx b/src/components/modules/verify-customer/VerifyCustomerAccount/VerifyCustomerAccount.tsx
index e2c93db2e..d03bd6aa4 100644
--- a/src/components/modules/verify-customer/VerifyCustomerAccount/VerifyCustomerAccount.tsx
+++ b/src/components/modules/verify-customer/VerifyCustomerAccount/VerifyCustomerAccount.tsx
@@ -2,7 +2,8 @@ import { useRouter } from 'next/router'
 import { useEffect, useState } from 'react'
 import { ButtonCommon } from 'src/components/common'
 import LoadingCommon from 'src/components/common/LoadingCommon/LoadingCommon'
-import { useModalCommon, useVerifyCustomer } from 'src/components/hooks'
+import { useModalCommon } from 'src/components/hooks'
+import { useVerifyCustomer } from 'src/components/hooks/auth'
 import { ROUTE } from 'src/utils/constanst.utils'
 import s from './VerifyCustomerAccount.module.scss'
 import Link from 'next/link'
diff --git a/src/graphql/mutation/index.ts b/src/graphql/mutation/index.ts
deleted file mode 100644
index 7ea0d4f82..000000000
--- a/src/graphql/mutation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './user.mutation'
diff --git a/src/graphql/query/index.ts b/src/graphql/query/index.ts
deleted file mode 100644
index 47c53bc6d..000000000
--- a/src/graphql/query/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-// export * from './user.mutation'
diff --git a/src/graphql/query/user.query.ts b/src/graphql/query/user.query.ts
deleted file mode 100644
index e9e7409b4..000000000
--- a/src/graphql/query/user.query.ts
+++ /dev/null
@@ -1 +0,0 @@
-// query here
\ No newline at end of file