diff --git a/frontend/src/components/codeeditor.svelte b/frontend/src/components/editors/codeeditor.svelte
similarity index 100%
rename from frontend/src/components/codeeditor.svelte
rename to frontend/src/components/editors/codeeditor.svelte
diff --git a/frontend/src/components/datepicker.svelte b/frontend/src/components/editors/datepicker.svelte
similarity index 97%
rename from frontend/src/components/datepicker.svelte
rename to frontend/src/components/editors/datepicker.svelte
index c4659d8..12f30e0 100644
--- a/frontend/src/components/datepicker.svelte
+++ b/frontend/src/components/editors/datepicker.svelte
@@ -2,9 +2,9 @@
   import { daysAbbr, months } from '$lib/constants';
   import { addDays, getWeek, isDate, isSameDay, startOfWeek } from 'date-fns';
   import { onMount } from 'svelte';
-  import Clock from './clock.svelte';
-  import Icon from './icon.svelte';
-  import Modal from './modal.svelte';
+  import Clock from '../clock.svelte';
+  import Icon from '../icon.svelte';
+  import Modal from '../modal.svelte';
 
   export let value;
   export let show = false;
diff --git a/frontend/src/components/directorychooser.svelte b/frontend/src/components/editors/directorychooser.svelte
similarity index 100%
rename from frontend/src/components/directorychooser.svelte
rename to frontend/src/components/editors/directorychooser.svelte
diff --git a/frontend/src/components/forminput.svelte b/frontend/src/components/editors/forminput.svelte
similarity index 99%
rename from frontend/src/components/forminput.svelte
rename to frontend/src/components/editors/forminput.svelte
index 9d2498a..6e0d9f1 100644
--- a/frontend/src/components/forminput.svelte
+++ b/frontend/src/components/editors/forminput.svelte
@@ -4,7 +4,7 @@
   import { ObjectId } from 'bson';
   import { onMount } from 'svelte';
   import Datepicker from './datepicker.svelte';
-  import Icon from './icon.svelte';
+  import Icon from '../icon.svelte';
 
   export let column = {};
   export let value = undefined;
diff --git a/frontend/src/components/objecteditor.svelte b/frontend/src/components/editors/objecteditor.svelte
similarity index 95%
rename from frontend/src/components/objecteditor.svelte
rename to frontend/src/components/editors/objecteditor.svelte
index 4a6b4db..4b446ca 100644
--- a/frontend/src/components/objecteditor.svelte
+++ b/frontend/src/components/editors/objecteditor.svelte
@@ -22,7 +22,8 @@
   });
 </script>
 
-<CodeEditor bind:editor
+<CodeEditor
+  bind:editor
   bind:text
   on:inited
   on:updated
diff --git a/frontend/src/components/grid-items.svelte b/frontend/src/components/grid/grid-items.svelte
similarity index 98%
rename from frontend/src/components/grid-items.svelte
rename to frontend/src/components/grid/grid-items.svelte
index 95ea050..efa1575 100644
--- a/frontend/src/components/grid-items.svelte
+++ b/frontend/src/components/grid/grid-items.svelte
@@ -2,8 +2,8 @@
   import { pathsAreEqual, resolveKeypath, setValue } from '$lib/objects';
   import contextMenu from '$lib/stores/contextmenu';
   import { createEventDispatcher } from 'svelte';
-  import FormInput from './forminput.svelte';
-  import Icon from './icon.svelte';
+  import FormInput from '$components/editors/forminput.svelte';
+  import Icon from '$components/icon.svelte';
 
   export let items = [];
   export let columns = [];
diff --git a/frontend/src/components/grid.svelte b/frontend/src/components/grid/grid.svelte
similarity index 97%
rename from frontend/src/components/grid.svelte
rename to frontend/src/components/grid/grid.svelte
index ee10fbd..c75c289 100644
--- a/frontend/src/components/grid.svelte
+++ b/frontend/src/components/grid/grid.svelte
@@ -1,8 +1,8 @@
 <script>
   import { onDestroy } from 'svelte';
-  import BlankState from './blankstate.svelte';
+  import BlankState from '../blankstate.svelte';
   import GridItems from './grid-items.svelte';
-  import Icon from './icon.svelte';
+  import Icon from '../icon.svelte';
 
   export let columns = [];
   export let items = [];
diff --git a/frontend/src/components/objectgrid.svelte b/frontend/src/components/grid/objectgrid.svelte
similarity index 100%
rename from frontend/src/components/objectgrid.svelte
rename to frontend/src/components/grid/objectgrid.svelte
diff --git a/frontend/src/components/objectviewer.svelte b/frontend/src/components/objectviewer.svelte
index 41b62fa..4063111 100644
--- a/frontend/src/components/objectviewer.svelte
+++ b/frontend/src/components/objectviewer.svelte
@@ -4,7 +4,7 @@
   import { createEventDispatcher, onDestroy } from 'svelte';
   import Icon from './icon.svelte';
   import Modal from './modal.svelte';
-  import ObjectEditor from './objecteditor.svelte';
+  import ObjectEditor from './editors/objecteditor.svelte';
 
   export let data;
   export let readonly = false;
