diff --git a/packages/p2p/src/app-content.jsx b/packages/p2p/src/app-content.jsx
index 99b464ddc0f3..9b5c605bc6d6 100644
--- a/packages/p2p/src/app-content.jsx
+++ b/packages/p2p/src/app-content.jsx
@@ -3,7 +3,7 @@ import { isMobile } from '@deriv/shared';
 import { Loading, Tabs } from '@deriv/components';
 import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
-import AdvertiserPage from 'Components/advertiser-page/advertiser-page.jsx';
+import AdvertiserPage from 'Pages/advertiser-page';
 import BuySell from 'Components/buy-sell/buy-sell.jsx';
 import Dp2pBlocked from 'Components/dp2p-blocked';
 import { localize } from 'Components/i18next';
diff --git a/packages/p2p/src/components/my-profile/my-profile-stats/my-profile-name/my-profile-name.jsx b/packages/p2p/src/components/my-profile/my-profile-stats/my-profile-name/my-profile-name.jsx
index dbc05232f0cb..12b6b1112de6 100644
--- a/packages/p2p/src/components/my-profile/my-profile-stats/my-profile-name/my-profile-name.jsx
+++ b/packages/p2p/src/components/my-profile/my-profile-stats/my-profile-name/my-profile-name.jsx
@@ -9,7 +9,7 @@ import TradeBadge from '../../../trade-badge';
 import MyProfilePrivacy from '../my-profile-privacy';
 import StarRating from 'Components/star-rating';
 import RecommendedBy from 'Components/recommended-by';
