diff --git a/apps/consent/app/login/phone/page.tsx b/apps/consent/app/login/phone/page.tsx
index 9529557f8a..4d447a18da 100644
--- a/apps/consent/app/login/phone/page.tsx
+++ b/apps/consent/app/login/phone/page.tsx
@@ -11,5 +11,4 @@ const Login = async ({ searchParams }: { searchParams: LoginProps }) => {
   const authAction = "Login"
   return <PhoneAuth login_challenge={login_challenge} authAction={authAction} />
 }
-
 export default Login
diff --git a/apps/pay/app/[username]/transaction/page.tsx b/apps/pay/app/[username]/transaction/page.tsx
index b1517c1918..e6dd261f23 100644
--- a/apps/pay/app/[username]/transaction/page.tsx
+++ b/apps/pay/app/[username]/transaction/page.tsx
@@ -7,7 +7,7 @@ import { useSession } from "next-auth/react"
 
 import { useGetPaginatedTransactionsQuery, Transaction } from "@/lib/graphql/generated"
 import LoadingComponent from "@/components/loading"
-import { formatCreateAt, formatDate, formatTime } from "@/utils/date-util"
+import { formatCreateAt, formatDate, formatTime } from "@/lib/utils/date-util"
 import { sendDataToPosCompanion } from "@/app/print-companion-service"
 import useCheckInstalledApps from "@/hooks/use-check-installed-apps"
 
diff --git a/apps/pay/app/lnurlp/[username]/callback/route.ts b/apps/pay/app/lnurlp/[username]/callback/route.ts
index 3955da147c..38c59b59fb 100644
--- a/apps/pay/app/lnurlp/[username]/callback/route.ts
+++ b/apps/pay/app/lnurlp/[username]/callback/route.ts
@@ -16,7 +16,7 @@ import {
   LnInvoiceCreateOnBehalfOfRecipientMutation,
 } from "../../../../lib/graphql/generated"
 import { client } from "../graphql"
-import { getOriginalRequestInfo } from "../../../../utils/utils"
+import { getOriginalRequestInfo } from "../../../../lib/utils"
 
 gql`
   mutation lnInvoiceCreateOnBehalfOfRecipient(
diff --git a/apps/pay/app/lnurlp/[username]/route.ts b/apps/pay/app/lnurlp/[username]/route.ts
index d803b3bb7d..148b473884 100644
--- a/apps/pay/app/lnurlp/[username]/route.ts
+++ b/apps/pay/app/lnurlp/[username]/route.ts
@@ -8,7 +8,7 @@ import {
   RealtimePriceInitialQuery,
 } from "../../../lib/graphql/generated"
 
-import { getOriginalRequestInfo } from "../../../utils/utils"
+import { getOriginalRequestInfo } from "../../../lib/utils"
 
 import { client } from "./graphql"
 
diff --git a/apps/pay/components/parse-pos-payment/index.tsx b/apps/pay/components/parse-pos-payment/index.tsx
index f7170982e8..8cbc2bd54b 100644
--- a/apps/pay/components/parse-pos-payment/index.tsx
+++ b/apps/pay/components/parse-pos-payment/index.tsx
@@ -11,7 +11,7 @@ import {
   getLocaleConfig,
   extractSearchParams,
   parseDisplayCurrency,
-} from "../../utils/utils"
+} from "../../lib/utils"
 
 import { useDisplayCurrency } from "../../hooks/use-display-currency"
 
diff --git a/apps/pay/components/parse-pos-payment/receive-invoice.tsx b/apps/pay/components/parse-pos-payment/receive-invoice.tsx
index cb076768c8..ccd867906c 100644
--- a/apps/pay/components/parse-pos-payment/receive-invoice.tsx
+++ b/apps/pay/components/parse-pos-payment/receive-invoice.tsx
@@ -17,7 +17,7 @@ import { ACTION_TYPE } from "../../app/reducer"
 import PaymentOutcome from "../payment-outcome"
 import { Share } from "../share"
 
-import { extractSearchParams, safeAmount } from "../../utils/utils"
+import { extractSearchParams, safeAmount } from "../../lib/utils"
 
 import LoadingComponent from "../loading"
 
diff --git a/apps/pay/components/payment-outcome/index.tsx b/apps/pay/components/payment-outcome/index.tsx
index 67f2f34300..e4ace8373a 100644
--- a/apps/pay/components/payment-outcome/index.tsx
+++ b/apps/pay/components/payment-outcome/index.tsx
@@ -14,7 +14,7 @@ import { useLnInvoicePaymentStatusSubscription } from "../../lib/graphql/generat
 import styles from "./payment-outcome.module.css"
 import Receipt from "./receipt"
 
-import { extractSearchParams } from "@/utils/utils"
+import { extractSearchParams } from "@/lib/utils"
 import { useInvoiceContext } from "@/context/invoice-context"
 import useCheckInstalledApps from "@/hooks/use-check-installed-apps"
 
diff --git a/apps/pay/components/payment-outcome/receipt.tsx b/apps/pay/components/payment-outcome/receipt.tsx
index 11fd9fc2ed..5b3b8b7ff0 100644
--- a/apps/pay/components/payment-outcome/receipt.tsx
+++ b/apps/pay/components/payment-outcome/receipt.tsx
@@ -2,7 +2,7 @@
 import React from "react"
 import Image from "react-bootstrap/Image"
 
-import { formattedDate, formattedTime } from "../../utils/date-util"
+import { formattedDate, formattedTime } from "../../lib/utils/date-util"
 
 import GaloyIcon from "./galoy-icon"
 import styles from "./payment-outcome.module.css"
diff --git a/apps/pay/hooks/use-display-currency.tsx b/apps/pay/hooks/use-display-currency.tsx
index 1262dc2b7f..2000ca456a 100644
--- a/apps/pay/hooks/use-display-currency.tsx
+++ b/apps/pay/hooks/use-display-currency.tsx
@@ -2,7 +2,7 @@ import { gql } from "@apollo/client"
 
 import { useCallback, useMemo } from "react"
 
-import { useCurrencyListQuery } from "./graphql/generated"
+import { useCurrencyListQuery } from "@/lib/graphql/generated"
 
 gql`
   query currencyList {
diff --git a/apps/pay/hooks/use-realtime-price.tsx b/apps/pay/hooks/use-realtime-price.tsx
index c5316958cc..61faaab610 100644
--- a/apps/pay/hooks/use-realtime-price.tsx
+++ b/apps/pay/hooks/use-realtime-price.tsx
@@ -48,7 +48,7 @@ gql`
 const useRealtimePrice = (
   currency: string,
   onSubscriptionDataCallback?: (
-    subscriptionData: SubscriptionResult<RealtimePriceWsSubscription, any>,
+    subscriptionData: SubscriptionResult<RealtimePriceWsSubscription, unknown>,
   ) => void,
 ) => {
   const priceRef = React.useRef<number>(0)
diff --git a/apps/pay/utils/date-util.ts b/apps/pay/lib/utils/date-util.ts
similarity index 100%
rename from apps/pay/utils/date-util.ts
rename to apps/pay/lib/utils/date-util.ts
diff --git a/apps/pay/utils/utils.ts b/apps/pay/lib/utils/index.ts
similarity index 100%
rename from apps/pay/utils/utils.ts
rename to apps/pay/lib/utils/index.ts