diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 61089ed1d..bf8b25dd7 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -114,17 +114,9 @@ if(BUILD_STONESENSE)
     add_subdirectory (stonesense)
 endif()
 
-
-OPTION(BUILD_KITTENS "Build the kittens plugin." OFF)
-if(BUILD_KITTENS)
-    DFHACK_PLUGIN(kittens kittens.cpp)
-endif()
-
-IF(UNIX)
-    OPTION(BUILD_VECTORS "Build the vectors search plugin." OFF)
-    if(BUILD_VECTORS)
-        DFHACK_PLUGIN(vectors vectors.cpp)
-    endif()
+OPTION(BUILD_DEV_PLUGINS "Build developer plugins." OFF)
+if(BUILD_DEV_PLUGINS)
+    add_subdirectory (devel)
 endif()
 
 
@@ -132,15 +124,11 @@ DFHACK_PLUGIN(reveal reveal.cpp)
 DFHACK_PLUGIN(probe probe.cpp)
 DFHACK_PLUGIN(plants plants.cpp)
 DFHACK_PLUGIN(prospector prospector.cpp)
-DFHACK_PLUGIN(rawdump rawdump.cpp)
 DFHACK_PLUGIN(cleanmap cleanmap.cpp)
 DFHACK_PLUGIN(weather weather.cpp)
 DFHACK_PLUGIN(vdig vdig.cpp)
 DFHACK_PLUGIN(colonies colonies.cpp)
-DFHACK_PLUGIN(itemhacks itemhacks.cpp)
-DFHACK_PLUGIN(notes notes.cpp)
 DFHACK_PLUGIN(mode mode.cpp)
-#DFHACK_PLUGIN(tiles tiles.cpp)
 DFHACK_PLUGIN(liquids liquids.cpp)
 DFHACK_PLUGIN(tubefill tubefill.cpp)
 DFHACK_PLUGIN(autodump autodump.cpp)
diff --git a/plugins/devel/CMakeLists.txt b/plugins/devel/CMakeLists.txt
new file mode 100644
index 000000000..fbc906b32
--- /dev/null
+++ b/plugins/devel/CMakeLists.txt
@@ -0,0 +1,9 @@
+IF(UNIX)
+DFHACK_PLUGIN(vectors vectors.cpp)
+endif()
+
+DFHACK_PLUGIN(kittens kittens.cpp)
+DFHACK_PLUGIN(rawdump rawdump.cpp)
+DFHACK_PLUGIN(itemhacks itemhacks.cpp)
+DFHACK_PLUGIN(notes notes.cpp)
+#DFHACK_PLUGIN(tiles tiles.cpp)
diff --git a/plugins/itemhacks.cpp b/plugins/devel/itemhacks.cpp
similarity index 100%
rename from plugins/itemhacks.cpp
rename to plugins/devel/itemhacks.cpp
diff --git a/plugins/kittens.cpp b/plugins/devel/kittens.cpp
similarity index 100%
rename from plugins/kittens.cpp
rename to plugins/devel/kittens.cpp
diff --git a/plugins/notes.cpp b/plugins/devel/notes.cpp
similarity index 100%
rename from plugins/notes.cpp
rename to plugins/devel/notes.cpp
diff --git a/plugins/rawdump.cpp b/plugins/devel/rawdump.cpp
similarity index 100%
rename from plugins/rawdump.cpp
rename to plugins/devel/rawdump.cpp
diff --git a/plugins/tiles.cpp b/plugins/devel/tiles.cpp
similarity index 100%
rename from plugins/tiles.cpp
rename to plugins/devel/tiles.cpp
diff --git a/plugins/vectors.cpp b/plugins/devel/vectors.cpp
similarity index 100%
rename from plugins/vectors.cpp
rename to plugins/devel/vectors.cpp