diff --git a/CMakeLists.txt b/CMakeLists.txt
index f06c2d7..eefcca1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,6 @@ configure_file(
 target_include_directories(${PROJECT_NAME} SYSTEM
 	INTERFACE ${Boost_INCLUDE_DIRS}
 	INTERFACE ${PostgreSQL_INCLUDE_DIRS}
-	INTERFACE ${YAMLCPP_INCLUDE_DIR}
 )
 
 target_include_directories(${bare_name}-inc
@@ -50,10 +49,10 @@ add_subdirectory(src/pq)
 add_subdirectory(src/main)
 add_subdirectory(src/common)
 add_subdirectory(src/delete)
+add_subdirectory(src/query)
 
 target_link_libraries(${PROJECT_NAME}
 	INTERFACE ${PostgreSQL_LIBRARIES}
-	INTERFACE ${YAMLCPP_LIBRARY}
 	INTERFACE ${Boost_LIBRARIES}
 	INTERFACE ${bare_name}-pq
 	INTERFACE ${bare_name}-inc
diff --git a/src/scan/settings.hpp b/include/dindexer-common/settings.hpp
similarity index 100%
rename from src/scan/settings.hpp
rename to include/dindexer-common/settings.hpp
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 4deec71..7bc533e 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -3,12 +3,17 @@ project(${bare_name}-common CXX C)
 add_library(${PROJECT_NAME}
 	commandline.cpp
 	mediatypes.cpp
+	settings.cpp
 )
 
 target_include_directories(${PROJECT_NAME}
 	PUBLIC ${DINDEXER_PUB_INCLUDE_DIR}
 )
+target_include_directories(${PROJECT_NAME} SYSTEM
+	PRIVATE ${YAMLCPP_INCLUDE_DIR}
+)
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
+	PRIVATE ${YAMLCPP_LIBRARY}
 )
diff --git a/src/scan/settings.cpp b/src/common/settings.cpp
similarity index 98%
rename from src/scan/settings.cpp
rename to src/common/settings.cpp
index 9522bf6..c948507 100644
--- a/src/scan/settings.cpp
+++ b/src/common/settings.cpp
@@ -15,7 +15,7 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "settings.hpp"
+#include "dindexer-common/settings.hpp"
 #include <yaml-cpp/yaml.h>
 #include <ciso646>
 
diff --git a/src/scan/CMakeLists.txt b/src/scan/CMakeLists.txt
index 72d0d4d..f901b97 100644
--- a/src/scan/CMakeLists.txt
+++ b/src/scan/CMakeLists.txt
@@ -16,7 +16,6 @@ add_executable(${PROJECT_NAME}
 	tiger.c
 	tiger.cpp
 	dbbackend.cpp
-	settings.cpp
 	commandline.cpp
 	discinfo.cpp
 	mediatype.cpp
diff --git a/src/scan/dbbackend.cpp b/src/scan/dbbackend.cpp
index d6882f8..d85967a 100644
--- a/src/scan/dbbackend.cpp
+++ b/src/scan/dbbackend.cpp
@@ -17,7 +17,7 @@
 
 #include "dbbackend.hpp"
 #include "pq/connection.hpp"
-#include "settings.hpp"
+#include "dindexer-common/settings.hpp"
 #include <string>
 #include <sstream>
 #include <utility>
diff --git a/src/scan/indexer.cpp b/src/scan/indexer.cpp
index a5b3327..bea5e7d 100644
--- a/src/scan/indexer.cpp
+++ b/src/scan/indexer.cpp
@@ -19,7 +19,7 @@
 #include "pathname.hpp"
 #include "tiger.hpp"
 #include "dbbackend.hpp"
-#include "settings.hpp"
+#include "dindexer-common/settings.hpp"
 #include "filestats.hpp"
 #include <algorithm>
 #include <functional>
diff --git a/src/scan/main.cpp b/src/scan/main.cpp
index cf6705b..8ebaafe 100644
--- a/src/scan/main.cpp
+++ b/src/scan/main.cpp
@@ -34,7 +34,7 @@
 #include "dindexerConfig.h"
 #include "filesearcher.hpp"
 #include "indexer.hpp"
-#include "settings.hpp"
+#include "dindexer-common/settings.hpp"
 #include "commandline.hpp"
 
 namespace {