diff --git a/src/pages_b/404.tsx b/pages/404.tsx
similarity index 100%
rename from src/pages_b/404.tsx
rename to pages/404.tsx
diff --git a/src/pages_b/_app.tsx b/pages/_app.tsx
similarity index 100%
rename from src/pages_b/_app.tsx
rename to pages/_app.tsx
diff --git a/src/pages_b/_site/[site]/[page].tsx b/pages/_site/[site]/[page].tsx
similarity index 100%
rename from src/pages_b/_site/[site]/[page].tsx
rename to pages/_site/[site]/[page].tsx
diff --git a/src/pages_b/_site/[site]/archives.tsx b/pages/_site/[site]/archives.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/archives.tsx
rename to pages/_site/[site]/archives.tsx
diff --git a/src/pages_b/_site/[site]/feed/comments.tsx b/pages/_site/[site]/feed/comments.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/feed/comments.tsx
rename to pages/_site/[site]/feed/comments.tsx
diff --git a/src/pages_b/_site/[site]/feed/index.tsx b/pages/_site/[site]/feed/index.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/feed/index.tsx
rename to pages/_site/[site]/feed/index.tsx
diff --git a/src/pages_b/_site/[site]/index.tsx b/pages/_site/[site]/index.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/index.tsx
rename to pages/_site/[site]/index.tsx
diff --git a/src/pages_b/_site/[site]/manifest.json.tsx b/pages/_site/[site]/manifest.json.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/manifest.json.tsx
rename to pages/_site/[site]/manifest.json.tsx
diff --git a/src/pages_b/_site/[site]/nft.tsx b/pages/_site/[site]/nft.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/nft.tsx
rename to pages/_site/[site]/nft.tsx
diff --git a/src/pages_b/_site/[site]/preview/[page].tsx b/pages/_site/[site]/preview/[page].tsx
similarity index 100%
rename from src/pages_b/_site/[site]/preview/[page].tsx
rename to pages/_site/[site]/preview/[page].tsx
diff --git a/src/pages_b/_site/[site]/robots.txt.tsx b/pages/_site/[site]/robots.txt.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/robots.txt.tsx
rename to pages/_site/[site]/robots.txt.tsx
diff --git a/src/pages_b/_site/[site]/search.tsx b/pages/_site/[site]/search.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/search.tsx
rename to pages/_site/[site]/search.tsx
diff --git a/src/pages_b/_site/[site]/sitemap.xml.tsx b/pages/_site/[site]/sitemap.xml.tsx
similarity index 100%
rename from src/pages_b/_site/[site]/sitemap.xml.tsx
rename to pages/_site/[site]/sitemap.xml.tsx
diff --git a/src/pages_b/_site/[site]/tag/[tag].tsx b/pages/_site/[site]/tag/[tag].tsx
similarity index 100%
rename from src/pages_b/_site/[site]/tag/[tag].tsx
rename to pages/_site/[site]/tag/[tag].tsx
diff --git a/src/pages_b/activities.tsx b/pages/activities.tsx
similarity index 100%
rename from src/pages_b/activities.tsx
rename to pages/activities.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/achievements.tsx b/pages/dashboard/[subdomain]/achievements.tsx
similarity index 91%
rename from src/pages_b/dashboard/[subdomain]/achievements.tsx
rename to pages/dashboard/[subdomain]/achievements.tsx
index 64838db0..09192d86 100644
--- a/src/pages_b/dashboard/[subdomain]/achievements.tsx
+++ b/pages/dashboard/[subdomain]/achievements.tsx
@@ -3,8 +3,6 @@ import { useRouter } from "next/router"
 import type { ReactElement } from "react"
 
 import { AchievementItem } from "~/components/common/AchievementItem"
-import { DashboardLayout } from "~/components/dashboard/DashboardLayout"
-import { getServerSideProps as getLayoutServerSideProps } from "~/components/dashboard/DashboardLayout.server"
 import { DashboardMain } from "~/components/dashboard/DashboardMain"
 import { serverSidePropsHandler } from "~/lib/server-side-props"
 import { useGetAchievements, useGetSite } from "~/queries/site"
