diff --git a/engines/agi/detection.cpp b/engines/agi/detection/detection.cpp
similarity index 98%
rename from engines/agi/detection.cpp
rename to engines/agi/detection/detection.cpp
index 10b4772f850..ea43d2c8195 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection/detection.cpp
@@ -29,8 +29,8 @@
 #include "engines/advancedDetector.h"
 
 #include "agi/detection_enums.h"
-#include "agi/detection.h"
-#include "agi/wagparser.h" // for fallback detection
+#include "agi/detection/detection.h"
+#include "agi/detection/wagparser.h" // for fallback detection
 
 static const PlainGameDescriptor agiGames[] = {
 	{"agi", "Sierra AGI game"},
@@ -64,7 +64,7 @@ static const PlainGameDescriptor agiGames[] = {
 	{0, 0}
 };
 
-#include "agi/detection_tables.h"
+#include "agi/detection/detection_tables.h"
 
 static const ADExtraGuiOptionsMap optionsList[] = {
 	{
diff --git a/engines/agi/detection.h b/engines/agi/detection/detection.h
similarity index 100%
rename from engines/agi/detection.h
rename to engines/agi/detection/detection.h
diff --git a/engines/agi/detection_tables.h b/engines/agi/detection/detection_tables.h
similarity index 100%
rename from engines/agi/detection_tables.h
rename to engines/agi/detection/detection_tables.h
diff --git a/engines/agi/detection/module.mk b/engines/agi/detection/module.mk
new file mode 100644
index 00000000000..879a2323cf5
--- /dev/null
+++ b/engines/agi/detection/module.mk
@@ -0,0 +1,11 @@
+MODULE := engines/agi/detection
+
+MODULE_OBJS :=
+
+# Detection objects
+DETECT_OBJS += $(MODULE)/detection.o
+
+# External dependencies of detection.
+# This is unneeded by the engine module itself,
+# so seperate it completely.
+DETECT_OBJS += $(MODULE)/wagparser.o
diff --git a/engines/agi/wagparser.cpp b/engines/agi/detection/wagparser.cpp
similarity index 99%
rename from engines/agi/wagparser.cpp
rename to engines/agi/detection/wagparser.cpp
index fa11654ad92..f7ace221539 100644
--- a/engines/agi/wagparser.cpp
+++ b/engines/agi/detection/wagparser.cpp
@@ -26,7 +26,7 @@
 #include "common/debug.h"
 #include "common/textconsole.h"
 
-#include "agi/wagparser.h"
+#include "agi/detection/wagparser.h"
 
 namespace Agi {
 
diff --git a/engines/agi/wagparser.h b/engines/agi/detection/wagparser.h
similarity index 100%
rename from engines/agi/wagparser.h
rename to engines/agi/detection/wagparser.h
diff --git a/engines/agi/metaengine.cpp b/engines/agi/metaengine.cpp
index f2507a8f375..1f7aa20909f 100644
--- a/engines/agi/metaengine.cpp
+++ b/engines/agi/metaengine.cpp
@@ -38,7 +38,7 @@
 #include "agi/preagi_troll.h"
 #include "agi/preagi_winnie.h"
 
-#include "agi/detection.h"
+#include "agi/detection/detection.h"
 
 namespace Agi {
 
diff --git a/engines/agi/module.mk b/engines/agi/module.mk
index d66e4129de8..84a71380868 100644
--- a/engines/agi/module.mk
+++ b/engines/agi/module.mk
@@ -49,11 +49,3 @@ endif
 
 # Include common rules
 include $(srcdir)/rules.mk
-
-# Detection objects
-DETECT_OBJS += $(MODULE)/detection.o
-
-# External dependencies of detection.
-# This is unneeded by the engine module itself,
-# so seperate it completely.
-DETECT_OBJS += $(MODULE)/wagparser.o