diff --git a/src/components/layout/Navbar.vue b/src/components/layout/Navbar.vue
index e3a6321..707ee46 100644
--- a/src/components/layout/Navbar.vue
+++ b/src/components/layout/Navbar.vue
@@ -14,7 +14,7 @@ import CurrencyDisplay from '@/components/ui/CurrencyDisplay.vue'
 import { LogoutConfirmDialog } from '@/components/ui/LogoutConfirmDialog'
 import { auth } from '@/composables/useAuthService'
 import { useMarketPreloader } from '@/modules/market/composables/useMarketPreloader'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { tryInjectService, SERVICE_TOKENS } from '@/core/di-container'
 import { useModularNavigation } from '@/composables/useModularNavigation'
 
diff --git a/src/core/services/invoiceService.ts b/src/core/services/invoiceService.ts
index 98bc11b..51add69 100644
--- a/src/core/services/invoiceService.ts
+++ b/src/core/services/invoiceService.ts
@@ -1,5 +1,5 @@
 import { getApiUrl } from '@/lib/config/lnbits'
-import type { Order } from '@/stores/market'
+import type { Order } from '@/modules/market/stores/market'
 
 export interface LightningInvoice {
   checking_id: string
diff --git a/src/modules/market/components/CartSummary.vue b/src/modules/market/components/CartSummary.vue
index abb9d7d..245e513 100644
--- a/src/modules/market/components/CartSummary.vue
+++ b/src/modules/market/components/CartSummary.vue
@@ -143,7 +143,7 @@ import { ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
 import { Button } from '@/components/ui/button'
 import { Shield } from 'lucide-vue-next'
-import type { ShippingZone } from '@/stores/market'
+import type { ShippingZone } from '@/modules/market/stores/market'
 
 interface Props {
   stallId: string
diff --git a/src/modules/market/components/MerchantStore.vue b/src/modules/market/components/MerchantStore.vue
index e8a60cd..b007305 100644
--- a/src/modules/market/components/MerchantStore.vue
+++ b/src/modules/market/components/MerchantStore.vue
@@ -301,7 +301,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { Button } from '@/components/ui/button'
 import { Badge } from '@/components/ui/badge'
 import { 
@@ -319,7 +319,7 @@ import {
   Settings,
   BarChart3
 } from 'lucide-vue-next'
-import type { OrderStatus } from '@/stores/market'
+import type { OrderStatus } from '@/modules/market/stores/market'
 import type { NostrmarketService } from '../services/nostrmarketService'
 import { auth } from '@/composables/useAuthService'
 import { injectService, SERVICE_TOKENS } from '@/core/di-container'
diff --git a/src/modules/market/components/OrderHistory.vue b/src/modules/market/components/OrderHistory.vue
index b76e787..b4600be 100644
--- a/src/modules/market/components/OrderHistory.vue
+++ b/src/modules/market/components/OrderHistory.vue
@@ -253,7 +253,7 @@ import { Button } from '@/components/ui/button'
 import { Badge } from '@/components/ui/badge'
 import { Package, Store, Zap, Copy, QrCode, CheckCircle } from 'lucide-vue-next'
 import { toast } from 'vue-sonner'
-import type { OrderStatus } from '@/stores/market'
+import type { OrderStatus } from '@/modules/market/stores/market'
 // Order type no longer needed since we use any for readonly compatibility
 
 const router = useRouter()
diff --git a/src/modules/market/components/PaymentDisplay.vue b/src/modules/market/components/PaymentDisplay.vue
index 01187f1..ff2ba3a 100644
--- a/src/modules/market/components/PaymentDisplay.vue
+++ b/src/modules/market/components/PaymentDisplay.vue
@@ -188,7 +188,7 @@ import {
   Info, 
   CheckCircle
 } from 'lucide-vue-next'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import QRCode from 'qrcode'
 
 
diff --git a/src/modules/market/components/ProductCard.vue b/src/modules/market/components/ProductCard.vue
index 764eb77..532c074 100644
--- a/src/modules/market/components/ProductCard.vue
+++ b/src/modules/market/components/ProductCard.vue
@@ -101,12 +101,12 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { Card, CardContent, CardFooter, CardTitle } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Badge } from '@/components/ui/badge'
 import { ShoppingCart } from 'lucide-vue-next'
-import type { Product } from '@/stores/market'
+import type { Product } from '@/modules/market/stores/market'
 
 interface Props {
   product: Product
diff --git a/src/modules/market/components/ShoppingCart.vue b/src/modules/market/components/ShoppingCart.vue
index 05ae898..81c48d9 100644
--- a/src/modules/market/components/ShoppingCart.vue
+++ b/src/modules/market/components/ShoppingCart.vue
@@ -183,7 +183,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { Button } from '@/components/ui/button'
 import { 
   ShoppingCart, 
diff --git a/src/modules/market/services/nostrmarketService.ts b/src/modules/market/services/nostrmarketService.ts
index 268373d..7606e6b 100644
--- a/src/modules/market/services/nostrmarketService.ts
+++ b/src/modules/market/services/nostrmarketService.ts
@@ -1,6 +1,6 @@
 import { finalizeEvent, type EventTemplate, nip04 } from 'nostr-tools'
 import { BaseService } from '@/core/base/BaseService'
-import type { Stall, Product, Order } from '@/stores/market'
+import type { Stall, Product, Order } from '@/modules/market/stores/market'
 
 export interface NostrmarketStall {
   id: string
diff --git a/src/modules/market/services/paymentMonitor.ts b/src/modules/market/services/paymentMonitor.ts
index 4357679..377b114 100644
--- a/src/modules/market/services/paymentMonitor.ts
+++ b/src/modules/market/services/paymentMonitor.ts
@@ -1,7 +1,7 @@
 import { ref } from 'vue'
 import { BaseService } from '@/core/base/BaseService'
 import type { PaymentStatus, LightningInvoice } from '@/core/services/invoiceService'
-import type { Order } from '@/stores/market'
+import type { Order } from '@/modules/market/stores/market'
 
 export interface PaymentMonitorState {
   isMonitoring: boolean
diff --git a/src/modules/market/stores/market.ts b/src/modules/market/stores/market.ts
index 81007e9..a5a2cee 100644
--- a/src/modules/market/stores/market.ts
+++ b/src/modules/market/stores/market.ts
@@ -12,7 +12,13 @@ import type {
   OrderStatus, StallCart, FilterData, SortOptions,
   PaymentRequest, PaymentStatus
 } from '../types/market'
-// Import types that are used in the store implementation
+
+// Re-export types for external use
+export type {
+  Market, Stall, Product, Order, ShippingZone,
+  OrderStatus, StallCart, FilterData, SortOptions,
+  PaymentRequest, PaymentStatus
+} from '../types/market'
 
 export const useMarketStore = defineStore('market', () => {
   const auth = useAuth()
diff --git a/src/modules/market/views/CheckoutPage.vue b/src/modules/market/views/CheckoutPage.vue
index 9254ba7..29eea64 100644
--- a/src/modules/market/views/CheckoutPage.vue
+++ b/src/modules/market/views/CheckoutPage.vue
@@ -270,7 +270,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { useRoute } from 'vue-router'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { injectService, SERVICE_TOKENS } from '@/core/di-container'
 import { auth } from '@/composables/useAuthService'
 import { 
diff --git a/src/modules/market/views/MarketDashboard.vue b/src/modules/market/views/MarketDashboard.vue
index 029b358..4a823c8 100644
--- a/src/modules/market/views/MarketDashboard.vue
+++ b/src/modules/market/views/MarketDashboard.vue
@@ -60,7 +60,7 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { Badge } from '@/components/ui/badge'
 import { 
   BarChart3, 
diff --git a/src/modules/market/views/MarketPage.vue b/src/modules/market/views/MarketPage.vue
index 1d8b0ff..9fa6d47 100644
--- a/src/modules/market/views/MarketPage.vue
+++ b/src/modules/market/views/MarketPage.vue
@@ -98,7 +98,7 @@
 <script setup lang="ts">
 import { onMounted, onUnmounted, computed } from 'vue'
 import { useRouter } from 'vue-router'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { useMarket } from '../composables/useMarket'
 import { useMarketPreloader } from '../composables/useMarketPreloader'
 import { config } from '@/lib/config'
diff --git a/src/pages/Cart.vue b/src/pages/Cart.vue
index 88c9fe0..04b21d8 100644
--- a/src/pages/Cart.vue
+++ b/src/pages/Cart.vue
@@ -47,7 +47,7 @@
 <script setup lang="ts">
 import { computed, onMounted } from 'vue'
 import { useRoute } from 'vue-router'
-import { useMarketStore } from '@/stores/market'
+import { useMarketStore } from '@/modules/market/stores/market'
 import { CheckCircle } from 'lucide-vue-next'
 import ShoppingCart from '@/modules/market/components/ShoppingCart.vue'
 
diff --git a/src/stores/market.ts b/src/stores/market.ts
deleted file mode 100644
index 7f2a19e..0000000
--- a/src/stores/market.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Compatibility re-export for the moved market store
-export * from '@/modules/market/stores/market'
-export { useMarketStore } from '@/modules/market/stores/market'
-export type * from '@/modules/market/types/market'
\ No newline at end of file