diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index 4a489afc..9eefc146 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -20,51 +20,52 @@ bin_PROGRAMS += rpm-ostree
 noinst_LTLIBRARIES += librpmostree.la
 
 librpmostree_la_SOURCES = \
-	src/rpmostree-postprocess.c \
-	src/rpmostree-postprocess.h \
-	src/rpmostree-json-parsing.c \
-	src/rpmostree-json-parsing.h \
-	src/rpmostree-util.c \
-	src/rpmostree-util.h \
-	src/rpmostree-passwd-util.c \
-	src/rpmostree-passwd-util.h \
-	src/rpmostree-cleanup.h \
-	src/rpmostree-treepkgdiff.c \
-	src/rpmostree-treepkgdiff.h \
-	src/rpmostree-rpm-util.c \
-	src/rpmostree-rpm-util.h \
-	src/rpmostree-treepkgdiff.c \
-	src/rpmostree-treepkgdiff.h \
+	src/libpriv/rpmostree-postprocess.c \
+	src/libpriv/rpmostree-postprocess.h \
+	src/libpriv/rpmostree-json-parsing.c \
+	src/libpriv/rpmostree-json-parsing.h \
+	src/libpriv/rpmostree-util.c \
+	src/libpriv/rpmostree-util.h \
+	src/libpriv/rpmostree-passwd-util.c \
+	src/libpriv/rpmostree-passwd-util.h \
+	src/libpriv/rpmostree-cleanup.h \
+	src/libpriv/rpmostree-treepkgdiff.c \
+	src/libpriv/rpmostree-treepkgdiff.h \
+	src/libpriv/rpmostree-rpm-util.c \
+	src/libpriv/rpmostree-rpm-util.h \
+	src/libpriv/rpmostree-treepkgdiff.c \
+	src/libpriv/rpmostree-treepkgdiff.h \
 	$(NULL)
-librpmostree_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src -I$(libglnx_srcpath) -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
+librpmostree_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libpriv -I$(libglnx_srcpath) -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
 librpmostree_la_LIBADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) libglnx.la $(CAP_LIBS)
 
-rpm_ostree_SOURCES = src/main.c \
-	src/rpmostree-builtins.h \
-	src/rpmostree-db-builtins.h \
-	src/rpmostree-builtin-upgrade.c \
-	src/rpmostree-builtin-rollback.c \
-	src/rpmostree-builtin-rebase.c \
-	src/rpmostree-builtin-status.c \
-	src/rpmostree-builtin-db.c \
-	src/rpmostree-db-builtin-diff.c \
-	src/rpmostree-db-builtin-list.c \
-	src/rpmostree-db-builtin-version.c \
+rpm_ostree_SOURCES = src/app/main.c \
+	src/app/rpmostree-builtins.h \
+	src/app/rpmostree-db-builtins.h \
+	src/app/rpmostree-compose-builtins.h \
+	src/app/rpmostree-builtin-upgrade.c \
+	src/app/rpmostree-builtin-rollback.c \
+	src/app/rpmostree-builtin-rebase.c \
+	src/app/rpmostree-builtin-status.c \
+	src/app/rpmostree-builtin-db.c \
+	src/app/rpmostree-db-builtin-diff.c \
+	src/app/rpmostree-db-builtin-list.c \
+	src/app/rpmostree-db-builtin-version.c \
 	$(NULL)
 
 if BUILDOPT_COMPOSE_TOOLING
 rpm_ostree_SOURCES += \
-	src/rpmostree-compose-builtin-tree.c \
-	src/rpmostree-compose-builtin-sign.c \
-	src/rpmostree-builtin-compose.c \
+	src/app/rpmostree-compose-builtin-tree.c \
+	src/app/rpmostree-compose-builtin-sign.c \
+	src/app/rpmostree-builtin-compose.c \
 	$(NULL)
 endif
 
-rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src -I$(libglnx_srcpath) -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
+rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/app -I$(srcdir)/src/libpriv -I$(libglnx_srcpath) -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
 rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS)  libglnx.la librpmostree.la
 
 privdatadir=$(pkglibdir)
-privdata_DATA = src/tmpfiles-ostree-integration.conf
+privdata_DATA = src/app/tmpfiles-ostree-integration.conf
 
 if BUILDOPT_USRBINATOMIC
 INSTALL_DATA_HOOKS += install-usrbinatomic-hook
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 991996b1..4c76ea39 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/buildutil/glib-tap.mk
 
-tests_jsonutil_CPPFLAGS = -I $(srcdir)/src
+tests_jsonutil_CPPFLAGS = -I $(srcdir)/src/libpriv
 tests_jsonutil_CFLAGS = $(PKGDEP_RPMOSTREE_CFLAGS)
 tests_jsonutil_LDADD = $(PKGDEP_RPMOSTREE_LIBS) librpmostree.la
 
diff --git a/src/main.c b/src/app/main.c
similarity index 100%
rename from src/main.c
rename to src/app/main.c
diff --git a/src/rpmostree-builtin-compose.c b/src/app/rpmostree-builtin-compose.c
similarity index 100%
rename from src/rpmostree-builtin-compose.c
rename to src/app/rpmostree-builtin-compose.c
diff --git a/src/rpmostree-builtin-db.c b/src/app/rpmostree-builtin-db.c
similarity index 100%
rename from src/rpmostree-builtin-db.c
rename to src/app/rpmostree-builtin-db.c
diff --git a/src/rpmostree-builtin-rebase.c b/src/app/rpmostree-builtin-rebase.c
similarity index 100%
rename from src/rpmostree-builtin-rebase.c
rename to src/app/rpmostree-builtin-rebase.c
diff --git a/src/rpmostree-builtin-rollback.c b/src/app/rpmostree-builtin-rollback.c
similarity index 100%
rename from src/rpmostree-builtin-rollback.c
rename to src/app/rpmostree-builtin-rollback.c
diff --git a/src/rpmostree-builtin-status.c b/src/app/rpmostree-builtin-status.c
similarity index 100%
rename from src/rpmostree-builtin-status.c
rename to src/app/rpmostree-builtin-status.c
diff --git a/src/rpmostree-builtin-upgrade.c b/src/app/rpmostree-builtin-upgrade.c
similarity index 100%
rename from src/rpmostree-builtin-upgrade.c
rename to src/app/rpmostree-builtin-upgrade.c
diff --git a/src/rpmostree-builtins.h b/src/app/rpmostree-builtins.h
similarity index 100%
rename from src/rpmostree-builtins.h
rename to src/app/rpmostree-builtins.h
diff --git a/src/rpmostree-compose-builtin-sign.c b/src/app/rpmostree-compose-builtin-sign.c
similarity index 100%
rename from src/rpmostree-compose-builtin-sign.c
rename to src/app/rpmostree-compose-builtin-sign.c
diff --git a/src/rpmostree-compose-builtin-tree.c b/src/app/rpmostree-compose-builtin-tree.c
similarity index 100%
rename from src/rpmostree-compose-builtin-tree.c
rename to src/app/rpmostree-compose-builtin-tree.c
diff --git a/src/rpmostree-compose-builtins.h b/src/app/rpmostree-compose-builtins.h
similarity index 100%
rename from src/rpmostree-compose-builtins.h
rename to src/app/rpmostree-compose-builtins.h
diff --git a/src/rpmostree-db-builtin-diff.c b/src/app/rpmostree-db-builtin-diff.c
similarity index 100%
rename from src/rpmostree-db-builtin-diff.c
rename to src/app/rpmostree-db-builtin-diff.c
diff --git a/src/rpmostree-db-builtin-list.c b/src/app/rpmostree-db-builtin-list.c
similarity index 100%
rename from src/rpmostree-db-builtin-list.c
rename to src/app/rpmostree-db-builtin-list.c
diff --git a/src/rpmostree-db-builtin-version.c b/src/app/rpmostree-db-builtin-version.c
similarity index 100%
rename from src/rpmostree-db-builtin-version.c
rename to src/app/rpmostree-db-builtin-version.c
diff --git a/src/rpmostree-db-builtins.h b/src/app/rpmostree-db-builtins.h
similarity index 100%
rename from src/rpmostree-db-builtins.h
rename to src/app/rpmostree-db-builtins.h
diff --git a/src/tmpfiles-ostree-integration.conf b/src/app/tmpfiles-ostree-integration.conf
similarity index 100%
rename from src/tmpfiles-ostree-integration.conf
rename to src/app/tmpfiles-ostree-integration.conf
diff --git a/src/rpmostree-cleanup.h b/src/libpriv/rpmostree-cleanup.h
similarity index 100%
rename from src/rpmostree-cleanup.h
rename to src/libpriv/rpmostree-cleanup.h
diff --git a/src/rpmostree-json-parsing.c b/src/libpriv/rpmostree-json-parsing.c
similarity index 100%
rename from src/rpmostree-json-parsing.c
rename to src/libpriv/rpmostree-json-parsing.c
diff --git a/src/rpmostree-json-parsing.h b/src/libpriv/rpmostree-json-parsing.h
similarity index 100%
rename from src/rpmostree-json-parsing.h
rename to src/libpriv/rpmostree-json-parsing.h
diff --git a/src/rpmostree-passwd-util.c b/src/libpriv/rpmostree-passwd-util.c
similarity index 100%
rename from src/rpmostree-passwd-util.c
rename to src/libpriv/rpmostree-passwd-util.c
diff --git a/src/rpmostree-passwd-util.h b/src/libpriv/rpmostree-passwd-util.h
similarity index 100%
rename from src/rpmostree-passwd-util.h
rename to src/libpriv/rpmostree-passwd-util.h
diff --git a/src/rpmostree-postprocess.c b/src/libpriv/rpmostree-postprocess.c
similarity index 100%
rename from src/rpmostree-postprocess.c
rename to src/libpriv/rpmostree-postprocess.c
diff --git a/src/rpmostree-postprocess.h b/src/libpriv/rpmostree-postprocess.h
similarity index 100%
rename from src/rpmostree-postprocess.h
rename to src/libpriv/rpmostree-postprocess.h
diff --git a/src/rpmostree-rpm-util.c b/src/libpriv/rpmostree-rpm-util.c
similarity index 100%
rename from src/rpmostree-rpm-util.c
rename to src/libpriv/rpmostree-rpm-util.c
diff --git a/src/rpmostree-rpm-util.h b/src/libpriv/rpmostree-rpm-util.h
similarity index 100%
rename from src/rpmostree-rpm-util.h
rename to src/libpriv/rpmostree-rpm-util.h
diff --git a/src/rpmostree-treepkgdiff.c b/src/libpriv/rpmostree-treepkgdiff.c
similarity index 100%
rename from src/rpmostree-treepkgdiff.c
rename to src/libpriv/rpmostree-treepkgdiff.c
diff --git a/src/rpmostree-treepkgdiff.h b/src/libpriv/rpmostree-treepkgdiff.h
similarity index 100%
rename from src/rpmostree-treepkgdiff.h
rename to src/libpriv/rpmostree-treepkgdiff.h
diff --git a/src/rpmostree-util.c b/src/libpriv/rpmostree-util.c
similarity index 100%
rename from src/rpmostree-util.c
rename to src/libpriv/rpmostree-util.c
diff --git a/src/rpmostree-util.h b/src/libpriv/rpmostree-util.h
similarity index 100%
rename from src/rpmostree-util.h
rename to src/libpriv/rpmostree-util.h