diff --git a/frontend/src/dialogs/settings/index.svelte b/frontend/src/dialogs/settings/index.svelte
index c203330..a1a148d 100644
--- a/frontend/src/dialogs/settings/index.svelte
+++ b/frontend/src/dialogs/settings/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import DirectoryChooser from '$components/directorychooser.svelte';
+  import DirectoryChooser from '$components/editors/directorychooser.svelte';
   import Modal from '$components/modal.svelte';
   import input from '$lib/actions/input';
   import settings from '$lib/stores/settings';
diff --git a/frontend/src/organisms/connection/collection/aggregate.svelte b/frontend/src/organisms/connection/collection/aggregate.svelte
index ece20f6..679fe33 100644
--- a/frontend/src/organisms/connection/collection/aggregate.svelte
+++ b/frontend/src/organisms/connection/collection/aggregate.svelte
@@ -2,7 +2,7 @@
   import Details from '$components/details.svelte';
   import Icon from '$components/icon.svelte';
   import Modal from '$components/modal.svelte';
-  import ObjectEditor from '$components/objecteditor.svelte';
+  import ObjectEditor from '$components/editors/objecteditor.svelte';
   import { aggregationStageDocumentationURL, aggregationStages } from '$lib/mongo';
   import Collation from '$lib/mongo/collation.svelte';
   import { jsonLooseParse, looseJsonIsValid } from '$lib/strings';
diff --git a/frontend/src/organisms/connection/collection/components/form.svelte b/frontend/src/organisms/connection/collection/components/form.svelte
index 51e05bd..c34e551 100644
--- a/frontend/src/organisms/connection/collection/components/form.svelte
+++ b/frontend/src/organisms/connection/collection/components/form.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FormInput from '$components/forminput.svelte';
+  import FormInput from '$components/editors/forminput.svelte';
   import Hint from '$components/hint.svelte';
   import Icon from '$components/icon.svelte';
   import { inputTypes } from '$lib/mongo';
diff --git a/frontend/src/organisms/connection/collection/dialogs/querychooser.svelte b/frontend/src/organisms/connection/collection/dialogs/querychooser.svelte
index 887f391..ee0fe80 100644
--- a/frontend/src/organisms/connection/collection/dialogs/querychooser.svelte
+++ b/frontend/src/organisms/connection/collection/dialogs/querychooser.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Grid from '$components/grid.svelte';
+  import Grid from '$components/grid/grid.svelte';
   import Hint from '$components/hint.svelte';
   import Icon from '$components/icon.svelte';
   import Modal from '$components/modal.svelte';
diff --git a/frontend/src/organisms/connection/collection/find.svelte b/frontend/src/organisms/connection/collection/find.svelte
index 0034c6c..7177c87 100644
--- a/frontend/src/organisms/connection/collection/find.svelte
+++ b/frontend/src/organisms/connection/collection/find.svelte
@@ -1,7 +1,7 @@
 <script>
-  import Grid from '$components/grid.svelte';
+  import Grid from '$components/grid/grid.svelte';
   import Icon from '$components/icon.svelte';
-  import ObjectGrid from '$components/objectgrid.svelte';
+  import ObjectGrid from '$components/grid/objectgrid.svelte';
   import ObjectViewer from '$components/objectviewer.svelte';
   import input from '$lib/actions/input';
   import dialogs from '$lib/dialogs';
diff --git a/frontend/src/organisms/connection/collection/indexes.svelte b/frontend/src/organisms/connection/collection/indexes.svelte
index 49ed505..ac6e365 100644
--- a/frontend/src/organisms/connection/collection/indexes.svelte
+++ b/frontend/src/organisms/connection/collection/indexes.svelte
@@ -1,6 +1,6 @@
 <script>
   import Icon from '$components/icon.svelte';
-  import ObjectGrid from '$components/objectgrid.svelte';
+  import ObjectGrid from '$components/grid/objectgrid.svelte';
 
   export let collection;
   export let visible = false;
diff --git a/frontend/src/organisms/connection/collection/insert.svelte b/frontend/src/organisms/connection/collection/insert.svelte
index d32b0c8..08f7c8e 100644
--- a/frontend/src/organisms/connection/collection/insert.svelte
+++ b/frontend/src/organisms/connection/collection/insert.svelte
@@ -1,8 +1,8 @@
 <script>
   import Details from '$components/details.svelte';
-  import Grid from '$components/grid.svelte';
+  import Grid from '$components/grid/grid.svelte';
   import Icon from '$components/icon.svelte';
-  import ObjectEditor from '$components/objecteditor.svelte';
+  import ObjectEditor from '$components/editors/objecteditor.svelte';
   import ObjectViewer from '$components/objectviewer.svelte';
   import { randomString } from '$lib/math';
   import { inputTypes } from '$lib/mongo';
diff --git a/frontend/src/organisms/connection/collection/remove.svelte b/frontend/src/organisms/connection/collection/remove.svelte
index 06703d5..bc55c62 100644
--- a/frontend/src/organisms/connection/collection/remove.svelte
+++ b/frontend/src/organisms/connection/collection/remove.svelte
@@ -1,6 +1,6 @@
 <script>
   import Icon from '$components/icon.svelte';
