diff --git a/src/public/app/layouts/desktop_main_window_layout.js b/src/public/app/layouts/desktop_main_window_layout.js
index 995dbcf15..11755dae0 100644
--- a/src/public/app/layouts/desktop_main_window_layout.js
+++ b/src/public/app/layouts/desktop_main_window_layout.js
@@ -17,13 +17,13 @@ import NoteTypeWidget from "../widgets/note_type.js";
 import NoteActionsWidget from "../widgets/note_actions.js";
 import PromotedAttributesWidget from "../widgets/promoted_attributes.js";
 import NoteDetailWidget from "../widgets/note_detail.js";
-import NoteInfoWidget from "../widgets/note_info.js";
-import CalendarWidget from "../widgets/calendar.js";
-import AttributesWidget from "../widgets/attributes.js";
-import LinkMapWidget from "../widgets/link_map.js";
-import NoteRevisionsWidget from "../widgets/note_revisions.js";
-import SimilarNotesWidget from "../widgets/similar_notes.js";
-import WhatLinksHereWidget from "../widgets/what_links_here.js";
+import NoteInfoWidget from "../widgets/collapsible_widgets/note_info.js";
+import CalendarWidget from "../widgets/collapsible_widgets/calendar.js";
+import AttributesWidget from "../widgets/collapsible_widgets/attributes.js";
+import LinkMapWidget from "../widgets/collapsible_widgets/link_map.js";
+import NoteRevisionsWidget from "../widgets/collapsible_widgets/note_revisions.js";
+import SimilarNotesWidget from "../widgets/collapsible_widgets/similar_notes.js";
+import WhatLinksHereWidget from "../widgets/collapsible_widgets/what_links_here.js";
 import SidePaneToggles from "../widgets/side_pane_toggles.js";
 import appContext from "../services/app_context.js";
 
diff --git a/src/public/app/layouts/mobile_layout.js b/src/public/app/layouts/mobile_layout.js
index 5dfc6dfcf..84f7d7b73 100644
--- a/src/public/app/layouts/mobile_layout.js
+++ b/src/public/app/layouts/mobile_layout.js
@@ -2,10 +2,10 @@ import FlexContainer from "../widgets/flex_container.js";
 import NoteTitleWidget from "../widgets/note_title.js";
 import NoteDetailWidget from "../widgets/note_detail.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
