184 files changed, 129 insertions, 129 deletions

diff --git a/.gitignore b/.gitignore
index 074a92a397..07b62271ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,20 +90,20 @@ lib*.a
 /test/runner.cpp
 /test/*.dSYM
 
-/tools/convbdf
-/tools/md5table
-/tools/make-scumm-fontdata
-/tools/create_drascula/create_drascula
-/tools/create_hugo/create_hugo
-/tools/create_kyradat/create_kyradat
-/tools/create_lure/create_lure
-/tools/create_mads/create_mads
-/tools/create_project/create_project
-/tools/create_teenagent/create_teenagent
-/tools/create_toon/create_toon
-/tools/create_translations/create_translations
-/tools/qtable/qtable
-/tools/skycpt/skycpt
+/devtools/convbdf
+/devtools/md5table
+/devtools/make-scumm-fontdata
+/devtools/create_drascula/create_drascula
+/devtools/create_hugo/create_hugo
+/devtools/create_kyradat/create_kyradat
+/devtools/create_lure/create_lure
+/devtools/create_mads/create_mads
+/devtools/create_project/create_project
+/devtools/create_teenagent/create_teenagent
+/devtools/create_toon/create_toon
+/devtools/create_translations/create_translations
+/devtools/qtable/qtable
+/devtools/skycpt/skycpt
 
 #ignore thumbnails created by windows
 Thumbs.db
diff --git a/Makefile.common b/Makefile.common
index 2413fa572b..6646af8e8d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -16,7 +16,7 @@ all: $(EXECUTABLE) plugins
 ######################################################################
 
 PLUGINS :=
-MODULES := test tools base $(MODULES)
+MODULES := test devtools base $(MODULES)
 
 -include $(srcdir)/engines/engines.mk
 
diff --git a/tools/README b/devtools/README
index b1c0f21cb0..b1c0f21cb0 100644
--- a/tools/README
+++ b/devtools/README
diff --git a/tools/agi-palex.py b/devtools/agi-palex.py
index 1e0fa9d54f..1e0fa9d54f 100644
--- a/tools/agi-palex.py
+++ b/devtools/agi-palex.py
diff --git a/tools/construct-pred-dict.pl b/devtools/construct-pred-dict.pl
index a092429ff6..a092429ff6 100755
--- a/tools/construct-pred-dict.pl
+++ b/devtools/construct-pred-dict.pl
diff --git a/tools/convbdf.c b/devtools/convbdf.c
index fc13cff6ce..fc13cff6ce 100644
--- a/tools/convbdf.c
+++ b/devtools/convbdf.c
diff --git a/tools/create_drascula/Makefile b/devtools/create_drascula/Makefile
index 3052436b55..3052436b55 100644
--- a/tools/create_drascula/Makefile
+++ b/devtools/create_drascula/Makefile
diff --git a/tools/create_drascula/create_drascula.cpp b/devtools/create_drascula/create_drascula.cpp
index 9ea2da380a..9ea2da380a 100644
--- a/tools/create_drascula/create_drascula.cpp
+++ b/devtools/create_drascula/create_drascula.cpp
diff --git a/tools/create_drascula/create_drascula.h b/devtools/create_drascula/create_drascula.h
index 13903e9564..13903e9564 100644
--- a/tools/create_drascula/create_drascula.h
+++ b/devtools/create_drascula/create_drascula.h
diff --git a/tools/create_drascula/dists/msvc8/create_drascula.sln b/devtools/create_drascula/dists/msvc8/create_drascula.sln
index dc7428bb80..dc7428bb80 100644
--- a/tools/create_drascula/dists/msvc8/create_drascula.sln
+++ b/devtools/create_drascula/dists/msvc8/create_drascula.sln
diff --git a/tools/create_drascula/dists/msvc8/create_drascula.vcproj b/devtools/create_drascula/dists/msvc8/create_drascula.vcproj
index 3b26261a76..3b26261a76 100644
--- a/tools/create_drascula/dists/msvc8/create_drascula.vcproj
+++ b/devtools/create_drascula/dists/msvc8/create_drascula.vcproj
diff --git a/tools/create_drascula/dists/msvc8_to_msvc9.bat b/devtools/create_drascula/dists/msvc8_to_msvc9.bat
index 54820b34d0..54820b34d0 100644
--- a/tools/create_drascula/dists/msvc8_to_msvc9.bat
+++ b/devtools/create_drascula/dists/msvc8_to_msvc9.bat
diff --git a/tools/create_drascula/dists/msvc9/create_drascula.sln b/devtools/create_drascula/dists/msvc9/create_drascula.sln
index 4a39bdbe42..4a39bdbe42 100644
--- a/tools/create_drascula/dists/msvc9/create_drascula.sln
+++ b/devtools/create_drascula/dists/msvc9/create_drascula.sln
diff --git a/tools/create_drascula/dists/msvc9/create_drascula.vcproj b/devtools/create_drascula/dists/msvc9/create_drascula.vcproj
index f30d6a114b..f30d6a114b 100644
--- a/tools/create_drascula/dists/msvc9/create_drascula.vcproj
+++ b/devtools/create_drascula/dists/msvc9/create_drascula.vcproj
diff --git a/tools/create_drascula/dists/msvc9_to_msvc8.bat b/devtools/create_drascula/dists/msvc9_to_msvc8.bat
index c87a524f77..c87a524f77 100644
--- a/tools/create_drascula/dists/msvc9_to_msvc8.bat
+++ b/devtools/create_drascula/dists/msvc9_to_msvc8.bat
diff --git a/tools/create_drascula/module.mk b/devtools/create_drascula/module.mk
index 3d64871960..b5a32d8d00 100644
--- a/tools/create_drascula/module.mk
+++ b/devtools/create_drascula/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/create_drascula
+MODULE := devtools/create_drascula
 
 MODULE_OBJS := \
 	create_drascula.o
diff --git a/tools/create_drascula/staticdata.h b/devtools/create_drascula/staticdata.h
index 51ed995884..51ed995884 100644
--- a/tools/create_drascula/staticdata.h
+++ b/devtools/create_drascula/staticdata.h
diff --git a/tools/create_hugo/Data/Btn_1.bmp b/devtools/create_hugo/Data/Btn_1.bmp
index 0cdfc91fd3..0cdfc91fd3 100644
--- a/tools/create_hugo/Data/Btn_1.bmp
+++ b/devtools/create_hugo/Data/Btn_1.bmp
diff --git a/tools/create_hugo/Data/Btn_1_off.bmp b/devtools/create_hugo/Data/Btn_1_off.bmp
index eb6146ac96..eb6146ac96 100644
--- a/tools/create_hugo/Data/Btn_1_off.bmp
+++ b/devtools/create_hugo/Data/Btn_1_off.bmp
diff --git a/tools/create_hugo/Data/Btn_2.bmp b/devtools/create_hugo/Data/Btn_2.bmp
index 971c996b4d..971c996b4d 100644
--- a/tools/create_hugo/Data/Btn_2.bmp
+++ b/devtools/create_hugo/Data/Btn_2.bmp
diff --git a/tools/create_hugo/Data/Btn_2_off.bmp b/devtools/create_hugo/Data/Btn_2_off.bmp
index 988c682b44..988c682b44 100644
--- a/tools/create_hugo/Data/Btn_2_off.bmp
+++ b/devtools/create_hugo/Data/Btn_2_off.bmp
diff --git a/tools/create_hugo/Data/Btn_3.bmp b/devtools/create_hugo/Data/Btn_3.bmp
index ac988d8a90..ac988d8a90 100644
--- a/tools/create_hugo/Data/Btn_3.bmp
+++ b/devtools/create_hugo/Data/Btn_3.bmp
diff --git a/tools/create_hugo/Data/Btn_3_off.bmp b/devtools/create_hugo/Data/Btn_3_off.bmp
index 14df72666b..14df72666b 100644
--- a/tools/create_hugo/Data/Btn_3_off.bmp
+++ b/devtools/create_hugo/Data/Btn_3_off.bmp
diff --git a/tools/create_hugo/Data/Btn_4.bmp b/devtools/create_hugo/Data/Btn_4.bmp
index ef47589044..ef47589044 100644
--- a/tools/create_hugo/Data/Btn_4.bmp
+++ b/devtools/create_hugo/Data/Btn_4.bmp
diff --git a/tools/create_hugo/Data/Btn_4_off.bmp b/devtools/create_hugo/Data/Btn_4_off.bmp
index d32f497d6c..d32f497d6c 100644
--- a/tools/create_hugo/Data/Btn_4_off.bmp
+++ b/devtools/create_hugo/Data/Btn_4_off.bmp
diff --git a/tools/create_hugo/Data/Btn_5.bmp b/devtools/create_hugo/Data/Btn_5.bmp
index 3eb03b20d6..3eb03b20d6 100644
--- a/tools/create_hugo/Data/Btn_5.bmp
+++ b/devtools/create_hugo/Data/Btn_5.bmp
diff --git a/tools/create_hugo/Data/Btn_5_off.bmp b/devtools/create_hugo/Data/Btn_5_off.bmp
index 6513ff2080..6513ff2080 100644
--- a/tools/create_hugo/Data/Btn_5_off.bmp
+++ b/devtools/create_hugo/Data/Btn_5_off.bmp
diff --git a/tools/create_hugo/Data/Btn_6.bmp b/devtools/create_hugo/Data/Btn_6.bmp
index d53585dde7..d53585dde7 100644
--- a/tools/create_hugo/Data/Btn_6.bmp
+++ b/devtools/create_hugo/Data/Btn_6.bmp
diff --git a/tools/create_hugo/Data/Btn_6_off.bmp b/devtools/create_hugo/Data/Btn_6_off.bmp
index 8748fa0ff2..8748fa0ff2 100644
--- a/tools/create_hugo/Data/Btn_6_off.bmp
+++ b/devtools/create_hugo/Data/Btn_6_off.bmp
diff --git a/tools/create_hugo/Data/Btn_7.bmp b/devtools/create_hugo/Data/Btn_7.bmp
index 25ba757e93..25ba757e93 100644
--- a/tools/create_hugo/Data/Btn_7.bmp
+++ b/devtools/create_hugo/Data/Btn_7.bmp
diff --git a/tools/create_hugo/Data/Btn_7_off.bmp b/devtools/create_hugo/Data/Btn_7_off.bmp
index 6fe8cff904..6fe8cff904 100644
--- a/tools/create_hugo/Data/Btn_7_off.bmp
+++ b/devtools/create_hugo/Data/Btn_7_off.bmp
diff --git a/tools/create_hugo/Data/Btn_8.bmp b/devtools/create_hugo/Data/Btn_8.bmp
index d3a92fccac..d3a92fccac 100644
--- a/tools/create_hugo/Data/Btn_8.bmp
+++ b/devtools/create_hugo/Data/Btn_8.bmp
diff --git a/tools/create_hugo/Data/Btn_8_off.bmp b/devtools/create_hugo/Data/Btn_8_off.bmp
index 7fb40a42b4..7fb40a42b4 100644
--- a/tools/create_hugo/Data/Btn_8_off.bmp
+++ b/devtools/create_hugo/Data/Btn_8_off.bmp
diff --git a/tools/create_hugo/Data/Btn_9.bmp b/devtools/create_hugo/Data/Btn_9.bmp
index 6443649b20..6443649b20 100644
--- a/tools/create_hugo/Data/Btn_9.bmp
+++ b/devtools/create_hugo/Data/Btn_9.bmp
diff --git a/tools/create_hugo/Data/Btn_9_off.bmp b/devtools/create_hugo/Data/Btn_9_off.bmp
index a9ce9dcddb..a9ce9dcddb 100644
--- a/tools/create_hugo/Data/Btn_9_off.bmp
+++ b/devtools/create_hugo/Data/Btn_9_off.bmp
diff --git a/tools/create_hugo/README b/devtools/create_hugo/README
index 42bdd22c36..42bdd22c36 100644
--- a/tools/create_hugo/README
+++ b/devtools/create_hugo/README
diff --git a/tools/create_hugo/create_hugo.cpp b/devtools/create_hugo/create_hugo.cpp
index 1dffa0edf1..1dffa0edf1 100644
--- a/tools/create_hugo/create_hugo.cpp
+++ b/devtools/create_hugo/create_hugo.cpp
diff --git a/tools/create_hugo/create_hugo.h b/devtools/create_hugo/create_hugo.h
index f30c186877..f30c186877 100644
--- a/tools/create_hugo/create_hugo.h
+++ b/devtools/create_hugo/create_hugo.h
diff --git a/tools/create_hugo/dists/msvc10/create_hugo.sln b/devtools/create_hugo/dists/msvc10/create_hugo.sln
index a6f87198f6..a6f87198f6 100644
--- a/tools/create_hugo/dists/msvc10/create_hugo.sln
+++ b/devtools/create_hugo/dists/msvc10/create_hugo.sln
diff --git a/tools/create_hugo/dists/msvc10/create_hugo.vcxproj b/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj
index eae5fbc55c..eae5fbc55c 100644
--- a/tools/create_hugo/dists/msvc10/create_hugo.vcxproj
+++ b/devtools/create_hugo/dists/msvc10/create_hugo.vcxproj
diff --git a/tools/create_hugo/dists/msvc9/create_hugo.sln b/devtools/create_hugo/dists/msvc9/create_hugo.sln
index 2d86ae4f19..2d86ae4f19 100644
--- a/tools/create_hugo/dists/msvc9/create_hugo.sln
+++ b/devtools/create_hugo/dists/msvc9/create_hugo.sln
diff --git a/tools/create_hugo/dists/msvc9/create_hugo.vcproj b/devtools/create_hugo/dists/msvc9/create_hugo.vcproj
index 473d89e43c..473d89e43c 100644
--- a/tools/create_hugo/dists/msvc9/create_hugo.vcproj
+++ b/devtools/create_hugo/dists/msvc9/create_hugo.vcproj
diff --git a/tools/create_hugo/enums.h b/devtools/create_hugo/enums.h
index 90cb1d54f3..90cb1d54f3 100644
--- a/tools/create_hugo/enums.h
+++ b/devtools/create_hugo/enums.h
diff --git a/tools/create_hugo/module.mk b/devtools/create_hugo/module.mk
index 797ff3a1a0..ad7e833972 100644
--- a/tools/create_hugo/module.mk
+++ b/devtools/create_hugo/module.mk
@@ -1,4 +1,4 @@
-MODULE := tools/create_hugo
+MODULE := devtools/create_hugo
 
 MODULE_OBJS := \
 	create_hugo.o
diff --git a/tools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h
index c12191c11d..c12191c11d 100644
--- a/tools/create_hugo/staticdata.h
+++ b/devtools/create_hugo/staticdata.h
diff --git a/tools/create_hugo/staticdisplay.h b/devtools/create_hugo/staticdisplay.h
index 790bf74d3b..790bf74d3b 100644
--- a/tools/create_hugo/staticdisplay.h
+++ b/devtools/create_hugo/staticdisplay.h
diff --git a/tools/create_hugo/staticengine.h b/devtools/create_hugo/staticengine.h
index 362100b8f0..362100b8f0 100644
--- a/tools/create_hugo/staticengine.h
+++ b/devtools/create_hugo/staticengine.h
diff --git a/tools/create_hugo/staticfont.h b/devtools/create_hugo/staticfont.h
index c5700cdf58..c5700cdf58 100644
--- a/tools/create_hugo/staticfont.h
+++ b/devtools/create_hugo/staticfont.h
diff --git a/tools/create_hugo/staticintro.h b/devtools/create_hugo/staticintro.h
index 2fe18b8231..2fe18b8231 100644
--- a/tools/create_hugo/staticintro.h
+++ b/devtools/create_hugo/staticintro.h
diff --git a/tools/create_hugo/staticmouse.h b/devtools/create_hugo/staticmouse.h
index 2d4987a30c..2d4987a30c 100644
--- a/tools/create_hugo/staticmouse.h
+++ b/devtools/create_hugo/staticmouse.h
diff --git a/tools/create_hugo/staticparser.h b/devtools/create_hugo/staticparser.h
index 9e67e98c26..9e67e98c26 100644
--- a/tools/create_hugo/staticparser.h
+++ b/devtools/create_hugo/staticparser.h
diff --git a/tools/create_hugo/staticutil.h b/devtools/create_hugo/staticutil.h
index 050655a4de..050655a4de 100644
--- a/tools/create_hugo/staticutil.h
+++ b/devtools/create_hugo/staticutil.h
diff --git a/tools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 7a4b8d73a1..7a4b8d73a1 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
diff --git a/tools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h
index d82e16fed0..d82e16fed0 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/devtools/create_kyradat/create_kyradat.h
diff --git a/tools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp
index 6b801d14f9..6b801d14f9 100644
--- a/tools/create_kyradat/extract.cpp
+++ b/devtools/create_kyradat/extract.cpp
diff --git a/tools/create_kyradat/extract.h b/devtools/create_kyradat/extract.h
index 0903852dd2..0903852dd2 100644
--- a/tools/create_kyradat/extract.h
+++ b/devtools/create_kyradat/extract.h
diff --git a/tools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index 75a956cab0..75a956cab0 100644
--- a/tools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
diff --git a/tools/create_kyradat/md5.cpp b/devtools/create_kyradat/md5.cpp
index 214b5ef7ed..214b5ef7ed 100644
--- a/tools/create_kyradat/md5.cpp
+++ b/devtools/create_kyradat/md5.cpp
diff --git a/tools/create_kyradat/md5.h b/devtools/create_kyradat/md5.h
index dd50efece8..dd50efece8 100644
--- a/tools/create_kyradat/md5.h
+++ b/devtools/create_kyradat/md5.h
diff --git a/tools/create_kyradat/module.mk b/devtools/create_kyradat/module.mk
index b10dbb33cb..60cd1f8578 100644
--- a/tools/create_kyradat/module.mk
+++ b/devtools/create_kyradat/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/create_kyradat
+MODULE := devtools/create_kyradat
 
 MODULE_OBJS := \
 	create_kyradat.o \
diff --git a/tools/create_kyradat/pak.cpp b/devtools/create_kyradat/pak.cpp
index 4179f42df0..4179f42df0 100644
--- a/tools/create_kyradat/pak.cpp
+++ b/devtools/create_kyradat/pak.cpp
diff --git a/tools/create_kyradat/pak.h b/devtools/create_kyradat/pak.h
index ee6dabb672..ee6dabb672 100644
--- a/tools/create_kyradat/pak.h
+++ b/devtools/create_kyradat/pak.h
diff --git a/tools/create_kyradat/search.cpp b/devtools/create_kyradat/search.cpp
index 28631fa652..28631fa652 100644
--- a/tools/create_kyradat/search.cpp
+++ b/devtools/create_kyradat/search.cpp
diff --git a/tools/create_kyradat/search.h b/devtools/create_kyradat/search.h
index 6459606ef8..6459606ef8 100644
--- a/tools/create_kyradat/search.h
+++ b/devtools/create_kyradat/search.h
diff --git a/tools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp
index 777f237650..777f237650 100644
--- a/tools/create_kyradat/tables.cpp
+++ b/devtools/create_kyradat/tables.cpp
diff --git a/tools/create_kyradat/tables.h b/devtools/create_kyradat/tables.h
index c990043f5d..c990043f5d 100644
--- a/tools/create_kyradat/tables.h
+++ b/devtools/create_kyradat/tables.h
diff --git a/tools/create_kyradat/util.cpp b/devtools/create_kyradat/util.cpp
index 702a36bc0e..702a36bc0e 100644
--- a/tools/create_kyradat/util.cpp
+++ b/devtools/create_kyradat/util.cpp
diff --git a/tools/create_kyradat/util.h b/devtools/create_kyradat/util.h
index 077597ac07..077597ac07 100644
--- a/tools/create_kyradat/util.h
+++ b/devtools/create_kyradat/util.h
diff --git a/tools/create_lure/Makefile b/devtools/create_lure/Makefile
index 1ed33b594c..1ed33b594c 100644
--- a/tools/create_lure/Makefile
+++ b/devtools/create_lure/Makefile
diff --git a/tools/create_lure/create_lure_dat.cpp b/devtools/create_lure/create_lure_dat.cpp
index ad883b808f..ad883b808f 100644
--- a/tools/create_lure/create_lure_dat.cpp
+++ b/devtools/create_lure/create_lure_dat.cpp
diff --git a/tools/create_lure/create_lure_dat.h b/devtools/create_lure/create_lure_dat.h
index 4743f6ac3f..4743f6ac3f 100644
--- a/tools/create_lure/create_lure_dat.h
+++ b/devtools/create_lure/create_lure_dat.h
diff --git a/tools/create_lure/dists/msvc8/create_lure.sln b/devtools/create_lure/dists/msvc8/create_lure.sln
index 8d74988d8c..8d74988d8c 100644
--- a/tools/create_lure/dists/msvc8/create_lure.sln
+++ b/devtools/create_lure/dists/msvc8/create_lure.sln
diff --git a/tools/create_lure/dists/msvc8/create_lure.vcproj b/devtools/create_lure/dists/msvc8/create_lure.vcproj
index 177466a29f..177466a29f 100644
--- a/tools/create_lure/dists/msvc8/create_lure.vcproj
+++ b/devtools/create_lure/dists/msvc8/create_lure.vcproj
diff --git a/tools/create_lure/dists/msvc8_to_msvc9.bat b/devtools/create_lure/dists/msvc8_to_msvc9.bat
index 54820b34d0..54820b34d0 100644
--- a/tools/create_lure/dists/msvc8_to_msvc9.bat
+++ b/devtools/create_lure/dists/msvc8_to_msvc9.bat
diff --git a/tools/create_lure/dists/msvc9/create_lure.sln b/devtools/create_lure/dists/msvc9/create_lure.sln
index 4f55924eea..4f55924eea 100644
--- a/tools/create_lure/dists/msvc9/create_lure.sln
+++ b/devtools/create_lure/dists/msvc9/create_lure.sln
diff --git a/tools/create_lure/dists/msvc9/create_lure.vcproj b/devtools/create_lure/dists/msvc9/create_lure.vcproj
index a611db31fa..a611db31fa 100644
--- a/tools/create_lure/dists/msvc9/create_lure.vcproj
+++ b/devtools/create_lure/dists/msvc9/create_lure.vcproj
diff --git a/tools/create_lure/dists/msvc9_to_msvc8.bat b/devtools/create_lure/dists/msvc9_to_msvc8.bat
index c87a524f77..c87a524f77 100644
--- a/tools/create_lure/dists/msvc9_to_msvc8.bat
+++ b/devtools/create_lure/dists/msvc9_to_msvc8.bat
diff --git a/tools/create_lure/module.mk b/devtools/create_lure/module.mk
index 04229b9377..5d8192cb7a 100644
--- a/tools/create_lure/module.mk
+++ b/devtools/create_lure/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/create_lure
+MODULE := devtools/create_lure
 
 MODULE_OBJS := \
 	create_lure_dat.o \
diff --git a/tools/create_lure/process_actions.cpp b/devtools/create_lure/process_actions.cpp
index 30e7eed9e4..30e7eed9e4 100644
--- a/tools/create_lure/process_actions.cpp
+++ b/devtools/create_lure/process_actions.cpp
diff --git a/tools/create_mads/Makefile b/devtools/create_mads/Makefile
index c2776f5d17..c2776f5d17 100644
--- a/tools/create_mads/Makefile
+++ b/devtools/create_mads/Makefile
diff --git a/tools/create_mads/dists/msvc9/create_mads.sln b/devtools/create_mads/dists/msvc9/create_mads.sln
index 5ddd18cffe..5ddd18cffe 100644
--- a/tools/create_mads/dists/msvc9/create_mads.sln
+++ b/devtools/create_mads/dists/msvc9/create_mads.sln
diff --git a/tools/create_mads/dists/msvc9/create_mads.vcproj b/devtools/create_mads/dists/msvc9/create_mads.vcproj
index 1f33faa418..1f33faa418 100644
--- a/tools/create_mads/dists/msvc9/create_mads.vcproj
+++ b/devtools/create_mads/dists/msvc9/create_mads.vcproj
diff --git a/tools/create_mads/main.cpp b/devtools/create_mads/main.cpp
index 26ae2a7558..26ae2a7558 100644
--- a/tools/create_mads/main.cpp
+++ b/devtools/create_mads/main.cpp
diff --git a/tools/create_mads/module.mk b/devtools/create_mads/module.mk
index db35973eef..c773da8366 100644
--- a/tools/create_mads/module.mk
+++ b/devtools/create_mads/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/create_mads
+MODULE := devtools/create_mads
 
 MODULE_OBJS := \
 	main.o \
diff --git a/tools/create_mads/parser.cpp b/devtools/create_mads/parser.cpp
index c37b3a7a80..c37b3a7a80 100644
--- a/tools/create_mads/parser.cpp
+++ b/devtools/create_mads/parser.cpp
diff --git a/tools/create_mads/parser.h b/devtools/create_mads/parser.h
index d404e8395f..d404e8395f 100644
--- a/tools/create_mads/parser.h
+++ b/devtools/create_mads/parser.h
diff --git a/tools/create_mads/scripts/rex_nebular.txt b/devtools/create_mads/scripts/rex_nebular.txt
index f177720398..f177720398 100644
--- a/tools/create_mads/scripts/rex_nebular.txt
+++ b/devtools/create_mads/scripts/rex_nebular.txt
diff --git a/tools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp
index d803fb0a37..d803fb0a37 100644
--- a/tools/create_project/codeblocks.cpp
+++ b/devtools/create_project/codeblocks.cpp
diff --git a/tools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h
index ba75daeafd..ba75daeafd 100644
--- a/tools/create_project/codeblocks.h
+++ b/devtools/create_project/codeblocks.h
diff --git a/tools/create_project/codeblocks/create_project.cbp b/devtools/create_project/codeblocks/create_project.cbp
index 9078ddcd51..9078ddcd51 100644
--- a/tools/create_project/codeblocks/create_project.cbp
+++ b/devtools/create_project/codeblocks/create_project.cbp
diff --git a/tools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index b896e85131..b896e85131 100644
--- a/tools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
diff --git a/tools/create_project/create_project.h b/devtools/create_project/create_project.h
index 8c4b8c7d23..8c4b8c7d23 100644
--- a/tools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
diff --git a/tools/create_project/module.mk b/devtools/create_project/module.mk
index 9334a126af..4382fe176c 100644
--- a/tools/create_project/module.mk
+++ b/devtools/create_project/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/create_project
+MODULE := devtools/create_project
 
 MODULE_OBJS := \
 	create_project.o \
diff --git a/tools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 73511218b4..73511218b4 100644
--- a/tools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
diff --git a/tools/create_project/msbuild.h b/devtools/create_project/msbuild.h
index fa5311734b..fa5311734b 100644
--- a/tools/create_project/msbuild.h
+++ b/devtools/create_project/msbuild.h
diff --git a/tools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 9745cffdd2..e2fff59c46 100644
--- a/tools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -152,7 +152,7 @@ std::string MSVCProvider::getPreBuildEvent() const {
 	cmdLine = "@echo off\n"
 	          "echo Executing Pre-Build script...\n"
 			  "echo.\n"
-			  "@call "$(SolutionDir)../../tools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.."\n"
+			  "@call "$(SolutionDir)../../devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.."\n"
 	          "EXIT /B0";
 
 	return cmdLine;
@@ -164,7 +164,7 @@ std::string MSVCProvider::getPostBuildEvent(bool isWin32) const {
 	cmdLine = "@echo off\n"
 	          "echo Executing Post-Build script...\n"
 	          "echo.\n"
-	          "@call "$(SolutionDir)../../tools/create_project/scripts/postbuild.cmd" "$(SolutionDir)/../.." "$(OutDir)" ";
+	          "@call "$(SolutionDir)../../devtools/create_project/scripts/postbuild.cmd" "$(SolutionDir)/../.." "$(OutDir)" ";
 
 	cmdLine += (isWin32) ? "x86" : "x64";
 
diff --git a/tools/create_project/msvc.h b/devtools/create_project/msvc.h
index f41ecc3aba..f41ecc3aba 100644
--- a/tools/create_project/msvc.h
+++ b/devtools/create_project/msvc.h
diff --git a/tools/create_project/msvc10/create_project.sln b/devtools/create_project/msvc10/create_project.sln
index 69eeb8ed19..69eeb8ed19 100644
--- a/tools/create_project/msvc10/create_project.sln
+++ b/devtools/create_project/msvc10/create_project.sln
diff --git a/tools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj
index 532d6dba29..532d6dba29 100644
--- a/tools/create_project/msvc10/create_project.vcxproj
+++ b/devtools/create_project/msvc10/create_project.vcxproj
diff --git a/tools/create_project/msvc10/create_project.vcxproj.filters b/devtools/create_project/msvc10/create_project.vcxproj.filters
index 7922e1e6f7..7922e1e6f7 100644
--- a/tools/create_project/msvc10/create_project.vcxproj.filters
+++ b/devtools/create_project/msvc10/create_project.vcxproj.filters
diff --git a/tools/create_project/msvc8/create_project.sln b/devtools/create_project/msvc8/create_project.sln
index 4a0152f33f..4a0152f33f 100644
--- a/tools/create_project/msvc8/create_project.sln
+++ b/devtools/create_project/msvc8/create_project.sln
diff --git a/tools/create_project/msvc8/create_project.vcproj b/devtools/create_project/msvc8/create_project.vcproj
index bc3b2437ac..bc3b2437ac 100644
--- a/tools/create_project/msvc8/create_project.vcproj
+++ b/devtools/create_project/msvc8/create_project.vcproj
diff --git a/tools/create_project/msvc9/create_project.sln b/devtools/create_project/msvc9/create_project.sln
index df754e1d78..df754e1d78 100644
--- a/tools/create_project/msvc9/create_project.sln
+++ b/devtools/create_project/msvc9/create_project.sln
diff --git a/tools/create_project/msvc9/create_project.vcproj b/devtools/create_project/msvc9/create_project.vcproj
index c89b88a1c9..c89b88a1c9 100644
--- a/tools/create_project/msvc9/create_project.vcproj
+++ b/devtools/create_project/msvc9/create_project.vcproj
diff --git a/tools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd
index 5c2bd8a1ad..5c2bd8a1ad 100644
--- a/tools/create_project/scripts/postbuild.cmd
+++ b/devtools/create_project/scripts/postbuild.cmd
diff --git a/tools/create_project/scripts/prebuild.cmd b/devtools/create_project/scripts/prebuild.cmd
index 584e217c65..b824f0d5a0 100644
--- a/tools/create_project/scripts/prebuild.cmd
+++ b/devtools/create_project/scripts/prebuild.cmd
@@ -12,7 +12,7 @@ REM    Root folder
 if "%~1"=="" goto error_input

 

 REM Run the revision script

-@call cscript "%~1/tools/create_project/scripts/revision.vbs" %~1 1>NUL

+@call cscript "%~1/devtools/create_project/scripts/revision.vbs" %~1 1>NUL

 if not %errorlevel% == 0 goto error_script

 goto done

 

diff --git a/tools/create_project/scripts/revision.vbs b/devtools/create_project/scripts/revision.vbs
index 851185371b..851185371b 100644
--- a/tools/create_project/scripts/revision.vbs
+++ b/devtools/create_project/scripts/revision.vbs
diff --git a/tools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index 2b7c8908cb..2b7c8908cb 100644
--- a/tools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
diff --git a/tools/create_project/visualstudio.h b/devtools/create_project/visualstudio.h
index 0cf572429b..0cf572429b 100644
--- a/tools/create_project/visualstudio.h
+++ b/devtools/create_project/visualstudio.h
diff --git a/tools/create_teenagent/create_teenagent.cpp b/devtools/create_teenagent/create_teenagent.cpp
index 9a9c00d4b4..9a9c00d4b4 100644
--- a/tools/create_teenagent/create_teenagent.cpp
+++ b/devtools/create_teenagent/create_teenagent.cpp
diff --git a/tools/create_teenagent/md5.cpp b/devtools/create_teenagent/md5.cpp
index 214b5ef7ed..214b5ef7ed 100644
--- a/tools/create_teenagent/md5.cpp
+++ b/devtools/create_teenagent/md5.cpp
diff --git a/tools/create_teenagent/md5.h b/devtools/create_teenagent/md5.h
index dd50efece8..dd50efece8 100644
--- a/tools/create_teenagent/md5.h
+++ b/devtools/create_teenagent/md5.h
diff --git a/tools/create_teenagent/module.mk b/devtools/create_teenagent/module.mk
index f7e4e11250..5c9b876140 100644
--- a/tools/create_teenagent/module.mk
+++ b/devtools/create_teenagent/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/create_teenagent
+MODULE := devtools/create_teenagent
 
 MODULE_OBJS := \
 	create_teenagent.o \
diff --git a/tools/create_teenagent/util.h b/devtools/create_teenagent/util.h
index 077597ac07..077597ac07 100644
--- a/tools/create_teenagent/util.h
+++ b/devtools/create_teenagent/util.h
diff --git a/tools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp
index 3cf252cbcd..3cf252cbcd 100644
--- a/tools/create_toon/create_toon.cpp
+++ b/devtools/create_toon/create_toon.cpp
diff --git a/tools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h
index 0695944b17..0695944b17 100644
--- a/tools/create_toon/create_toon.h
+++ b/devtools/create_toon/create_toon.h
diff --git a/tools/create_toon/dists/msvc9/create_toon.sln b/devtools/create_toon/dists/msvc9/create_toon.sln
index e9c3750590..e9c3750590 100644
--- a/tools/create_toon/dists/msvc9/create_toon.sln
+++ b/devtools/create_toon/dists/msvc9/create_toon.sln
diff --git a/tools/create_toon/dists/msvc9/create_toon.vcproj b/devtools/create_toon/dists/msvc9/create_toon.vcproj
index f860b8b201..f860b8b201 100644
--- a/tools/create_toon/dists/msvc9/create_toon.vcproj
+++ b/devtools/create_toon/dists/msvc9/create_toon.vcproj
diff --git a/tools/create_toon/module.mk b/devtools/create_toon/module.mk
index 761afb7a7f..9bcbfcb6e8 100644
--- a/tools/create_toon/module.mk
+++ b/devtools/create_toon/module.mk
@@ -1,4 +1,4 @@
-MODULE := tools/create_toon
+MODULE := devtools/create_toon
 
 MODULE_OBJS := \
 	create_toon.o
diff --git a/tools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h
index efcb893024..efcb893024 100644
--- a/tools/create_toon/staticdata.h
+++ b/devtools/create_toon/staticdata.h
diff --git a/tools/create_translations/create_translations.cpp b/devtools/create_translations/create_translations.cpp
index 9fcf3b4a31..9fcf3b4a31 100644
--- a/tools/create_translations/create_translations.cpp
+++ b/devtools/create_translations/create_translations.cpp
diff --git a/tools/create_translations/create_translations.h b/devtools/create_translations/create_translations.h
index 0ece8102f0..0ece8102f0 100644
--- a/tools/create_translations/create_translations.h
+++ b/devtools/create_translations/create_translations.h
diff --git a/tools/create_translations/module.mk b/devtools/create_translations/module.mk
index 4ffb39183b..430cf91976 100644
--- a/tools/create_translations/module.mk
+++ b/devtools/create_translations/module.mk
@@ -1,4 +1,4 @@
-MODULE := tools/create_translations
+MODULE := devtools/create_translations
 
 MODULE_OBJS := \
 	po_parser.o \
diff --git a/tools/create_translations/po_parser.cpp b/devtools/create_translations/po_parser.cpp
index bc49da40d4..bc49da40d4 100644
--- a/tools/create_translations/po_parser.cpp
+++ b/devtools/create_translations/po_parser.cpp
diff --git a/tools/create_translations/po_parser.h b/devtools/create_translations/po_parser.h
index 6991b1d11e..6991b1d11e 100644
--- a/tools/create_translations/po_parser.h
+++ b/devtools/create_translations/po_parser.h
diff --git a/tools/credits.pl b/devtools/credits.pl
index 349197d90c..349197d90c 100755
--- a/tools/credits.pl
+++ b/devtools/credits.pl
diff --git a/tools/dist-scummvm.sh b/devtools/dist-scummvm.sh
index de76c9f6a9..de76c9f6a9 100755
--- a/tools/dist-scummvm.sh
+++ b/devtools/dist-scummvm.sh
diff --git a/tools/extract-words-tok.pl b/devtools/extract-words-tok.pl
index ea654759aa..9209d49eb5 100755
--- a/tools/extract-words-tok.pl
+++ b/devtools/extract-words-tok.pl
@@ -32,8 +32,8 @@
 #
 # for i in agigames/*/words.tok
 # do
