diff --git a/src/kiri/app/api.js b/src/kiri/app/api.js
index ccb80965..41f644e3 100644
--- a/src/kiri/app/api.js
+++ b/src/kiri/app/api.js
@@ -37,7 +37,7 @@ import { UI } from './inputs.js';
 import { updateTool } from '../mode/cam/tools.js';
 import { view as viewModule } from './view-mode.js';
 import { visuals } from './visuals.js';
-import { widgets } from '../core/widgets.js';
+import { widgets } from './widgets.js';
 import { workspace } from './workspace.js';
 
 // environment setup
diff --git a/src/kiri/core/boxes.js b/src/kiri/app/boxes.js
similarity index 100%
rename from src/kiri/core/boxes.js
rename to src/kiri/app/boxes.js
diff --git a/src/kiri/app/frame.js b/src/kiri/app/frame.js
index 32fd2431..4cc9dedd 100644
--- a/src/kiri/app/frame.js
+++ b/src/kiri/app/frame.js
@@ -27,7 +27,7 @@ import { api } from './api.js';
 import { load } from '../../load/file.js';
 import { newWidget } from './widget.js';
 import { VIEWS } from './consts.js';
-import { widgets } from '../core/widgets.js';
+import { widgets } from './widgets.js';
 
 /**
  * Frame message API listener.
diff --git a/src/kiri/core/widgets.js b/src/kiri/app/widgets.js
similarity index 100%
rename from src/kiri/core/widgets.js
rename to src/kiri/app/widgets.js
diff --git a/src/kiri/mode/cam/cl-origin.js b/src/kiri/mode/cam/cl-origin.js
index 5255d084..ee6349f9 100644
--- a/src/kiri/mode/cam/cl-origin.js
+++ b/src/kiri/mode/cam/cl-origin.js
@@ -3,7 +3,7 @@
 import { api } from '../../app/api.js';
 import { env, clearPops } from './init-ui.js';
 import { CAM } from './driver-fe.js';
-import { addbox, clearboxes } from '../../core/boxes.js';
+import { addbox, clearboxes } from '../../app/boxes.js';
 
 export let originSelectOn = false;
 
diff --git a/src/kiri/mode/cam/cl-tab.js b/src/kiri/mode/cam/cl-tab.js
index ae86f4b2..6ee3c6df 100644
--- a/src/kiri/mode/cam/cl-tab.js
+++ b/src/kiri/mode/cam/cl-tab.js
@@ -3,7 +3,7 @@
 import { api } from '../../app/api.js';
 import { colorSchemeRegistry } from '../../app/color/schemes.js';
 import { env, isDark } from './init-ui.js';
-import { addbox, delbox, clearboxes } from '../../core/boxes.js';
+import { addbox, delbox, clearboxes } from '../../app/boxes.js';
 import { traceDone } from './cl-trace.js';
 import { space as SPACE } from '../../../moto/space.js';