diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 7f22a47b3..9038d5d79 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -88,8 +88,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(autodump autodump.cpp)
     dfhack_plugin(autofarm autofarm.cpp)
     dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static)
-    dfhack_plugin(autohauler autohauler.cpp)
-    dfhack_plugin(autolabor autolabor.cpp)
+    add_subdirectory(autolabor)
     dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua)
     dfhack_plugin(automelt automelt.cpp)
     dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
@@ -133,7 +132,6 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(infiniteSky infiniteSky.cpp)
     dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote)
     dfhack_plugin(jobutils jobutils.cpp)
-    add_subdirectory(labormanager)
     dfhack_plugin(lair lair.cpp)
     dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua)
     dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread)
diff --git a/plugins/autolabor/CMakeLists.txt b/plugins/autolabor/CMakeLists.txt
new file mode 100644
index 000000000..73ae5e3c5
--- /dev/null
+++ b/plugins/autolabor/CMakeLists.txt
@@ -0,0 +1,16 @@
+project(autolahor)
+# A list of source files
+set(COMMON_SRCS
+)
+# A list of headers
+set(COMMON_HDRS
+)
+set_source_files_properties(${COMMON_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+# mash them together (headers are marked as headers and nothing will try to compile them)
+list(APPEND COMMON_SRCS ${COMMON_HDRS})
+
+dfhack_plugin(labormanager labormanager.cpp joblabormapper.cpp ${COMMON_SRCS})
+
+dfhack_plugin(autohauler autohauler.cpp ${COMMON_SRCS})
+dfhack_plugin(autolabor autolabor.cpp ${COMMON_SRCS})
diff --git a/plugins/autohauler.cpp b/plugins/autolabor/autohauler.cpp
similarity index 100%
rename from plugins/autohauler.cpp
rename to plugins/autolabor/autohauler.cpp
diff --git a/plugins/autolabor.cpp b/plugins/autolabor/autolabor.cpp
similarity index 100%
rename from plugins/autolabor.cpp
rename to plugins/autolabor/autolabor.cpp
diff --git a/plugins/labormanager/joblabormapper.cpp b/plugins/autolabor/joblabormapper.cpp
similarity index 100%
rename from plugins/labormanager/joblabormapper.cpp
rename to plugins/autolabor/joblabormapper.cpp
diff --git a/plugins/labormanager/joblabormapper.h b/plugins/autolabor/joblabormapper.h
similarity index 100%
rename from plugins/labormanager/joblabormapper.h
rename to plugins/autolabor/joblabormapper.h
diff --git a/plugins/labormanager/labormanager.cpp b/plugins/autolabor/labormanager.cpp
similarity index 100%
rename from plugins/labormanager/labormanager.cpp
rename to plugins/autolabor/labormanager.cpp
diff --git a/plugins/labormanager/labormanager.h b/plugins/autolabor/labormanager.h
similarity index 100%
rename from plugins/labormanager/labormanager.h
rename to plugins/autolabor/labormanager.h
diff --git a/plugins/labormanager/CMakeLists.txt b/plugins/labormanager/CMakeLists.txt
deleted file mode 100644
index 787028452..000000000
--- a/plugins/labormanager/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-project(labormanager)
-# A list of source files
-set(PROJECT_SRCS
-    labormanager.cpp
-    joblabormapper.cpp
-)
-# A list of headers
-set(PROJECT_HDRS
-    labormanager.h
-    joblabormapper.h
-)
-set_source_files_properties(${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
-
-# mash them together (headers are marked as headers and nothing will try to compile them)
-list(APPEND PROJECT_SRCS ${PROJECT_HDRS})
-
-dfhack_plugin(labormanager ${PROJECT_SRCS})