diff --git a/src/App.vue b/src/App.vue
index 5052772..f8e831b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,7 @@ import Footer from '@/components/layout/Footer.vue'
 import LoginDialog from '@/components/auth/LoginDialog.vue'
 import { Toaster } from '@/components/ui/sonner'
 import 'vue-sonner/style.css'
-import { useMarketPreloader } from '@/composables/useMarketPreloader'
+import { useMarketPreloader } from '@/modules/market/composables/useMarketPreloader'
 import { auth } from '@/composables/useAuth'
 import { toast } from 'vue-sonner'
 
diff --git a/src/components/events/PurchaseTicketDialog.vue b/src/components/events/PurchaseTicketDialog.vue
deleted file mode 100644
index efdff70..0000000
--- a/src/components/events/PurchaseTicketDialog.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<!-- eslint-disable vue/multi-word-component-names -->
-<script setup lang="ts">
-import { onUnmounted } from 'vue'
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } from '@/components/ui/dialog'
-import { Button } from '@/components/ui/button'
-import { Badge } from '@/components/ui/badge'
-import { useTicketPurchase } from '@/modules/events/composables/useTicketPurchase'
-import { useAuth } from '@/composables/useAuth'
-import { User, Wallet, CreditCard, Zap, Ticket } from 'lucide-vue-next'
-import { formatEventPrice, formatWalletBalance } from '@/lib/utils/formatting'
-
-interface Props {
-  event: {
-    id: string
-    name: string
-    price_per_ticket: number
-    currency: string
-  }
-  isOpen: boolean
-}
-
-interface Emits {
-  (e: 'update:isOpen', value: boolean): void
-}
-
-const props = defineProps<Props>()
-const emit = defineEmits<Emits>()
-
-const { isAuthenticated, userDisplay } = useAuth()
-const {
-  isLoading,
-  error,
-  paymentHash,
-
-  qrCode,
-  isPaymentPending,
-  isPayingWithWallet,
-  canPurchase,
-  userWallets,
-  hasWalletWithBalance,
-  purchaseTicketForEvent,
-  handleOpenLightningWallet,
-  resetPaymentState,
-  cleanup,
-  ticketQRCode,
-  purchasedTicketId,
-  showTicketQR
-} = useTicketPurchase()
-
-async function handlePurchase() {
-  if (!canPurchase.value) return
-
-  try {
-    await purchaseTicketForEvent(props.event.id)
-  } catch (err) {
-    console.error('Error purchasing ticket:', err)
-  }
-}
-
-function handleClose() {
-  emit('update:isOpen', false)
-  resetPaymentState()
-}
-
-// Cleanup on unmount
-onUnmounted(() => {
-  cleanup()
-})
-</script>
-
-<template>
-  <Dialog :open="isOpen" @update:open="handleClose">
-    <DialogContent class="sm:max-w-[425px]">
-      <DialogHeader>
-        <DialogTitle class="flex items-center gap-2">
-          <CreditCard class="w-5 h-5" />
-          Purchase Ticket
-        </DialogTitle>
-        <DialogDescription>
-          Purchase a ticket for <strong>{{ event.name }}</strong> for {{ formatEventPrice(event.price_per_ticket, event.currency) }}
-        </DialogDescription>
-      </DialogHeader>
-
-      <!-- Authentication Check -->
-      <div v-if="!isAuthenticated" class="py-4 text-center space-y-4">
-        <div class="flex justify-center">
-          <User class="w-12 h-12 text-muted-foreground" />
-        </div>
-        <div class="space-y-2">
-          <h3 class="text-lg font-semibold">Login Required</h3>
-          <p class="text-sm text-muted-foreground">
-            Please log in to your account to purchase tickets using your wallet.
-          </p>
-        </div>
-        <Button @click="handleClose" variant="outline">
-          Close
-        </Button>
-      </div>
-
-      <!-- User Info and Purchase -->
-      <div v-else-if="!paymentHash" class="py-4 space-y-4">
-        <div class="bg-muted/50 rounded-lg p-4 space-y-3">
-          <div class="flex items-center gap-2">
-            <User class="w-4 h-4 text-muted-foreground" />
-            <span class="text-sm font-medium">Purchasing as:</span>
-          </div>
-          <div class="space-y-1">
-            <div class="flex items-center gap-2">
-              <span class="text-sm text-muted-foreground">Name:</span>
-              <span class="text-sm font-medium">{{ userDisplay?.name }}</span>
-            </div>
-            <div class="flex items-center gap-2">
-              <span class="text-sm text-muted-foreground">User ID:</span>
-              <Badge variant="secondary" class="text-xs font-mono">{{ userDisplay?.shortId }}</Badge>
-            </div>
-          </div>
-        </div>
-
-        <!-- Wallet Information -->
-        <div class="bg-muted/50 rounded-lg p-4 space-y-3">
-          <div class="flex items-center gap-2">
-            <Wallet class="w-4 h-4 text-muted-foreground" />
-            <span class="text-sm font-medium">Wallet Status:</span>
-          </div>
-          <div class="space-y-2">
-            <div v-if="userWallets.length === 0" class="text-sm text-muted-foreground">
-              No wallets found
-            </div>
-            <div v-else class="space-y-2">
-              <div v-for="wallet in userWallets" :key="wallet.id" class="flex items-center justify-between">
-                <div class="flex items-center gap-2">
-                  <span class="text-sm font-medium">{{ wallet.name }}</span>
-                  <Badge v-if="wallet.balance_msat > 0" variant="default" class="text-xs">
-                    {{ formatWalletBalance(wallet.balance_msat) }}
-                  </Badge>
-                  <Badge v-else variant="secondary" class="text-xs">Empty</Badge>
-                </div>
-              </div>
-              <div v-if="hasWalletWithBalance" class="flex items-center gap-2 text-sm text-green-600">
-                <Zap class="w-4 h-4" />
-                <span>Auto-payment available</span>
-              </div>
-              <div v-else class="flex items-center gap-2 text-sm text-muted-foreground">
-                <span>No funds available, fill your wallet or pay with an external one</span>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="bg-muted/50 rounded-lg p-4 space-y-3">
-          <div class="flex items-center gap-2">
-            <CreditCard class="w-4 h-4 text-muted-foreground" />
-            <span class="text-sm font-medium">Payment Details:</span>
-          </div>
-          <div class="space-y-1">
-            <div class="flex justify-between">
-              <span class="text-sm text-muted-foreground">Event:</span>
-              <span class="text-sm font-medium">{{ event.name }}</span>
-            </div>
-            <div class="flex justify-between">
-              <span class="text-sm text-muted-foreground">Price:</span>
-              <span class="text-sm font-medium">{{ formatEventPrice(event.price_per_ticket, event.currency) }}</span>
-            </div>
-          </div>
-        </div>
-
-        <div v-if="error" class="text-sm text-destructive bg-destructive/10 p-3 rounded-lg">
-          {{ error }}
-        </div>
-
-        <Button 
-          @click="handlePurchase" 
-          :disabled="isLoading || !canPurchase"
-          class="w-full"
-        >
-          <span v-if="isLoading" class="animate-spin mr-2">⚡</span>
-          <span v-else-if="hasWalletWithBalance" class="flex items-center gap-2">
-            <Zap class="w-4 h-4" />
-            Pay with Wallet
-          </span>
-          <span v-else>Generate Payment Request</span>
-        </Button>
-      </div>
-
-      <!-- Payment QR Code and Status -->
-      <div v-else-if="paymentHash && !showTicketQR" class="py-4 flex flex-col items-center gap-4">
-        <div class="text-center space-y-2">
-          <h3 class="text-lg font-semibold">Payment Required</h3>
-          <p v-if="isPayingWithWallet" class="text-sm text-muted-foreground">
-            Processing payment with your wallet...
-          </p>
-          <p v-else class="text-sm text-muted-foreground">
-            Scan the QR code with your Lightning wallet to complete the payment
-          </p>
-        </div>
-
-        <div v-if="!isPayingWithWallet && qrCode" class="bg-muted/50 rounded-lg p-4">
-          <img :src="qrCode" alt="Lightning payment QR code" class="w-64 h-64 mx-auto" />
-        </div>
-
-        <div class="space-y-3 w-full">
-          <Button v-if="!isPayingWithWallet" variant="outline" @click="handleOpenLightningWallet" class="w-full">
-            <Wallet class="w-4 h-4 mr-2" />
-            Open in Lightning Wallet
-          </Button>
-          
-          <div v-if="isPaymentPending" class="text-center space-y-2">
-            <div class="flex items-center justify-center gap-2">
-              <div class="animate-spin w-4 h-4 border-2 border-primary border-t-transparent rounded-full"></div>
-              <span class="text-sm text-muted-foreground">
-                {{ isPayingWithWallet ? 'Processing payment...' : 'Waiting for payment...' }}
-              </span>
-            </div>
-            <p class="text-xs text-muted-foreground">
-              Payment will be confirmed automatically once received
-            </p>
-          </div>
-        </div>
-      </div>
-
-      <!-- Ticket QR Code (After Successful Purchase) -->
-      <div v-else-if="showTicketQR && ticketQRCode" class="py-4 flex flex-col items-center gap-4">
-        <div class="text-center space-y-2">
-          <h3 class="text-lg font-semibold text-green-600">Ticket Purchased Successfully!</h3>
-          <p class="text-sm text-muted-foreground">
-            Your ticket has been purchased and is now available in your tickets area.
-          </p>
-        </div>
-
-        <div class="bg-muted/50 rounded-lg p-4 w-full">
-          <div class="text-center space-y-3">
-            <div class="flex justify-center">
-              <Ticket class="w-12 h-12 text-green-600" />
-            </div>
-            <div>
-              <p class="text-sm font-medium">Ticket ID</p>
-              <div class="bg-background border rounded px-2 py-1 max-w-full mt-1">
-                <p class="text-xs font-mono break-all">{{ purchasedTicketId }}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="space-y-3 w-full">
-          <Button @click="() => $router.push('/my-tickets')" class="w-full">
-            View My Tickets
-          </Button>
-          <Button variant="outline" @click="handleClose" class="w-full">
-            Close
-          </Button>
-        </div>
-      </div>
-    </DialogContent>
-  </Dialog>
-</template> 
\ No newline at end of file
diff --git a/src/components/layout/Navbar.vue b/src/components/layout/Navbar.vue
index 2906776..57ec08e 100644
--- a/src/components/layout/Navbar.vue
+++ b/src/components/layout/Navbar.vue
@@ -13,7 +13,7 @@ import ProfileDialog from '@/components/auth/ProfileDialog.vue'
 import CurrencyDisplay from '@/components/ui/CurrencyDisplay.vue'
 import { LogoutConfirmDialog } from '@/components/ui/LogoutConfirmDialog'
 import { auth } from '@/composables/useAuth'
