diff --git a/src/mami.js/ui/ping.jsx b/src/mami.js/controls/ping.jsx
similarity index 100%
rename from src/mami.js/ui/ping.jsx
rename to src/mami.js/controls/ping.jsx
diff --git a/src/mami.js/main.js b/src/mami.js/main.js
index adc1a10..bdedb21 100644
--- a/src/mami.js/main.js
+++ b/src/mami.js/main.js
@@ -17,8 +17,11 @@ window.Umi = { UI: {} };
 #include worker.js
 #include audio/autoplay.js
 #include controls/msgbox.jsx
+#include controls/ping.jsx
 #include controls/views.js
 #include eeprom/eeprom.js
+#include notices/baka.jsx
+#include notices/youare.jsx
 #include settings/backup.js
 #include settings/settings.js
 #include sidebar/act-clear-backlog.jsx
@@ -37,16 +40,13 @@ window.Umi = { UI: {} };
 #include sound/context.js
 #include sound/osukeys.js
 #include sound/sndtest.jsx
-#include ui/baka.jsx
 #include ui/chat-layout.js
 #include ui/emotes.js
 #include ui/hooks.js
 #include ui/input-menus.js
 #include ui/loading-overlay.jsx
 #include ui/markup.js
-#include ui/ping.jsx
 #include ui/view.js
-#include ui/youare.jsx
 
 (async () => {
     const eventTarget = new MamiEventTargetWindow;
diff --git a/src/mami.js/ui/baka.jsx b/src/mami.js/notices/baka.jsx
similarity index 100%
rename from src/mami.js/ui/baka.jsx
rename to src/mami.js/notices/baka.jsx
diff --git a/src/mami.js/ui/youare.jsx b/src/mami.js/notices/youare.jsx
similarity index 100%
rename from src/mami.js/ui/youare.jsx
rename to src/mami.js/notices/youare.jsx
diff --git a/src/mami.js/sockchat/handlers.js b/src/mami.js/sockchat/handlers.js
index 660f587..22c4290 100644
--- a/src/mami.js/sockchat/handlers.js
+++ b/src/mami.js/sockchat/handlers.js
@@ -2,8 +2,8 @@
 #include messages.js
 #include parsing.js
 #include users.js
+#include notices/baka.jsx
 #include sockchat/modal.js
-#include ui/baka.jsx
 #include ui/emotes.js
 #include ui/markup.js
 #include ui/messages.jsx