diff --git a/apps/web/src/components/SendFlow/Beacon/BeaconSignPageProps.ts b/apps/web/src/components/SendFlow/Beacon/BeaconSignPageProps.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/web/src/components/SendFlow/Beacon/BatchSignPage.tsx b/apps/web/src/components/SendFlow/common/BatchSignPage.tsx
similarity index 97%
rename from apps/web/src/components/SendFlow/Beacon/BatchSignPage.tsx
rename to apps/web/src/components/SendFlow/common/BatchSignPage.tsx
index 7c7910de7e..aec74b54cc 100644
--- a/apps/web/src/components/SendFlow/Beacon/BatchSignPage.tsx
+++ b/apps/web/src/components/SendFlow/common/BatchSignPage.tsx
@@ -16,10 +16,10 @@ import {
 import { FormProvider, useForm } from "react-hook-form";
 
 import { Header } from "./Header";
-import { useSignWithBeacon } from "./useSignWithBeacon";
 import { useColor } from "../../../styles/useColor";
 import { AddressTile } from "../../AddressTile/AddressTile";
 import { JsValueWrap } from "../../JsValueWrap";
+import { useSignWithBeacon } from "../Beacon/useSignWithBeacon";
 import { SignButton } from "../SignButton";
 import { SignPageFee } from "../SignPageFee";
 import { type SdkSignPageProps } from "../utils";
diff --git a/apps/web/src/components/SendFlow/Beacon/ContractCallSignPage.tsx b/apps/web/src/components/SendFlow/common/ContractCallSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/ContractCallSignPage.tsx
rename to apps/web/src/components/SendFlow/common/ContractCallSignPage.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/DelegationSignPage.tsx b/apps/web/src/components/SendFlow/common/DelegationSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/DelegationSignPage.tsx
rename to apps/web/src/components/SendFlow/common/DelegationSignPage.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/FinalizeUnstakeSignPage.tsx b/apps/web/src/components/SendFlow/common/FinalizeUnstakeSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/FinalizeUnstakeSignPage.tsx
rename to apps/web/src/components/SendFlow/common/FinalizeUnstakeSignPage.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/Header.tsx b/apps/web/src/components/SendFlow/common/Header.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/Header.tsx
rename to apps/web/src/components/SendFlow/common/Header.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/OriginationOperationSignPage.test.tsx b/apps/web/src/components/SendFlow/common/OriginationOperationSignPage.test.tsx
similarity index 98%
rename from apps/web/src/components/SendFlow/Beacon/OriginationOperationSignPage.test.tsx
rename to apps/web/src/components/SendFlow/common/OriginationOperationSignPage.test.tsx
index 93d91bb5bc..b9f4f89e9a 100644
--- a/apps/web/src/components/SendFlow/Beacon/OriginationOperationSignPage.test.tsx
+++ b/apps/web/src/components/SendFlow/common/OriginationOperationSignPage.test.tsx
@@ -16,7 +16,7 @@ import {
 } from "../../../testUtils";
 import { SuccessStep } from "../SuccessStep";
 import { type SdkSignPageProps, type SignHeaderProps } from "../utils";
-import { SingleSignPage } from "./BeaconSignPage";
+import { SingleSignPage } from "./SingleSignPage";
 
 const message = {
   id: "messageid",
diff --git a/apps/web/src/components/SendFlow/Beacon/OriginationOperationSignPage.tsx b/apps/web/src/components/SendFlow/common/OriginationOperationSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/OriginationOperationSignPage.tsx
rename to apps/web/src/components/SendFlow/common/OriginationOperationSignPage.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/BeaconSignPage.tsx b/apps/web/src/components/SendFlow/common/SingleSignPage.tsx
similarity index 96%
rename from apps/web/src/components/SendFlow/Beacon/BeaconSignPage.tsx
rename to apps/web/src/components/SendFlow/common/SingleSignPage.tsx
index 4aaf1eb94c..4f70346847 100644
--- a/apps/web/src/components/SendFlow/Beacon/BeaconSignPage.tsx
+++ b/apps/web/src/components/SendFlow/common/SingleSignPage.tsx
@@ -9,7 +9,7 @@ import { StakeSignPage } from "./StakeSignPage";
 import { TezSignPage } from "./TezSignPage";
 import { UndelegationSignPage } from "./UndelegationSignPage";
 import { UnstakeSignPage } from "./UnstakeSignPage";
-import { useSignWithBeacon } from "./useSignWithBeacon";
+import { useSignWithBeacon } from "../Beacon/useSignWithBeacon";
 
 export const SingleSignPage = (signProps: SdkSignPageProps) => {
   const operationType = signProps.operation.operations[0].type;
diff --git a/apps/web/src/components/SendFlow/Beacon/StakeSignPage.tsx b/apps/web/src/components/SendFlow/common/StakeSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/StakeSignPage.tsx
rename to apps/web/src/components/SendFlow/common/StakeSignPage.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/TezSignPage.test.tsx b/apps/web/src/components/SendFlow/common/TezSignPage.test.tsx
similarity index 98%
rename from apps/web/src/components/SendFlow/Beacon/TezSignPage.test.tsx
rename to apps/web/src/components/SendFlow/common/TezSignPage.test.tsx
index 78b23f5ba6..538ff08fa2 100644
--- a/apps/web/src/components/SendFlow/Beacon/TezSignPage.test.tsx
+++ b/apps/web/src/components/SendFlow/common/TezSignPage.test.tsx
@@ -15,7 +15,7 @@ import {
 } from "../../../testUtils";
 import { SuccessStep } from "../SuccessStep";
 import { type SdkSignPageProps, type SignHeaderProps } from "../utils";
-import { SingleSignPage } from "./BeaconSignPage";
+import { SingleSignPage } from "./SingleSignPage";
 
 jest.mock("@umami/core", () => ({
   ...jest.requireActual("@umami/core"),
diff --git a/apps/web/src/components/SendFlow/Beacon/TezSignPage.tsx b/apps/web/src/components/SendFlow/common/TezSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/TezSignPage.tsx
rename to apps/web/src/components/SendFlow/common/TezSignPage.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/UndelegationSignPage.tsx b/apps/web/src/components/SendFlow/common/UndelegationSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/UndelegationSignPage.tsx
rename to apps/web/src/components/SendFlow/common/UndelegationSignPage.tsx
diff --git a/apps/web/src/components/SendFlow/Beacon/UnstakeSignPage.tsx b/apps/web/src/components/SendFlow/common/UnstakeSignPage.tsx
similarity index 100%
rename from apps/web/src/components/SendFlow/Beacon/UnstakeSignPage.tsx
rename to apps/web/src/components/SendFlow/common/UnstakeSignPage.tsx
diff --git a/apps/web/src/components/beacon/useHandleBeaconMessage.test.tsx b/apps/web/src/components/beacon/useHandleBeaconMessage.test.tsx
index 8e7977f767..63c484b9ca 100644
--- a/apps/web/src/components/beacon/useHandleBeaconMessage.test.tsx
+++ b/apps/web/src/components/beacon/useHandleBeaconMessage.test.tsx
@@ -21,8 +21,8 @@ import { CustomError } from "@umami/utils";
 
 import { useHandleBeaconMessage } from "./useHandleBeaconMessage";
 import { act, dynamicModalContextMock, renderHook, screen, waitFor } from "../../testUtils";
-import { BatchSignPage } from "../SendFlow/Beacon/BatchSignPage";
-import { SingleSignPage } from "../SendFlow/Beacon/BeaconSignPage";
+import { BatchSignPage } from "../SendFlow/common/BatchSignPage";
+import { SingleSignPage } from "../SendFlow/common/SingleSignPage";
 import { type SdkSignPageProps, type SignHeaderProps } from "../SendFlow/utils";
 
 jest.mock("@umami/core", () => ({
diff --git a/apps/web/src/components/beacon/useHandleBeaconMessage.tsx b/apps/web/src/components/beacon/useHandleBeaconMessage.tsx
index 80c3230f66..472cec316f 100644
--- a/apps/web/src/components/beacon/useHandleBeaconMessage.tsx
+++ b/apps/web/src/components/beacon/useHandleBeaconMessage.tsx
@@ -18,8 +18,8 @@ import { CustomError } from "@umami/utils";
 
 import { PermissionRequestModal } from "./PermissionRequestModal";
 import { SignPayloadRequestModal } from "./SignPayloadRequestModal";
-import { BatchSignPage } from "../SendFlow/Beacon/BatchSignPage";
-import { SingleSignPage } from "../SendFlow/Beacon/BeaconSignPage";
+import { BatchSignPage } from "../SendFlow/common/BatchSignPage";
+import { SingleSignPage } from "../SendFlow/common/SingleSignPage";
 import { type SdkSignPageProps, type SignHeaderProps } from "../SendFlow/utils";
 
 /**