diff --git a/.gitignore b/.gitignore
index ac79e6435e..d957706a41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,13 +28,13 @@ ltmain.sh
 .cproject
 .settings
 Debug
-m4/libtool.m4
-m4/lt~obsolete.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/pkg.m4
-m4/ax*.m4
+autotools/m4/libtool.m4
+autotools/m4/lt~obsolete.m4
+autotools/m4/ltoptions.m4
+autotools/m4/ltsugar.m4
+autotools/m4/ltversion.m4
+autotools/m4/pkg.m4
+autotools/m4/ax*.m4
 /compile
 .deps
 /lib/cfg-grammar.h
diff --git a/.lgtm.yml b/.lgtm.yml
deleted file mode 100644
index 6779b8625e..0000000000
--- a/.lgtm.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Disable LGTM's built-in query to detect unsafe uses of gmtime; there's a
-# custom query to check for that
-queries:
-  - exclude: cpp/potentially-dangerous-function
-
-extraction:
-  cpp:
-    prepare:
-      packages:
-        - autoconf-archive
-        - openjdk-8-jdk-headless
-    after_prepare:
-      - export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin/:$PATH
-      - export LD_LIBRARY_PATH=/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server:$LD_LIBRARY_PATH
-      - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-
-      - cd /tmp && wget https://ftp.gnu.org/gnu/bison/bison-3.7.6.tar.gz && tar -xzf bison-3.7.6.tar.gz
-      - cd /tmp/bison-3.7.6 && ./configure --prefix=/tmp/bison && make all install
-      - export PATH=/tmp/bison/bin/:$PATH
diff --git a/.lgtm/cpp-queries/call-to-gmtime-without-lock.ql b/.lgtm/cpp-queries/call-to-gmtime-without-lock.ql
deleted file mode 100644
index 619508636f..0000000000
--- a/.lgtm/cpp-queries/call-to-gmtime-without-lock.ql
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @name Use of gmtime without proper lock
- * @description In the absence of the safer gmtime_r function, any call to
- * gmtime should be protected by a lock
- * Based on LGTM's built-in query 'cpp/potentially-dangerous-function'
- * (https://lgtm.com/rules/2154840805) after discussion here:
- * https://discuss.lgtm.com/t/suppressions-in-c-code/1525
- *
- * @kind problem
- * @problem.severity error
- * @precision high
- * @id cpp/call-to-gmtime-without-lock
- * @tags reliability
- *       security
- *       external/cwe/cwe-676
- */
-import cpp
-import semmle.code.cpp.controlflow.Dominance
-
-predicate isLockedUseOfFunction(FunctionCall call){
-	exists (FunctionCall lockCall |
-		lockCall.getTarget().getQualifiedName() = "g_mutex_lock"
-		and dominates(lockCall, call)
-	)
-}
-
-from FunctionCall call
-where call.getTarget().getName() = "gmtime"
-and isLockedUseOfFunction(call)
-
-select call, "Call to gmtime is not protected by a lock"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 409a316f45..c8e14f5101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -467,7 +467,7 @@ endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_subdirectory(Mk)
+add_subdirectory(autotools/Mk)
 add_subdirectory(scl)
 add_subdirectory(lib)
 add_subdirectory(modules)
@@ -478,7 +478,7 @@ add_subdirectory(persist-tool)
 add_subdirectory(tests)
 add_subdirectory(libtest)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/syslog-ng-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng-config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/syslog-ng-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng-config.h)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng-config.h DESTINATION include/syslog-ng)
 
@@ -500,7 +500,7 @@ set(PKG_CONFIG_INTERNAL_IVYKIS_CFLAGS ${IVYKIS_INCLUDE_DIRS})
 set(libdir "\${libdir}")
 set(includedir "\${includedir}")
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/syslog-ng.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng.pc)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/syslog-ng.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng.pc)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng.pc DESTINATION lib/pkgconfig)
 
 include(print_config_summary)
diff --git a/Makefile.am b/Makefile.am
index a23fd0a375..137aff091a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,15 +31,15 @@ if ENABLE_SANITIZER
 LOG_COMPILER            = $(top_srcdir)/scripts/test-grep.sh
 endif
 