diff --git a/src/pages_b/dashboard/[subdomain]/comments.tsx b/pages/dashboard/[subdomain]/comments.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/comments.tsx
rename to pages/dashboard/[subdomain]/comments.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/editor.tsx b/pages/dashboard/[subdomain]/editor.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/editor.tsx
rename to pages/dashboard/[subdomain]/editor.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/events.tsx b/pages/dashboard/[subdomain]/events.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/events.tsx
rename to pages/dashboard/[subdomain]/events.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/import/index.tsx b/pages/dashboard/[subdomain]/import/index.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/import/index.tsx
rename to pages/dashboard/[subdomain]/import/index.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/import/markdown.tsx b/pages/dashboard/[subdomain]/import/markdown.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/import/markdown.tsx
rename to pages/dashboard/[subdomain]/import/markdown.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/import/mirror.tsx b/pages/dashboard/[subdomain]/import/mirror.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/import/mirror.tsx
rename to pages/dashboard/[subdomain]/import/mirror.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/index.tsx b/pages/dashboard/[subdomain]/index.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/index.tsx
rename to pages/dashboard/[subdomain]/index.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/pages.tsx b/pages/dashboard/[subdomain]/pages.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/pages.tsx
rename to pages/dashboard/[subdomain]/pages.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/posts.tsx b/pages/dashboard/[subdomain]/posts.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/posts.tsx
rename to pages/dashboard/[subdomain]/posts.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/settings/css.tsx b/pages/dashboard/[subdomain]/settings/css.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/settings/css.tsx
rename to pages/dashboard/[subdomain]/settings/css.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/settings/domains.tsx b/pages/dashboard/[subdomain]/settings/domains.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/settings/domains.tsx
rename to pages/dashboard/[subdomain]/settings/domains.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/settings/general.tsx b/pages/dashboard/[subdomain]/settings/general.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/settings/general.tsx
rename to pages/dashboard/[subdomain]/settings/general.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/settings/navigation.tsx b/pages/dashboard/[subdomain]/settings/navigation.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/settings/navigation.tsx
rename to pages/dashboard/[subdomain]/settings/navigation.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/settings/operator.tsx b/pages/dashboard/[subdomain]/settings/operator.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/settings/operator.tsx
rename to pages/dashboard/[subdomain]/settings/operator.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/settings/social-platforms.tsx b/pages/dashboard/[subdomain]/settings/social-platforms.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/settings/social-platforms.tsx
rename to pages/dashboard/[subdomain]/settings/social-platforms.tsx
diff --git a/src/pages_b/dashboard/[subdomain]/tokens.tsx b/pages/dashboard/[subdomain]/tokens.tsx
similarity index 100%
rename from src/pages_b/dashboard/[subdomain]/tokens.tsx
rename to pages/dashboard/[subdomain]/tokens.tsx
diff --git a/src/pages_b/dashboard/index.tsx b/pages/dashboard/index.tsx
similarity index 100%
rename from src/pages_b/dashboard/index.tsx
rename to pages/dashboard/index.tsx
diff --git a/src/pages_b/feed/hottest/0.tsx b/pages/feed/hottest/0.tsx
similarity index 100%
rename from src/pages_b/feed/hottest/0.tsx
rename to pages/feed/hottest/0.tsx
diff --git a/src/pages_b/feed/hottest/1.tsx b/pages/feed/hottest/1.tsx
similarity index 100%
rename from src/pages_b/feed/hottest/1.tsx
rename to pages/feed/hottest/1.tsx
diff --git a/src/pages_b/feed/hottest/30.tsx b/pages/feed/hottest/30.tsx
similarity index 100%
rename from src/pages_b/feed/hottest/30.tsx
rename to pages/feed/hottest/30.tsx
diff --git a/src/pages_b/feed/hottest/7.tsx b/pages/feed/hottest/7.tsx
similarity index 100%
rename from src/pages_b/feed/hottest/7.tsx
rename to pages/feed/hottest/7.tsx
diff --git a/src/pages_b/feed/latest.tsx b/pages/feed/latest.tsx
similarity index 100%
rename from src/pages_b/feed/latest.tsx
rename to pages/feed/latest.tsx
diff --git a/src/pages_b/index.tsx b/pages/index.tsx
similarity index 100%
rename from src/pages_b/index.tsx
rename to pages/index.tsx
diff --git a/src/pages_b/search.tsx b/pages/search.tsx
similarity index 100%
rename from src/pages_b/search.tsx
rename to pages/search.tsx
diff --git a/src/pages_b/topic/[topic].tsx b/pages/topic/[topic].tsx
similarity index 100%
rename from src/pages_b/topic/[topic].tsx
rename to pages/topic/[topic].tsx
diff --git a/src/app/dashboard/[subdomain]/tokens/page.tsx b/src/app/dashboard/[subdomain]/tokens/page.tsx
index 4d5e35ec..bd1c4547 100644
--- a/src/app/dashboard/[subdomain]/tokens/page.tsx
+++ b/src/app/dashboard/[subdomain]/tokens/page.tsx
@@ -1,7 +1,6 @@
 "use client"
 
 import { useParams } from "next/navigation"
-import type { ReactElement } from "react"
 
 import {
   useAccountBalance,
@@ -9,7 +8,6 @@ import {
   useWalletClaimCSBModal,
 } from "@crossbell/connect-kit"
 
-import { DashboardLayout } from "~/components/dashboard/DashboardLayout"
 import { DashboardMain } from "~/components/dashboard/DashboardMain"
 import { Button } from "~/components/ui/Button"
 import { UniLink } from "~/components/ui/UniLink"
@@ -149,7 +147,3 @@ export default function TokensPage() {
     </DashboardMain>
   )
 }
-
-TokensPage.getLayout = (page: ReactElement) => {
-  return <DashboardLayout title="Tokens">{page}</DashboardLayout>
-}