diff --git a/web/static/src/ts/main.ts b/web/static/src/ts/main.ts
index ea5d9410..dc8f5d93 100644
--- a/web/static/src/ts/main.ts
+++ b/web/static/src/ts/main.ts
@@ -6,7 +6,7 @@ import { actionRegistry } from "./registries";
 import { rpc } from "./services/ajax";
 import { Router } from "./services/router";
 import { Store } from "./store/store";
-import { Root } from "./widgets/root";
+import { Root } from "./ui/root";
 
 //------------------------------------------------------------------------------
 // Web Client Bootstrapping
diff --git a/web/static/src/ts/registries.ts b/web/static/src/ts/registries.ts
index 81c4d918..43eec1dd 100644
--- a/web/static/src/ts/registries.ts
+++ b/web/static/src/ts/registries.ts
@@ -1,6 +1,6 @@
 import { Registry } from "./core/registry";
 import { ActionWidget } from "./store/store";
-import { Discuss } from "./widgets/discuss";
+import { Discuss } from "./ui/discuss/discuss";
 
 export const actionRegistry: Registry<ActionWidget> = new Registry();
 
diff --git a/web/static/src/ts/store/action_manager_mixin.ts b/web/static/src/ts/store/action_manager_mixin.ts
index 452883d5..e6d1f44e 100644
--- a/web/static/src/ts/store/action_manager_mixin.ts
+++ b/web/static/src/ts/store/action_manager_mixin.ts
@@ -1,7 +1,7 @@
 import { Type } from "../core/component";
 import { rpcMixin } from "./rpc_mixin";
-import { Widget } from "../widgets/widget";
-import { View } from "../widgets/view";
+import { Widget } from "../ui/widget";
+import { View } from "../ui/view";
 
 export type Context = { [key: string]: any };
 
diff --git a/web/static/src/ts/widgets/clock.ts b/web/static/src/ts/ui/discuss/clock.ts
similarity index 96%
rename from web/static/src/ts/widgets/clock.ts
rename to web/static/src/ts/ui/discuss/clock.ts
index 443c0600..45fc6a67 100644
--- a/web/static/src/ts/widgets/clock.ts
+++ b/web/static/src/ts/ui/discuss/clock.ts
@@ -1,4 +1,4 @@
-import { Widget } from "./widget";
+import { Widget } from "../widget";
 
 //------------------------------------------------------------------------------
 // Types
diff --git a/web/static/src/ts/widgets/Counter.ts b/web/static/src/ts/ui/discuss/counter.ts
similarity index 96%
rename from web/static/src/ts/widgets/Counter.ts
rename to web/static/src/ts/ui/discuss/counter.ts
index 43fce3e7..4c783cae 100644
--- a/web/static/src/ts/widgets/Counter.ts
+++ b/web/static/src/ts/ui/discuss/counter.ts
@@ -1,4 +1,4 @@
-import { Widget } from "./widget";
+import { Widget } from "../widget";
 
 //------------------------------------------------------------------------------
 // Types
diff --git a/web/static/src/ts/widgets/Discuss.ts b/web/static/src/ts/ui/discuss/discuss.ts
similarity index 97%
rename from web/static/src/ts/widgets/Discuss.ts
rename to web/static/src/ts/ui/discuss/discuss.ts
index 7ef07bfa..741761de 100644
--- a/web/static/src/ts/widgets/Discuss.ts
+++ b/web/static/src/ts/ui/discuss/discuss.ts
@@ -1,6 +1,6 @@
 import { Clock } from "./clock";
 import { Counter } from "./counter";
-import { Widget } from "./widget";
+import { Widget } from "../widget";
 
 //------------------------------------------------------------------------------
 // Types