-#   tools/extract-words-tok.pl "$i"
-# done | tools/construct-pred-dict.pl
+#   devtools/extract-words-tok.pl "$i"
+# done | devtools/construct-pred-dict.pl
 #
 
 local $/;
diff --git a/tools/make-scumm-fontdata.c b/devtools/make-scumm-fontdata.c
index 991d49831a..991d49831a 100644
--- a/tools/make-scumm-fontdata.c
+++ b/devtools/make-scumm-fontdata.c
diff --git a/tools/md5table.c b/devtools/md5table.c
index 7d76b7541d..7d76b7541d 100644
--- a/tools/md5table.c
+++ b/devtools/md5table.c
diff --git a/devtools/module.mk b/devtools/module.mk
new file mode 100644
index 0000000000..fdbc13f645
--- /dev/null
+++ b/devtools/module.mk
@@ -0,0 +1,86 @@
+# $URL$
+# $Id$
+
+MODULE := devtools
+
+MODULE_DIRS += \
+	devtools/
+
+
+#######################################################################
+# Tools directory
+#######################################################################
+
+DEVTOOLS := \
+	devtools/convbdf$(EXEEXT) \
+	devtools/md5table$(EXEEXT) \
+	devtools/make-scumm-fontdata$(EXEEXT)
+
+include $(srcdir)/devtools/*/module.mk
+
+.PHONY: $(srcdir)/devtools/*/module.mk
+
+# Make sure the 'all' / 'clean' targets build/clean the devtools, too
+#all:
+clean: clean-devtools
+
+# Main target
+devtools: $(DEVTOOLS)
+
+clean-devtools:
+	-$(RM) $(DEVTOOLS)
+
+#
+# Build rules for the devtools
+#
+
+devtools/convbdf$(EXEEXT): $(srcdir)/devtools/convbdf.c
+	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
+	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
+
+devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.c
+	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
+	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
+
+devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c
+	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
+	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
+
+#
+# Rules to explicitly rebuild the credits / MD5 tables.
+# The rules for the files in the "web" resp. "docs" modules
+# assume that you are invoking "make" from within a complete
+# checkout of the ScummVM repository. Of course if that is not the
+# case, then you have to modify those paths...
+#
+
+credits:
+	$(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS
+#	$(srcdir)/devtools/credits.pl --rtf > $(srcdir)/Credits.rtf
+	$(srcdir)/devtools/credits.pl --cpp > $(srcdir)/gui/credits.h
+	$(srcdir)/devtools/credits.pl --xml-website > $(srcdir)/../../web/trunk/data/credits.xml
+#	$(srcdir)/devtools/credits.pl --xml-docbook > $(srcdir)/../../docs/trunk/docbook/credits.xml
+
+md5scumm: devtools/md5table$(EXEEXT)
+	devtools/md5table$(EXEEXT) --c++ < $(srcdir)/devtools/scumm-md5.txt > $(srcdir)/engines/scumm/scumm-md5.h
+
+#
+# Rules which automatically and implicitly rebuild the credits and
+# MD5 tables when needed.
+# These are currently disabled, because if the input data changes, then
+# the generated files should be checked in, too. Otherwise, we'd reduce
+# portability to system on which our devtools can't (automatically) be
+# run for some reason.
+#
+
+#scumm/scumm-md5.h: $(srcdir)/devtools/scumm-md5.txt devtools/md5table$(EXEEXT)
+#	devtools/md5table$(EXEEXT) --c++ < $< > $@
+
+#AUTHORS: $(srcdir)/devtools/credits.pl
+#	$(srcdir)/devtools/credits.pl --text > $@
+
+#gui/credits.h: $(srcdir)/devtools/credits.pl
+#	$(srcdir)/devtools/credits.pl --cpp > $@
+
+
+.PHONY: clean-devtools devtools credits md5scumm
diff --git a/tools/qtable/fat_amiga_demo.h b/devtools/qtable/fat_amiga_demo.h
index 027fc83e78..027fc83e78 100644
--- a/tools/qtable/fat_amiga_demo.h
+++ b/devtools/qtable/fat_amiga_demo.h
diff --git a/tools/qtable/fat_amiga_eng_floppy.h b/devtools/qtable/fat_amiga_eng_floppy.h
index 49895cd0eb..49895cd0eb 100644
--- a/tools/qtable/fat_amiga_eng_floppy.h
+++ b/devtools/qtable/fat_amiga_eng_floppy.h
diff --git a/tools/qtable/fat_amiga_interview.h b/devtools/qtable/fat_amiga_interview.h
index 1ea39df6cb..1ea39df6cb 100644
--- a/tools/qtable/fat_amiga_interview.h
+++ b/devtools/qtable/fat_amiga_interview.h
diff --git a/tools/qtable/fat_eng_cdrom.h b/devtools/qtable/fat_eng_cdrom.h
index 28a7d4fa56..28a7d4fa56 100644
--- a/tools/qtable/fat_eng_cdrom.h
+++ b/devtools/qtable/fat_eng_cdrom.h
diff --git a/tools/qtable/fat_eng_floppy.h b/devtools/qtable/fat_eng_floppy.h
index 075c27431d..075c27431d 100644
--- a/tools/qtable/fat_eng_floppy.h
+++ b/devtools/qtable/fat_eng_floppy.h
diff --git a/tools/qtable/fat_fre_cdrom.h b/devtools/qtable/fat_fre_cdrom.h
index 1cb60b1814..1cb60b1814 100644
--- a/tools/qtable/fat_fre_cdrom.h
+++ b/devtools/qtable/fat_fre_cdrom.h
diff --git a/tools/qtable/fat_fre_floppy.h b/devtools/qtable/fat_fre_floppy.h
index f280abbb19..f280abbb19 100644
--- a/tools/qtable/fat_fre_floppy.h
+++ b/devtools/qtable/fat_fre_floppy.h
diff --git a/tools/qtable/fat_ger_cdrom.h b/devtools/qtable/fat_ger_cdrom.h
index 6842892342..6842892342 100644
--- a/tools/qtable/fat_ger_cdrom.h
+++ b/devtools/qtable/fat_ger_cdrom.h
diff --git a/tools/qtable/fat_ger_floppy.h b/devtools/qtable/fat_ger_floppy.h
index f05892f87d..f05892f87d 100644
--- a/tools/qtable/fat_ger_floppy.h
+++ b/devtools/qtable/fat_ger_floppy.h
diff --git a/tools/qtable/fat_heb_cdrom.h b/devtools/qtable/fat_heb_cdrom.h
index bc7ca92869..bc7ca92869 100644
--- a/tools/qtable/fat_heb_cdrom.h
+++ b/devtools/qtable/fat_heb_cdrom.h
diff --git a/tools/qtable/fat_ita_cdrom.h b/devtools/qtable/fat_ita_cdrom.h
index 0bd0a484ae..0bd0a484ae 100644
--- a/tools/qtable/fat_ita_cdrom.h
+++ b/devtools/qtable/fat_ita_cdrom.h
diff --git a/tools/qtable/fat_ita_floppy.h b/devtools/qtable/fat_ita_floppy.h
index 1cbf3518bd..1cbf3518bd 100644
--- a/tools/qtable/fat_ita_floppy.h
+++ b/devtools/qtable/fat_ita_floppy.h
diff --git a/tools/qtable/fat_pc_demo.h b/devtools/qtable/fat_pc_demo.h
index e0ab9ae663..e0ab9ae663 100644
--- a/tools/qtable/fat_pc_demo.h
+++ b/devtools/qtable/fat_pc_demo.h
diff --git a/tools/qtable/fat_pc_demo_pcgames.h b/devtools/qtable/fat_pc_demo_pcgames.h
index b9632e174f..b9632e174f 100644
--- a/tools/qtable/fat_pc_demo_pcgames.h
+++ b/devtools/qtable/fat_pc_demo_pcgames.h
diff --git a/tools/qtable/fat_pc_interview.h b/devtools/qtable/fat_pc_interview.h
index 30b96a81c3..30b96a81c3 100644
--- a/tools/qtable/fat_pc_interview.h
+++ b/devtools/qtable/fat_pc_interview.h
diff --git a/tools/qtable/fat_spa_cdrom.h b/devtools/qtable/fat_spa_cdrom.h
index 38eba99cf0..38eba99cf0 100644
--- a/tools/qtable/fat_spa_cdrom.h
+++ b/devtools/qtable/fat_spa_cdrom.h
diff --git a/tools/qtable/module.mk b/devtools/qtable/module.mk
index 43225040c8..5aab9ad0c7 100644
--- a/tools/qtable/module.mk
+++ b/devtools/qtable/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/qtable
+MODULE := devtools/qtable
 
 MODULE_OBJS := \
 	qtable.o
diff --git a/tools/qtable/qtable.cpp b/devtools/qtable/qtable.cpp
index a659698688..a659698688 100644
--- a/tools/qtable/qtable.cpp
+++ b/devtools/qtable/qtable.cpp
diff --git a/tools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp
index 139ce451ef..139ce451ef 100644
--- a/tools/sci/musicplayer.cpp
+++ b/devtools/sci/musicplayer.cpp
diff --git a/tools/sci/scidisasm.cpp b/devtools/sci/scidisasm.cpp
index 39ea7f9c41..39ea7f9c41 100644
--- a/tools/sci/scidisasm.cpp
+++ b/devtools/sci/scidisasm.cpp
diff --git a/tools/sci/scipack.cpp b/devtools/sci/scipack.cpp
index f70d91fabc..f70d91fabc 100644
--- a/tools/sci/scipack.cpp
+++ b/devtools/sci/scipack.cpp
diff --git a/tools/sci/scitrace.asm b/devtools/sci/scitrace.asm
index 360e0b7ffc..360e0b7ffc 100644
--- a/tools/sci/scitrace.asm
+++ b/devtools/sci/scitrace.asm
diff --git a/tools/scumm-md5.txt b/devtools/scumm-md5.txt
index 60fc615057..60fc615057 100644
--- a/tools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
diff --git a/tools/skycpt/288diff.txt b/devtools/skycpt/288diff.txt
index 61d82b4262..61d82b4262 100644
--- a/tools/skycpt/288diff.txt
+++ b/devtools/skycpt/288diff.txt
diff --git a/tools/skycpt/AsciiCptCompile.cpp b/devtools/skycpt/AsciiCptCompile.cpp
index 1169de5aea..1169de5aea 100644
--- a/tools/skycpt/AsciiCptCompile.cpp
+++ b/devtools/skycpt/AsciiCptCompile.cpp
diff --git a/tools/skycpt/AsciiCptCompile.sln b/devtools/skycpt/AsciiCptCompile.sln
index 93de755bf3..93de755bf3 100644
--- a/tools/skycpt/AsciiCptCompile.sln
+++ b/devtools/skycpt/AsciiCptCompile.sln
diff --git a/tools/skycpt/AsciiCptCompile.vcproj b/devtools/skycpt/AsciiCptCompile.vcproj
index e6a5def316..e6a5def316 100644
--- a/tools/skycpt/AsciiCptCompile.vcproj
+++ b/devtools/skycpt/AsciiCptCompile.vcproj
diff --git a/tools/skycpt/COMPACT.TXT b/devtools/skycpt/COMPACT.TXT
index af22e129cf..af22e129cf 100644
--- a/tools/skycpt/COMPACT.TXT
+++ b/devtools/skycpt/COMPACT.TXT
diff --git a/tools/skycpt/KmpSearch.cpp b/devtools/skycpt/KmpSearch.cpp
index b0512a8d3e..b0512a8d3e 100644
--- a/tools/skycpt/KmpSearch.cpp
+++ b/devtools/skycpt/KmpSearch.cpp
diff --git a/tools/skycpt/KmpSearch.h b/devtools/skycpt/KmpSearch.h
index 6f13ace4a5..6f13ace4a5 100644
--- a/tools/skycpt/KmpSearch.h
+++ b/devtools/skycpt/KmpSearch.h
diff --git a/tools/skycpt/README b/devtools/skycpt/README
index 4b303cb0e9..4b303cb0e9 100644
--- a/tools/skycpt/README
+++ b/devtools/skycpt/README
diff --git a/tools/skycpt/TextFile.cpp b/devtools/skycpt/TextFile.cpp
index ee64d22f5f..ee64d22f5f 100644
--- a/tools/skycpt/TextFile.cpp
+++ b/devtools/skycpt/TextFile.cpp
diff --git a/tools/skycpt/TextFile.h b/devtools/skycpt/TextFile.h
index a9ad65417c..a9ad65417c 100644
--- a/tools/skycpt/TextFile.h
+++ b/devtools/skycpt/TextFile.h
diff --git a/tools/skycpt/cptcompiler.cpp b/devtools/skycpt/cptcompiler.cpp
index 7453b383b6..7453b383b6 100644
--- a/tools/skycpt/cptcompiler.cpp
+++ b/devtools/skycpt/cptcompiler.cpp
diff --git a/tools/skycpt/cpthelp.cpp b/devtools/skycpt/cpthelp.cpp
index 134e440fd7..134e440fd7 100644
--- a/tools/skycpt/cpthelp.cpp
+++ b/devtools/skycpt/cpthelp.cpp
diff --git a/tools/skycpt/cpthelp.h b/devtools/skycpt/cpthelp.h
index 722e756edf..722e756edf 100644
--- a/tools/skycpt/cpthelp.h
+++ b/devtools/skycpt/cpthelp.h
diff --git a/tools/skycpt/idFinder.cpp b/devtools/skycpt/idFinder.cpp
index 53c9f1f1a0..53c9f1f1a0 100644
--- a/tools/skycpt/idFinder.cpp
+++ b/devtools/skycpt/idFinder.cpp
diff --git a/tools/skycpt/module.mk b/devtools/skycpt/module.mk
index 8ce208210b..84a59cee9f 100644
--- a/tools/skycpt/module.mk
+++ b/devtools/skycpt/module.mk
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 
-MODULE := tools/skycpt
+MODULE := devtools/skycpt
 
 MODULE_OBJS := \
 	AsciiCptCompile.o \
diff --git a/tools/skycpt/savedata.txt b/devtools/skycpt/savedata.txt
index e867287c33..e867287c33 100644
--- a/tools/skycpt/savedata.txt
+++ b/devtools/skycpt/savedata.txt
diff --git a/tools/skycpt/skycpt-engine.patch b/devtools/skycpt/skycpt-engine.patch
index 16388a3221..16388a3221 100644
--- a/tools/skycpt/skycpt-engine.patch
+++ b/devtools/skycpt/skycpt-engine.patch
diff --git a/tools/skycpt/stdafx.cpp b/devtools/skycpt/stdafx.cpp
index 8a5c78bc36..8a5c78bc36 100644
--- a/tools/skycpt/stdafx.cpp
+++ b/devtools/skycpt/stdafx.cpp
diff --git a/tools/skycpt/stdafx.h b/devtools/skycpt/stdafx.h
index 3e5c6042eb..3e5c6042eb 100644
--- a/tools/skycpt/stdafx.h
+++ b/devtools/skycpt/stdafx.h
diff --git a/tools/svnpropset.sh b/devtools/svnpropset.sh
index a6e331956c..a6e331956c 100755
--- a/tools/svnpropset.sh
+++ b/devtools/svnpropset.sh
diff --git a/tools/themeparser.py b/devtools/themeparser.py
index 993f7c79bc..993f7c79bc 100644
--- a/tools/themeparser.py
+++ b/devtools/themeparser.py
diff --git a/tools/update-version.pl b/devtools/update-version.pl
index 91e9e2492b..91e9e2492b 100755
--- a/tools/update-version.pl
+++ b/devtools/update-version.pl
diff --git a/dists/msvc10/readme.txt b/dists/msvc10/readme.txt
index be7b8a4db5..fa077fa485 100644
--- a/dists/msvc10/readme.txt
+++ b/dists/msvc10/readme.txt
@@ -1,5 +1,5 @@
 The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /tools/create_project folder.
+files using the create_project tool inside the /devtools/create_project folder.
 
 To create the default project files, build create_project.exe, copy it inside
 this folder and run the create_msvc10.bat file for a default build. You can run
diff --git a/dists/msvc8/readme.txt b/dists/msvc8/readme.txt
index 461e5c9bd5..95b55e973a 100644
--- a/dists/msvc8/readme.txt
+++ b/dists/msvc8/readme.txt
@@ -1,5 +1,5 @@
 The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /tools/create_project folder.
+files using the create_project tool inside the /devtools/create_project folder.
 
 To create the default project files, build create_project.exe, copy it inside
 this folder and run the create_msvc8.bat file for a default build. You can run
diff --git a/dists/msvc9/readme.txt b/dists/msvc9/readme.txt
index 059c9e556b..410b8ea403 100644
--- a/dists/msvc9/readme.txt
+++ b/dists/msvc9/readme.txt
@@ -1,5 +1,5 @@
 The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /tools/create_project folder.
+files using the create_project tool inside the /devtools/create_project folder.
 
 To create the default project files, build create_project.exe, copy it inside
 this folder and run the create_msvc9.bat file for a default build. You can run
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 8372bf9ad1..9948c52001 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -102,7 +102,7 @@ protected:
 enum KyraResources {
 	kLoadAll = -1,
 
-	// This list has to match orderwise (and thus value wise) the static data list of "tools/create_kyradat/create_kyradat.h"!
+	// This list has to match orderwise (and thus value wise) the static data list of "devtools/create_kyradat/create_kyradat.h"!
 	k1ForestSeq = 1,
 	k1KallakWritingSeq,
 	k1KyrandiaLogoSeq,
diff --git a/po/module.mk b/po/module.mk
index 47c5a401c4..d2d6127321 100644
--- a/po/module.mk
+++ b/po/module.mk
@@ -33,8 +33,8 @@ updatepot:
 		mv -f $@.new $@; \
 	fi;
 
-translations-dat: tools/create_translations
-	tools/create_translations/create_translations $(POFILES)
+translations-dat: devtools/create_translations
+	devtools/create_translations/create_translations $(POFILES)
 	mv translations.dat $(srcdir)/gui/themes/
 
 update-translations: updatepot $(POFILES) translations-dat
diff --git a/ports.mk b/ports.mk
index c56031ef11..13b4e48c52 100644
--- a/ports.mk
+++ b/ports.mk
@@ -47,7 +47,7 @@ bundle: scummvm-static
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/
 endif
-	$(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
+	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
 	chmod 644 $(bundle_name)/Contents/Resources/*
 	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
 	chmod 755 $(bundle_name)/Contents/MacOS/scummvm
@@ -138,7 +138,7 @@ iphone: $(OBJS)
 # TODO: Replace AUTHORS by Credits.rtf
 osxsnap: bundle
 	mkdir ScummVM-snapshot
-	$(srcdir)/tools/credits.pl --text > $(srcdir)/AUTHORS
+	$(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS
 	cp $(srcdir)/AUTHORS ./ScummVM-snapshot/Authors
 	cp $(srcdir)/COPYING ./ScummVM-snapshot/License\ \(GPL\)
 	cp $(srcdir)/COPYING.LGPL ./ScummVM-snapshot/License\ \(LGPL\)
diff --git a/rules.mk b/rules.mk
index fde462fc0b..c531d49a29 100644
--- a/rules.mk
+++ b/rules.mk
@@ -28,12 +28,12 @@ $(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE))
 # Reset TOOL_EXECUTABLE var
 TOOL_EXECUTABLE:=
 
-# Add to "tools" target
-tools: $(TOOL-$(MODULE))
+# Add to "devtools" target
+devtools: $(TOOL-$(MODULE))
 
-# Pseudo target for comfort, allows for "make tools/skycpt", etc.
+# Pseudo target for comfort, allows for "make devtools/skycpt", etc.
 $(MODULE): $(TOOL-$(MODULE))
-clean-tools: clean-$(MODULE)
+clean-devtools: clean-$(MODULE)
 
 else
 ifdef PLUGIN
diff --git a/tools/module.mk b/tools/module.mk
deleted file mode 100644
index 3368f5e527..0000000000
--- a/tools/module.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# $URL$
-# $Id$
-
-MODULE := tools
-
-MODULE_DIRS += \
-	tools/
-
-
-#######################################################################
-# Tools directory
-#######################################################################
-
-TOOLS := \
-	tools/convbdf$(EXEEXT) \
-	tools/md5table$(EXEEXT) \
-	tools/make-scumm-fontdata$(EXEEXT)
-
-include $(srcdir)/tools/*/module.mk
-
-.PHONY: $(srcdir)/tools/*/module.mk
-
-# Make sure the 'all' / 'clean' targets build/clean the tools, too
-#all:
-clean: clean-tools
-
-# Main target
-tools: $(TOOLS)
-
-clean-tools:
-	-$(RM) $(TOOLS)
-
-#
-# Build rules for the tools
-#
-
-tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c
-	$(QUIET)$(MKDIR) tools/$(DEPDIR)
-	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
-
-tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c
-	$(QUIET)$(MKDIR) tools/$(DEPDIR)
-	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
-
-tools/make-scumm-fontdata$(EXEEXT): $(srcdir)/tools/make-scumm-fontdata.c
-	$(QUIET)$(MKDIR) tools/$(DEPDIR)
-	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
-
-#
-# Rules to explicitly rebuild the credits / MD5 tables.
-# The rules for the files in the "web" resp. "docs" modules
-# assume that you are invoking "make" from within a complete
-# checkout of the ScummVM repository. Of course if that is not the
-# case, then you have to modify those paths...
-#
-
-credits:
-	$(srcdir)/tools/credits.pl --text > $(srcdir)/AUTHORS
-#	$(srcdir)/tools/credits.pl --rtf > $(srcdir)/Credits.rtf
-	$(srcdir)/tools/credits.pl --cpp > $(srcdir)/gui/credits.h
-	$(srcdir)/tools/credits.pl --xml-website > $(srcdir)/../../web/trunk/data/credits.xml
-#	$(srcdir)/tools/credits.pl --xml-docbook > $(srcdir)/../../docs/trunk/docbook/credits.xml
-
-md5scumm: tools/md5table$(EXEEXT)
-	tools/md5table$(EXEEXT) --c++ < $(srcdir)/tools/scumm-md5.txt > $(srcdir)/engines/scumm/scumm-md5.h
-
-#
-# Rules which automatically and implicitly rebuild the credits and
-# MD5 tables when needed.
-# These are currently disabled, because if the input data changes, then
-# the generated files should be checked in, too. Otherwise, we'd reduce
-# portability to system on which our tools can't (automatically) be
-# run for some reason.
-#
-
-#scumm/scumm-md5.h: $(srcdir)/tools/scumm-md5.txt tools/md5table$(EXEEXT)
-#	tools/md5table$(EXEEXT) --c++ < $< > $@
-
-#AUTHORS: $(srcdir)/tools/credits.pl
-#	$(srcdir)/tools/credits.pl --text > $@
-
-#gui/credits.h: $(srcdir)/tools/credits.pl
-#	$(srcdir)/tools/credits.pl --cpp > $@
-
-
-.PHONY: clean-tools tools credits md5scumm