diff --git a/src/Makefile.am b/src/Makefile.am
index 21e1dfe5fbeb..b5ee23ff1e74 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,8 +15,8 @@ noinst_HEADERS = \
 	alert-fastlog.h \
 	alert-syslog.h \
 	app-layer-detect-proto.h \
-	app-layer-dnp3.h \
-	app-layer-dnp3-objects.h \
+	app-layer/dnp3/app-layer-dnp3.h \
+	app-layer/dnp3/app-layer-dnp3-objects.h \
 	app-layer-enip-common.h \
 	app-layer-enip.h \
 	app-layer-events.h \
@@ -120,7 +120,7 @@ noinst_HEADERS = \
 	detect-depth.h \
 	detect-detection-filter.h \
 	detect-distance.h \
-	detect-dnp3.h \
+	app-layer/dnp3/detect-dnp3.h \
 	detect-dns-opcode.h \
 	detect-dns-query.h \
 	detect-dsize.h \
@@ -400,8 +400,8 @@ noinst_HEADERS = \
 	output-json-bittorrent-dht.h \
 	output-json-dcerpc.h \
 	output-json-dhcp.h \
-	output-json-dnp3.h \
-	output-json-dnp3-objects.h \
+	app-layer/dnp3/output-json-dnp3.h \
+	app-layer/dnp3/output-json-dnp3-objects.h \
 	output-json-dns.h \
 	output-json-drop.h \
 	output-json-email-common.h \
@@ -560,8 +560,8 @@ noinst_HEADERS = \
 	util-logopenfile.h \
 	util-log-redis.h \
 	util-lua-common.h \
-	util-lua-dnp3.h \
-	util-lua-dnp3-objects.h \
+	app-layer/dnp3/util-lua-dnp3.h \
+	app-layer/dnp3/util-lua-dnp3-objects.h \
 	util-lua-dns.h \
 	util-lua.h \
 	util-lua-hassh.h \
@@ -633,8 +633,8 @@ libsuricata_c_a_SOURCES = \
 	alert-syslog.c \
 	app-layer.c \
 	app-layer-detect-proto.c \
-	app-layer-dnp3.c \
-	app-layer-dnp3-objects.c \
+	app-layer/dnp3/app-layer-dnp3.c \
+	app-layer/dnp3/app-layer-dnp3-objects.c \
 	app-layer-enip.c \
 	app-layer-enip-common.c \
 	app-layer-events.c \
@@ -736,7 +736,7 @@ libsuricata_c_a_SOURCES = \
 	detect-depth.c \
 	detect-detection-filter.c \
 	detect-distance.c \
-	detect-dnp3.c \
+	app-layer/dnp3/detect-dnp3.c \
 	detect-dns-opcode.c \
 	detect-dns-query.c \
 	detect-dsize.c \
@@ -1014,8 +1014,8 @@ libsuricata_c_a_SOURCES = \
 	output-json-common.c \
 	output-json-dcerpc.c \
 	output-json-dhcp.c \
-	output-json-dnp3.c \
-	output-json-dnp3-objects.c \
+	app-layer/dnp3/output-json-dnp3.c \
+	app-layer/dnp3/output-json-dnp3-objects.c \
 	output-json-dns.c \
 	output-json-drop.c \
 	output-json-email-common.c \
@@ -1161,8 +1161,8 @@ libsuricata_c_a_SOURCES = \
 	util-log-redis.c \
 	util-lua.c \
 	util-lua-common.c \
-	util-lua-dnp3.c \
-	util-lua-dnp3-objects.c \
+	app-layer/dnp3/util-lua-dnp3.c \
+	app-layer/dnp3/util-lua-dnp3-objects.c \
 	util-lua-dns.c \
 	util-lua-hassh.c \
 	util-lua-http.c \
diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
index 1f6066471757..f1a0ed73ee97 100644
--- a/src/app-layer-parser.c
+++ b/src/app-layer-parser.c
@@ -48,7 +48,7 @@
 #include "app-layer-ssh.h"
 #include "app-layer-modbus.h"
 #include "app-layer-enip.h"
-#include "app-layer-dnp3.h"
+#include "app-layer/dnp3/app-layer-dnp3.h"
 #include "app-layer-nfs-tcp.h"
 #include "app-layer-nfs-udp.h"
 #include "app-layer-ntp.h"
