diff --git a/Makefile.am b/Makefile.am
index 745560b5..0f0785b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,7 @@ libglnx_libs := $(BASE_LIBS)
 include libglnx/Makefile-libglnx.am.inc
 
 include common/Makefile.am.inc
-include builder/Makefile.am.inc
+include src/Makefile.am.inc
 include tests/Makefile.am.inc
 
 EXTRA_DIST += README.md
diff --git a/builder/Makefile.am.inc b/builder/Makefile.am.inc
deleted file mode 100644
index a9592f05..00000000
--- a/builder/Makefile.am.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-bin_PROGRAMS += \
-	flatpak-builder \
-	$(NULL)
-
-flatpak_builder_SOURCES = \
-	builder/builder-main.c \
-	builder/builder-manifest.c \
-	builder/builder-manifest.h \
-	builder/builder-options.c \
-	builder/builder-options.h \
-	builder/builder-extension.c \
-	builder/builder-extension.h \
-	builder/builder-module.c \
-	builder/builder-module.h \
-	builder/builder-post-process.c \
-	builder/builder-post-process.h \
-	builder/builder-source.c \
-	builder/builder-source.h \
-	builder/builder-source-archive.c \
-	builder/builder-source-archive.h \
-	builder/builder-source-git.c \
-	builder/builder-source-git.h \
-	builder/builder-source-bzr.c \
-	builder/builder-source-bzr.h \
-	builder/builder-source-file.c \
-	builder/builder-source-file.h \
-	builder/builder-source-script.c \
-	builder/builder-source-script.h \
-	builder/builder-source-shell.c \
-	builder/builder-source-shell.h \
-	builder/builder-source-patch.c \
-	builder/builder-source-patch.h \
-	builder/builder-context.c \
-	builder/builder-context.h \
-	builder/builder-cache.c \
-	builder/builder-cache.h \
-	builder/builder-utils.c \
-	builder/builder-utils.h \
-	builder/builder-git.c \
-	builder/builder-git.h \
-	$(NULL)
-
-flatpak_builder_LDADD = $(AM_LDADD) $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBELF_LIBS) \
-			libglnx.la libflatpak-common.la
-flatpak_builder_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS)
diff --git a/src/Makefile.am.inc b/src/Makefile.am.inc
new file mode 100644
index 00000000..d6597f1e
--- /dev/null
+++ b/src/Makefile.am.inc
@@ -0,0 +1,45 @@
+bin_PROGRAMS += \
+	flatpak-builder \
+	$(NULL)
+
+flatpak_builder_SOURCES = \
+	src/builder-main.c \
+	src/builder-manifest.c \
+	src/builder-manifest.h \
+	src/builder-options.c \
+	src/builder-options.h \
+	src/builder-extension.c \
+	src/builder-extension.h \
+	src/builder-module.c \
+	src/builder-module.h \
+	src/builder-post-process.c \
+	src/builder-post-process.h \
+	src/builder-source.c \
+	src/builder-source.h \
+	src/builder-source-archive.c \
+	src/builder-source-archive.h \
+	src/builder-source-git.c \
+	src/builder-source-git.h \
+	src/builder-source-bzr.c \
+	src/builder-source-bzr.h \
+	src/builder-source-file.c \
+	src/builder-source-file.h \
+	src/builder-source-script.c \
+	src/builder-source-script.h \
+	src/builder-source-shell.c \
+	src/builder-source-shell.h \
+	src/builder-source-patch.c \
+	src/builder-source-patch.h \
+	src/builder-context.c \
+	src/builder-context.h \
+	src/builder-cache.c \
+	src/builder-cache.h \
+	src/builder-utils.c \
+	src/builder-utils.h \
+	src/builder-git.c \
+	src/builder-git.h \
+	$(NULL)
+
+flatpak_builder_LDADD = $(AM_LDADD) $(BASE_LIBS) $(OSTREE_LIBS) $(JSON_LIBS) $(SOUP_LIBS) $(LIBELF_LIBS) \
+			libglnx.la libflatpak-common.la
+flatpak_builder_CFLAGS = $(AM_CFLAGS) $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(JSON_CFLAGS) $(SOUP_CFLAGS)
diff --git a/builder/builder-cache.c b/src/builder-cache.c
similarity index 100%
rename from builder/builder-cache.c
rename to src/builder-cache.c
diff --git a/builder/builder-cache.h b/src/builder-cache.h
similarity index 100%
rename from builder/builder-cache.h
rename to src/builder-cache.h
diff --git a/builder/builder-context.c b/src/builder-context.c
similarity index 100%
rename from builder/builder-context.c
rename to src/builder-context.c
diff --git a/builder/builder-context.h b/src/builder-context.h
similarity index 100%
rename from builder/builder-context.h
rename to src/builder-context.h
diff --git a/builder/builder-extension.c b/src/builder-extension.c
similarity index 100%
rename from builder/builder-extension.c
rename to src/builder-extension.c
diff --git a/builder/builder-extension.h b/src/builder-extension.h
similarity index 100%
rename from builder/builder-extension.h
rename to src/builder-extension.h
diff --git a/builder/builder-git.c b/src/builder-git.c
similarity index 100%
rename from builder/builder-git.c
rename to src/builder-git.c
diff --git a/builder/builder-git.h b/src/builder-git.h
similarity index 100%
rename from builder/builder-git.h
rename to src/builder-git.h
diff --git a/builder/builder-main.c b/src/builder-main.c
similarity index 100%
rename from builder/builder-main.c
rename to src/builder-main.c
diff --git a/builder/builder-manifest.c b/src/builder-manifest.c
similarity index 100%
rename from builder/builder-manifest.c
rename to src/builder-manifest.c
diff --git a/builder/builder-manifest.h b/src/builder-manifest.h
similarity index 100%
rename from builder/builder-manifest.h
rename to src/builder-manifest.h
diff --git a/builder/builder-module.c b/src/builder-module.c
similarity index 100%
rename from builder/builder-module.c
rename to src/builder-module.c
diff --git a/builder/builder-module.h b/src/builder-module.h
similarity index 100%
rename from builder/builder-module.h
rename to src/builder-module.h
diff --git a/builder/builder-options.c b/src/builder-options.c
similarity index 100%
rename from builder/builder-options.c
rename to src/builder-options.c
diff --git a/builder/builder-options.h b/src/builder-options.h
similarity index 100%
rename from builder/builder-options.h
rename to src/builder-options.h
diff --git a/builder/builder-post-process.c b/src/builder-post-process.c
similarity index 100%
rename from builder/builder-post-process.c
rename to src/builder-post-process.c
diff --git a/builder/builder-post-process.h b/src/builder-post-process.h
similarity index 100%
rename from builder/builder-post-process.h
rename to src/builder-post-process.h
diff --git a/builder/builder-source-archive.c b/src/builder-source-archive.c
similarity index 100%
rename from builder/builder-source-archive.c
rename to src/builder-source-archive.c
diff --git a/builder/builder-source-archive.h b/src/builder-source-archive.h
similarity index 100%
rename from builder/builder-source-archive.h
rename to src/builder-source-archive.h
diff --git a/builder/builder-source-bzr.c b/src/builder-source-bzr.c
similarity index 100%
rename from builder/builder-source-bzr.c
rename to src/builder-source-bzr.c
diff --git a/builder/builder-source-bzr.h b/src/builder-source-bzr.h
similarity index 100%
rename from builder/builder-source-bzr.h
rename to src/builder-source-bzr.h
diff --git a/builder/builder-source-file.c b/src/builder-source-file.c
similarity index 100%
rename from builder/builder-source-file.c
rename to src/builder-source-file.c
diff --git a/builder/builder-source-file.h b/src/builder-source-file.h
similarity index 100%
rename from builder/builder-source-file.h
rename to src/builder-source-file.h
diff --git a/builder/builder-source-git.c b/src/builder-source-git.c
similarity index 100%
rename from builder/builder-source-git.c
rename to src/builder-source-git.c
diff --git a/builder/builder-source-git.h b/src/builder-source-git.h
similarity index 100%
rename from builder/builder-source-git.h
rename to src/builder-source-git.h
diff --git a/builder/builder-source-patch.c b/src/builder-source-patch.c
similarity index 100%
rename from builder/builder-source-patch.c
rename to src/builder-source-patch.c
diff --git a/builder/builder-source-patch.h b/src/builder-source-patch.h
similarity index 100%
rename from builder/builder-source-patch.h
rename to src/builder-source-patch.h
diff --git a/builder/builder-source-script.c b/src/builder-source-script.c
similarity index 100%
rename from builder/builder-source-script.c
rename to src/builder-source-script.c
diff --git a/builder/builder-source-script.h b/src/builder-source-script.h
similarity index 100%
rename from builder/builder-source-script.h
rename to src/builder-source-script.h
diff --git a/builder/builder-source-shell.c b/src/builder-source-shell.c
similarity index 100%
rename from builder/builder-source-shell.c
rename to src/builder-source-shell.c
diff --git a/builder/builder-source-shell.h b/src/builder-source-shell.h
similarity index 100%
rename from builder/builder-source-shell.h
rename to src/builder-source-shell.h
diff --git a/builder/builder-source.c b/src/builder-source.c
similarity index 100%
rename from builder/builder-source.c
rename to src/builder-source.c
diff --git a/builder/builder-source.h b/src/builder-source.h
similarity index 100%
rename from builder/builder-source.h
rename to src/builder-source.h
diff --git a/builder/builder-utils.c b/src/builder-utils.c
similarity index 100%
rename from builder/builder-utils.c
rename to src/builder-utils.c
diff --git a/builder/builder-utils.h b/src/builder-utils.h
similarity index 100%
rename from builder/builder-utils.h
rename to src/builder-utils.h