diff --git a/public/banner-1.jpg b/public/assets/banners/banner-1.jpg
similarity index 100%
rename from public/banner-1.jpg
rename to public/assets/banners/banner-1.jpg
diff --git a/public/banner-10.jpg b/public/assets/banners/banner-10.jpg
similarity index 100%
rename from public/banner-10.jpg
rename to public/assets/banners/banner-10.jpg
diff --git a/public/banner-11.jpg b/public/assets/banners/banner-11.jpg
similarity index 100%
rename from public/banner-11.jpg
rename to public/assets/banners/banner-11.jpg
diff --git a/public/banner-12.jpg b/public/assets/banners/banner-12.jpg
similarity index 100%
rename from public/banner-12.jpg
rename to public/assets/banners/banner-12.jpg
diff --git a/public/banner-2.jpg b/public/assets/banners/banner-2.jpg
similarity index 100%
rename from public/banner-2.jpg
rename to public/assets/banners/banner-2.jpg
diff --git a/public/banner-3.jpg b/public/assets/banners/banner-3.jpg
similarity index 100%
rename from public/banner-3.jpg
rename to public/assets/banners/banner-3.jpg
diff --git a/public/banner-4.jpg b/public/assets/banners/banner-4.jpg
similarity index 100%
rename from public/banner-4.jpg
rename to public/assets/banners/banner-4.jpg
diff --git a/public/banner-5.jpg b/public/assets/banners/banner-5.jpg
similarity index 100%
rename from public/banner-5.jpg
rename to public/assets/banners/banner-5.jpg
diff --git a/public/banner-6.jpg b/public/assets/banners/banner-6.jpg
similarity index 100%
rename from public/banner-6.jpg
rename to public/assets/banners/banner-6.jpg
diff --git a/public/banner-7.jpg b/public/assets/banners/banner-7.jpg
similarity index 100%
rename from public/banner-7.jpg
rename to public/assets/banners/banner-7.jpg
diff --git a/public/banner-8.jpg b/public/assets/banners/banner-8.jpg
similarity index 100%
rename from public/banner-8.jpg
rename to public/assets/banners/banner-8.jpg
diff --git a/public/banner-9.jpg b/public/assets/banners/banner-9.jpg
similarity index 100%
rename from public/banner-9.jpg
rename to public/assets/banners/banner-9.jpg
diff --git a/public/fade-blue.png b/public/assets/fade-blue.png
similarity index 100%
rename from public/fade-blue.png
rename to public/assets/fade-blue.png
diff --git a/public/fade.png b/public/assets/fade.png
similarity index 100%
rename from public/fade.png
rename to public/assets/fade.png
diff --git a/public/android-chrome-192x192.png b/public/assets/logo/android-chrome-192x192.png
similarity index 100%
rename from public/android-chrome-192x192.png
rename to public/assets/logo/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/public/assets/logo/android-chrome-512x512.png
similarity index 100%
rename from public/android-chrome-512x512.png
rename to public/assets/logo/android-chrome-512x512.png
diff --git a/public/apple-touch-icon.png b/public/assets/logo/apple-touch-icon.png
similarity index 100%
rename from public/apple-touch-icon.png
rename to public/assets/logo/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/assets/logo/favicon-16x16.png
similarity index 100%
rename from public/favicon-16x16.png
rename to public/assets/logo/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/assets/logo/favicon-32x32.png
similarity index 100%
rename from public/favicon-32x32.png
rename to public/assets/logo/favicon-32x32.png
diff --git a/public/favicon.ico b/public/assets/logo/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to public/assets/logo/favicon.ico
diff --git a/public/logo-single-transparent.png b/public/assets/logo/logo-single-transparent.png
similarity index 100%
rename from public/logo-single-transparent.png
rename to public/assets/logo/logo-single-transparent.png
diff --git a/public/logo-transparent.png b/public/assets/logo/logo-transparent.png
similarity index 100%
rename from public/logo-transparent.png
rename to public/assets/logo/logo-transparent.png
diff --git a/public/mstile-150x150.png b/public/assets/logo/mstile-150x150.png
similarity index 100%
rename from public/mstile-150x150.png
rename to public/assets/logo/mstile-150x150.png
diff --git a/public/plebchan-psycho.png b/public/assets/plebchan-psycho.png
similarity index 100%
rename from public/plebchan-psycho.png
rename to public/assets/plebchan-psycho.png
diff --git a/public/plebchan.png b/public/assets/plebchan.png
similarity index 100%
rename from public/plebchan.png
rename to public/assets/plebchan.png
diff --git a/src/App.js b/src/App.js
index 44958c75..74f6c2d0 100644
--- a/src/App.js
+++ b/src/App.js
@@ -20,7 +20,7 @@ const GlobalStyle = createGlobalStyle`
 
 export default function App() {
   const [bodyStyle, setBodyStyle] = useState({
-    background: "#ffe url(/fade.png) top repeat-x",
+    background: "#ffe url(/assets/fade.png) top repeat-x",
     color: "maroon",
     fontFamily: "Helvetica, Arial, sans-serif"
   });
@@ -32,11 +32,10 @@ export default function App() {
   return (
   <div>
     <Helmet>
-      <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-      <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-      <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+      <link rel="apple-touch-icon" sizes="180x180" href="/assets/logo/apple-touch-icon.png" />
+      <link rel="icon" type="image/png" sizes="32x32" href="/assets/logo/favicon-32x32.png" />
+      <link rel="icon" type="image/png" sizes="16x16" href="/assets/logo/favicon-16x16.png" />
       <link rel="manifest" href="/site.webmanifest" />
-      <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#fee9cd" />
       <meta name="msapplication-TileColor" content="#fee9cd" />
       <meta name="theme-color" content="#ffffff" />
     </Helmet>
diff --git a/src/components/Board.jsx b/src/components/Board.jsx
index f50c63bf..249fa394 100644
--- a/src/components/Board.jsx
+++ b/src/components/Board.jsx
@@ -142,7 +142,7 @@ const Board = ({ setBodyStyle }) => {
     switch (event.target.value) {
       case "Yotsuba":
         setBodyStyle({
-          background: "#ffe url(/fade.png) top repeat-x",
+          background: "#ffe url(/assets/fade.png) top repeat-x",
           color: "maroon",
           fontFamily: "Arial, Helvetica, sans-serif"
         });
@@ -151,7 +151,7 @@ const Board = ({ setBodyStyle }) => {
 
       case "Yotsuba B":
         setBodyStyle({
-          background: "#eef2ff url(/fade-blue.png) top center repeat-x",
+          background: "#eef2ff url(/assets/fade-blue.png) top center repeat-x",
           color: "#000",
           fontFamily: "Arial, Helvetica, sans-serif"
         });
@@ -196,7 +196,7 @@ const Board = ({ setBodyStyle }) => {
 
       default:
         setBodyStyle({
-          background: "#ffe url(/fade.png) top repeat-x",
+          background: "#ffe url(/assets/fade.png) top repeat-x",
           color: "maroon",
           fontFamily: "Arial, Helvetica, sans-serif"
         });
diff --git a/src/components/Home.jsx b/src/components/Home.jsx
index 01864ac3..53bf1e43 100644
--- a/src/components/Home.jsx
+++ b/src/components/Home.jsx
@@ -9,7 +9,7 @@ const Home = ({ setBodyStyle }) => {
 
   useEffect(() => {
     setBodyStyle({
-      background: "#ffe url(/fade.png) top repeat-x",
+      background: "#ffe url(/assets/fade.png) top repeat-x",
       color: "maroon",
       fontFamily: "Helvetica, Arial, sans-serif"
     });
@@ -43,7 +43,7 @@ const Home = ({ setBodyStyle }) => {
       <Header>
         <Logo>
           <Link to="/">
-            <img alt="plebchan" src="/logo-transparent.png" />
+            <img alt="plebchan" src="/assets/logo/logo-transparent.png" />
           </Link>
         </Logo>
       </Header>
@@ -77,7 +77,7 @@ const Home = ({ setBodyStyle }) => {
                   <Link to="/board" onClick={() => {
                     handleClick(subplebbit.title, subplebbit.address);
                   }} >
-                    <img alt="board logo" src="/plebchan.png" />
+                    <img alt="board logo" src="/assets/plebchan.png" />
                   </Link>
                   <div className="board-text">
                     <b>{subplebbit.address}</b>
diff --git a/src/components/ImageBanner.jsx b/src/components/ImageBanner.jsx
index e373f636..b851593e 100644
--- a/src/components/ImageBanner.jsx
+++ b/src/components/ImageBanner.jsx
@@ -8,7 +8,7 @@ const ImageBanner = () => {
   }, []);
 
   return (
-    <img id="banner-img" src={`banner-${currentImage}.jpg`} alt="banner" />
+    <img id="banner-img" src={`/assets/banners/banner-${currentImage}.jpg`} alt="banner" />
   );
 };
 
diff --git a/src/components/Thread.jsx b/src/components/Thread.jsx
index 299b1686..155201fd 100644
--- a/src/components/Thread.jsx
+++ b/src/components/Thread.jsx
@@ -51,7 +51,7 @@ const Thread = ({ setBodyStyle }) => {
     switch (event.target.value) {
       case "Yotsuba":
         setBodyStyle({
-          background: "#ffe url(/fade.png) top repeat-x",
+          background: "#ffe url(/assets/fade.png) top repeat-x",
           color: "maroon",
           fontFamily: "Arial, Helvetica, sans-serif"
         });
@@ -60,7 +60,7 @@ const Thread = ({ setBodyStyle }) => {
 
       case "Yotsuba B":
         setBodyStyle({
-          background: "#eef2ff url(/fade-blue.png) top center repeat-x",
+          background: "#eef2ff url(/assets/fade-blue.png) top center repeat-x",
           color: "#000",
           fontFamily: "Arial, Helvetica, sans-serif"
         });
@@ -105,7 +105,7 @@ const Thread = ({ setBodyStyle }) => {
 
       default:
         setBodyStyle({
-          background: "#ffe url(/fade.png) top repeat-x",
+          background: "#ffe url(/assets/fade.png) top repeat-x",
           color: "maroon",
           fontFamily: "Arial, Helvetica, sans-serif"
         });