diff --git a/src/confd/configure.ac b/src/confd/configure.ac
index 3dd88cc8..16533f14 100644
--- a/src/confd/configure.ac
+++ b/src/confd/configure.ac
@@ -6,7 +6,6 @@ AM_SILENT_RULES(yes)
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
-	src/confd/Makefile
 	yang/Makefile
 ])
 
diff --git a/src/confd/src/Makefile.am b/src/confd/src/Makefile.am
index fa478382..d19137b7 100644
--- a/src/confd/src/Makefile.am
+++ b/src/confd/src/Makefile.am
@@ -1,3 +1,50 @@
-AUTOMAKE_OPTIONS = subdir-objects
+CFLAGS                 += -Wall -Wextra -Werror -Wno-unused-parameter
+AM_CPPFLAGS             = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE -DYANG_PATH_=\"$(YANGDIR)\"
 
-SUBDIRS = confd
+plugindir               = $(srpdplugindir)
+plugin_LTLIBRARIES      = confd-plugin.la
+
+confd_plugin_la_LDFLAGS = -module -avoid-version -shared
+
+confd_plugin_la_CFLAGS  =			\
+	$(augeas_CFLAGS)			\
+	$(glib_CFLAGS)				\
+	$(jansson_CFLAGS)			\
+	$(libite_CFLAGS)			\
+	$(sysrepo_CFLAGS)			\
+	$(libsrx_CFLAGS)			\
+	$(CFLAGS)
+
+confd_plugin_la_LIBADD  =			\
+	$(augeas_LIBS)				\
+	$(glib_LIBS)				\
+	$(jansson_LIBS)				\
+	$(libite_LIBS)				\
+	$(sysrepo_LIBS)				\
+	$(libsrx_LIBS)
+
+confd_plugin_la_SOURCES =			\
+	core.c		core.h			\
+	dagger.c	dagger.h		\
+	ietf-interfaces.c			\
+	ietf-system.c				\
+	infix-dhcp.c				\
+	infix-factory.c				\
+	infix-system-software.c
+
+rauc_installer_sources = \
+	rauc-installer.c rauc-installer.h
+
+BUILT_SOURCES = $(rauc_installer_sources)
+EXTRA_DIST    = de.pengutronix.rauc.Installer.xml
+
+$(rauc_installer_sources): de.pengutronix.rauc.Installer.xml
+	$(AM_V_GEN) gdbus-codegen			\
+		--generate-c-code rauc-installer	\
+		--c-generate-autocleanup all		\
+		--c-namespace Rauc			\
+		--interface-prefix de.pengutronix.rauc.	\
+		$<
+
+nodist_confd_plugin_la_SOURCES = \
+	$(rauc_installer_sources)
diff --git a/src/confd/src/confd/Makefile.am b/src/confd/src/confd/Makefile.am
deleted file mode 100644
index 2e409b4e..00000000
--- a/src/confd/src/confd/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-CFLAGS                 += -Wall -Wextra -Werror -Wno-unused-parameter
-AM_CPPFLAGS             = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE -DYANG_PATH_=\"$(YANGDIR)\"
-
-plugindir               = $(srpdplugindir)
-plugin_LTLIBRARIES      = confd-plugin.la
-
-confd_plugin_la_LDFLAGS = -module -avoid-version -shared
-
-confd_plugin_la_CFLAGS  =			\
-	$(augeas_CFLAGS)			\
-	$(glib_CFLAGS)				\
-	$(jansson_CFLAGS)			\
-	$(libite_CFLAGS)			\
-	$(sysrepo_CFLAGS)			\
-	$(libsrx_CFLAGS)			\
-	$(CFLAGS)
-
-confd_plugin_la_LIBADD  =			\
-	$(augeas_LIBS)				\
-	$(glib_LIBS)				\
-	$(jansson_LIBS)				\
-	$(libite_LIBS)				\
-	$(sysrepo_LIBS)				\
-	$(libsrx_LIBS)
-
-rauc_installer_sources = \
-	rauc-installer.c \
-	rauc-installer.h
-
-BUILT_SOURCES = $(rauc_installer_sources)
-EXTRA_DIST = ../lib/de.pengutronix.rauc.Installer.xml
-
-$(rauc_installer_sources): ../lib/de.pengutronix.rauc.Installer.xml
-	$(AM_V_GEN) gdbus-codegen			\
-		--generate-c-code rauc-installer	\
-		--c-generate-autocleanup all		\
-		--c-namespace Rauc			\
-		--interface-prefix de.pengutronix.rauc.	\
-		$<
-
-nodist_confd_plugin_la_SOURCES = \
-	$(rauc_installer_sources)
-
-confd_plugin_la_SOURCES =			\
-	ietf-interfaces.c			\
-	ietf-system.c				\
-	infix-dhcp.c				\
-	infix-factory.c				\
-	infix-system-software.c			\
-	core.c		core.h			\
-	dagger.c	dagger.h
diff --git a/src/confd/src/confd/core.c b/src/confd/src/core.c
similarity index 100%
rename from src/confd/src/confd/core.c
rename to src/confd/src/core.c
diff --git a/src/confd/src/confd/core.h b/src/confd/src/core.h
similarity index 100%
rename from src/confd/src/confd/core.h
rename to src/confd/src/core.h
diff --git a/src/confd/src/confd/dagger.c b/src/confd/src/dagger.c
similarity index 100%
rename from src/confd/src/confd/dagger.c
rename to src/confd/src/dagger.c
diff --git a/src/confd/src/confd/dagger.h b/src/confd/src/dagger.h
similarity index 100%
rename from src/confd/src/confd/dagger.h
rename to src/confd/src/dagger.h
diff --git a/src/confd/src/lib/de.pengutronix.rauc.Installer.xml b/src/confd/src/de.pengutronix.rauc.Installer.xml
similarity index 100%
rename from src/confd/src/lib/de.pengutronix.rauc.Installer.xml
rename to src/confd/src/de.pengutronix.rauc.Installer.xml
diff --git a/src/confd/src/confd/ietf-interfaces.c b/src/confd/src/ietf-interfaces.c
similarity index 100%
rename from src/confd/src/confd/ietf-interfaces.c
rename to src/confd/src/ietf-interfaces.c
diff --git a/src/confd/src/confd/ietf-system.c b/src/confd/src/ietf-system.c
similarity index 100%
rename from src/confd/src/confd/ietf-system.c
rename to src/confd/src/ietf-system.c
diff --git a/src/confd/src/confd/infix-dhcp.c b/src/confd/src/infix-dhcp.c
similarity index 100%
rename from src/confd/src/confd/infix-dhcp.c
rename to src/confd/src/infix-dhcp.c
diff --git a/src/confd/src/confd/infix-factory.c b/src/confd/src/infix-factory.c
similarity index 100%
rename from src/confd/src/confd/infix-factory.c
rename to src/confd/src/infix-factory.c
diff --git a/src/confd/src/confd/infix-system-software.c b/src/confd/src/infix-system-software.c
similarity index 100%
rename from src/confd/src/confd/infix-system-software.c
rename to src/confd/src/infix-system-software.c