diff --git a/Makefile.am b/Makefile.am
index ddca382..1008449 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,10 +27,7 @@
 	-flto
 
 nobase_include_HEADERS = \
-	blobs-ipmid/blobs.hpp \
-	blobs-ipmid/manager.hpp \
-	blobs-ipmid/test/blob_mock.hpp \
-	blobs-ipmid/test/manager_mock.hpp
+	blobs-ipmid/blobs.hpp
 
 # Install the blob handlers in ipmid-providers so you can leverage
 # meta-phosphor/blob/master/classes/obmc-phosphor-ipmiprovider-symlink.bbclass
diff --git a/example/example.cpp b/example/example.cpp
index cc36e88..dd7c486 100644
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -1,7 +1,6 @@
 #include "example/example.hpp"
 
 #include <algorithm>
-#include <blobs-ipmid/manager.hpp>
 #include <cstring>
 #include <memory>
 #include <phosphor-logging/log.hpp>
diff --git a/ipmi.hpp b/ipmi.hpp
index a09d347..93bc953 100644
--- a/ipmi.hpp
+++ b/ipmi.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "manager.hpp"
+
 #include <host-ipmid/ipmid-api.h>
 
-#include <blobs-ipmid/manager.hpp>
 #include <string>
 
 namespace blobs
diff --git a/main.cpp b/main.cpp
index bc93ddd..dd755e6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,12 +17,12 @@
 #include "config.h"
 
 #include "ipmi.hpp"
+#include "manager.hpp"
 #include "process.hpp"
 #include "utils.hpp"
 
 #include <host-ipmid/ipmid-api.h>
 
-#include <blobs-ipmid/manager.hpp>
 #include <cstdio>
 #include <host-ipmid/iana.hpp>
 #include <host-ipmid/oemopenbmc.hpp>
diff --git a/manager.cpp b/manager.cpp
index bc96b34..712d7db 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
+#include "manager.hpp"
+
 #include <algorithm>
-#include <blobs-ipmid/manager.hpp>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/blobs-ipmid/manager.hpp b/manager.hpp
similarity index 100%
rename from blobs-ipmid/manager.hpp
rename to manager.hpp
diff --git a/process.hpp b/process.hpp
index 0e377bc..af19b22 100644
--- a/process.hpp
+++ b/process.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "crc.hpp"
+#include "manager.hpp"
 
 #include <host-ipmid/ipmid-api.h>
 
-#include <blobs-ipmid/manager.hpp>
 #include <functional>
 
 namespace blobs
diff --git a/blobs-ipmid/test/blob_mock.hpp b/test/blob_mock.hpp
similarity index 100%
rename from blobs-ipmid/test/blob_mock.hpp
rename to test/blob_mock.hpp
diff --git a/test/ipmi_close_unittest.cpp b/test/ipmi_close_unittest.cpp
index edfddca..2fa22b2 100644
--- a/test/ipmi_close_unittest.cpp
+++ b/test/ipmi_close_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_commit_unittest.cpp b/test/ipmi_commit_unittest.cpp
index 30f78bf..85bd8f3 100644
--- a/test/ipmi_commit_unittest.cpp
+++ b/test/ipmi_commit_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_delete_unittest.cpp b/test/ipmi_delete_unittest.cpp
index 6985eb1..9145fe3 100644
--- a/test/ipmi_delete_unittest.cpp
+++ b/test/ipmi_delete_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_enumerate_unittest.cpp b/test/ipmi_enumerate_unittest.cpp
index 184c686..3be56ba 100644
--- a/test/ipmi_enumerate_unittest.cpp
+++ b/test/ipmi_enumerate_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_getcount_unittest.cpp b/test/ipmi_getcount_unittest.cpp
index 267ae43..c6d74e6 100644
--- a/test/ipmi_getcount_unittest.cpp
+++ b/test/ipmi_getcount_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <vector>
 
diff --git a/test/ipmi_open_unittest.cpp b/test/ipmi_open_unittest.cpp
index 704c144..9079df0 100644
--- a/test/ipmi_open_unittest.cpp
+++ b/test/ipmi_open_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_read_unittest.cpp b/test/ipmi_read_unittest.cpp
index ef36646..b6dab55 100644
--- a/test/ipmi_read_unittest.cpp
+++ b/test/ipmi_read_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <vector>
 
diff --git a/test/ipmi_sessionstat_unittest.cpp b/test/ipmi_sessionstat_unittest.cpp
index a71252c..1e4005e 100644
--- a/test/ipmi_sessionstat_unittest.cpp
+++ b/test/ipmi_sessionstat_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_stat_unittest.cpp b/test/ipmi_stat_unittest.cpp
index e7ff277..cbff23d 100644
--- a/test/ipmi_stat_unittest.cpp
+++ b/test/ipmi_stat_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 #include <string>
 
