diff --git a/CMakeLists.txt b/CMakeLists.txt
index 875936ee..b1b00418 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,9 +174,6 @@ link_directories(${UNBOUND_LIBRARY_DIRS})
 # Final setup for rapidjson
 include_directories(external/rapidjson)
 
-
-add_subdirectory(db_drivers)
-
 # Final setup for liblmdb
 include_directories(${LMDB_INCLUDE})
 
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 80e574b0..245758d9 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -97,3 +97,5 @@ else()
     die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent")
   endif()
 endif()
+
+add_subdirectory(db_drivers)
diff --git a/db_drivers/CMakeLists.txt b/external/db_drivers/CMakeLists.txt
similarity index 95%
rename from db_drivers/CMakeLists.txt
rename to external/db_drivers/CMakeLists.txt
index c96f623d..5bc27ed1 100644
--- a/db_drivers/CMakeLists.txt
+++ b/external/db_drivers/CMakeLists.txt
@@ -30,6 +30,6 @@
 # critical a consensus component to rely on dynamically linked libraries
 message(STATUS "Using ${ARCH_WIDTH}-bit LMDB from source tree")
 add_subdirectory(liblmdb${ARCH_WIDTH})
-set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb${ARCH_WIDTH}" PARENT_SCOPE)
+set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb${ARCH_WIDTH}" CACHE STRING "LMDB Include path")
 