-ACLOCAL_AMFLAGS		= -I m4 --install
+ACLOCAL_AMFLAGS		= -I autotools/m4 --install
 
 EXTRA_DIST		= $(filter-out ${NODIST_BUILT_SOURCES},${BUILT_SOURCES}) VERSION.txt NEWS.md autogen.sh \
-			  dist.conf dist.conf.in syslog-ng.pc.in \
-			  syslog-ng-config.h.in	\
+			  autotools/dist.conf autotools/dist.conf.in autotools/syslog-ng.pc.in \
+			  cmake/syslog-ng-config.h.in	\
 			  CONTRIBUTING.md	\
-			  sub-configure.sh	\
-			  syslog-ng.pc.cmake	\
-			  syslog-ng-native-connector.pc.cmake	\
+			  autotools/sub-configure.sh	\
+			  cmake/syslog-ng.pc.cmake	\
+			  cmake/syslog-ng-native-connector.pc.cmake	\
 			  syslog-ng-ctl/CMakeLists.txt	\
 			  requirements.txt	\
 			  dev-requirements.txt  \
@@ -54,7 +54,7 @@ pkglibdir = $(libdir)/syslog-ng
 pkglibexecdir = $(libexecdir)/syslog-ng
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= syslog-ng.pc
+pkgconfig_DATA		= autotools/syslog-ng.pc
 
 AM_CPPFLAGS		= -I$(top_srcdir)/lib -I$(top_srcdir)/modules -I$(top_builddir)/lib -I$(top_builddir)/modules
 
@@ -210,7 +210,7 @@ install-exec-hook: ${INSTALL_EXEC_HOOKS}
 uninstall-hook: ${UNINSTALL_HOOKS}
 
 populate-makefiles:
-	$(top_srcdir)/Mk/populate-makefiles.sh
+	$(top_srcdir)/autotools/Mk/populate-makefiles.sh
 
 style-check:
 	$(top_srcdir)/scripts/style-checker.sh check $(top_srcdir)
@@ -248,9 +248,9 @@ $(install_moduleLTLIBRARIES): install-libLTLIBRARIES
 install_loggenpluginLTLIBRARIES	= install-loggenpluginLTLIBRARIES
 $(install_loggenpluginLTLIBRARIES): install-libLTLIBRARIES
 
-include Mk/lex-rules.am
-include Mk/python-venv.am
-include Mk/Makefile.am
+include autotools/Mk/lex-rules.am
+include autotools/Mk/python-venv.am
+include autotools/Mk/Makefile.am
 if ENABLE_TESTING
 include libtest/Makefile.am
 endif
@@ -268,14 +268,13 @@ include scl/Makefile.am
 include packaging/Makefile.am
 include dbld/Makefile.am
 include cmake/Makefile.am
-include dev-utils/plugin_skeleton_creator/Makefile.am
 include persist-tool/Makefile.am
 
 TEST_EXTENSIONS = .sh
 @VALGRIND_CHECK_RULES@
 
 VALGRIND_SUPPRESSIONS_FILES = $(top_srcdir)/tests/valgrind/unit-test-leak.supp
-EXTRA_DIST += syslog-ng.supp	\
+EXTRA_DIST += \
 	.github/ISSUE_TEMPLATE/10-bug-report.md	\
 	.github/ISSUE_TEMPLATE/20-documentation-issue.md	\
 	.github/ISSUE_TEMPLATE/30-feature-request.md	\
diff --git a/Mk/Makefile.am b/Mk/Makefile.am
deleted file mode 100644
index 22bbc2b5f6..0000000000
--- a/Mk/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-EXTRA_DIST	+= Mk/lex-rules.am \
-		Mk/find-top-builddir.sh \
-		Mk/populate-makefiles.sh \
-		Mk/subdir.mk	\
-		Mk/CMakeLists.txt
-
-tools_DATA	= \
-		Mk/lex-rules.am \
-		lib/cfg-grammar.y
-
-tools_SCRIPTS	= \
-		lib/merge-grammar.py
diff --git a/README.md b/README.md
index 124005a898..6ccf12ae5f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 <p align="center">
   <picture>
