46 files changed, 105 insertions, 124 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 41c640c68..0374fad15 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -30,6 +30,27 @@ set(ui_SRC
 	tool/selector.cpp
 	tool/transform-handle-set.cpp
 
+	toolbar/arc-toolbar.cpp
+	toolbar/box3d-toolbar.cpp
+	toolbar/calligraphy-toolbar.cpp
+	toolbar/connector-toolbar.cpp
+	toolbar/dropper-toolbar.cpp
+	toolbar/eraser-toolbar.cpp
+	toolbar/gradient-toolbar.cpp
+	toolbar/lpe-toolbar.cpp
+	toolbar/measure-toolbar.cpp
+	toolbar/mesh-toolbar.cpp
+	toolbar/node-toolbar.cpp
+	toolbar/pencil-toolbar.cpp
+	toolbar/rect-toolbar.cpp
+	toolbar/select-toolbar.cpp
+	toolbar/spiral-toolbar.cpp
+	toolbar/spray-toolbar.cpp
+	toolbar/star-toolbar.cpp
+	toolbar/text-toolbar.cpp
+	toolbar/tweak-toolbar.cpp
+	toolbar/zoom-toolbar.cpp
+
 	tools/arc-tool.cpp
 	tools/box3d-tool.cpp
 	tools/calligraphic-tool.cpp
@@ -117,7 +138,7 @@ set(ui_SRC
 	dialog/transformation.cpp
 	dialog/undo-history.cpp
 	dialog/xml-tree.cpp
-    dialog/save-template-dialog.cpp
+        dialog/save-template-dialog.cpp
 
 	widget/addtoicon.cpp
 	widget/alignment-selector.cpp
@@ -271,7 +292,7 @@ set(ui_SRC
 	dialog/transformation.h
 	dialog/undo-history.h
 	dialog/xml-tree.h
-    dialog/save-template-dialog.h
+	dialog/save-template-dialog.h
 
 	tool/commit-events.h
 	tool/control-point-selection.h
@@ -289,6 +310,27 @@ set(ui_SRC
 	tool/shape-record.h
 	tool/transform-handle-set.h
 
+	toolbar/arc-toolbar.h
+	toolbar/box3d-toolbar.h
+	toolbar/calligraphy-toolbar.h
+	toolbar/connector-toolbar.h
+	toolbar/dropper-toolbar.h
+	toolbar/eraser-toolbar.h
+	toolbar/gradient-toolbar.h
+	toolbar/lpe-toolbar.h
+	toolbar/measure-toolbar.h
+	toolbar/mesh-toolbar.h
+	toolbar/node-toolbar.h
+	toolbar/pencil-toolbar.h
+	toolbar/rect-toolbar.h
+	toolbar/select-toolbar.h
+	toolbar/spiral-toolbar.h
+	toolbar/spray-toolbar.h
+	toolbar/star-toolbar.h
+	toolbar/text-toolbar.h
+	toolbar/tweak-toolbar.h
+	toolbar/zoom-toolbar.h
+
 	tools/arc-tool.h
 	tools/box3d-tool.h
 	tools/calligraphic-tool.h
@@ -387,7 +429,6 @@ if(WIN32)
 	)
 endif()
 
-# add_inkscape_lib(ui_LIB "${ui_SRC}")
 add_inkscape_source("${ui_SRC}")
 
 set ( ui_flood_and_trace_SRC
@@ -395,6 +436,8 @@ set ( ui_flood_and_trace_SRC
 	tools/flood-tool.cpp
 	dialog/tracedialog.cpp
 	dialog/tracedialog.h
+	toolbar/paintbucket-toolbar.cpp
+	toolbar/paintbucket-toolbar.h
 )
 
 if ("${HAVE_POTRACE}")
diff --git a/src/widgets/arc-toolbar.cpp b/src/ui/toolbar/arc-toolbar.cpp
index 8b779ca6a..ad1b70a6c 100644
--- a/src/widgets/arc-toolbar.cpp
+++ b/src/ui/toolbar/arc-toolbar.cpp
@@ -34,11 +34,10 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "ink-action.h"
-#include "ink-radio-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/toolbox.h"
 #include "mod360.h"
 #include "selection.h"
-#include "toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-ellipse.h"
diff --git a/src/widgets/arc-toolbar.h b/src/ui/toolbar/arc-toolbar.h
index ca1319631..ca1319631 100644
--- a/src/widgets/arc-toolbar.h
+++ b/src/ui/toolbar/arc-toolbar.h
diff --git a/src/widgets/box3d-toolbar.cpp b/src/ui/toolbar/box3d-toolbar.cpp
index 4b944314d..846aea59d 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/ui/toolbar/box3d-toolbar.cpp
@@ -37,7 +37,7 @@
 #include "document-undo.h"
 #include "document.h"
 #include "inkscape.h"
-#include "toolbox.h"
+#include "widgets/toolbox.h"
 #include "verbs.h"
 
 #include "object/box3d.h"
diff --git a/src/widgets/box3d-toolbar.h b/src/ui/toolbar/box3d-toolbar.h
index cba9ca2d8..cba9ca2d8 100644
--- a/src/widgets/box3d-toolbar.h
+++ b/src/ui/toolbar/box3d-toolbar.h
diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/ui/toolbar/calligraphy-toolbar.cpp
index ed9779f1a..44271531e 100644
--- a/src/widgets/calligraphy-toolbar.cpp
+++ b/src/ui/toolbar/calligraphy-toolbar.cpp
@@ -37,7 +37,7 @@
 #include "widgets/ege-adjustment-action.h"
 #include "widgets/ink-action.h"
 #include "widgets/ink-toggle-action.h"
-#include "toolbox.h"
+#include "widgets/toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/ink-select-one-action.h"
diff --git a/src/widgets/calligraphy-toolbar.h b/src/ui/toolbar/calligraphy-toolbar.h
index e3caa19ee..e3caa19ee 100644
--- a/src/widgets/calligraphy-toolbar.h
+++ b/src/ui/toolbar/calligraphy-toolbar.h
diff --git a/src/widgets/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp
index 2030e7acb..2709c700e 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/ui/toolbar/connector-toolbar.cpp
@@ -37,10 +37,10 @@
 #include "document-undo.h"
 #include "enums.h"
 #include "graphlayout.h"
-#include "ink-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 #include "inkscape.h"
-#include "toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-namedview.h"
diff --git a/src/widgets/connector-toolbar.h b/src/ui/toolbar/connector-toolbar.h
index 180c11e0f..180c11e0f 100644
--- a/src/widgets/connector-toolbar.h
+++ b/src/ui/toolbar/connector-toolbar.h
diff --git a/src/widgets/dropper-toolbar.cpp b/src/ui/toolbar/dropper-toolbar.cpp
index 7a9cf1779..ba3c9037c 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/ui/toolbar/dropper-toolbar.cpp
@@ -33,7 +33,7 @@
 #include "dropper-toolbar.h"
 #include "document-undo.h"
 #include "widgets/ege-output-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-toggle-action.h"
 #include "preferences.h"
 #include "widgets/spinbutton-events.h"
 
diff --git a/src/widgets/dropper-toolbar.h b/src/ui/toolbar/dropper-toolbar.h
index 8d5ea2d0a..8d5ea2d0a 100644
--- a/src/widgets/dropper-toolbar.h
+++ b/src/ui/toolbar/dropper-toolbar.h
diff --git a/src/widgets/eraser-toolbar.cpp b/src/ui/toolbar/eraser-toolbar.cpp
index 3f6dd6b12..26ff3a654 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/ui/toolbar/eraser-toolbar.cpp
@@ -37,10 +37,8 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "widgets/ege-adjustment-action.h"
-#include "ink-action.h"
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
-#include "toolbox.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 #include "ui/widget/ink-select-one-action.h"
 #include "ui/icon-names.h"
 #include "ui/tools/eraser-tool.h"
diff --git a/src/widgets/eraser-toolbar.h b/src/ui/toolbar/eraser-toolbar.h
index 3c88d344e..3c88d344e 100644
--- a/src/widgets/eraser-toolbar.h
+++ b/src/ui/toolbar/eraser-toolbar.h
diff --git a/src/widgets/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp
index 910142bfb..38724aca4 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/ui/toolbar/gradient-toolbar.cpp
@@ -25,12 +25,11 @@
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
 #include "gradient-toolbar.h"
-#include "ink-action.h"
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 #include "macros.h"
 #include "selection.h"
-#include "toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-defs.h"
diff --git a/src/widgets/gradient-toolbar.h b/src/ui/toolbar/gradient-toolbar.h
index 38afb743b..38afb743b 100644
--- a/src/widgets/gradient-toolbar.h
+++ b/src/ui/toolbar/gradient-toolbar.h
diff --git a/src/widgets/lpe-toolbar.cpp b/src/ui/toolbar/lpe-toolbar.cpp
index 3e3a2e95c..bed5ed4bf 100644
--- a/src/widgets/lpe-toolbar.cpp
+++ b/src/ui/toolbar/lpe-toolbar.cpp
@@ -34,8 +34,7 @@
 #include "helper/action-context.h"
 #include "helper/action.h"
 
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-toggle-action.h"
 
 #include "ui/tools-switch.h"
 #include "ui/tools/lpe-tool.h"
diff --git a/src/widgets/lpe-toolbar.h b/src/ui/toolbar/lpe-toolbar.h
index 3db2bcb65..3db2bcb65 100644
--- a/src/widgets/lpe-toolbar.h
+++ b/src/ui/toolbar/lpe-toolbar.h
diff --git a/src/widgets/measure-toolbar.cpp b/src/ui/toolbar/measure-toolbar.cpp
index d06e3df1e..ec9cffe25 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/ui/toolbar/measure-toolbar.cpp
@@ -34,11 +34,11 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "ink-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 #include "inkscape.h"
 #include "message-stack.h"
-#include "toolbox.h"
 
 #include "ui/icon-names.h"
 #include "ui/tools/measure-tool.h"
diff --git a/src/widgets/measure-toolbar.h b/src/ui/toolbar/measure-toolbar.h
index aff0a209b..aff0a209b 100644
--- a/src/widgets/measure-toolbar.h
+++ b/src/ui/toolbar/measure-toolbar.h
diff --git a/src/widgets/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp
index fb5e5428a..fdeb736e6 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/ui/toolbar/mesh-toolbar.cpp
@@ -29,11 +29,10 @@
 #include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
-#include "ink-action.h"
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
 #include "inkscape.h"
-#include "toolbox.h"
+#include "widgets/toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-defs.h"
diff --git a/src/widgets/mesh-toolbar.h b/src/ui/toolbar/mesh-toolbar.h
index fd3f4b4b7..fd3f4b4b7 100644
--- a/src/widgets/mesh-toolbar.h
+++ b/src/ui/toolbar/mesh-toolbar.h
diff --git a/src/widgets/node-toolbar.cpp b/src/ui/toolbar/node-toolbar.cpp
index 2e80b77d8..a5e6a68ad 100644
--- a/src/widgets/node-toolbar.cpp
+++ b/src/ui/toolbar/node-toolbar.cpp
@@ -33,12 +33,12 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "ink-toggle-action.h"
-#include "ink-tool-menu-action.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/ink-tool-menu-action.h"
+#include "widgets/toolbox.h"
 #include "inkscape.h"
 #include "node-toolbar.h"
 #include "selection-chemistry.h"
-#include "toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-namedview.h"
diff --git a/src/widgets/node-toolbar.h b/src/ui/toolbar/node-toolbar.h
index 1f2a3f6b7..1f2a3f6b7 100644
--- a/src/widgets/node-toolbar.h
+++ b/src/ui/toolbar/node-toolbar.h
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/ui/toolbar/paintbucket-toolbar.cpp
index 280cf0eb1..280cf0eb1 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/ui/toolbar/paintbucket-toolbar.cpp
diff --git a/src/widgets/paintbucket-toolbar.h b/src/ui/toolbar/paintbucket-toolbar.h
index 9e6d6194a..9e6d6194a 100644
--- a/src/widgets/paintbucket-toolbar.h
+++ b/src/ui/toolbar/paintbucket-toolbar.h
diff --git a/src/widgets/pencil-toolbar.cpp b/src/ui/toolbar/pencil-toolbar.cpp
index d2939c720..6391af394 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/ui/toolbar/pencil-toolbar.cpp
@@ -35,11 +35,10 @@
 
 #include "desktop.h"
 #include "selection.h"
-#include "toolbox.h"
 
-#include "ink-action.h"
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 
 #include "live_effects/lpe-bspline.h"
 #include "live_effects/lpe-powerstroke.h"
diff --git a/src/widgets/pencil-toolbar.h b/src/ui/toolbar/pencil-toolbar.h
index c01b7d591..c01b7d591 100644
--- a/src/widgets/pencil-toolbar.h
+++ b/src/ui/toolbar/pencil-toolbar.h
diff --git a/src/widgets/rect-toolbar.cpp b/src/ui/toolbar/rect-toolbar.cpp
index afa090ba7..420c3410e 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/ui/toolbar/rect-toolbar.cpp
@@ -36,7 +36,7 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "inkscape.h"
-#include "toolbox.h"
+#include "widgets/toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-namedview.h"
diff --git a/src/widgets/rect-toolbar.h b/src/ui/toolbar/rect-toolbar.h
index f89903c6c..f89903c6c 100644
--- a/src/widgets/rect-toolbar.h
+++ b/src/ui/toolbar/rect-toolbar.h
diff --git a/src/widgets/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp
index 53191fc37..47a9b9ed7 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/ui/toolbar/select-toolbar.cpp
@@ -25,12 +25,12 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "ink-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 #include "inkscape.h"
 #include "message-stack.h"
 #include "selection-chemistry.h"
-#include "toolbox.h"
 #include "verbs.h"
 
 #include "display/sp-canvas.h"
diff --git a/src/widgets/select-toolbar.h b/src/ui/toolbar/select-toolbar.h
index b900a0615..b900a0615 100644
--- a/src/widgets/select-toolbar.h
+++ b/src/ui/toolbar/select-toolbar.h
diff --git a/src/widgets/spiral-toolbar.cpp b/src/ui/toolbar/spiral-toolbar.cpp
index 79ea30e8e..c5c87755d 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/ui/toolbar/spiral-toolbar.cpp
@@ -36,7 +36,7 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "selection.h"
-#include "toolbox.h"
+#include "widgets/toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-spiral.h"
diff --git a/src/widgets/spiral-toolbar.h b/src/ui/toolbar/spiral-toolbar.h
index 3372ea224..3372ea224 100644
--- a/src/widgets/spiral-toolbar.h
+++ b/src/ui/toolbar/spiral-toolbar.h
diff --git a/src/widgets/spray-toolbar.cpp b/src/ui/toolbar/spray-toolbar.cpp
index 361364992..f44e61051 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/ui/toolbar/spray-toolbar.cpp
@@ -35,9 +35,8 @@
 #include "desktop.h"
 #include "inkscape.h"
 #include "widgets/ege-adjustment-action.h"
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
-#include "toolbox.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 #include "ui/dialog/clonetiler.h"
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/panel-dialog.h"
diff --git a/src/widgets/spray-toolbar.h b/src/ui/toolbar/spray-toolbar.h
index 30d8233ca..30d8233ca 100644
--- a/src/widgets/spray-toolbar.h
+++ b/src/ui/toolbar/spray-toolbar.h
diff --git a/src/widgets/star-toolbar.cpp b/src/ui/toolbar/star-toolbar.cpp
index 7a8a4da2e..1c5745273 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/ui/toolbar/star-toolbar.cpp
@@ -34,10 +34,9 @@
 
 #include "desktop.h"
 #include "document-undo.h"
-#include "ink-action.h"
-#include "ink-radio-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/toolbox.h"
 #include "selection.h"
-#include "toolbox.h"
 #include "verbs.h"
 
 #include "object/sp-star.h"
diff --git a/src/widgets/star-toolbar.h b/src/ui/toolbar/star-toolbar.h
index aa0db785c..aa0db785c 100644
--- a/src/widgets/star-toolbar.h
+++ b/src/ui/toolbar/star-toolbar.h
diff --git a/src/widgets/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index bbb457472..4f532fa3d 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -38,12 +38,11 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "ink-radio-action.h"
-#include "ink-toggle-action.h"
+#include "widgets/ink-toggle-action.h"
+#include "widgets/toolbox.h"
 #include "inkscape.h"
 #include "selection-chemistry.h"
 #include "text-editing.h"
-#include "toolbox.h"
 #include "verbs.h"
 
 #include "libnrtype/font-lister.h"
diff --git a/src/widgets/text-toolbar.h b/src/ui/toolbar/text-toolbar.h
index 86a1cad21..86a1cad21 100644
--- a/src/widgets/text-toolbar.h
+++ b/src/ui/toolbar/text-toolbar.h
diff --git a/src/widgets/tweak-toolbar.cpp b/src/ui/toolbar/tweak-toolbar.cpp
index 173e99479..173e99479 100644
--- a/src/widgets/tweak-toolbar.cpp
+++ b/src/ui/toolbar/tweak-toolbar.cpp
diff --git a/src/widgets/tweak-toolbar.h b/src/ui/toolbar/tweak-toolbar.h
index 1a65a0844..1a65a0844 100644
--- a/src/widgets/tweak-toolbar.h
+++ b/src/ui/toolbar/tweak-toolbar.h
diff --git a/src/widgets/zoom-toolbar.cpp b/src/ui/toolbar/zoom-toolbar.cpp
index a961c0061..a961c0061 100644
--- a/src/widgets/zoom-toolbar.cpp
+++ b/src/ui/toolbar/zoom-toolbar.cpp
diff --git a/src/widgets/zoom-toolbar.h b/src/ui/toolbar/zoom-toolbar.h
index 45d979066..45d979066 100644
--- a/src/widgets/zoom-toolbar.h
+++ b/src/ui/toolbar/zoom-toolbar.h
diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp
index 4f951fa62..87dadf211 100644
--- a/src/ui/widget/font-selector-toolbar.cpp
+++ b/src/ui/widget/font-selector-toolbar.cpp
@@ -28,7 +28,7 @@
 #include "object/sp-text.h"
 
 // TEMP TEMP TEMP
-#include "widgets/text-toolbar.h"
+#include "ui/toolbar/text-toolbar.h"
 
 /* To do:
  *   Fix altx. Need to store
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index d9a5c2922..052e82347 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,37 +1,23 @@
 add_subdirectory(gimp)
 
 set(widgets_SRC
-	arc-toolbar.cpp
-	box3d-toolbar.cpp
 	button.cpp
-	calligraphy-toolbar.cpp
-	connector-toolbar.cpp
 	dash-selector.cpp
 	desktop-widget.cpp
-	dropper-toolbar.cpp
 	eek-preview.cpp
 	ege-adjustment-action.cpp
 	ege-output-action.cpp
 	ege-paint-def.cpp
-	eraser-toolbar.cpp
 	fill-style.cpp
 	gradient-image.cpp
 	gradient-selector.cpp
-	gradient-toolbar.cpp
 	gradient-vector.cpp
 	ink-action.cpp
 	ink-comboboxentry-action.cpp
 	ink-radio-action.cpp
 	ink-toggle-action.cpp
 	ink-tool-menu-action.cpp
-	lpe-toolbar.cpp
-	measure-toolbar.cpp
-	mesh-toolbar.cpp
-	node-toolbar.cpp
 	paint-selector.cpp
-	pencil-toolbar.cpp
-	rect-toolbar.cpp
-	select-toolbar.cpp
 	sp-attribute-widget.cpp
 	sp-color-selector.cpp
 	sp-widget.cpp
@@ -39,53 +25,32 @@ set(widgets_SRC
 	sp-xmlview-content.cpp
 	sp-xmlview-tree.cpp
 	spinbutton-events.cpp
-	spiral-toolbar.cpp
-	spray-toolbar.cpp
 	spw-utilities.cpp
-	star-toolbar.cpp
 	stroke-marker-selector.cpp
 	stroke-style.cpp
 	swatch-selector.cpp
-	text-toolbar.cpp
 	toolbox.cpp
-	tweak-toolbar.cpp
-	zoom-toolbar.cpp
-
 
 	# -------
 	# Headers
-	arc-toolbar.h
-	box3d-toolbar.h
 	button.h
-	calligraphy-toolbar.h
-	connector-toolbar.h
 	dash-selector.h
 	desktop-widget.h
-	dropper-toolbar.h
 	eek-preview.h
 	ege-adjustment-action.h
 	ege-output-action.h
 	ege-paint-def.h
-	eraser-toolbar.h
 	fill-n-stroke-factory.h
 	fill-style.h
 	gradient-image.h
 	gradient-selector.h
-	gradient-toolbar.h
 	gradient-vector.h
 	ink-action.h
 	ink-comboboxentry-action.h
 	ink-radio-action.h
 	ink-toggle-action.h
 	ink-tool-menu-action.h
-	lpe-toolbar.h
-	measure-toolbar.h
-	mesh-toolbar.h
-	node-toolbar.h
 	paint-selector.h
-	pencil-toolbar.h
-	rect-toolbar.h
-	select-toolbar.h
 	sp-attribute-widget.h
 	sp-color-selector.h
 	sp-widget.h
@@ -93,29 +58,12 @@ set(widgets_SRC
 	sp-xmlview-content.h
 	sp-xmlview-tree.h
 	spinbutton-events.h
-	spiral-toolbar.h
-	spray-toolbar.h
 	spw-utilities.h
-	star-toolbar.h
 	stroke-marker-selector.h
 	stroke-style.h
 	swatch-selector.h
-	text-toolbar.h
 	toolbox.h
-	tweak-toolbar.h
 	widget-sizes.h
-	zoom-toolbar.h
 )
 
-# add_inkscape_lib(widgets_LIB "${widgets_SRC}")
 add_inkscape_source("${widgets_SRC}")
-
-set(widgets_paintbucket_SRC
-	paintbucket-toolbar.cpp
-	paintbucket-toolbar.h
-)
-
-if ("${HAVE_POTRACE}")
-	add_inkscape_source("${widgets_paintbucket_SRC}")
-endif()
-
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 5894391ff..af2fcf26f 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -69,31 +69,31 @@
 #include "xml/attribute-record.h"
 #include "xml/node-event-vector.h"
 
-#include "arc-toolbar.h"
-#include "box3d-toolbar.h"
-#include "calligraphy-toolbar.h"
-#include "connector-toolbar.h"
-#include "dropper-toolbar.h"
-#include "eraser-toolbar.h"
-#include "gradient-toolbar.h"
-#include "lpe-toolbar.h"
-#include "mesh-toolbar.h"
-#include "measure-toolbar.h"
-#include "node-toolbar.h"
-#include "rect-toolbar.h"
+#include "ui/toolbar/arc-toolbar.h"
+#include "ui/toolbar/box3d-toolbar.h"
+#include "ui/toolbar/calligraphy-toolbar.h"
+#include "ui/toolbar/connector-toolbar.h"
+#include "ui/toolbar/dropper-toolbar.h"
+#include "ui/toolbar/eraser-toolbar.h"
+#include "ui/toolbar/gradient-toolbar.h"
+#include "ui/toolbar/lpe-toolbar.h"
+#include "ui/toolbar/mesh-toolbar.h"
+#include "ui/toolbar/measure-toolbar.h"
+#include "ui/toolbar/node-toolbar.h"
+#include "ui/toolbar/rect-toolbar.h"
 
 #if HAVE_POTRACE
-# include "paintbucket-toolbar.h"
+# include "ui/toolbar/paintbucket-toolbar.h"
 #endif
 
-#include "pencil-toolbar.h"
-#include "select-toolbar.h"
-#include "spray-toolbar.h"
-#include "spiral-toolbar.h"
-#include "star-toolbar.h"
-#include "tweak-toolbar.h"
-#include "text-toolbar.h"
-#include "zoom-toolbar.h"
+#include "ui/toolbar/pencil-toolbar.h"
+#include "ui/toolbar/select-toolbar.h"
+#include "ui/toolbar/spray-toolbar.h"
+#include "ui/toolbar/spiral-toolbar.h"
+#include "ui/toolbar/star-toolbar.h"
+#include "ui/toolbar/tweak-toolbar.h"
+#include "ui/toolbar/text-toolbar.h"
+#include "ui/toolbar/zoom-toolbar.h"
 
 #include "toolbox.h"