diff --git a/src/absytree.nim b/src/absytree.nim
index 3b1fcf05..df2d72f3 100644
--- a/src/absytree.nim
+++ b/src/absytree.nim
@@ -70,8 +70,10 @@ block: ## Enable loggers
 
 import std/[strformat]
 import misc/[util, timer, custom_async]
-import app, platform/widget_builders, platform/platform
+import platform/platform
+import ui/widget_builders
 import text/language/language_server
+import app
 
 when enableTerminal:
   import platform/terminal_platform
diff --git a/src/absytree_js.nim b/src/absytree_js.nim
index ed301802..4517714c 100644
--- a/src/absytree_js.nim
+++ b/src/absytree_js.nim
@@ -7,9 +7,12 @@ logger.enableConsoleLogger()
 
 import std/[strformat, dom, macros]
 import misc/[util, timer, event, custom_async]
-import app, platform/widget_builders, platform/platform, platform/browser_platform, text/text_document
+import platform/[platform, browser_platform]
+import ui/[widget_builders]
+import text/text_document
 import text/language/language_server
 from scripting_api import Backend
+import app
 
 import ui/node
 
diff --git a/src/platform/widget_builder_ast_document.nim b/src/ui/widget_builder_ast_document.nim
similarity index 100%
rename from src/platform/widget_builder_ast_document.nim
rename to src/ui/widget_builder_ast_document.nim
diff --git a/src/platform/widget_builder_model_document.nim b/src/ui/widget_builder_model_document.nim
similarity index 99%
rename from src/platform/widget_builder_model_document.nim
rename to src/ui/widget_builder_model_document.nim
index b0188e65..8479726e 100644
--- a/src/platform/widget_builder_model_document.nim
+++ b/src/ui/widget_builder_model_document.nim
@@ -4,8 +4,9 @@ import misc/[util, custom_logger, custom_unicode]
 import ui/node
 import text/text_document
 import ast/[model_document, model, cells, model_state]
-import app, document_editor, platform, theme, config_provider, input, app_interface
-import widget_builders_base, widget_library
+import platform/platform
+import ui/[widget_builders_base, widget_library]
+import app, document_editor, theme, config_provider, input, app_interface
 
 # Mark this entire file as used, otherwise we get warnings when importing it but only calling a method
 {.used.}
diff --git a/src/platform/widget_builder_selector_popup.nim b/src/ui/widget_builder_selector_popup.nim
similarity index 97%
rename from src/platform/widget_builder_selector_popup.nim
rename to src/ui/widget_builder_selector_popup.nim
index 4e47695e..5d0de6d5 100644
--- a/src/platform/widget_builder_selector_popup.nim
+++ b/src/ui/widget_builder_selector_popup.nim
@@ -1,7 +1,9 @@
 import vmath, bumpy, chroma
 import misc/[util, custom_logger]
 import ui/node
-import app, selector_popup, platform, theme, widget_builders_base
+import platform/platform
+import ui/[widget_builders_base]
+import app, selector_popup, theme
 
 # Mark this entire file as used, otherwise we get warnings when importing it but only calling a method
 {.used.}
diff --git a/src/platform/widget_builder_text_document.nim b/src/ui/widget_builder_text_document.nim
similarity index 99%
rename from src/platform/widget_builder_text_document.nim
rename to src/ui/widget_builder_text_document.nim
index 1d79a062..7e318459 100644
--- a/src/platform/widget_builder_text_document.nim
+++ b/src/ui/widget_builder_text_document.nim
@@ -3,7 +3,9 @@ import vmath, bumpy, chroma
 import misc/[util, custom_logger, custom_unicode]
 import text/text_editor
 import scripting_api except DocumentEditor, TextDocumentEditor, AstDocumentEditor
-import app, document_editor, widget_builders_base, platform, theme, config_provider, widget_library, app_interface
+import platform/platform
+import ui/[widget_builders_base, widget_library]
+import app, document_editor, theme, config_provider, app_interface
 
 import ui/node
 
diff --git a/src/platform/widget_builders.nim b/src/ui/widget_builders.nim
similarity index 93%
rename from src/platform/widget_builders.nim
rename to src/ui/widget_builders.nim
index 6850863c..367d5084 100644
--- a/src/platform/widget_builders.nim
+++ b/src/ui/widget_builders.nim
@@ -1,8 +1,9 @@
 import vmath, bumpy, chroma
 import misc/[custom_logger, rect_utils]
 import ui/node
-import app, document_editor, platform, theme
-import widget_builders_base, widget_builder_text_document, widget_builder_selector_popup, widget_builder_model_document
+import platform/platform
+import ui/[widget_builders_base, widget_builder_text_document, widget_builder_selector_popup, widget_builder_model_document]
+import app, document_editor, theme
 
 logCategory "widget_builder"
 
diff --git a/src/platform/widget_builders_base.nim b/src/ui/widget_builders_base.nim
similarity index 100%
rename from src/platform/widget_builders_base.nim
rename to src/ui/widget_builders_base.nim
diff --git a/src/platform/widget_library.nim b/src/ui/widget_library.nim
similarity index 100%
rename from src/platform/widget_library.nim
rename to src/ui/widget_library.nim