-  import ObjectEditor from '$components/objecteditor.svelte';
+  import ObjectEditor from '$components/editors/objecteditor.svelte';
   import { convertLooseJson } from '$lib/strings';
   import { RemoveItems } from '$wails/go/app/App';
   import { onMount } from 'svelte';
diff --git a/frontend/src/organisms/connection/collection/stats.svelte b/frontend/src/organisms/connection/collection/stats.svelte
index d489e7e..1fb1cf4 100644
--- a/frontend/src/organisms/connection/collection/stats.svelte
+++ b/frontend/src/organisms/connection/collection/stats.svelte
@@ -1,6 +1,6 @@
 <script>
   import Icon from '$components/icon.svelte';
-  import ObjectGrid from '$components/objectgrid.svelte';
+  import ObjectGrid from '$components/grid/objectgrid.svelte';
 
   export let collection;
 
diff --git a/frontend/src/organisms/connection/database/dialogs/dump.svelte b/frontend/src/organisms/connection/database/dialogs/dump.svelte
index bbc8248..a52e8ab 100644
--- a/frontend/src/organisms/connection/database/dialogs/dump.svelte
+++ b/frontend/src/organisms/connection/database/dialogs/dump.svelte
@@ -1,6 +1,6 @@
 <script>
-  import DirectoryChooser from '$components/directorychooser.svelte';
-  import Grid from '$components/grid.svelte';
+  import DirectoryChooser from '$components/editors/directorychooser.svelte';
+  import Grid from '$components/grid/grid.svelte';
   import Modal from '$components/modal.svelte';
   import { startProgress } from '$lib/progress';
   import hostTree from '$lib/stores/hosttree';
diff --git a/frontend/src/organisms/connection/database/stats.svelte b/frontend/src/organisms/connection/database/stats.svelte
index 3d6d7f2..971a445 100644
--- a/frontend/src/organisms/connection/database/stats.svelte
+++ b/frontend/src/organisms/connection/database/stats.svelte
@@ -1,6 +1,6 @@
 <script>
   import Icon from '$components/icon.svelte';
-  import ObjectGrid from '$components/objectgrid.svelte';
+  import ObjectGrid from '$components/grid/objectgrid.svelte';
 
   export let database;
 
diff --git a/frontend/src/organisms/connection/host/logs.svelte b/frontend/src/organisms/connection/host/logs.svelte
index ea61acf..ecb6c43 100644
--- a/frontend/src/organisms/connection/host/logs.svelte
+++ b/frontend/src/organisms/connection/host/logs.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Grid from '$components/grid.svelte';
+  import Grid from '$components/grid/grid.svelte';
   import Icon from '$components/icon.svelte';
   import ObjectViewer from '$components/objectviewer.svelte';
   import input from '$lib/actions/input';
diff --git a/frontend/src/organisms/connection/host/status.svelte b/frontend/src/organisms/connection/host/status.svelte
index be235ab..9355346 100644
--- a/frontend/src/organisms/connection/host/status.svelte
+++ b/frontend/src/organisms/connection/host/status.svelte
@@ -1,6 +1,6 @@
 <script>
   import Icon from '$components/icon.svelte';
-  import ObjectGrid from '$components/objectgrid.svelte';
+  import ObjectGrid from '$components/grid/objectgrid.svelte';
 
   export let host;
 
diff --git a/frontend/src/organisms/connection/host/systeminfo.svelte b/frontend/src/organisms/connection/host/systeminfo.svelte
index 2a42565..d78c1fa 100644
--- a/frontend/src/organisms/connection/host/systeminfo.svelte
+++ b/frontend/src/organisms/connection/host/systeminfo.svelte
@@ -1,6 +1,6 @@
 <script>
   import Icon from '$components/icon.svelte';
-  import ObjectGrid from '$components/objectgrid.svelte';
+  import ObjectGrid from '$components/grid/objectgrid.svelte';
 
   export let host;
 
diff --git a/frontend/src/organisms/connection/hosttree.svelte b/frontend/src/organisms/connection/hosttree.svelte
index 1035c44..971be55 100644
--- a/frontend/src/organisms/connection/hosttree.svelte
+++ b/frontend/src/organisms/connection/hosttree.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Grid from '$components/grid.svelte';
+  import Grid from '$components/grid/grid.svelte';
   import hostTree from '$lib/stores/hosttree';
 
   export let path = [];
diff --git a/frontend/src/organisms/connection/shell.svelte b/frontend/src/organisms/connection/shell.svelte
index 0be4539..0dc6d1e 100644
--- a/frontend/src/organisms/connection/shell.svelte
+++ b/frontend/src/organisms/connection/shell.svelte
@@ -1,6 +1,6 @@
 <script>
   import BlankState from '$components/blankstate.svelte';
-  import CodeEditor from '$components/codeeditor.svelte';
+  import CodeEditor from '$components/editors/codeeditor.svelte';
   import Icon from '$components/icon.svelte';
   import environment from '$lib/stores/environment';
   import { OpenShellScript, SaveShellScript } from '$wails/go/app/App';