diff --git a/src/public/app/layouts/desktop_extra_window_layout.js b/src/public/app/layouts/desktop_extra_window_layout.js
index 767d040bc..460c8b2f4 100644
--- a/src/public/app/layouts/desktop_extra_window_layout.js
+++ b/src/public/app/layouts/desktop_extra_window_layout.js
@@ -8,16 +8,16 @@ import NoteTitleWidget from "../widgets/note_title.js";
 import NoteTypeWidget from "../widgets/note_type.js";
 import NoteActionsWidget from "../widgets/note_actions.js";
 import NoteDetailWidget from "../widgets/note_detail.js";
-import OwnedAttributeListWidget from "../widgets/attribute_widgets/owned_attribute_list.js";
+import OwnedAttributeListWidget from "../widgets/type_property_widgets/owned_attribute_list.js";
 import CollapsibleSectionContainer from "../widgets/collapsible_section_container.js";
-import SearchDefinitionWidget from "../widgets/search_definition.js";
-import PromotedAttributesWidget from "../widgets/attribute_widgets/promoted_attributes.js";
-import InheritedAttributesWidget from "../widgets/inherited_attribute_list.js";
+import SearchDefinitionWidget from "../widgets/type_property_widgets/search_definition.js";
+import PromotedAttributesWidget from "../widgets/type_property_widgets/promoted_attributes.js";
+import InheritedAttributesWidget from "../widgets/type_property_widgets/inherited_attribute_list.js";
 import Container from "../widgets/container.js";
 import SqlTableSchemasWidget from "../widgets/sql_table_schemas.js";
 import NoteListWidget from "../widgets/note_list.js";
 import SqlResultWidget from "../widgets/sql_result.js";
