diff --git a/configure.ac b/configure.ac
index 0ed6517..837180d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -639,17 +639,18 @@
 
 # Create configured output
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([bmc/Makefile bmc/test/Makefile])
+AC_CONFIG_FILES([bmc/Makefile])
+AC_CONFIG_FILES([bmc/firmware-handler/Makefile bmc/firmware-handler/test/Makefile])
 AC_CONFIG_FILES([tools/Makefile tools/test/Makefile])
 AC_CONFIG_FILES([cleanup/Makefile cleanup/test/Makefile])
-AC_CONFIG_FILES([bmc/phosphor-ipmi-flash-bmc-prepare.target])
-AC_CONFIG_FILES([bmc/phosphor-ipmi-flash-bmc-verify.target])
-AC_CONFIG_FILES([bmc/phosphor-ipmi-flash-bmc-update.target])
-AC_CONFIG_FILES([bmc/phosphor-ipmi-flash-bios-prepare.target])
-AC_CONFIG_FILES([bmc/phosphor-ipmi-flash-bios-verify.target])
-AC_CONFIG_FILES([bmc/phosphor-ipmi-flash-bios-update.target])
-AC_CONFIG_FILES([bmc/config-static-bmc-reboot.json])
-AC_CONFIG_FILES([bmc/config-static-bmc.json])
-AC_CONFIG_FILES([bmc/config-static-bmc-with-update-status.json])
-AC_CONFIG_FILES([bmc/config-bios.json])
+AC_CONFIG_FILES([bmc/firmware-handler/phosphor-ipmi-flash-bmc-prepare.target])
+AC_CONFIG_FILES([bmc/firmware-handler/phosphor-ipmi-flash-bmc-verify.target])
+AC_CONFIG_FILES([bmc/firmware-handler/phosphor-ipmi-flash-bmc-update.target])
+AC_CONFIG_FILES([bmc/firmware-handler/phosphor-ipmi-flash-bios-prepare.target])
+AC_CONFIG_FILES([bmc/firmware-handler/phosphor-ipmi-flash-bios-verify.target])
+AC_CONFIG_FILES([bmc/firmware-handler/phosphor-ipmi-flash-bios-update.target])
+AC_CONFIG_FILES([bmc/firmware-handler/config-static-bmc-reboot.json])
+AC_CONFIG_FILES([bmc/firmware-handler/config-static-bmc.json])
+AC_CONFIG_FILES([bmc/firmware-handler/config-static-bmc-with-update-status.json])
+AC_CONFIG_FILES([bmc/firmware-handler/config-bios.json])
 AC_OUTPUT