diff --git a/web/static/src/ts/widgets/home_menu.ts b/web/static/src/ts/ui/home_menu.ts
similarity index 100%
rename from web/static/src/ts/widgets/home_menu.ts
rename to web/static/src/ts/ui/home_menu.ts
diff --git a/web/static/src/ts/widgets/Navbar.ts b/web/static/src/ts/ui/navbar.ts
similarity index 100%
rename from web/static/src/ts/widgets/Navbar.ts
rename to web/static/src/ts/ui/navbar.ts
diff --git a/web/static/src/ts/widgets/notification.ts b/web/static/src/ts/ui/notification.ts
similarity index 100%
rename from web/static/src/ts/widgets/notification.ts
rename to web/static/src/ts/ui/notification.ts
diff --git a/web/static/src/ts/widgets/root.ts b/web/static/src/ts/ui/root.ts
similarity index 100%
rename from web/static/src/ts/widgets/root.ts
rename to web/static/src/ts/ui/root.ts
diff --git a/web/static/src/ts/widgets/view.ts b/web/static/src/ts/ui/view.ts
similarity index 100%
rename from web/static/src/ts/widgets/view.ts
rename to web/static/src/ts/ui/view.ts
diff --git a/web/static/src/ts/widgets/widget.ts b/web/static/src/ts/ui/widget.ts
similarity index 100%
rename from web/static/src/ts/widgets/widget.ts
rename to web/static/src/ts/ui/widget.ts
diff --git a/web/static/tests/widgets/__snapshots__/home_menu.test.ts.snap b/web/static/tests/ui/__snapshots__/home_menu.test.ts.snap
similarity index 100%
rename from web/static/tests/widgets/__snapshots__/home_menu.test.ts.snap
rename to web/static/tests/ui/__snapshots__/home_menu.test.ts.snap
diff --git a/web/static/tests/widgets/__snapshots__/navbar.test.ts.snap b/web/static/tests/ui/__snapshots__/navbar.test.ts.snap
similarity index 100%
rename from web/static/tests/widgets/__snapshots__/navbar.test.ts.snap
rename to web/static/tests/ui/__snapshots__/navbar.test.ts.snap
diff --git a/web/static/tests/widgets/__snapshots__/notification.test.ts.snap b/web/static/tests/ui/__snapshots__/notification.test.ts.snap
similarity index 100%
rename from web/static/tests/widgets/__snapshots__/notification.test.ts.snap
rename to web/static/tests/ui/__snapshots__/notification.test.ts.snap
diff --git a/web/static/tests/widgets/__snapshots__/root.test.ts.snap b/web/static/tests/ui/__snapshots__/root.test.ts.snap
similarity index 100%
rename from web/static/tests/widgets/__snapshots__/root.test.ts.snap
rename to web/static/tests/ui/__snapshots__/root.test.ts.snap
diff --git a/web/static/tests/widgets/home_menu.test.ts b/web/static/tests/ui/home_menu.test.ts
similarity index 94%
rename from web/static/tests/widgets/home_menu.test.ts
rename to web/static/tests/ui/home_menu.test.ts
index c8bc0eed..e517e7fa 100644
--- a/web/static/tests/widgets/home_menu.test.ts
+++ b/web/static/tests/ui/home_menu.test.ts
@@ -1,6 +1,6 @@
 import { Env, makeEnv } from "../../src/ts/env";
 import { Store } from "../../src/ts/store/store";
-import { HomeMenu, Props } from "../../src/ts/widgets/home_menu";
+import { HomeMenu, Props } from "../../src/ts/ui/home_menu";
 import * as helpers from "../helpers";
 
 //------------------------------------------------------------------------------
diff --git a/web/static/tests/widgets/navbar.test.ts b/web/static/tests/ui/navbar.test.ts
similarity index 97%
rename from web/static/tests/widgets/navbar.test.ts
rename to web/static/tests/ui/navbar.test.ts
index 378e39d9..24910cd6 100644
--- a/web/static/tests/widgets/navbar.test.ts
+++ b/web/static/tests/ui/navbar.test.ts
@@ -1,6 +1,6 @@
 import { Env, makeEnv } from "../../src/ts/env";
 import { MenuInfo, Store } from "../../src/ts/store/store";
-import { Navbar, Props } from "../../src/ts/widgets/navbar";
+import { Navbar, Props } from "../../src/ts/ui/navbar";
 import * as helpers from "../helpers";
 
 //------------------------------------------------------------------------------
diff --git a/web/static/tests/widgets/notification.test.ts b/web/static/tests/ui/notification.test.ts
similarity index 96%
rename from web/static/tests/widgets/notification.test.ts
rename to web/static/tests/ui/notification.test.ts
index b4deb466..ea17adf5 100644
--- a/web/static/tests/widgets/notification.test.ts
+++ b/web/static/tests/ui/notification.test.ts
@@ -1,6 +1,6 @@
 import { Env, makeEnv } from "../../src/ts/env";
 import { INotification, Store } from "../../src/ts/store/store";
-import { Notification } from "../../src/ts/widgets/notification";
+import { Notification } from "../../src/ts/ui/notification";
 import * as helpers from "../helpers";
 
 //------------------------------------------------------------------------------
diff --git a/web/static/tests/widgets/root.test.ts b/web/static/tests/ui/root.test.ts
similarity index 97%
rename from web/static/tests/widgets/root.test.ts
rename to web/static/tests/ui/root.test.ts
index 7ded0172..55a37645 100644
--- a/web/static/tests/widgets/root.test.ts
+++ b/web/static/tests/ui/root.test.ts
@@ -1,6 +1,6 @@
 import { Env, makeEnv } from "../../src/ts/env";
 import { Store } from "../../src/ts/store/store";
-import { Root } from "../../src/ts/widgets/root";
+import { Root } from "../../src/ts/ui/root";
 import * as helpers from "../helpers";
 
 //------------------------------------------------------------------------------