-set(LMDB_LIBRARY "lmdb" PARENT_SCOPE)
+set(LMDB_LIBRARY "lmdb" CACHE STRING "LMDB Library name")
diff --git a/db_drivers/liblmdb32/.gitignore b/external/db_drivers/liblmdb32/.gitignore
similarity index 100%
rename from db_drivers/liblmdb32/.gitignore
rename to external/db_drivers/liblmdb32/.gitignore
diff --git a/db_drivers/liblmdb32/CHANGES b/external/db_drivers/liblmdb32/CHANGES
similarity index 100%
rename from db_drivers/liblmdb32/CHANGES
rename to external/db_drivers/liblmdb32/CHANGES
diff --git a/db_drivers/liblmdb32/CMakeLists.txt b/external/db_drivers/liblmdb32/CMakeLists.txt
similarity index 100%
rename from db_drivers/liblmdb32/CMakeLists.txt
rename to external/db_drivers/liblmdb32/CMakeLists.txt
diff --git a/db_drivers/liblmdb32/COPYRIGHT b/external/db_drivers/liblmdb32/COPYRIGHT
similarity index 100%
rename from db_drivers/liblmdb32/COPYRIGHT
rename to external/db_drivers/liblmdb32/COPYRIGHT
diff --git a/db_drivers/liblmdb32/Doxyfile b/external/db_drivers/liblmdb32/Doxyfile
similarity index 100%
rename from db_drivers/liblmdb32/Doxyfile
rename to external/db_drivers/liblmdb32/Doxyfile
diff --git a/db_drivers/liblmdb32/LICENSE b/external/db_drivers/liblmdb32/LICENSE
similarity index 100%
rename from db_drivers/liblmdb32/LICENSE
rename to external/db_drivers/liblmdb32/LICENSE
diff --git a/db_drivers/liblmdb32/Makefile b/external/db_drivers/liblmdb32/Makefile
similarity index 100%
rename from db_drivers/liblmdb32/Makefile
rename to external/db_drivers/liblmdb32/Makefile
diff --git a/db_drivers/liblmdb32/lmdb.h b/external/db_drivers/liblmdb32/lmdb.h
similarity index 100%
rename from db_drivers/liblmdb32/lmdb.h
rename to external/db_drivers/liblmdb32/lmdb.h
diff --git a/db_drivers/liblmdb32/mdb.c b/external/db_drivers/liblmdb32/mdb.c
similarity index 100%
rename from db_drivers/liblmdb32/mdb.c
rename to external/db_drivers/liblmdb32/mdb.c
diff --git a/db_drivers/liblmdb32/mdb_copy.1 b/external/db_drivers/liblmdb32/mdb_copy.1
similarity index 100%
rename from db_drivers/liblmdb32/mdb_copy.1
rename to external/db_drivers/liblmdb32/mdb_copy.1
diff --git a/db_drivers/liblmdb32/mdb_copy.c b/external/db_drivers/liblmdb32/mdb_copy.c
similarity index 100%
rename from db_drivers/liblmdb32/mdb_copy.c
rename to external/db_drivers/liblmdb32/mdb_copy.c
diff --git a/db_drivers/liblmdb32/mdb_dump.1 b/external/db_drivers/liblmdb32/mdb_dump.1
similarity index 100%
rename from db_drivers/liblmdb32/mdb_dump.1
rename to external/db_drivers/liblmdb32/mdb_dump.1
diff --git a/db_drivers/liblmdb32/mdb_dump.c b/external/db_drivers/liblmdb32/mdb_dump.c
similarity index 100%
rename from db_drivers/liblmdb32/mdb_dump.c
rename to external/db_drivers/liblmdb32/mdb_dump.c
diff --git a/db_drivers/liblmdb32/mdb_load.1 b/external/db_drivers/liblmdb32/mdb_load.1
similarity index 100%
rename from db_drivers/liblmdb32/mdb_load.1
rename to external/db_drivers/liblmdb32/mdb_load.1
diff --git a/db_drivers/liblmdb32/mdb_load.c b/external/db_drivers/liblmdb32/mdb_load.c
similarity index 100%
rename from db_drivers/liblmdb32/mdb_load.c
rename to external/db_drivers/liblmdb32/mdb_load.c
diff --git a/db_drivers/liblmdb32/mdb_stat.1 b/external/db_drivers/liblmdb32/mdb_stat.1
similarity index 100%
rename from db_drivers/liblmdb32/mdb_stat.1
rename to external/db_drivers/liblmdb32/mdb_stat.1
diff --git a/db_drivers/liblmdb32/mdb_stat.c b/external/db_drivers/liblmdb32/mdb_stat.c
similarity index 100%
rename from db_drivers/liblmdb32/mdb_stat.c
rename to external/db_drivers/liblmdb32/mdb_stat.c
diff --git a/db_drivers/liblmdb32/midl.c b/external/db_drivers/liblmdb32/midl.c
similarity index 100%
rename from db_drivers/liblmdb32/midl.c
rename to external/db_drivers/liblmdb32/midl.c
diff --git a/db_drivers/liblmdb32/midl.h b/external/db_drivers/liblmdb32/midl.h
similarity index 100%
rename from db_drivers/liblmdb32/midl.h
rename to external/db_drivers/liblmdb32/midl.h
diff --git a/db_drivers/liblmdb32/mtest.c b/external/db_drivers/liblmdb32/mtest.c
similarity index 100%
rename from db_drivers/liblmdb32/mtest.c
rename to external/db_drivers/liblmdb32/mtest.c
diff --git a/db_drivers/liblmdb32/mtest2.c b/external/db_drivers/liblmdb32/mtest2.c
similarity index 100%
rename from db_drivers/liblmdb32/mtest2.c
rename to external/db_drivers/liblmdb32/mtest2.c
diff --git a/db_drivers/liblmdb32/mtest3.c b/external/db_drivers/liblmdb32/mtest3.c
similarity index 100%
rename from db_drivers/liblmdb32/mtest3.c
rename to external/db_drivers/liblmdb32/mtest3.c
diff --git a/db_drivers/liblmdb32/mtest4.c b/external/db_drivers/liblmdb32/mtest4.c
similarity index 100%
rename from db_drivers/liblmdb32/mtest4.c
rename to external/db_drivers/liblmdb32/mtest4.c
diff --git a/db_drivers/liblmdb32/mtest5.c b/external/db_drivers/liblmdb32/mtest5.c
similarity index 100%
rename from db_drivers/liblmdb32/mtest5.c
rename to external/db_drivers/liblmdb32/mtest5.c
diff --git a/db_drivers/liblmdb32/mtest6.c b/external/db_drivers/liblmdb32/mtest6.c
similarity index 100%
rename from db_drivers/liblmdb32/mtest6.c
rename to external/db_drivers/liblmdb32/mtest6.c
diff --git a/db_drivers/liblmdb32/sample-bdb.txt b/external/db_drivers/liblmdb32/sample-bdb.txt
similarity index 100%
rename from db_drivers/liblmdb32/sample-bdb.txt
rename to external/db_drivers/liblmdb32/sample-bdb.txt
diff --git a/db_drivers/liblmdb32/sample-mdb.txt b/external/db_drivers/liblmdb32/sample-mdb.txt
similarity index 100%
rename from db_drivers/liblmdb32/sample-mdb.txt
rename to external/db_drivers/liblmdb32/sample-mdb.txt
diff --git a/db_drivers/liblmdb32/tooltag b/external/db_drivers/liblmdb32/tooltag
similarity index 100%
rename from db_drivers/liblmdb32/tooltag
rename to external/db_drivers/liblmdb32/tooltag
diff --git a/db_drivers/liblmdb64/.gitignore b/external/db_drivers/liblmdb64/.gitignore
similarity index 100%
rename from db_drivers/liblmdb64/.gitignore
rename to external/db_drivers/liblmdb64/.gitignore
diff --git a/db_drivers/liblmdb64/CHANGES b/external/db_drivers/liblmdb64/CHANGES
similarity index 100%
rename from db_drivers/liblmdb64/CHANGES
rename to external/db_drivers/liblmdb64/CHANGES
diff --git a/db_drivers/liblmdb64/CMakeLists.txt b/external/db_drivers/liblmdb64/CMakeLists.txt
similarity index 100%
rename from db_drivers/liblmdb64/CMakeLists.txt
rename to external/db_drivers/liblmdb64/CMakeLists.txt
diff --git a/db_drivers/liblmdb64/COPYRIGHT b/external/db_drivers/liblmdb64/COPYRIGHT
similarity index 100%
rename from db_drivers/liblmdb64/COPYRIGHT
rename to external/db_drivers/liblmdb64/COPYRIGHT
diff --git a/db_drivers/liblmdb64/Doxyfile b/external/db_drivers/liblmdb64/Doxyfile
similarity index 100%
rename from db_drivers/liblmdb64/Doxyfile
rename to external/db_drivers/liblmdb64/Doxyfile
diff --git a/db_drivers/liblmdb64/LICENSE b/external/db_drivers/liblmdb64/LICENSE
similarity index 100%
rename from db_drivers/liblmdb64/LICENSE
rename to external/db_drivers/liblmdb64/LICENSE
diff --git a/db_drivers/liblmdb64/Makefile b/external/db_drivers/liblmdb64/Makefile
similarity index 100%
rename from db_drivers/liblmdb64/Makefile
rename to external/db_drivers/liblmdb64/Makefile
diff --git a/db_drivers/liblmdb64/lmdb.h b/external/db_drivers/liblmdb64/lmdb.h
similarity index 100%
rename from db_drivers/liblmdb64/lmdb.h
rename to external/db_drivers/liblmdb64/lmdb.h
diff --git a/db_drivers/liblmdb64/mdb.c b/external/db_drivers/liblmdb64/mdb.c
similarity index 100%
rename from db_drivers/liblmdb64/mdb.c
rename to external/db_drivers/liblmdb64/mdb.c
diff --git a/db_drivers/liblmdb64/mdb_copy.1 b/external/db_drivers/liblmdb64/mdb_copy.1
similarity index 100%
rename from db_drivers/liblmdb64/mdb_copy.1
rename to external/db_drivers/liblmdb64/mdb_copy.1
diff --git a/db_drivers/liblmdb64/mdb_copy.c b/external/db_drivers/liblmdb64/mdb_copy.c
similarity index 100%
rename from db_drivers/liblmdb64/mdb_copy.c
rename to external/db_drivers/liblmdb64/mdb_copy.c
diff --git a/db_drivers/liblmdb64/mdb_dump.1 b/external/db_drivers/liblmdb64/mdb_dump.1
similarity index 100%
rename from db_drivers/liblmdb64/mdb_dump.1
rename to external/db_drivers/liblmdb64/mdb_dump.1
diff --git a/db_drivers/liblmdb64/mdb_dump.c b/external/db_drivers/liblmdb64/mdb_dump.c
similarity index 100%
rename from db_drivers/liblmdb64/mdb_dump.c
rename to external/db_drivers/liblmdb64/mdb_dump.c
diff --git a/db_drivers/liblmdb64/mdb_load.1 b/external/db_drivers/liblmdb64/mdb_load.1
similarity index 100%
rename from db_drivers/liblmdb64/mdb_load.1
rename to external/db_drivers/liblmdb64/mdb_load.1
diff --git a/db_drivers/liblmdb64/mdb_load.c b/external/db_drivers/liblmdb64/mdb_load.c
similarity index 100%
rename from db_drivers/liblmdb64/mdb_load.c
rename to external/db_drivers/liblmdb64/mdb_load.c
diff --git a/db_drivers/liblmdb64/mdb_stat.1 b/external/db_drivers/liblmdb64/mdb_stat.1
similarity index 100%
rename from db_drivers/liblmdb64/mdb_stat.1
rename to external/db_drivers/liblmdb64/mdb_stat.1
diff --git a/db_drivers/liblmdb64/mdb_stat.c b/external/db_drivers/liblmdb64/mdb_stat.c
similarity index 100%
rename from db_drivers/liblmdb64/mdb_stat.c
rename to external/db_drivers/liblmdb64/mdb_stat.c
diff --git a/db_drivers/liblmdb64/midl.c b/external/db_drivers/liblmdb64/midl.c
similarity index 100%
rename from db_drivers/liblmdb64/midl.c
rename to external/db_drivers/liblmdb64/midl.c
diff --git a/db_drivers/liblmdb64/midl.h b/external/db_drivers/liblmdb64/midl.h
similarity index 100%
rename from db_drivers/liblmdb64/midl.h
rename to external/db_drivers/liblmdb64/midl.h
diff --git a/db_drivers/liblmdb64/mtest.c b/external/db_drivers/liblmdb64/mtest.c
similarity index 100%
rename from db_drivers/liblmdb64/mtest.c
rename to external/db_drivers/liblmdb64/mtest.c
diff --git a/db_drivers/liblmdb64/mtest2.c b/external/db_drivers/liblmdb64/mtest2.c
similarity index 100%
rename from db_drivers/liblmdb64/mtest2.c
rename to external/db_drivers/liblmdb64/mtest2.c
diff --git a/db_drivers/liblmdb64/mtest3.c b/external/db_drivers/liblmdb64/mtest3.c
similarity index 100%
rename from db_drivers/liblmdb64/mtest3.c
rename to external/db_drivers/liblmdb64/mtest3.c
diff --git a/db_drivers/liblmdb64/mtest4.c b/external/db_drivers/liblmdb64/mtest4.c
similarity index 100%
rename from db_drivers/liblmdb64/mtest4.c
rename to external/db_drivers/liblmdb64/mtest4.c
diff --git a/db_drivers/liblmdb64/mtest5.c b/external/db_drivers/liblmdb64/mtest5.c
similarity index 100%
rename from db_drivers/liblmdb64/mtest5.c
rename to external/db_drivers/liblmdb64/mtest5.c
diff --git a/db_drivers/liblmdb64/mtest6.c b/external/db_drivers/liblmdb64/mtest6.c
similarity index 100%
rename from db_drivers/liblmdb64/mtest6.c
rename to external/db_drivers/liblmdb64/mtest6.c
diff --git a/db_drivers/liblmdb64/sample-bdb.txt b/external/db_drivers/liblmdb64/sample-bdb.txt
similarity index 100%
rename from db_drivers/liblmdb64/sample-bdb.txt
rename to external/db_drivers/liblmdb64/sample-bdb.txt
diff --git a/db_drivers/liblmdb64/sample-mdb.txt b/external/db_drivers/liblmdb64/sample-mdb.txt
similarity index 100%
rename from db_drivers/liblmdb64/sample-mdb.txt
rename to external/db_drivers/liblmdb64/sample-mdb.txt
diff --git a/db_drivers/liblmdb64/tooltag b/external/db_drivers/liblmdb64/tooltag
similarity index 100%
rename from db_drivers/liblmdb64/tooltag
rename to external/db_drivers/liblmdb64/tooltag