diff --git a/framework/bigcommerce/api/cart/add-item.ts b/framework/bigcommerce/api/endpoints/cart/add-item.ts
similarity index 90%
rename from framework/bigcommerce/api/cart/add-item.ts
rename to framework/bigcommerce/api/endpoints/cart/add-item.ts
index fd4387833..31cfdef20 100644
--- a/framework/bigcommerce/api/cart/add-item.ts
+++ b/framework/bigcommerce/api/endpoints/cart/add-item.ts
@@ -1,6 +1,6 @@
 import { normalizeCart } from '@framework/lib/normalize'
-import { parseCartItem } from '../utils/parse-item'
-import getCartCookie from '../utils/get-cart-cookie'
+import { parseCartItem } from '../../utils/parse-item'
+import getCartCookie from '../../utils/get-cart-cookie'
 import type { CartEndpoint } from '.'
 
 const addItem: CartEndpoint['operations']['addItem'] = async ({
diff --git a/framework/bigcommerce/api/cart/get-cart.ts b/framework/bigcommerce/api/endpoints/cart/get-cart.ts
similarity index 83%
rename from framework/bigcommerce/api/cart/get-cart.ts
rename to framework/bigcommerce/api/endpoints/cart/get-cart.ts
index 56fd23218..9c1e40f38 100644
--- a/framework/bigcommerce/api/cart/get-cart.ts
+++ b/framework/bigcommerce/api/endpoints/cart/get-cart.ts
@@ -1,7 +1,7 @@
 import { normalizeCart } from '@framework/lib/normalize'
-import { BigcommerceApiError } from '../utils/errors'
-import getCartCookie from '../utils/get-cart-cookie'
-import type { BigcommerceCart } from '../../types'
+import { BigcommerceApiError } from '../../utils/errors'
+import getCartCookie from '../../utils/get-cart-cookie'
+import type { BigcommerceCart } from '../../../types'
 import type { CartEndpoint } from '.'
 
 // Return current cart info
diff --git a/framework/bigcommerce/api/cart/index.ts b/framework/bigcommerce/api/endpoints/cart/index.ts
similarity index 79%
rename from framework/bigcommerce/api/cart/index.ts
rename to framework/bigcommerce/api/endpoints/cart/index.ts
index bea1eb028..a04363589 100644
--- a/framework/bigcommerce/api/cart/index.ts
+++ b/framework/bigcommerce/api/endpoints/cart/index.ts
@@ -1,6 +1,6 @@
 import type { GetAPISchema } from '@commerce/api'
-import type { CartSchema } from '../../types/cart'
-import type { BigcommerceAPI } from '..'
+import type { CartSchema } from '../../../types/cart'
+import type { BigcommerceAPI } from '../..'
 import getCart from './get-cart'
 import addItem from './add-item'
 import updateItem from './update-item'
diff --git a/framework/bigcommerce/api/cart/remove-item.ts b/framework/bigcommerce/api/endpoints/cart/remove-item.ts
similarity index 94%
rename from framework/bigcommerce/api/cart/remove-item.ts
rename to framework/bigcommerce/api/endpoints/cart/remove-item.ts
index c7ac712d8..86c1b8848 100644
--- a/framework/bigcommerce/api/cart/remove-item.ts
+++ b/framework/bigcommerce/api/endpoints/cart/remove-item.ts
@@ -1,5 +1,5 @@
 import { normalizeCart } from '@framework/lib/normalize'
-import getCartCookie from '../utils/get-cart-cookie'
+import getCartCookie from '../../utils/get-cart-cookie'
 import type { CartEndpoint } from '.'
 
 const removeItem: CartEndpoint['operations']['removeItem'] = async ({
diff --git a/framework/bigcommerce/api/cart/update-item.ts b/framework/bigcommerce/api/endpoints/cart/update-item.ts
similarity index 88%
rename from framework/bigcommerce/api/cart/update-item.ts
rename to framework/bigcommerce/api/endpoints/cart/update-item.ts
index b283e24a3..fce40a434 100644
--- a/framework/bigcommerce/api/cart/update-item.ts
+++ b/framework/bigcommerce/api/endpoints/cart/update-item.ts
@@ -1,6 +1,6 @@
 import { normalizeCart } from '@framework/lib/normalize'
-import { parseCartItem } from '../utils/parse-item'
-import getCartCookie from '../utils/get-cart-cookie'
+import { parseCartItem } from '../../utils/parse-item'
+import getCartCookie from '../../utils/get-cart-cookie'
 import type { CartEndpoint } from '.'
 
 const updateItem: CartEndpoint['operations']['updateItem'] = async ({
diff --git a/framework/bigcommerce/api/customer/get-logged-in-customer.ts b/framework/bigcommerce/api/endpoints/customer/get-logged-in-customer.ts
similarity index 94%
rename from framework/bigcommerce/api/customer/get-logged-in-customer.ts
rename to framework/bigcommerce/api/endpoints/customer/get-logged-in-customer.ts
index f35b2d135..78207844f 100644
--- a/framework/bigcommerce/api/customer/get-logged-in-customer.ts
+++ b/framework/bigcommerce/api/endpoints/customer/get-logged-in-customer.ts
@@ -1,4 +1,4 @@
-import type { GetLoggedInCustomerQuery } from '../../schema'
+import type { GetLoggedInCustomerQuery } from '../../../schema'
 import type { CustomerEndpoint } from '.'
 
 export const getLoggedInCustomerQuery = /* GraphQL */ `
diff --git a/framework/bigcommerce/api/customer/index.ts b/framework/bigcommerce/api/endpoints/customer/index.ts
similarity index 73%
rename from framework/bigcommerce/api/customer/index.ts
rename to framework/bigcommerce/api/endpoints/customer/index.ts
index 47832b8a0..abd5e1153 100644
--- a/framework/bigcommerce/api/customer/index.ts
+++ b/framework/bigcommerce/api/endpoints/customer/index.ts
@@ -1,6 +1,6 @@
 import type { GetAPISchema } from '@commerce/api'
-import type { CustomerSchema } from '../../types/customer'
-import type { BigcommerceAPI } from '..'
+import type { CustomerSchema } from '../../../types/customer'
+import type { BigcommerceAPI } from '../..'
 import getLoggedInCustomer from './get-logged-in-customer'
 
 export type CustomerAPI = GetAPISchema<BigcommerceAPI, CustomerSchema>
diff --git a/framework/bigcommerce/api/login/index.ts b/framework/bigcommerce/api/endpoints/login/index.ts
similarity index 69%
rename from framework/bigcommerce/api/login/index.ts
rename to framework/bigcommerce/api/endpoints/login/index.ts
index 8b9543c29..de2b6ebe3 100644
--- a/framework/bigcommerce/api/login/index.ts
+++ b/framework/bigcommerce/api/endpoints/login/index.ts
@@ -1,6 +1,6 @@
 import type { GetAPISchema } from '@commerce/api'
-import type { LoginSchema } from '../../types/login'
-import type { BigcommerceAPI } from '..'
+import type { LoginSchema } from '../../../types/login'
+import type { BigcommerceAPI } from '../..'
 import login from './login'
 
 export type LoginAPI = GetAPISchema<BigcommerceAPI, LoginSchema>
diff --git a/framework/bigcommerce/api/login/login.ts b/framework/bigcommerce/api/endpoints/login/login.ts
similarity index 100%
rename from framework/bigcommerce/api/login/login.ts
rename to framework/bigcommerce/api/endpoints/login/login.ts
diff --git a/framework/bigcommerce/api/logout/index.ts b/framework/bigcommerce/api/endpoints/logout/index.ts
similarity index 70%
rename from framework/bigcommerce/api/logout/index.ts
rename to framework/bigcommerce/api/endpoints/logout/index.ts
index eb658860c..d7c05b34e 100644
--- a/framework/bigcommerce/api/logout/index.ts
+++ b/framework/bigcommerce/api/endpoints/logout/index.ts
@@ -1,6 +1,6 @@
 import type { GetAPISchema } from '@commerce/api'
-import type { LogoutSchema } from '../../types/logout'
-import type { BigcommerceAPI } from '..'
+import type { LogoutSchema } from '../../../types/logout'
+import type { BigcommerceAPI } from '../..'
 import logout from './logout'
 
 export type LogoutAPI = GetAPISchema<BigcommerceAPI, LogoutSchema>
diff --git a/framework/bigcommerce/api/logout/logout.ts b/framework/bigcommerce/api/endpoints/logout/logout.ts
similarity index 100%
rename from framework/bigcommerce/api/logout/logout.ts
rename to framework/bigcommerce/api/endpoints/logout/logout.ts
diff --git a/framework/bigcommerce/api/signup/index.ts b/framework/bigcommerce/api/endpoints/signup/index.ts
similarity index 70%
rename from framework/bigcommerce/api/signup/index.ts
rename to framework/bigcommerce/api/endpoints/signup/index.ts
index 9e656990e..cea3f9d2d 100644
--- a/framework/bigcommerce/api/signup/index.ts
+++ b/framework/bigcommerce/api/endpoints/signup/index.ts
@@ -1,6 +1,6 @@
 import type { GetAPISchema } from '@commerce/api'
-import type { SignupSchema } from '../../types/signup'
-import type { BigcommerceAPI } from '..'
+import type { SignupSchema } from '../../../types/signup'
+import type { BigcommerceAPI } from '../..'
 import signup from './signup'
 
 export type SignupAPI = GetAPISchema<BigcommerceAPI, SignupSchema>
diff --git a/framework/bigcommerce/api/signup/signup.ts b/framework/bigcommerce/api/endpoints/signup/signup.ts
similarity index 96%
rename from framework/bigcommerce/api/signup/signup.ts
rename to framework/bigcommerce/api/endpoints/signup/signup.ts
index df4f6ec57..2d11f42e3 100644
--- a/framework/bigcommerce/api/signup/signup.ts
+++ b/framework/bigcommerce/api/endpoints/signup/signup.ts
@@ -1,4 +1,4 @@
-import { BigcommerceApiError } from '../utils/errors'
+import { BigcommerceApiError } from '../../utils/errors'
 import type { SignupEndpoint } from '.'
 
 const signup: SignupEndpoint['operations']['signup'] = async ({
diff --git a/framework/bigcommerce/api/index.ts b/framework/bigcommerce/api/index.ts
index 90e04a6a4..222ec0b06 100644
--- a/framework/bigcommerce/api/index.ts
+++ b/framework/bigcommerce/api/index.ts
@@ -9,11 +9,11 @@ import {
 import fetchGraphqlApi from './utils/fetch-graphql-api'
 import fetchStoreApi from './utils/fetch-store-api'
 
-import type { CartAPI } from './cart'
-import type { CustomerAPI } from './customer'
-import type { LoginAPI } from './login'
-import type { LogoutAPI } from './logout'
-import type { SignupAPI } from './signup'
+import type { CartAPI } from './endpoints/cart'
+import type { CustomerAPI } from './endpoints/customer'
+import type { LoginAPI } from './endpoints/login'
+import type { LogoutAPI } from './endpoints/logout'
+import type { SignupAPI } from './endpoints/signup'
 import login from './operations/login'
 
 export interface BigcommerceConfig extends CommerceAPIConfig {
diff --git a/pages/api/cart.ts b/pages/api/cart.ts
index 4bb74cb2f..6f1692446 100644
--- a/pages/api/cart.ts
+++ b/pages/api/cart.ts
@@ -1,5 +1,5 @@
 import cart from '@commerce/api/endpoints/cart'
-import { CartAPI, operations } from '@framework/api/cart'
+import { CartAPI, operations } from '@framework/api/endpoints/cart'
 import commerce from '@lib/api/commerce'
 
 export default commerce.endpoint({
diff --git a/pages/api/customer.ts b/pages/api/customer.ts
index ba3e627b1..092618a22 100644
--- a/pages/api/customer.ts
+++ b/pages/api/customer.ts
@@ -1,5 +1,5 @@
 import customer from '@commerce/api/endpoints/customer'
-import { CustomerAPI, operations } from '@framework/api/customer'
+import { CustomerAPI, operations } from '@framework/api/endpoints/customer'
 import commerce from '@lib/api/commerce'
 
 export default commerce.endpoint({
diff --git a/pages/api/login.ts b/pages/api/login.ts
index 5f87a24e8..7536ec186 100644
--- a/pages/api/login.ts
+++ b/pages/api/login.ts
@@ -1,5 +1,5 @@
 import login from '@commerce/api/endpoints/login'
-import { LoginAPI, operations } from '@framework/api/login'
+import { LoginAPI, operations } from '@framework/api/endpoints/login'
 import commerce from '@lib/api/commerce'
 
 export default commerce.endpoint({
diff --git a/pages/api/logout.ts b/pages/api/logout.ts
index 20c51c66f..e191b8211 100644
--- a/pages/api/logout.ts
+++ b/pages/api/logout.ts
@@ -1,5 +1,5 @@
 import logout from '@commerce/api/endpoints/logout'
-import { LogoutAPI, operations } from '@framework/api/logout'
+import { LogoutAPI, operations } from '@framework/api/endpoints/logout'
 import commerce from '@lib/api/commerce'
 
 export default commerce.endpoint({
diff --git a/pages/api/signup.ts b/pages/api/signup.ts
index bc24f407a..b596add6e 100644
--- a/pages/api/signup.ts
+++ b/pages/api/signup.ts
@@ -1,5 +1,5 @@
 import signup from '@commerce/api/endpoints/signup'
-import { SignupAPI, operations } from '@framework/api/signup'
+import { SignupAPI, operations } from '@framework/api/endpoints/signup'
 import commerce from '@lib/api/commerce'
 
 export default commerce.endpoint({