-import FilePropertiesWidget from "../widgets/file_properties.js";
+import FilePropertiesWidget from "../widgets/type_property_widgets/file_properties.js";
 
 export default class DesktopExtraWindowLayout {
     constructor(customWidgets) {
diff --git a/src/public/app/layouts/desktop_main_window_layout.js b/src/public/app/layouts/desktop_main_window_layout.js
index 19c64c369..2fa7a9531 100644
--- a/src/public/app/layouts/desktop_main_window_layout.js
+++ b/src/public/app/layouts/desktop_main_window_layout.js
@@ -8,7 +8,7 @@ import NoteTreeWidget from "../widgets/note_tree.js";
 import TabCachingWidget from "../widgets/tab_caching_widget.js";
 import NotePathsWidget from "../widgets/note_paths.js";
 import NoteTitleWidget from "../widgets/note_title.js";
-import OwnedAttributeListWidget from "../widgets/attribute_widgets/owned_attribute_list.js";
+import OwnedAttributeListWidget from "../widgets/type_property_widgets/owned_attribute_list.js";
 import NoteTypeWidget from "../widgets/note_type.js";
 import NoteActionsWidget from "../widgets/note_actions.js";
 import NoteDetailWidget from "../widgets/note_detail.js";
@@ -21,14 +21,14 @@ import WhatLinksHereWidget from "../widgets/collapsible_widgets/what_links_here.
 import SidePaneToggles from "../widgets/side_pane_toggles.js";
 import EditedNotesWidget from "../widgets/collapsible_widgets/edited_notes.js";
 import CollapsibleSectionContainer from "../widgets/collapsible_section_container.js";
-import PromotedAttributesWidget from "../widgets/attribute_widgets/promoted_attributes.js";
-import InheritedAttributesWidget from "../widgets/inherited_attribute_list.js";
+import PromotedAttributesWidget from "../widgets/type_property_widgets/promoted_attributes.js";
+import InheritedAttributesWidget from "../widgets/type_property_widgets/inherited_attribute_list.js";
 import NoteListWidget from "../widgets/note_list.js";
-import SearchDefinitionWidget from "../widgets/search_definition.js";
+import SearchDefinitionWidget from "../widgets/type_property_widgets/search_definition.js";
 import Container from "../widgets/container.js";
 import SqlResultWidget from "../widgets/sql_result.js";
 import SqlTableSchemasWidget from "../widgets/sql_table_schemas.js";
-import FilePropertiesWidget from "../widgets/file_properties.js";
+import FilePropertiesWidget from "../widgets/type_property_widgets/file_properties.js";
 
 const RIGHT_PANE_CSS = `
 <style>
diff --git a/src/public/app/widgets/file_properties.js b/src/public/app/widgets/type_property_widgets/file_properties.js
similarity index 94%
rename from src/public/app/widgets/file_properties.js
rename to src/public/app/widgets/type_property_widgets/file_properties.js
index 2965ba7ed..a68f70ea5 100644
--- a/src/public/app/widgets/file_properties.js
+++ b/src/public/app/widgets/type_property_widgets/file_properties.js
@@ -1,8 +1,8 @@
-import server from "../services/server.js";
-import TabAwareWidget from "./tab_aware_widget.js";
-import toastService from "../services/toast.js";
-import openService from "../services/open.js";
-import utils from "../services/utils.js";
+import server from "../../services/server.js";
+import TabAwareWidget from "../tab_aware_widget.js";
+import toastService from "../../services/toast.js";
+import openService from "../../services/open.js";
+import utils from "../../services/utils.js";
 
 const TPL = `
 <div class="file-properties-widget">
diff --git a/src/public/app/widgets/inherited_attribute_list.js b/src/public/app/widgets/type_property_widgets/inherited_attribute_list.js
similarity index 92%
rename from src/public/app/widgets/inherited_attribute_list.js
rename to src/public/app/widgets/type_property_widgets/inherited_attribute_list.js
index 284ea162d..3bc1da356 100644
--- a/src/public/app/widgets/inherited_attribute_list.js
+++ b/src/public/app/widgets/type_property_widgets/inherited_attribute_list.js
@@ -1,6 +1,6 @@
-import TabAwareWidget from "./tab_aware_widget.js";
-import AttributeDetailWidget from "./attribute_widgets/attribute_detail.js";
-import attributeRenderer from "../services/attribute_renderer.js";
+import TabAwareWidget from "../tab_aware_widget.js";
+import AttributeDetailWidget from "../attribute_widgets/attribute_detail.js";
+import attributeRenderer from "../../services/attribute_renderer.js";
 
 const TPL = `
 <div class="inherited-attributes-widget">
diff --git a/src/public/app/widgets/attribute_widgets/owned_attribute_list.js b/src/public/app/widgets/type_property_widgets/owned_attribute_list.js
similarity index 92%
rename from src/public/app/widgets/attribute_widgets/owned_attribute_list.js
rename to src/public/app/widgets/type_property_widgets/owned_attribute_list.js
index 125b1db87..0ac92854d 100644
--- a/src/public/app/widgets/attribute_widgets/owned_attribute_list.js
+++ b/src/public/app/widgets/type_property_widgets/owned_attribute_list.js
@@ -1,6 +1,6 @@
 import TabAwareWidget from "../tab_aware_widget.js";
-import AttributeDetailWidget from "./attribute_detail.js";
-import AttributeEditorWidget from "./attribute_editor.js";
+import AttributeDetailWidget from "../attribute_widgets/attribute_detail.js";
+import AttributeEditorWidget from "../attribute_widgets/attribute_editor.js";
 
 const TPL = `
 <div class="attribute-list">
diff --git a/src/public/app/widgets/attribute_widgets/promoted_attributes.js b/src/public/app/widgets/type_property_widgets/promoted_attributes.js
similarity index 100%
rename from src/public/app/widgets/attribute_widgets/promoted_attributes.js
rename to src/public/app/widgets/type_property_widgets/promoted_attributes.js
diff --git a/src/public/app/widgets/search_definition.js b/src/public/app/widgets/type_property_widgets/search_definition.js
similarity index 89%
rename from src/public/app/widgets/search_definition.js
rename to src/public/app/widgets/type_property_widgets/search_definition.js
index 8e49a8bdc..ed15c4eda 100644
--- a/src/public/app/widgets/search_definition.js
+++ b/src/public/app/widgets/type_property_widgets/search_definition.js
@@ -1,23 +1,23 @@
-import server from "../services/server.js";
-import TabAwareWidget from "./tab_aware_widget.js";
-import treeCache from "../services/tree_cache.js";
-import ws from "../services/ws.js";
-import toastService from "../services/toast.js";
+import server from "../../services/server.js";
+import TabAwareWidget from "../tab_aware_widget.js";
+import treeCache from "../../services/tree_cache.js";
+import ws from "../../services/ws.js";
+import toastService from "../../services/toast.js";
 
-import DeleteNoteSearchAction from "./search_actions/delete_note.js";
-import DeleteLabelSearchAction from "./search_actions/delete_label.js";
-import DeleteRelationSearchAction from "./search_actions/delete_relation.js";
-import RenameLabelSearchAction from "./search_actions/rename_label.js";
-import SetLabelValueSearchAction from "./search_actions/set_label_value.js";
-import SetRelationTargetSearchAction from "./search_actions/set_relation_target.js";
-import RenameRelationSearchAction from "./search_actions/rename_relation.js";
-import ExecuteScriptSearchAction from "./search_actions/execute_script.js"
-import SearchString from "./search_options/search_string.js";
-import FastSearch from "./search_options/fast_search.js";
-import Ancestor from "./search_options/ancestor.js";
-import IncludeArchivedNotes from "./search_options/include_archived_notes.js";
-import OrderBy from "./search_options/order_by.js";
-import SearchScript from "./search_options/search_script.js";
+import DeleteNoteSearchAction from "../search_actions/delete_note.js";
+import DeleteLabelSearchAction from "../search_actions/delete_label.js";
+import DeleteRelationSearchAction from "../search_actions/delete_relation.js";
+import RenameLabelSearchAction from "../search_actions/rename_label.js";
+import SetLabelValueSearchAction from "../search_actions/set_label_value.js";
+import SetRelationTargetSearchAction from "../search_actions/set_relation_target.js";
+import RenameRelationSearchAction from "../search_actions/rename_relation.js";
+import ExecuteScriptSearchAction from "../search_actions/execute_script.js"
+import SearchString from "../search_options/search_string.js";
+import FastSearch from "../search_options/fast_search.js";
+import Ancestor from "../search_options/ancestor.js";
+import IncludeArchivedNotes from "../search_options/include_archived_notes.js";
+import OrderBy from "../search_options/order_by.js";
+import SearchScript from "../search_options/search_script.js";
 
 const TPL = `
 <div class="search-definition-widget">
diff --git a/src/public/app/widgets/attribute_list.js b/src/public/app/widgets/type_widgets/attribute_list.js
similarity index 100%
rename from src/public/app/widgets/attribute_list.js
rename to src/public/app/widgets/type_widgets/attribute_list.js