diff --git a/src/app-layer-dnp3-objects.c b/src/app-layer/dnp3/app-layer-dnp3-objects.c
similarity index 100%
rename from src/app-layer-dnp3-objects.c
rename to src/app-layer/dnp3/app-layer-dnp3-objects.c
diff --git a/src/app-layer-dnp3-objects.h b/src/app-layer/dnp3/app-layer-dnp3-objects.h
similarity index 100%
rename from src/app-layer-dnp3-objects.h
rename to src/app-layer/dnp3/app-layer-dnp3-objects.h
diff --git a/src/app-layer-dnp3.c b/src/app-layer/dnp3/app-layer-dnp3.c
similarity index 100%
rename from src/app-layer-dnp3.c
rename to src/app-layer/dnp3/app-layer-dnp3.c
diff --git a/src/app-layer-dnp3.h b/src/app-layer/dnp3/app-layer-dnp3.h
similarity index 100%
rename from src/app-layer-dnp3.h
rename to src/app-layer/dnp3/app-layer-dnp3.h
diff --git a/src/detect-dnp3.c b/src/app-layer/dnp3/detect-dnp3.c
similarity index 100%
rename from src/detect-dnp3.c
rename to src/app-layer/dnp3/detect-dnp3.c
diff --git a/src/detect-dnp3.h b/src/app-layer/dnp3/detect-dnp3.h
similarity index 100%
rename from src/detect-dnp3.h
rename to src/app-layer/dnp3/detect-dnp3.h
diff --git a/src/output-json-dnp3-objects.c b/src/app-layer/dnp3/output-json-dnp3-objects.c
similarity index 100%
rename from src/output-json-dnp3-objects.c
rename to src/app-layer/dnp3/output-json-dnp3-objects.c
diff --git a/src/output-json-dnp3-objects.h b/src/app-layer/dnp3/output-json-dnp3-objects.h
similarity index 100%
rename from src/output-json-dnp3-objects.h
rename to src/app-layer/dnp3/output-json-dnp3-objects.h
diff --git a/src/output-json-dnp3.c b/src/app-layer/dnp3/output-json-dnp3.c
similarity index 100%
rename from src/output-json-dnp3.c
rename to src/app-layer/dnp3/output-json-dnp3.c
diff --git a/src/output-json-dnp3.h b/src/app-layer/dnp3/output-json-dnp3.h
similarity index 100%
rename from src/output-json-dnp3.h
rename to src/app-layer/dnp3/output-json-dnp3.h
diff --git a/src/util-lua-dnp3-objects.c b/src/app-layer/dnp3/util-lua-dnp3-objects.c
similarity index 100%
rename from src/util-lua-dnp3-objects.c
rename to src/app-layer/dnp3/util-lua-dnp3-objects.c
diff --git a/src/util-lua-dnp3-objects.h b/src/app-layer/dnp3/util-lua-dnp3-objects.h
similarity index 100%
rename from src/util-lua-dnp3-objects.h
rename to src/app-layer/dnp3/util-lua-dnp3-objects.h
diff --git a/src/util-lua-dnp3.c b/src/app-layer/dnp3/util-lua-dnp3.c
similarity index 100%
rename from src/util-lua-dnp3.c
rename to src/app-layer/dnp3/util-lua-dnp3.c
diff --git a/src/util-lua-dnp3.h b/src/app-layer/dnp3/util-lua-dnp3.h
similarity index 100%
rename from src/util-lua-dnp3.h
rename to src/app-layer/dnp3/util-lua-dnp3.h
diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
index 0f459eccb67b..78856b53edea 100644
--- a/src/detect-engine-register.c
+++ b/src/detect-engine-register.c
@@ -272,7 +272,7 @@
 #include "detect-ssl-state.h"
 #include "detect-modbus.h"
 #include "detect-cipservice.h"
-#include "detect-dnp3.h"
+#include "app-layer/dnp3/detect-dnp3.h"
 #include "detect-ike-exch-type.h"
 #include "detect-ike-spi.h"
 #include "detect-ike-vendor.h"
diff --git a/src/detect-lua-extensions.c b/src/detect-lua-extensions.c
index 897b0874021a..a0bc055e3156 100644
--- a/src/detect-lua-extensions.c
+++ b/src/detect-lua-extensions.c
@@ -70,7 +70,7 @@
 #include "util-lua-ssh.h"
 #include "util-lua-hassh.h"
 #include "util-lua-smtp.h"
-#include "util-lua-dnp3.h"
+#include "app-layer/dnp3/util-lua-dnp3.h"
 #include "detect-lua-extensions.h"
 
 static const char luaext_key_ld[] = "suricata:luadata";
diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index c7acfe64d140..1bbec935505a 100644
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -48,7 +48,7 @@
 #include "detect-reference.h"
 #include "detect-metadata.h"
 #include "app-layer-parser.h"
-#include "app-layer-dnp3.h"
+#include "app-layer/dnp3/app-layer-dnp3.h"
 #include "app-layer-htp.h"
 #include "app-layer-htp-xff.h"
 #include "app-layer-ftp.h"
@@ -60,7 +60,7 @@
 #include "output.h"
 #include "output-json.h"
 #include "output-json-alert.h"
-#include "output-json-dnp3.h"
+#include "app-layer/dnp3/output-json-dnp3.h"
 #include "output-json-dns.h"
 #include "output-json-http.h"
 #include "output-json-tls.h"
diff --git a/src/output-json-frame.c b/src/output-json-frame.c
index 665010a6e44a..6f542abc78f1 100644
--- a/src/output-json-frame.c
+++ b/src/output-json-frame.c
@@ -46,7 +46,7 @@
 #include "detect-metadata.h"
 #include "app-layer-parser.h"
 #include "app-layer-frames.h"
-#include "app-layer-dnp3.h"
+#include "app-layer/dnp3/app-layer-dnp3.h"
 #include "app-layer-htp.h"
 #include "app-layer-htp-xff.h"
 #include "app-layer-ftp.h"
diff --git a/src/output-json-metadata.c b/src/output-json-metadata.c
index 772b2ccb06f2..7918a57685df 100644
--- a/src/output-json-metadata.c
+++ b/src/output-json-metadata.c
@@ -43,7 +43,7 @@
 #include "detect-engine-mpm.h"
 #include "detect-reference.h"
 #include "app-layer-parser.h"
-#include "app-layer-dnp3.h"
+#include "app-layer/dnp3/app-layer-dnp3.h"
 #include "app-layer-htp.h"
 #include "app-layer-htp-xff.h"
 #include "util-classification-config.h"
diff --git a/src/output.c b/src/output.c
index 149dda58c284..612a82af754f 100644
--- a/src/output.c
+++ b/src/output.c
@@ -84,7 +84,7 @@
 #include "output-json-rdp.h"
 #include "output-json-http2.h"
 #include "output-lua.h"
-#include "output-json-dnp3.h"
+#include "app-layer/dnp3/output-json-dnp3.h"
 #include "output-json-metadata.h"
 #include "output-json-dcerpc.h"
 #include "output-json-frame.h"