-    <source media="(prefers-color-scheme: light)" srcset="https://github.com/axoflow/axosyslog/raw/main/docs/axosyslog.svg">
-    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/axoflow/axosyslog/raw/main/docs/axosyslog-white.svg">
-    <img alt="Axoflow" src="https://github.com/axoflow/axosyslog/raw/main/docs/axosyslog.svg" width="550">
+    <source media="(prefers-color-scheme: light)" srcset="https://github.com/axoflow/axosyslog/raw/main/doc/axosyslog.svg">
+    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/axoflow/axosyslog/raw/main/doc/axosyslog-white.svg">
+    <img alt="Axoflow" src="https://github.com/axoflow/axosyslog/raw/main/doc/axosyslog.svg" width="550">
   </picture>
 </p>
 
@@ -11,7 +11,7 @@
 
 [![Discord](https://img.shields.io/discord/1082023686028148877?label=Discord&logo=discord&logoColor=white)](https://discord.gg/qmq53uBm2c)
 [![Build Status](https://github.com/axoflow/axosyslog/actions/workflows/devshell.yml/badge.svg)](https://github.com/axoflow/axosyslog/actions/workflows/devshell.yml)
-[![Nightly](https://github.com/axoflow/axosyslog/actions/workflows/nightly-release.yml/badge.svg)](https://github.com/axoflow/axosyslog/actions/workflows/nightly-release.yml)
+[![Nightly](https://github.com/axoflow/axosyslog/actions/workflows/axosyslog-nightly.yml/badge.svg)](https://github.com/axoflow/axosyslog/actions/workflows/axosyslog-nightly.yml)
 [![Binary packages](https://github.com/axoflow/axosyslog/actions/workflows/packages.yml/badge.svg)](https://github.com/axoflow/axosyslog/actions/workflows/packages.yml)
 
 This repository contains the AxoSyslog source tree, cloud-ready syslog-ng images, and Helm charts
diff --git a/autogen.sh b/autogen.sh
index 7b78333aef..380700035b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -78,7 +78,7 @@ autogen_submodules()
 
 		CONFIGURE_OPTS="--disable-shared --enable-static --with-pic"
 
-		$SED -e "s/@__CONFIGURE_OPTS__@/${CONFIGURE_OPTS}/g" ${origdir}/sub-configure.sh >configure.gnu
+		$SED -e "s/@__CONFIGURE_OPTS__@/${CONFIGURE_OPTS}/g" ${origdir}/autotools/sub-configure.sh >configure.gnu
 		cd "$origdir"
 	done
 }
@@ -94,7 +94,7 @@ case `uname -s` in
 esac
 
 $LIBTOOLIZE --force --copy
-aclocal -I m4 --install
+aclocal -I autotools/m4 --install
 $SED -i -e 's/PKG_PROG_PKG_CONFIG(\[0\.16\])/PKG_PROG_PKG_CONFIG([0.14])/g' aclocal.m4
 
 include_automake_from_dir_if_exists debian
diff --git a/Mk/CMakeLists.txt b/autotools/Mk/CMakeLists.txt
similarity index 100%
rename from Mk/CMakeLists.txt
rename to autotools/Mk/CMakeLists.txt
diff --git a/autotools/Mk/Makefile.am b/autotools/Mk/Makefile.am
new file mode 100644
index 0000000000..96d77d7d0d
--- /dev/null
+++ b/autotools/Mk/Makefile.am
@@ -0,0 +1,12 @@
+EXTRA_DIST	+= autotools/Mk/lex-rules.am \
+		autotools/Mk/find-top-builddir.sh \
+		autotools/Mk/populate-makefiles.sh \
+		autotools/Mk/subdir.mk	\
+		autotools/Mk/CMakeLists.txt
+
+tools_DATA	= \
+		autotools/Mk/lex-rules.am \
+		lib/cfg-grammar.y
+
+tools_SCRIPTS	= \
+		lib/merge-grammar.py
diff --git a/Mk/find-top-builddir.sh b/autotools/Mk/find-top-builddir.sh
similarity index 100%
rename from Mk/find-top-builddir.sh
rename to autotools/Mk/find-top-builddir.sh
diff --git a/Mk/lex-rules.am b/autotools/Mk/lex-rules.am
similarity index 100%
rename from Mk/lex-rules.am
rename to autotools/Mk/lex-rules.am
diff --git a/Mk/populate-makefiles.sh b/autotools/Mk/populate-makefiles.sh
similarity index 70%
rename from Mk/populate-makefiles.sh
rename to autotools/Mk/populate-makefiles.sh
index 13f99fc364..40756813f0 100755
--- a/Mk/populate-makefiles.sh
+++ b/autotools/Mk/populate-makefiles.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 
-root=$(cd $(dirname $0) && cd .. && pwd)
+root=$(cd $(dirname $0) && cd ../.. && pwd)
 
 populate() {
         mfam="$1"
         dir="$(dirname ${mfam})"
         if [ "${dir}" != "." ] && [ "${dir}" != "${root}" ] && [ -d "${dir}" ]; then
-                echo "${root}/Mk/subdir.mk" "=>" "${dir}/Makefile"
-                ln -sf "${root}/Mk/subdir.mk" "${dir}/Makefile"
+                echo "${root}/autotools/Mk/subdir.mk" "=>" "${dir}/Makefile"
+                ln -sf "${root}/autotools/Mk/subdir.mk" "${dir}/Makefile"
         fi
         if [ -e "${root}/${dir}/Makefile.am" ]; then
                 incs=$(grep "^include" "${root}/${dir}/Makefile.am" | sed -e "s,^include ,,")
diff --git a/Mk/python-venv.am b/autotools/Mk/python-venv.am
similarity index 100%
rename from Mk/python-venv.am
rename to autotools/Mk/python-venv.am
diff --git a/Mk/subdir.mk b/autotools/Mk/subdir.mk
similarity index 96%
rename from Mk/subdir.mk
rename to autotools/Mk/subdir.mk
index 41ba42e7c3..f1ae8d75ac 100644
--- a/Mk/subdir.mk
+++ b/autotools/Mk/subdir.mk
@@ -1,5 +1,5 @@
 top_srcdir	= $(dir $(shell readlink ${MAKEFILE_LIST}))../
-top_builddir	= $(shell ${top_srcdir}/Mk/find-top-builddir.sh)
+top_builddir	= $(shell ${top_srcdir}/autotools/Mk/find-top-builddir.sh)
 
 self		= $(subst ${top_builddir}/,,${CURDIR})
 self_sub	= $(subst -,_,$(subst /,_,${self}))
diff --git a/dist.conf.in b/autotools/dist.conf.in
similarity index 100%
rename from dist.conf.in
rename to autotools/dist.conf.in
diff --git a/m4/_ax_valgrind_check.m4 b/autotools/m4/_ax_valgrind_check.m4
similarity index 100%
rename from m4/_ax_valgrind_check.m4
rename to autotools/m4/_ax_valgrind_check.m4
diff --git a/m4/ax_cflags_gcc_option.m4 b/autotools/m4/ax_cflags_gcc_option.m4
similarity index 100%
rename from m4/ax_cflags_gcc_option.m4
rename to autotools/m4/ax_cflags_gcc_option.m4
diff --git a/m4/ax_require_defined.m4 b/autotools/m4/ax_require_defined.m4
similarity index 100%
rename from m4/ax_require_defined.m4
rename to autotools/m4/ax_require_defined.m4
diff --git a/m4/check_java_support.m4 b/autotools/m4/check_java_support.m4
similarity index 100%
rename from m4/check_java_support.m4
rename to autotools/m4/check_java_support.m4
diff --git a/m4/m4_esyscmd_s.m4 b/autotools/m4/m4_esyscmd_s.m4
similarity index 100%
rename from m4/m4_esyscmd_s.m4
rename to autotools/m4/m4_esyscmd_s.m4
diff --git a/sub-configure.sh b/autotools/sub-configure.sh
similarity index 100%
rename from sub-configure.sh
rename to autotools/sub-configure.sh
diff --git a/syslog-ng-native-connector.pc.in b/autotools/syslog-ng-native-connector.pc.in
similarity index 100%
rename from syslog-ng-native-connector.pc.in
rename to autotools/syslog-ng-native-connector.pc.in
diff --git a/syslog-ng.pc.in b/autotools/syslog-ng.pc.in
similarity index 100%
rename from syslog-ng.pc.in
rename to autotools/syslog-ng.pc.in
diff --git a/syslog-ng-config.h.in b/cmake/syslog-ng-config.h.in
similarity index 100%
rename from syslog-ng-config.h.in
rename to cmake/syslog-ng-config.h.in
diff --git a/syslog-ng-native-connector.pc.cmake b/cmake/syslog-ng-native-connector.pc.cmake
similarity index 100%
rename from syslog-ng-native-connector.pc.cmake
rename to cmake/syslog-ng-native-connector.pc.cmake
diff --git a/syslog-ng.pc.cmake b/cmake/syslog-ng.pc.cmake
similarity index 100%
rename from syslog-ng.pc.cmake
rename to cmake/syslog-ng.pc.cmake
diff --git a/configure.ac b/configure.ac
index d235e7ee42..ca1ee34e50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ dnl
 
 AC_INIT([axosyslog], m4_esyscmd_s([scripts/version.sh]))
 AC_CONFIG_SRCDIR([syslog-ng/main.c])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([autotools/m4])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl ***************************************************************************
@@ -68,10 +68,10 @@ dnl Initial setup
 
 ostype=`uname -s`
 
-if test -r $srcdir/dist.conf; then
+if test -r $srcdir/autotools/dist.conf; then
         # read defaults, dist.conf does not change
         # values for parameters that are already set
-        . $srcdir/dist.conf
+        . $srcdir/autotools/dist.conf
 fi
 
 if test -z "$RELEASE_TAG"; then
@@ -1709,7 +1709,7 @@ CFLAGS=$old_CFLAGS
 
 
 if test "x$enable_native" = "xyes" -o "x$enable_native" = "xauto"; then
-    AC_CONFIG_FILES([syslog-ng-native-connector.pc])
+    AC_CONFIG_FILES([autotools/syslog-ng-native-connector.pc])
 fi
 
 dnl ***************************************************************************
@@ -2366,9 +2366,9 @@ AC_SUBST(XSL_STYLESHEET)
 AX_PREFIX_CONFIG_H(syslog-ng-config.h, "SYSLOG_NG")
 AX_VALGRIND_CHECK
 
-AC_OUTPUT(dist.conf
+AC_OUTPUT(autotools/dist.conf
           Makefile
-	  syslog-ng.pc
+	  autotools/syslog-ng.pc
           libtest/syslog-ng-test.pc
 	  scripts/update-patterndb
 	  scripts/syslog-ng-update-virtualenv
diff --git a/dev-utils/plugin_skeleton_creator/Makefile.am b/dev-utils/plugin_skeleton_creator/Makefile.am
deleted file mode 100644
index 12289c9f92..0000000000
--- a/dev-utils/plugin_skeleton_creator/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-EXTRA_DIST +=	\
-	dev-utils/plugin_skeleton_creator	\
-	dev-utils/plugin_skeleton_creator/create_plugin.sh	\
-	dev-utils/plugin_skeleton_creator/plugin_template_CMakeLists.txt	\
-	dev-utils/plugin_skeleton_creator/plugin_template_grammar.ym	\
-	dev-utils/plugin_skeleton_creator/plugin_template_Makefile.am	\
-	dev-utils/plugin_skeleton_creator/plugin_template_parser.c	\
-	dev-utils/plugin_skeleton_creator/plugin_template_parser.h	\
-	dev-utils/plugin_skeleton_creator/plugin_template_plugin.c
diff --git a/docs/axoflow-logo-color.svg b/doc/axoflow-logo-color.svg
similarity index 100%
rename from docs/axoflow-logo-color.svg
rename to doc/axoflow-logo-color.svg
diff --git a/docs/axoflow-logo-white.svg b/doc/axoflow-logo-white.svg
similarity index 100%
rename from docs/axoflow-logo-white.svg
rename to doc/axoflow-logo-white.svg
diff --git a/docs/axosyslog-white.svg b/doc/axosyslog-white.svg
similarity index 100%
rename from docs/axosyslog-white.svg
rename to doc/axosyslog-white.svg
diff --git a/docs/axosyslog.svg b/doc/axosyslog.svg
similarity index 100%
rename from docs/axosyslog.svg
rename to doc/axosyslog.svg
diff --git a/modules/native/CMakeLists.txt b/modules/native/CMakeLists.txt
index 9ee432a4c5..1014a3588a 100644
--- a/modules/native/CMakeLists.txt
+++ b/modules/native/CMakeLists.txt
@@ -28,7 +28,7 @@ if (ENABLE_NATIVE)
   set(PKG_CONFIG_LIBDIR "\${exec_prefix}/lib")
   set(PKG_CONFIG_LIBS "-L\${libdir} -lsyslog-ng-native-connector")
 
-  configure_file (${PROJECT_SOURCE_DIR}/syslog-ng-native-connector.pc.cmake ${PROJECT_BINARY_DIR}/syslog-ng-native-connector.pc)
+  configure_file (${PROJECT_SOURCE_DIR}/cmake/syslog-ng-native-connector.pc.cmake ${PROJECT_BINARY_DIR}/syslog-ng-native-connector.pc)
   install(FILES ${PROJECT_BINARY_DIR}/syslog-ng-native-connector.pc
           DESTINATION lib/pkgconfig
           COMPONENT native-connector)
diff --git a/modules/native/Makefile.am b/modules/native/Makefile.am
index 756fe60339..cadee33744 100644
--- a/modules/native/Makefile.am
+++ b/modules/native/Makefile.am
@@ -11,7 +11,7 @@ modules_native_libsyslog_ng_native_connector_a_SOURCES = \
   modules/native/parser.c				\
   modules/native/parser.h
 
-pkgconfig_DATA += syslog-ng-native-connector.pc
+pkgconfig_DATA += autotools/syslog-ng-native-connector.pc
 
 modules_native_libsyslog_ng_native_connector_a_CPPFLAGS = \
   $(AM_CPPFLAGS)	-fPIC	\
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4a6066fc2b..99661f474b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -13,3 +13,6 @@ EXTRA_DIST	+= scripts/update-patterndb.in \
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/patterndb.d
+
+
+include scripts/plugin-skeleton-creator/Makefile.am
diff --git a/scripts/plugin-skeleton-creator/Makefile.am b/scripts/plugin-skeleton-creator/Makefile.am
new file mode 100644
index 0000000000..06bce6ea85
--- /dev/null
+++ b/scripts/plugin-skeleton-creator/Makefile.am
@@ -0,0 +1,9 @@
+EXTRA_DIST +=	\
+	scripts/plugin-skeleton-creator	\
+	scripts/plugin-skeleton-creator/create_plugin.sh	\
+	scripts/plugin-skeleton-creator/plugin_template_CMakeLists.txt	\
+	scripts/plugin-skeleton-creator/plugin_template_grammar.ym	\
+	scripts/plugin-skeleton-creator/plugin_template_Makefile.am	\
+	scripts/plugin-skeleton-creator/plugin_template_parser.c	\
+	scripts/plugin-skeleton-creator/plugin_template_parser.h	\
+	scripts/plugin-skeleton-creator/plugin_template_plugin.c
diff --git a/dev-utils/plugin_skeleton_creator/create_plugin.sh b/scripts/plugin-skeleton-creator/create_plugin.sh
similarity index 100%
rename from dev-utils/plugin_skeleton_creator/create_plugin.sh
rename to scripts/plugin-skeleton-creator/create_plugin.sh
diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_CMakeLists.txt b/scripts/plugin-skeleton-creator/plugin_template_CMakeLists.txt
similarity index 100%
rename from dev-utils/plugin_skeleton_creator/plugin_template_CMakeLists.txt
rename to scripts/plugin-skeleton-creator/plugin_template_CMakeLists.txt
diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_Makefile.am b/scripts/plugin-skeleton-creator/plugin_template_Makefile.am
similarity index 100%
rename from dev-utils/plugin_skeleton_creator/plugin_template_Makefile.am
rename to scripts/plugin-skeleton-creator/plugin_template_Makefile.am
diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_grammar.ym b/scripts/plugin-skeleton-creator/plugin_template_grammar.ym
similarity index 100%
rename from dev-utils/plugin_skeleton_creator/plugin_template_grammar.ym
rename to scripts/plugin-skeleton-creator/plugin_template_grammar.ym
diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_parser.c b/scripts/plugin-skeleton-creator/plugin_template_parser.c
similarity index 100%
rename from dev-utils/plugin_skeleton_creator/plugin_template_parser.c
rename to scripts/plugin-skeleton-creator/plugin_template_parser.c
diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_parser.h b/scripts/plugin-skeleton-creator/plugin_template_parser.h
similarity index 100%
rename from dev-utils/plugin_skeleton_creator/plugin_template_parser.h
rename to scripts/plugin-skeleton-creator/plugin_template_parser.h
diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_plugin.c b/scripts/plugin-skeleton-creator/plugin_template_plugin.c
similarity index 100%
rename from dev-utils/plugin_skeleton_creator/plugin_template_plugin.c
rename to scripts/plugin-skeleton-creator/plugin_template_plugin.c
diff --git a/syslog-ng.supp b/syslog-ng.supp
deleted file mode 100644
index 48fda27491..0000000000
--- a/syslog-ng.supp
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-   json_hashlittle
-   Memcheck:Addr4
-   fun:hashlittle
-   fun:lh_char_hash
-}
diff --git a/tests/copyright/policy b/tests/copyright/policy
index 7322fef8df..999a50192e 100644
--- a/tests/copyright/policy
+++ b/tests/copyright/policy
@@ -19,7 +19,7 @@ modules/grpc/protos/opentelemetry-proto
 modules/grpc/protos/grafana-loki
 modules/grpc/protos/googleapis-proto
 modules/cloud-auth/jwt-cpp
-dev-utils/plugin_skeleton_creator/plugin_template.*
+scripts/plugin-skeleton-creator/plugin_template.*
 (lib|modules)/.*\.conf$
 dist\.conf$
 .*/\.gradle
@@ -30,8 +30,7 @@ tests/copyright/policy$
 lib/cfg-lex\.[ch]$
 tgz2build
 autom4te\.cache
-m4
-Mk
+autotools
 .*\.(a|bin|class|css|dirstamp|html|idx|jar|js|o|la|lai|lo|MF|persist|Plo|Po|pc|pyc|so|so\.0\.0\.0|soT|spec|trs)$
 (.*/)?Makefile$
 doc/man
@@ -64,7 +63,7 @@ lib/logmsg/tests/messages/syslog-ng-(pe-)?[.0-9]*-msg.h$
 modules/python-modules/requirements\.lock
 scl/darwinosl/darwinosl-metadata-db.csv
 lib/multi-line/smart-multi-line\.fsm$
-docs/.*$
+doc/.*\.svg$
 charts/.*$
 docker/.*$
 
@@ -154,7 +153,7 @@ lib/tests/test_zone\.c
 ###########################################################################
                                                  LGPLv2.1+_SSL
 autogen\.sh$
-sub-configure\.sh$
+autotools/sub-configure\.sh$
 configure\.ac$
 Makefile\.am$
 lib/(compat|str-repr|timeutils|control|debugger|filter|logproto|multi-line|parser|rewrite|stats|template|tests|transport|logmsg|value-pairs|secret-storage|logthrdest|logthrsource|ack-tracker|signal-slot-connector|[^/]*$)
@@ -284,7 +283,7 @@ packaging/package-indexer/cdn/cloudflare_cdn.py
 
 news/create-newsfile.py
 news/next-pr-id.py
-dev-utils/plugin_skeleton_creator/create_plugin.sh
+scripts/plugin-skeleton-creator/create_plugin.sh
 tests/functional
 tests/unit
 tests/valgrind