-import { useMarketPreloader } from '@/composables/useMarketPreloader'
+import { useMarketPreloader } from '@/modules/market/composables/useMarketPreloader'
 import { useMarketStore } from '@/stores/market'
 import { tryInjectService, SERVICE_TOKENS } from '@/core/di-container'
 import { useModularNavigation } from '@/composables/useModularNavigation'
diff --git a/src/components/market/CartSummary.vue b/src/components/market/CartSummary.vue
deleted file mode 100644
index 9db6fe1..0000000
--- a/src/components/market/CartSummary.vue
+++ /dev/null
@@ -1,4 +0,0 @@
-<script lang="ts">
-import CartSummaryComponent from '@/modules/market/components/CartSummary.vue'
-export default CartSummaryComponent
-</script>
\ No newline at end of file
diff --git a/src/components/market/PaymentDisplay.vue b/src/components/market/PaymentDisplay.vue
deleted file mode 100644
index c5ea4eb..0000000
--- a/src/components/market/PaymentDisplay.vue
+++ /dev/null
@@ -1,4 +0,0 @@
-<script lang="ts">
-import PaymentDisplayComponent from '@/modules/market/components/PaymentDisplay.vue'
-export default PaymentDisplayComponent
-</script>
\ No newline at end of file
diff --git a/src/components/market/ShoppingCart.vue b/src/components/market/ShoppingCart.vue
deleted file mode 100644
index 4790f7e..0000000
--- a/src/components/market/ShoppingCart.vue
+++ /dev/null
@@ -1,4 +0,0 @@
-<script lang="ts">
-import ShoppingCartComponent from '@/modules/market/components/ShoppingCart.vue'
-export default ShoppingCartComponent
-</script>
\ No newline at end of file
diff --git a/src/composables/useMarket.ts b/src/composables/useMarket.ts
deleted file mode 100644
index 9e99d1f..0000000
--- a/src/composables/useMarket.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Compatibility re-export for the moved useMarket composable
-export * from '@/modules/market/composables/useMarket'
-export { useMarket } from '@/modules/market/composables/useMarket'
\ No newline at end of file
diff --git a/src/composables/useMarketPreloader.ts b/src/composables/useMarketPreloader.ts
deleted file mode 100644
index 3ea23d9..0000000
--- a/src/composables/useMarketPreloader.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Compatibility re-export for the moved useMarketPreloader composable
-export * from '@/modules/market/composables/useMarketPreloader'
-export { useMarketPreloader } from '@/modules/market/composables/useMarketPreloader'
\ No newline at end of file
diff --git a/src/lib/services/invoiceService.ts b/src/core/services/invoiceService.ts
similarity index 100%
rename from src/lib/services/invoiceService.ts
rename to src/core/services/invoiceService.ts
diff --git a/src/lib/services/nostrmarketService.ts b/src/lib/services/nostrmarketService.ts
deleted file mode 100644
index dd303eb..0000000
--- a/src/lib/services/nostrmarketService.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Compatibility re-export for the moved nostrmarketService
-export * from '@/modules/market/services/nostrmarketService'
-export { nostrmarketService } from '@/modules/market/services/nostrmarketService'
\ No newline at end of file
diff --git a/src/modules/market/components/PaymentRequestDialog.vue b/src/modules/market/components/PaymentRequestDialog.vue
index eb43b1f..bf5f8a4 100644
--- a/src/modules/market/components/PaymentRequestDialog.vue
+++ b/src/modules/market/components/PaymentRequestDialog.vue
@@ -98,7 +98,7 @@
 import { computed, ref, watch } from 'vue'
 import { toast } from 'vue-sonner'
 import QRCode from 'qrcode'
