diff --git a/Makefile.am b/Makefile.am
index 829db7e9ef..54cc5096f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -946,9 +946,9 @@ pkginclude_HEADERS += \
 
 # ------------------------------------------------------------------------------
 systemd_shutdown_SOURCES = \
-	src/umount.c \
-	src/umount.h \
-	src/shutdown.c
+	src/core/umount.c \
+	src/core/umount.h \
+	src/core/shutdown.c
 
 systemd_shutdown_LDADD = \
 	libsystemd-label.la \
diff --git a/src/shutdown.c b/src/core/shutdown.c
similarity index 100%
rename from src/shutdown.c
rename to src/core/shutdown.c
diff --git a/src/umount.c b/src/core/umount.c
similarity index 100%
rename from src/umount.c
rename to src/core/umount.c
diff --git a/src/umount.h b/src/core/umount.h
similarity index 100%
rename from src/umount.h
rename to src/core/umount.h