diff --git a/Makefile.am b/Makefile.am
index 7465a72..9a6b92f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,7 +110,7 @@
 	pid/util.cpp \
 	pid/pidloop.cpp \
 	pid/tuning.cpp \
-	build/buildjson.cpp \
+	buildjson/buildjson.cpp \
 	experiments/drive.cpp
 
 libmanualcmdsdir = ${libdir}/ipmid-providers
diff --git a/build/buildjson.cpp b/buildjson/buildjson.cpp
similarity index 97%
rename from build/buildjson.cpp
rename to buildjson/buildjson.cpp
index 14253e8..964cf08 100644
--- a/build/buildjson.cpp
+++ b/buildjson/buildjson.cpp
@@ -1,4 +1,4 @@
-#include "build/buildjson.hpp"
+#include "buildjson/buildjson.hpp"
 
 #include "errors/exception.hpp"
 
diff --git a/build/buildjson.hpp b/buildjson/buildjson.hpp
similarity index 100%
rename from build/buildjson.hpp
rename to buildjson/buildjson.hpp
diff --git a/main.cpp b/main.cpp
index 81c85a6..796c066 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,7 +16,7 @@
 
 #include "config.h"
 
-#include "build/buildjson.hpp"
+#include "buildjson/buildjson.hpp"
 #include "conf.hpp"
 #include "dbus/dbusconfiguration.hpp"
 #include "interfaces.hpp"
diff --git a/test/Makefile.am b/test/Makefile.am
index 7cb8014..f978fa2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -78,4 +78,4 @@
 pid_json_unittest_LDADD = $(top_builddir)/pid/buildjson.o
 
 json_parse_unittest_SOURCES = json_parse_unittest.cpp
-json_parse_unittest_LDADD = $(top_builddir)/build/buildjson.o
+json_parse_unittest_LDADD = $(top_builddir)/buildjson/buildjson.o
diff --git a/test/json_parse_unittest.cpp b/test/json_parse_unittest.cpp
index 3345163..f8967de 100644
--- a/test/json_parse_unittest.cpp
+++ b/test/json_parse_unittest.cpp
@@ -1,4 +1,4 @@
-#include "build/buildjson.hpp"
+#include "buildjson/buildjson.hpp"
 #include "errors/exception.hpp"
 
 #include <gmock/gmock.h>