diff --git a/test/ipmi_validate_unittest.cpp b/test/ipmi_validate_unittest.cpp
index 5a1cbfe..6bf4200 100644
--- a/test/ipmi_validate_unittest.cpp
+++ b/test/ipmi_validate_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_write_unittest.cpp b/test/ipmi_write_unittest.cpp
index 99615af..a42e266 100644
--- a/test/ipmi_write_unittest.cpp
+++ b/test/ipmi_write_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_writemeta_unittest.cpp b/test/ipmi_writemeta_unittest.cpp
index 2d63452..3542b23 100644
--- a/test/ipmi_writemeta_unittest.cpp
+++ b/test/ipmi_writemeta_unittest.cpp
@@ -1,6 +1,6 @@
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_close_unittest.cpp b/test/manager_close_unittest.cpp
index 02b5dfe..47c9264 100644
--- a/test/manager_close_unittest.cpp
+++ b/test/manager_close_unittest.cpp
@@ -1,5 +1,5 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_commit_unittest.cpp b/test/manager_commit_unittest.cpp
index 48e6b67..b1b3c8c 100644
--- a/test/manager_commit_unittest.cpp
+++ b/test/manager_commit_unittest.cpp
@@ -1,5 +1,6 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
+
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_delete_unittest.cpp b/test/manager_delete_unittest.cpp
index e35355d..9ad3afd 100644
--- a/test/manager_delete_unittest.cpp
+++ b/test/manager_delete_unittest.cpp
@@ -1,5 +1,5 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_getsession_unittest.cpp b/test/manager_getsession_unittest.cpp
index 2022146..e66729a 100644
--- a/test/manager_getsession_unittest.cpp
+++ b/test/manager_getsession_unittest.cpp
@@ -1,4 +1,4 @@
-#include <blobs-ipmid/manager.hpp>
+#include "manager.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/blobs-ipmid/test/manager_mock.hpp b/test/manager_mock.hpp
similarity index 96%
rename from blobs-ipmid/test/manager_mock.hpp
rename to test/manager_mock.hpp
index 00eeb6b..73d4d07 100644
--- a/blobs-ipmid/test/manager_mock.hpp
+++ b/test/manager_mock.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "manager.hpp"
+
 #include <blobs-ipmid/blobs.hpp>
-#include <blobs-ipmid/manager.hpp>
 #include <memory>
 #include <string>
 
diff --git a/test/manager_open_unittest.cpp b/test/manager_open_unittest.cpp
index 72aff85..309d3f6 100644
--- a/test/manager_open_unittest.cpp
+++ b/test/manager_open_unittest.cpp
@@ -1,5 +1,6 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
+
 #include <string>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_read_unittest.cpp b/test/manager_read_unittest.cpp
index 23df9d4..1d40f5d 100644
--- a/test/manager_read_unittest.cpp
+++ b/test/manager_read_unittest.cpp
@@ -1,5 +1,6 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
+
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/test/manager_sessionstat_unittest.cpp b/test/manager_sessionstat_unittest.cpp
index 019d95b..6ae27d3 100644
--- a/test/manager_sessionstat_unittest.cpp
+++ b/test/manager_sessionstat_unittest.cpp
@@ -1,5 +1,5 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_stat_unittest.cpp b/test/manager_stat_unittest.cpp
index 0ae7822..a13a66d 100644
--- a/test/manager_stat_unittest.cpp
+++ b/test/manager_stat_unittest.cpp
@@ -1,5 +1,5 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_unittest.cpp b/test/manager_unittest.cpp
index a4c7a8c..7d4d49e 100644
--- a/test/manager_unittest.cpp
+++ b/test/manager_unittest.cpp
@@ -1,6 +1,7 @@
+#include "blob_mock.hpp"
+#include "manager.hpp"
+
 #include <algorithm>
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
 #include <string>
 #include <vector>
 
diff --git a/test/manager_write_unittest.cpp b/test/manager_write_unittest.cpp
index 84b3400..33c6d5a 100644
--- a/test/manager_write_unittest.cpp
+++ b/test/manager_write_unittest.cpp
@@ -1,5 +1,5 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/manager_writemeta_unittest.cpp b/test/manager_writemeta_unittest.cpp
index e83c904..919d259 100644
--- a/test/manager_writemeta_unittest.cpp
+++ b/test/manager_writemeta_unittest.cpp
@@ -1,5 +1,5 @@
-#include <blobs-ipmid/manager.hpp>
-#include <blobs-ipmid/test/blob_mock.hpp>
+#include "blob_mock.hpp"
+#include "manager.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/test/process_unittest.cpp b/test/process_unittest.cpp
index 0f683e5..bd1f886 100644
--- a/test/process_unittest.cpp
+++ b/test/process_unittest.cpp
@@ -1,9 +1,9 @@
 #include "crc.hpp"
 #include "crc_mock.hpp"
 #include "ipmi.hpp"
+#include "manager_mock.hpp"
 #include "process.hpp"
 
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <cstring>
 
 #include <gtest/gtest.h>
diff --git a/test/utils_unittest.cpp b/test/utils_unittest.cpp
index 8a0cdca..b986bd8 100644
--- a/test/utils_unittest.cpp
+++ b/test/utils_unittest.cpp
@@ -1,9 +1,9 @@
+#include "blob_mock.hpp"
 #include "dlsys_mock.hpp"
 #include "fs.hpp"
+#include "manager_mock.hpp"
 #include "utils.hpp"
 
-#include <blobs-ipmid/test/blob_mock.hpp>
-#include <blobs-ipmid/test/manager_mock.hpp>
 #include <experimental/filesystem>
 #include <memory>
 #include <string>
diff --git a/utils.cpp b/utils.cpp
index 24166ca..e03ec90 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -17,10 +17,10 @@
 #include "utils.hpp"
 
 #include "fs.hpp"
+#include "manager.hpp"
 
 #include <dlfcn.h>
 
-#include <blobs-ipmid/manager.hpp>
 #include <memory>
 #include <phosphor-logging/log.hpp>
 #include <regex>
diff --git a/utils.hpp b/utils.hpp
index 50d320e..67380cd 100644
--- a/utils.hpp
+++ b/utils.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "internal/sys.hpp"
+#include "manager.hpp"
 
-#include <blobs-ipmid/manager.hpp>
 #include <memory>
 #include <string>