diff --git a/tools/TeamColorizer.pl b/utils/TeamColorizer.pl
similarity index 100%
rename from tools/TeamColorizer.pl
rename to utils/TeamColorizer.pl
diff --git a/tools/autoexp_vc6.txt b/utils/autoexp_vc6.txt
similarity index 100%
rename from tools/autoexp_vc6.txt
rename to utils/autoexp_vc6.txt
diff --git a/tools/castle-cutter/castle-walls.tmpl b/utils/castle-cutter/castle-walls.tmpl
similarity index 100%
rename from tools/castle-cutter/castle-walls.tmpl
rename to utils/castle-cutter/castle-walls.tmpl
diff --git a/tools/castle-cutter/castle.png b/utils/castle-cutter/castle.png
similarity index 100%
rename from tools/castle-cutter/castle.png
rename to utils/castle-cutter/castle.png
diff --git a/tools/castle-cutter/castles.xcf b/utils/castle-cutter/castles.xcf
similarity index 100%
rename from tools/castle-cutter/castles.xcf
rename to utils/castle-cutter/castles.xcf
diff --git a/tools/castle-cutter/cutout-bg.png b/utils/castle-cutter/cutout-bg.png
similarity index 100%
rename from tools/castle-cutter/cutout-bg.png
rename to utils/castle-cutter/cutout-bg.png
diff --git a/tools/castle-cutter/cutout-fg.png b/utils/castle-cutter/cutout-fg.png
similarity index 100%
rename from tools/castle-cutter/cutout-fg.png
rename to utils/castle-cutter/cutout-fg.png
diff --git a/tools/castle-cutter/encampment.png b/utils/castle-cutter/encampment.png
similarity index 100%
rename from tools/castle-cutter/encampment.png
rename to utils/castle-cutter/encampment.png
diff --git a/tools/castle-cutter/keep1.png b/utils/castle-cutter/keep1.png
similarity index 100%
rename from tools/castle-cutter/keep1.png
rename to utils/castle-cutter/keep1.png
diff --git a/tools/castle-cutter/keep1.tmpl b/utils/castle-cutter/keep1.tmpl
similarity index 100%
rename from tools/castle-cutter/keep1.tmpl
rename to utils/castle-cutter/keep1.tmpl
diff --git a/tools/castle-cutter/keep2.png b/utils/castle-cutter/keep2.png
similarity index 100%
rename from tools/castle-cutter/keep2.png
rename to utils/castle-cutter/keep2.png
diff --git a/tools/castle-cutter/keep2.tmpl b/utils/castle-cutter/keep2.tmpl
similarity index 100%
rename from tools/castle-cutter/keep2.tmpl
rename to utils/castle-cutter/keep2.tmpl
diff --git a/tools/castle-cutter/mask.png b/utils/castle-cutter/mask.png
similarity index 100%
rename from tools/castle-cutter/mask.png
rename to utils/castle-cutter/mask.png
diff --git a/tools/castle-cutter/mk-all-castles.sh b/utils/castle-cutter/mk-all-castles.sh
similarity index 100%
rename from tools/castle-cutter/mk-all-castles.sh
rename to utils/castle-cutter/mk-all-castles.sh
diff --git a/tools/castle-cutter/mk-castle.sh b/utils/castle-cutter/mk-castle.sh
similarity index 100%
rename from tools/castle-cutter/mk-castle.sh
rename to utils/castle-cutter/mk-castle.sh
diff --git a/tools/map_convert.pl b/utils/map_convert.pl
similarity index 100%
rename from tools/map_convert.pl
rename to utils/map_convert.pl
diff --git a/tools/mk-edges.pl b/utils/mk-edges.pl
similarity index 100%
rename from tools/mk-edges.pl
rename to utils/mk-edges.pl
diff --git a/tools/scoutDefault.py b/utils/scoutDefault.py
similarity index 100%
rename from tools/scoutDefault.py
rename to utils/scoutDefault.py
diff --git a/tools/wesnoth-attack-sim.c b/utils/wesnoth-attack-sim.c
similarity index 100%
rename from tools/wesnoth-attack-sim.c
rename to utils/wesnoth-attack-sim.c