-import MobileGlobalButtonsWidget from "../widgets/mobile_global_buttons.js";
-import CloseDetailButtonWidget from "../widgets/close_detail_button.js";
-import MobileDetailMenuWidget from "../widgets/mobile_detail_menu.js";
-import ScreenContainer from "../widgets/screen_container.js";
+import MobileGlobalButtonsWidget from "../widgets/mobile_widgets/mobile_global_buttons.js";
+import CloseDetailButtonWidget from "../widgets/mobile_widgets/close_detail_button.js";
+import MobileDetailMenuWidget from "../widgets/mobile_widgets/mobile_detail_menu.js";
+import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
 
 const MOBILE_CSS = `
 <style>
diff --git a/src/public/app/services/app_context.js b/src/public/app/services/app_context.js
index 67787988a..62cbaa174 100644
--- a/src/public/app/services/app_context.js
+++ b/src/public/app/services/app_context.js
@@ -9,7 +9,7 @@ import TabManager from "./tab_manager.js";
 import treeService from "./tree.js";
 import Component from "../widgets/component.js";
 import keyboardActionsService from "./keyboard_actions.js";
-import MobileScreenSwitcherExecutor from "../widgets/mobile_screen_switcher.js";
+import MobileScreenSwitcherExecutor from "../widgets/mobile_widgets/mobile_screen_switcher.js";
 import MainTreeExecutors from "./main_tree_executors.js";
 
 class AppContext extends Component {
diff --git a/src/public/app/widgets/attributes.js b/src/public/app/widgets/collapsible_widgets/attributes.js
similarity index 92%
rename from src/public/app/widgets/attributes.js
rename to src/public/app/widgets/collapsible_widgets/attributes.js
index 3c4644d33..25a136dec 100644
--- a/src/public/app/widgets/attributes.js
+++ b/src/public/app/widgets/collapsible_widgets/attributes.js
@@ -1,7 +1,7 @@
-import utils from "../services/utils.js";
-import linkService from "../services/link.js";
-import ws from "../services/ws.js";
-import CollapsibleWidget from "./collapsible_widget.js";
+import utils from "../../services/utils.js";
+import linkService from "../../services/link.js";
+import ws from "../../services/ws.js";
+import CollapsibleWidget from "../collapsible_widget.js";
 
 export default class AttributesWidget extends CollapsibleWidget {
     get widgetTitle() { return "Attributes"; }
@@ -16,7 +16,7 @@ export default class AttributesWidget extends CollapsibleWidget {
     get headerActions() {
         const $showFullButton = $("<a>").append("show dialog").addClass('widget-header-action');
         $showFullButton.on('click', async () => {
-            const attributesDialog = await import("../dialogs/attributes.js");
+            const attributesDialog = await import("../../dialogs/attributes.js");
             attributesDialog.showDialog();
         });
 
diff --git a/src/public/app/widgets/calendar.js b/src/public/app/widgets/collapsible_widgets/calendar.js
similarity index 93%
rename from src/public/app/widgets/calendar.js
rename to src/public/app/widgets/collapsible_widgets/calendar.js
index ec6bea722..63913f7e4 100644
--- a/src/public/app/widgets/calendar.js
+++ b/src/public/app/widgets/collapsible_widgets/calendar.js
@@ -1,9 +1,9 @@
-import CollapsibleWidget from "./collapsible_widget.js";
-import libraryLoader from "../services/library_loader.js";
-import utils from "../services/utils.js";
-import dateNoteService from "../services/date_notes.js";
-import server from "../services/server.js";
-import appContext from "../services/app_context.js";
+import CollapsibleWidget from "../collapsible_widget.js";
+import libraryLoader from "../../services/library_loader.js";
+import utils from "../../services/utils.js";
+import dateNoteService from "../../services/date_notes.js";
+import server from "../../services/server.js";
+import appContext from "../../services/app_context.js";
 
 const TPL = `
 <div class="calendar-widget">
