diff --git a/src/Canvas.zig b/src/Canvas.zig
index 0033ebb..c497779 100644
--- a/src/Canvas.zig
+++ b/src/Canvas.zig
@@ -8,8 +8,8 @@ const Rect_i = basic_models.Rect_i;
 const Size_i = basic_models.Size_i;
 const Point2_f = @import("models/basic_models.zig").Point2_f;
 const Color = dvui.Color;
-const tools = @import("tools.zig");
-const Toolbar = @import("Toolbar.zig");
+const tools = @import("toolbar/tools.zig");
+const Toolbar = @import("toolbar/Toolbar.zig");
 const random_document = @import("random_document.zig");
 const Canvas = @This();
 
diff --git a/src/Tool.zig b/src/toolbar/Tool.zig
similarity index 63%
rename from src/Tool.zig
rename to src/toolbar/Tool.zig
index ad8f188..e2ff953 100644
--- a/src/Tool.zig
+++ b/src/toolbar/Tool.zig
@@ -1,5 +1,5 @@
-const Point2_f = @import("models/basic_models.zig").Point2_f;
-const Canvas = @import("Canvas.zig");
+const Point2_f = @import("../models/basic_models.zig").Point2_f;
+const Canvas = @import("../Canvas.zig");
 
 pub const ToolContext = struct {
     canvas: *Canvas,
diff --git a/src/Toolbar.zig b/src/toolbar/Toolbar.zig
similarity index 100%
rename from src/Toolbar.zig
rename to src/toolbar/Toolbar.zig
diff --git a/src/tools.zig b/src/toolbar/tools.zig
similarity index 94%
rename from src/tools.zig
rename to src/toolbar/tools.zig
index e2cd353..9a98433 100644
--- a/src/tools.zig
+++ b/src/toolbar/tools.zig
@@ -3,7 +3,7 @@ const line = @import("tools/line.zig");
 const ellipse = @import("tools/ellipse.zig");
 const arc = @import("tools/arc.zig");
 const broken = @import("tools/broken.zig");
-const icons = @import("icons.zig");
+const icons = @import("../icons.zig");
 
 pub const default_tools = [_]Toolbar.ToolDescriptor{
     .{
diff --git a/src/tools/arc.zig b/src/toolbar/tools/arc.zig
similarity index 89%
rename from src/tools/arc.zig
rename to src/toolbar/tools/arc.zig
index d5f58c4..b52bfb0 100644
--- a/src/tools/arc.zig
+++ b/src/toolbar/tools/arc.zig
@@ -1,5 +1,5 @@
 const Tool = @import("../Tool.zig");
-const shape = @import("../models/shape/shape.zig");
+const shape = @import("../../models/shape/shape.zig");
 
 fn onCanvasClick(ctx: *const Tool.ToolContext) !void {
     const canvas = ctx.canvas;
diff --git a/src/tools/broken.zig b/src/toolbar/tools/broken.zig
similarity index 89%
rename from src/tools/broken.zig
rename to src/toolbar/tools/broken.zig
index ae3df5d..eb15958 100644
--- a/src/tools/broken.zig
+++ b/src/toolbar/tools/broken.zig
@@ -1,5 +1,5 @@
 const Tool = @import("../Tool.zig");
-const shape = @import("../models/shape/shape.zig");
+const shape = @import("../../models/shape/shape.zig");
 
 fn onCanvasClick(ctx: *const Tool.ToolContext) !void {
     const canvas = ctx.canvas;
diff --git a/src/tools/ellipse.zig b/src/toolbar/tools/ellipse.zig
similarity index 89%
rename from src/tools/ellipse.zig
rename to src/toolbar/tools/ellipse.zig
index 7d17c34..41c01fa 100644
--- a/src/tools/ellipse.zig
+++ b/src/toolbar/tools/ellipse.zig
@@ -1,5 +1,5 @@
 const Tool = @import("../Tool.zig");
-const shape = @import("../models/shape/shape.zig");
+const shape = @import("../../models/shape/shape.zig");
 
 fn onCanvasClick(ctx: *const Tool.ToolContext) !void {
     const canvas = ctx.canvas;
diff --git a/src/tools/line.zig b/src/toolbar/tools/line.zig
similarity index 83%
rename from src/tools/line.zig
rename to src/toolbar/tools/line.zig
index 8e8bae5..57644ca 100644
--- a/src/tools/line.zig
+++ b/src/toolbar/tools/line.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
-const Canvas = @import("../Canvas.zig");
+const Canvas = @import("../../Canvas.zig");
 const Tool = @import("../Tool.zig");
-const shape = @import("../models/shape/shape.zig");
+const shape = @import("../../models/shape/shape.zig");
 
 fn onCanvasClick(ctx: *const Tool.ToolContext) !void {
     const canvas = ctx.canvas;
diff --git a/src/ui/canvas_view.zig b/src/ui/canvas_view.zig
index 233c9f6..4e36494 100644
--- a/src/ui/canvas_view.zig
+++ b/src/ui/canvas_view.zig
@@ -3,7 +3,7 @@ const dvui = @import("dvui");
 const dvui_ext = @import("dvui_ext.zig");
 const Canvas = @import("../Canvas.zig");
 const Rect_i = @import("../models/basic_models.zig").Rect_i;
-const Tool = @import("../Tool.zig");
+const Tool = @import("../toolbar/Tool.zig");
 
 pub fn canvasView(canvas: *Canvas, content_rect_scale: dvui.RectScale) void {
     var textured = dvui_ext.texturedBox(content_rect_scale, dvui.Rect.all(20));