-import BlockUserCount from 'Components/advertiser-page/block-user/block-user-count';
+import BlockUserCount from 'Pages/advertiser-page/block-user/block-user-count';
 
 const MyProfileName = () => {
     const { general_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page-adverts.jsx b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-adverts.jsx
similarity index 97%
rename from packages/p2p/src/components/advertiser-page/advertiser-page-adverts.jsx
rename to packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-adverts.jsx
index a67e2da7a058..17e23b86fbd4 100644
--- a/packages/p2p/src/components/advertiser-page/advertiser-page-adverts.jsx
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-adverts.jsx
@@ -6,8 +6,8 @@ import { observer } from 'mobx-react-lite';
 import { localize, Localize } from 'Components/i18next';
 import { useStores } from 'Stores';
 import Empty from 'Components/empty/empty.jsx';
-import AdvertiserPageRow from './advertiser-page-row.jsx';
-import './advertiser-page.scss';
+import AdvertiserPageRow from './advertiser-page-row';
+import '../advertiser-page.scss';
 
 const AdvertiserPageAdverts = () => {
     const { advertiser_page_store, general_store } = useStores();
diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page-row.jsx b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-row/advertiser-page-row.jsx
similarity index 99%
rename from packages/p2p/src/components/advertiser-page/advertiser-page-row.jsx
rename to packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-row/advertiser-page-row.jsx
index 178fd4064510..5bd33ce453df 100644
--- a/packages/p2p/src/components/advertiser-page/advertiser-page-row.jsx
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-row/advertiser-page-row.jsx
@@ -7,7 +7,7 @@ import { useStores } from 'Stores';
 import { buy_sell } from 'Constants/buy-sell';
 import { localize, Localize } from 'Components/i18next';
 import { generateEffectiveRate } from 'Utils/format-value';
-import './advertiser-page.scss';
+import 'Pages/advertiser-page/advertiser-page.scss';
 
 const AdvertiserPageRow = ({ row: advert, showAdPopup }) => {
     const { advertiser_page_store, buy_sell_store, floating_rate_store, general_store } = useStores();
diff --git a/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-row/index.js b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-row/index.js
new file mode 100644
index 000000000000..4bafe2017766
--- /dev/null
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/advertiser-page-row/index.js
@@ -0,0 +1,3 @@
+import AdvertiserPageRow from './advertiser-page-row.jsx';
+
+export default AdvertiserPageRow;
diff --git a/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/index.js b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/index.js
new file mode 100644
index 000000000000..df1ba728023a
--- /dev/null
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-adverts/index.js
@@ -0,0 +1,3 @@
+import AdvertiserPageAdverts from './advertiser-page-adverts.jsx';
+
+export default AdvertiserPageAdverts;
diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page-dropdown-menu.jsx b/packages/p2p/src/pages/advertiser-page/advertiser-page-dropdown-menu/advertiser-page-dropdown-menu.jsx
similarity index 95%
rename from packages/p2p/src/components/advertiser-page/advertiser-page-dropdown-menu.jsx
rename to packages/p2p/src/pages/advertiser-page/advertiser-page-dropdown-menu/advertiser-page-dropdown-menu.jsx
index 2e2e7b23d5d6..cd4c6ae10abf 100644
--- a/packages/p2p/src/components/advertiser-page/advertiser-page-dropdown-menu.jsx
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-dropdown-menu/advertiser-page-dropdown-menu.jsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite';
 import { Dropdown, Icon, Text } from '@deriv/components';
 import { Localize } from 'Components/i18next';
 import { useStores } from 'Stores';
-import { useOnClickOutside } from '../../../../components/src/hooks';
-import './advertiser-page.scss';
+import { useOnClickOutside } from '@deriv/components/src/hooks';
+import '../advertiser-page.scss';
 
 const AdvertiserPageDropdownMenu = () => {
     const dropdown_menu_ref = React.useRef();
diff --git a/packages/p2p/src/pages/advertiser-page/advertiser-page-dropdown-menu/index.js b/packages/p2p/src/pages/advertiser-page/advertiser-page-dropdown-menu/index.js
new file mode 100644
index 000000000000..1276be69ad5d
--- /dev/null
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-dropdown-menu/index.js
@@ -0,0 +1,3 @@
+import AdvertiserPageDropdownMenu from './advertiser-page-dropdown-menu.jsx';
+
+export default AdvertiserPageDropdownMenu;
diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page-stats.jsx b/packages/p2p/src/pages/advertiser-page/advertiser-page-stats/advertiser-page-stats.jsx
similarity index 99%
rename from packages/p2p/src/components/advertiser-page/advertiser-page-stats.jsx
rename to packages/p2p/src/pages/advertiser-page/advertiser-page-stats/advertiser-page-stats.jsx
index e9f76f2f745e..aaf72304791c 100644
--- a/packages/p2p/src/components/advertiser-page/advertiser-page-stats.jsx
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-stats/advertiser-page-stats.jsx
@@ -4,7 +4,7 @@ import { isMobile } from '@deriv/shared';
 import { observer } from 'mobx-react-lite';
 import { localize, Localize } from 'Components/i18next';
 import { useStores } from 'Stores';
-import './advertiser-page.scss';
+import '../advertiser-page.scss';
 
 const AdvertiserPageStats = () => {
     const { advertiser_page_store, general_store } = useStores();
diff --git a/packages/p2p/src/pages/advertiser-page/advertiser-page-stats/index.js b/packages/p2p/src/pages/advertiser-page/advertiser-page-stats/index.js
new file mode 100644
index 000000000000..e41a3e3a687e
--- /dev/null
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page-stats/index.js
@@ -0,0 +1,3 @@
+import AdvertiserPageStats from './advertiser-page-stats';
+
+export default AdvertiserPageStats;
diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page.jsx b/packages/p2p/src/pages/advertiser-page/advertiser-page.jsx
similarity index 98%
rename from packages/p2p/src/components/advertiser-page/advertiser-page.jsx
rename to packages/p2p/src/pages/advertiser-page/advertiser-page.jsx
index ebda18c26d13..181613f35409 100644
--- a/packages/p2p/src/components/advertiser-page/advertiser-page.jsx
+++ b/packages/p2p/src/pages/advertiser-page/advertiser-page.jsx
@@ -11,11 +11,11 @@ import BuySellModal from 'Components/buy-sell/buy-sell-modal.jsx';
 import PageReturn from 'Components/page-return/page-return.jsx';
 import RecommendedBy from 'Components/recommended-by';
 import UserAvatar from 'Components/user/user-avatar/user-avatar.jsx';
-import AdvertiserPageStats from './advertiser-page-stats.jsx';
-import AdvertiserPageAdverts from './advertiser-page-adverts.jsx';
+import AdvertiserPageStats from './advertiser-page-stats';
+import AdvertiserPageAdverts from './advertiser-page-adverts';
 import StarRating from 'Components/star-rating';
-import AdvertiserPageDropdownMenu from './advertiser-page-dropdown-menu.jsx';
-import TradeBadge from '../trade-badge/trade-badge.jsx';
+import AdvertiserPageDropdownMenu from './advertiser-page-dropdown-menu';
+import TradeBadge from 'Components/trade-badge/trade-badge.jsx';
 import BlockUserOverlay from './block-user/block-user-overlay';
 import BlockUserModal from 'Components/block-user/block-user-modal';
 import ErrorModal from 'Components/error-modal/error-modal';
diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page.scss b/packages/p2p/src/pages/advertiser-page/advertiser-page.scss
similarity index 100%
rename from packages/p2p/src/components/advertiser-page/advertiser-page.scss
rename to packages/p2p/src/pages/advertiser-page/advertiser-page.scss
diff --git a/packages/p2p/src/components/advertiser-page/block-user/block-user-count.jsx b/packages/p2p/src/pages/advertiser-page/block-user/block-user-count/block-user-count.jsx
similarity index 100%
rename from packages/p2p/src/components/advertiser-page/block-user/block-user-count.jsx
rename to packages/p2p/src/pages/advertiser-page/block-user/block-user-count/block-user-count.jsx
diff --git a/packages/p2p/src/components/advertiser-page/block-user/block-user-count.scss b/packages/p2p/src/pages/advertiser-page/block-user/block-user-count/block-user-count.scss
similarity index 100%
rename from packages/p2p/src/components/advertiser-page/block-user/block-user-count.scss
rename to packages/p2p/src/pages/advertiser-page/block-user/block-user-count/block-user-count.scss
diff --git a/packages/p2p/src/pages/advertiser-page/block-user/block-user-count/index.js b/packages/p2p/src/pages/advertiser-page/block-user/block-user-count/index.js
new file mode 100644
index 000000000000..14e43f9efe1b
--- /dev/null
+++ b/packages/p2p/src/pages/advertiser-page/block-user/block-user-count/index.js
@@ -0,0 +1,3 @@
+import BlockUserCount from './block-user-count.jsx';
+
+export default BlockUserCount;
diff --git a/packages/p2p/src/components/advertiser-page/block-user/block-user-overlay/block-user-overlay.jsx b/packages/p2p/src/pages/advertiser-page/block-user/block-user-overlay/block-user-overlay.jsx
similarity index 100%
rename from packages/p2p/src/components/advertiser-page/block-user/block-user-overlay/block-user-overlay.jsx
rename to packages/p2p/src/pages/advertiser-page/block-user/block-user-overlay/block-user-overlay.jsx
diff --git a/packages/p2p/src/components/advertiser-page/block-user/block-user-overlay/block-user-overlay.scss b/packages/p2p/src/pages/advertiser-page/block-user/block-user-overlay/block-user-overlay.scss
similarity index 100%
rename from packages/p2p/src/components/advertiser-page/block-user/block-user-overlay/block-user-overlay.scss
rename to packages/p2p/src/pages/advertiser-page/block-user/block-user-overlay/block-user-overlay.scss
diff --git a/packages/p2p/src/components/advertiser-page/block-user/block-user-overlay/index.js b/packages/p2p/src/pages/advertiser-page/block-user/block-user-overlay/index.js
similarity index 100%
rename from packages/p2p/src/components/advertiser-page/block-user/block-user-overlay/index.js
rename to packages/p2p/src/pages/advertiser-page/block-user/block-user-overlay/index.js
diff --git a/packages/p2p/src/pages/advertiser-page/index.js b/packages/p2p/src/pages/advertiser-page/index.js
new file mode 100644
index 000000000000..7d3708518533
--- /dev/null
+++ b/packages/p2p/src/pages/advertiser-page/index.js
@@ -0,0 +1,3 @@
+import AdvertiserPage from './advertiser-page.jsx';
+
+export default AdvertiserPage;
diff --git a/packages/p2p/src/pages/test.jsx b/packages/p2p/src/pages/test.jsx
deleted file mode 100644
index 7d143587f67b..000000000000
--- a/packages/p2p/src/pages/test.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-
-const test = () => {
-    return <div>test</div>;
-};
-
-export default test;