diff --git a/src/public/app/widgets/edited_notes.js b/src/public/app/widgets/collapsible_widgets/edited_notes.js
similarity index 87%
rename from src/public/app/widgets/edited_notes.js
rename to src/public/app/widgets/collapsible_widgets/edited_notes.js
index 39551cd36..54d98a82f 100644
--- a/src/public/app/widgets/edited_notes.js
+++ b/src/public/app/widgets/collapsible_widgets/edited_notes.js
@@ -1,7 +1,7 @@
-import CollapsibleWidget from "./collapsible_widget.js";
-import linkService from "../services/link.js";
-import server from "../services/server.js";
-import treeCache from "../services/tree_cache.js";
+import CollapsibleWidget from "../collapsible_widget.js";
+import linkService from "../../services/link.js";
+import server from "../../services/server.js";
+import treeCache from "../../services/tree_cache.js";
 
 export default class EditedNotesWidget extends CollapsibleWidget {
     get widgetTitle() { return "Edited notes on this day"; }
diff --git a/src/public/app/widgets/link_map.js b/src/public/app/widgets/collapsible_widgets/link_map.js
similarity index 92%
rename from src/public/app/widgets/link_map.js
rename to src/public/app/widgets/collapsible_widgets/link_map.js
index e8ddda2db..fc1adcf6b 100644
--- a/src/public/app/widgets/link_map.js
+++ b/src/public/app/widgets/collapsible_widgets/link_map.js
@@ -1,4 +1,4 @@
-import CollapsibleWidget from "./collapsible_widget.js";
+import CollapsibleWidget from "../collapsible_widget.js";
 
 let linkMapContainerIdCtr = 1;
 
@@ -21,7 +21,7 @@ export default class LinkMapWidget extends CollapsibleWidget {
     get headerActions() {
         const $showFullButton = $("<a>").append("show full").addClass('widget-header-action');
         $showFullButton.on('click', async () => {
-            const linkMapDialog = await import("../dialogs/link_map.js");
+            const linkMapDialog = await import("../../dialogs/link_map.js");
             linkMapDialog.showDialog();
         });
 
@@ -66,7 +66,7 @@ export default class LinkMapWidget extends CollapsibleWidget {
         const $linkMapContainer = this.$body.find('.link-map-container');
         $linkMapContainer.attr("id", "link-map-container-" + linkMapContainerIdCtr++);
 
-        const LinkMapServiceClass = (await import('../services/link_map.js')).default;
+        const LinkMapServiceClass = (await import('../../services/link_map.js')).default;
 
         this.linkMapService = new LinkMapServiceClass(note, $linkMapContainer, {
             maxDepth: 1,
diff --git a/src/public/app/widgets/note_info.js b/src/public/app/widgets/collapsible_widgets/note_info.js
similarity index 97%
rename from src/public/app/widgets/note_info.js
rename to src/public/app/widgets/collapsible_widgets/note_info.js
index cff5446df..f847d95fb 100644
--- a/src/public/app/widgets/note_info.js
+++ b/src/public/app/widgets/collapsible_widgets/note_info.js
@@ -1,4 +1,4 @@
-import CollapsibleWidget from "./collapsible_widget.js";
+import CollapsibleWidget from "../collapsible_widget.js";
 
 const TPL = `
 <table class="note-info-widget-table">
diff --git a/src/public/app/widgets/note_revisions.js b/src/public/app/widgets/collapsible_widgets/note_revisions.js
similarity index 92%
rename from src/public/app/widgets/note_revisions.js
rename to src/public/app/widgets/collapsible_widgets/note_revisions.js
index 84f5b11ad..523ae144a 100644
--- a/src/public/app/widgets/note_revisions.js
+++ b/src/public/app/widgets/collapsible_widgets/note_revisions.js
@@ -1,5 +1,5 @@
-import server from "../services/server.js";
-import CollapsibleWidget from "./collapsible_widget.js";
+import server from "../../services/server.js";
+import CollapsibleWidget from "../collapsible_widget.js";
 
 const TPL = `
 <ul class="note-revision-list" style="max-height: 150px; overflow: auto;">
@@ -19,7 +19,7 @@ class NoteRevisionsWidget extends CollapsibleWidget {
     get headerActions() {
         const $showFullButton = $("<a>").append("show dialog").addClass('widget-header-action');
         $showFullButton.on('click', async () => {
-            const attributesDialog = await import("../dialogs/note_revisions.js");
+            const attributesDialog = await import("../../dialogs/note_revisions.js");
             attributesDialog.showCurrentNoteRevisions(this.noteId);
         });
 
diff --git a/src/public/app/widgets/similar_notes.js b/src/public/app/widgets/collapsible_widgets/similar_notes.js
similarity index 89%
rename from src/public/app/widgets/similar_notes.js
rename to src/public/app/widgets/collapsible_widgets/similar_notes.js
index e8b5ebb76..45a3a27d8 100644
--- a/src/public/app/widgets/similar_notes.js
+++ b/src/public/app/widgets/collapsible_widgets/similar_notes.js
@@ -1,7 +1,7 @@
-import CollapsibleWidget from "./collapsible_widget.js";
-import linkService from "../services/link.js";
-import server from "../services/server.js";
-import treeCache from "../services/tree_cache.js";
+import CollapsibleWidget from "../collapsible_widget.js";
+import linkService from "../../services/link.js";
+import server from "../../services/server.js";
+import treeCache from "../../services/tree_cache.js";
 
 export default class SimilarNotesWidget extends CollapsibleWidget {
     get widgetTitle() { return "Similar notes"; }
diff --git a/src/public/app/widgets/what_links_here.js b/src/public/app/widgets/collapsible_widgets/what_links_here.js
similarity index 89%
rename from src/public/app/widgets/what_links_here.js
rename to src/public/app/widgets/collapsible_widgets/what_links_here.js
index 8c82eb71f..9f13ece02 100644
--- a/src/public/app/widgets/what_links_here.js
+++ b/src/public/app/widgets/collapsible_widgets/what_links_here.js
@@ -1,5 +1,5 @@
-import CollapsibleWidget from "./collapsible_widget.js";
-import linkService from "../services/link.js";
+import CollapsibleWidget from "../collapsible_widget.js";
+import linkService from "../../services/link.js";
 
 export default class WhatLinksHereWidget extends CollapsibleWidget {
     get widgetTitle() { return "What links here"; }
@@ -13,7 +13,7 @@ export default class WhatLinksHereWidget extends CollapsibleWidget {
     get headerActions() {
         const $showFullButton = $("<a>").append("show link map").addClass('widget-header-action');
         $showFullButton.on('click', async () => {
-            const linkMapDialog = await import("../dialogs/link_map.js");
+            const linkMapDialog = await import("../../dialogs/link_map.js");
             linkMapDialog.showDialog();
         });
 
diff --git a/src/public/app/widgets/close_detail_button.js b/src/public/app/widgets/mobile_widgets/close_detail_button.js
similarity index 90%
rename from src/public/app/widgets/close_detail_button.js
rename to src/public/app/widgets/mobile_widgets/close_detail_button.js
index a989c9b97..8d3bbe00e 100644
--- a/src/public/app/widgets/close_detail_button.js
+++ b/src/public/app/widgets/mobile_widgets/close_detail_button.js
@@ -1,4 +1,4 @@
-import BasicWidget from "./basic_widget.js";
+import BasicWidget from "../basic_widget.js";
 
 const TPL = `
 <button type="button" class="action-button d-sm-none d-md-none d-lg-none d-xl-none" aria-label="Close">
diff --git a/src/public/app/widgets/mobile_detail_menu.js b/src/public/app/widgets/mobile_widgets/mobile_detail_menu.js
similarity index 83%
rename from src/public/app/widgets/mobile_detail_menu.js
rename to src/public/app/widgets/mobile_widgets/mobile_detail_menu.js
index 5eb3740ae..82d8d51fb 100644
--- a/src/public/app/widgets/mobile_detail_menu.js
+++ b/src/public/app/widgets/mobile_widgets/mobile_detail_menu.js
@@ -1,8 +1,8 @@
-import BasicWidget from "./basic_widget.js";
-import appContext from "../services/app_context.js";
-import contextMenu from "../services/context_menu.js";
-import noteCreateService from "../services/note_create.js";
-import branchService from "../services/branches.js";
+import BasicWidget from "../basic_widget.js";
+import appContext from "../../services/app_context.js";
+import contextMenu from "../../services/context_menu.js";
+import noteCreateService from "../../services/note_create.js";
+import branchService from "../../services/branches.js";
 
 const TPL = `<button type="button" class="action-button bx bx-menu"></button>`;
 
diff --git a/src/public/app/widgets/mobile_global_buttons.js b/src/public/app/widgets/mobile_widgets/mobile_global_buttons.js
similarity index 96%
rename from src/public/app/widgets/mobile_global_buttons.js
rename to src/public/app/widgets/mobile_widgets/mobile_global_buttons.js
index aa2458b6f..629794ae6 100644
--- a/src/public/app/widgets/mobile_global_buttons.js
+++ b/src/public/app/widgets/mobile_widgets/mobile_global_buttons.js
@@ -1,4 +1,4 @@
-import BasicWidget from "./basic_widget.js";
+import BasicWidget from "../basic_widget.js";
 
 const WIDGET_TPL = `
 <div id="global-buttons">
diff --git a/src/public/app/widgets/mobile_screen_switcher.js b/src/public/app/widgets/mobile_widgets/mobile_screen_switcher.js
similarity index 90%
rename from src/public/app/widgets/mobile_screen_switcher.js
rename to src/public/app/widgets/mobile_widgets/mobile_screen_switcher.js
index 3ad9821a4..f8ef3723e 100644
--- a/src/public/app/widgets/mobile_screen_switcher.js
+++ b/src/public/app/widgets/mobile_widgets/mobile_screen_switcher.js
@@ -1,4 +1,4 @@
-import Component from "./component.js";
+import Component from "../component.js";
 
 export default class MobileScreenSwitcherExecutor extends Component {
     setActiveScreenCommand({screen}) {
diff --git a/src/public/app/widgets/screen_container.js b/src/public/app/widgets/mobile_widgets/screen_container.js
similarity index 89%
rename from src/public/app/widgets/screen_container.js
rename to src/public/app/widgets/mobile_widgets/screen_container.js
index 8893f0b60..1a7ee3a8d 100644
--- a/src/public/app/widgets/screen_container.js
+++ b/src/public/app/widgets/mobile_widgets/screen_container.js
@@ -1,4 +1,4 @@
-import FlexContainer from "./flex_container.js";
+import FlexContainer from "../flex_container.js";
 
 export default class ScreenContainer extends FlexContainer {
     constructor(screenName, direction) {