-import type { NostrmarketPaymentRequest } from '@/lib/services/nostrmarketService'
+import type { NostrmarketPaymentRequest } from '../services/nostrmarketService'
 import {
   Dialog,
   DialogContent,
diff --git a/src/lib/services/paymentMonitor.ts b/src/modules/market/services/paymentMonitor.ts
similarity index 98%
rename from src/lib/services/paymentMonitor.ts
rename to src/modules/market/services/paymentMonitor.ts
index 395bfb4..2c2ec25 100644
--- a/src/lib/services/paymentMonitor.ts
+++ b/src/modules/market/services/paymentMonitor.ts
@@ -1,5 +1,5 @@
 import { ref } from 'vue'
-import type { PaymentStatus, LightningInvoice } from './invoiceService'
+import type { PaymentStatus, LightningInvoice } from '@/core/services/invoiceService'
 import type { Order } from '@/stores/market'
 
 export interface PaymentMonitorState {
diff --git a/src/modules/market/stores/market.ts b/src/modules/market/stores/market.ts
index 04c38d2..9543fa8 100644
--- a/src/modules/market/stores/market.ts
+++ b/src/modules/market/stores/market.ts
@@ -1,11 +1,11 @@
 import { defineStore } from 'pinia'
 import { ref, computed, readonly, watch } from 'vue'
-import { invoiceService } from '@/lib/services/invoiceService'
-import { paymentMonitor } from '@/lib/services/paymentMonitor'
+import { invoiceService } from '@/core/services/invoiceService'
+import { paymentMonitor } from '../services/paymentMonitor'
 import { nostrmarketService } from '../services/nostrmarketService'
 import { useAuth } from '@/composables/useAuth'
 import { injectService, SERVICE_TOKENS } from '@/core/di-container'
-import type { LightningInvoice } from '@/lib/services/invoiceService'
+import type { LightningInvoice } from '@/core/services/invoiceService'
 
 
 import type {
diff --git a/src/modules/market/views/MarketPage.vue b/src/modules/market/views/MarketPage.vue
index d257c85..1d8b0ff 100644
--- a/src/modules/market/views/MarketPage.vue
+++ b/src/modules/market/views/MarketPage.vue
@@ -99,8 +99,8 @@
 import { onMounted, onUnmounted, computed } from 'vue'
 import { useRouter } from 'vue-router'
 import { useMarketStore } from '@/stores/market'
-import { useMarket } from '@/composables/useMarket'
-import { useMarketPreloader } from '@/composables/useMarketPreloader'
+import { useMarket } from '../composables/useMarket'
+import { useMarketPreloader } from '../composables/useMarketPreloader'
 import { config } from '@/lib/config'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
diff --git a/src/pages/Cart.vue b/src/pages/Cart.vue
index 72c6c39..88c9fe0 100644
--- a/src/pages/Cart.vue
+++ b/src/pages/Cart.vue
@@ -49,7 +49,7 @@ import { computed, onMounted } from 'vue'
 import { useRoute } from 'vue-router'
 import { useMarketStore } from '@/stores/market'
 import { CheckCircle } from 'lucide-vue-next'
-import ShoppingCart from '@/components/market/ShoppingCart.vue'
+import ShoppingCart from '@/modules/market/components/ShoppingCart.vue'
 
 const route = useRoute()
 const marketStore = useMarketStore()