diff --git a/quartz/extra/components/OverlayExplorer.tsx b/quartz/components/OverlayExplorer.tsx
similarity index 98%
rename from quartz/extra/components/OverlayExplorer.tsx
rename to quartz/components/OverlayExplorer.tsx
index 420cb3802..5b00b1bef 100644
--- a/quartz/extra/components/OverlayExplorer.tsx
+++ b/quartz/components/OverlayExplorer.tsx
@@ -3,7 +3,7 @@ import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } fro
 import overlayexplorerStyle from "./styles/overlayexplorer.scss"
 
 // @ts-ignore
-import script from "./scripts/overlayexplorer.inline"
+import script from "../extra/components/scripts/overlayexplorer.inline"
 import { FileNode, Options } from "../components/ExplorerNode"
 import { QuartzPluginData } from "../plugins/vfile"
 import { classNames } from "../util/lang"
diff --git a/quartz/extra/components/PageIcon.tsx b/quartz/components/PageIcon.tsx
similarity index 100%
rename from quartz/extra/components/PageIcon.tsx
rename to quartz/components/PageIcon.tsx
diff --git a/quartz/components/index.ts b/quartz/components/index.ts
index 5b197941c..611f29c22 100644
--- a/quartz/components/index.ts
+++ b/quartz/components/index.ts
@@ -20,6 +20,8 @@ import MobileOnly from "./MobileOnly"
 import RecentNotes from "./RecentNotes"
 import Breadcrumbs from "./Breadcrumbs"
 import Comments from "./Comments"
+import OverlayExplorer from "./OverlayExplorer"
+import PageIcon from "./PageIcon"
 
 export {
   ArticleTitle,
@@ -44,4 +46,6 @@ export {
   NotFound,
   Breadcrumbs,
   Comments,
+  OverlayExplorer,
+  PageIcon,
 }
diff --git a/quartz/extra/components/scripts/overlayexplorer.inline.ts b/quartz/components/scripts/overlayexplorer.inline.ts
similarity index 100%
rename from quartz/extra/components/scripts/overlayexplorer.inline.ts
rename to quartz/components/scripts/overlayexplorer.inline.ts
diff --git a/quartz/extra/components/styles/overlayexplorer.scss b/quartz/components/styles/overlayexplorer.scss
similarity index 100%
rename from quartz/extra/components/styles/overlayexplorer.scss
rename to quartz/components/styles/overlayexplorer.scss
diff --git a/quartz/extra/components/styles/pageicon.scss b/quartz/components/styles/pageicon.scss
similarity index 100%
rename from quartz/extra/components/styles/pageicon.scss
rename to quartz/components/styles/pageicon.scss
diff --git a/quartz/extra/components/index.ts b/quartz/extra/components/index.ts
deleted file mode 100644
index 9f9f3e3ea..000000000
--- a/quartz/extra/components/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import OverlayExplorer from "./OverlayExplorer"
-import PageIcon from "./PageIcon"
-
-export {
-  OverlayExplorer,
-  PageIcon,
-}
diff --git a/quartz/extra/static/icon.png b/quartz/extra/static/icon.png
deleted file mode 100644
index 91a4803c8..000000000
Binary files a/quartz/extra/static/icon.png and /dev/null differ
diff --git a/quartz/extra/static/og-image.png b/quartz/extra/static/og-image.png
deleted file mode 100644
index f7fa83477..000000000
Binary files a/quartz/extra/static/og-image.png and /dev/null differ
diff --git a/quartz/extra/static/page_icon.png b/quartz/extra/static/page_icon.png
deleted file mode 100644
index 0934543e7..000000000
Binary files a/quartz/extra/static/page_icon.png and /dev/null differ
diff --git a/quartz/extra/styles/callouts.css b/quartz/styles/callouts.css
similarity index 100%
rename from quartz/extra/styles/callouts.css
rename to quartz/styles/callouts.css