diff --git a/contextual-classifier/ContextualClassifier.cpp b/contextual-classifier/ContextualClassifier.cpp
index 3c51ed69b..69fccc757 100644
--- a/contextual-classifier/ContextualClassifier.cpp
+++ b/contextual-classifier/ContextualClassifier.cpp
@@ -27,12 +27,10 @@
 #define CLASSIFIER_TAG "CONTEXTUAL_CLASSIFIER"
 #define CLASSIFIER_CONFIGS_DIR "/etc/urm/classifier/"
 
-const std::string FT_MODEL_PATH =
+static const std::string FT_MODEL_PATH =
     CLASSIFIER_CONFIGS_DIR "floret_model_supervised.bin";
-const std::string IGNORE_PROC_PATH =
+static const std::string IGNORE_PROC_PATH =
     CLASSIFIER_CONFIGS_DIR "classifier-blocklist.txt";
-static const std::string IGNORE_TOKENS_PATH =
-    CLASSIFIER_CONFIGS_DIR "ignore-tokens.txt";
 static const std::string ALLOW_LIST_PATH =
     CLASSIFIER_CONFIGS_DIR "allow-list.txt";
 
diff --git a/contextual-classifier/Include/FeatureExtractor.h b/contextual-classifier/Include/FeatureExtractor.h
index 53f1c7ac4..c3b233ebf 100644
--- a/contextual-classifier/Include/FeatureExtractor.h
+++ b/contextual-classifier/Include/FeatureExtractor.h
@@ -14,7 +14,7 @@
 
 #include "FeaturePruner.h"
 
-#define CLASSIFIER_CONF_DIR "/etc/classifier/"
+#define CLASSIFIER_CONF_DIR "/etc/urm/classifier/"
 const std::string IGNORE_TOKENS_PATH = CLASSIFIER_CONF_DIR "ignore-tokens.txt";
 
 class FeatureExtractor {
diff --git a/modula/CMakeLists.txt b/modula/CMakeLists.txt
index b0602b1b1..35df882c2 100644
--- a/modula/CMakeLists.txt
+++ b/modula/CMakeLists.txt
@@ -17,11 +17,17 @@ target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/CoreMo
 target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/CoreModules/Include)
 install(TARGETS UrmAuxUtils LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
+# Install Headers
 install(
   FILES ${CMAKE_CURRENT_SOURCE_DIR}/Common/Include/UrmPlatformAL.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Urm
 )
 
+install(
+  FILES ${CMAKE_CURRENT_SOURCE_DIR}/Common/Include/Resource.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Urm
+)
+
 install(
   FILES ${CMAKE_CURRENT_SOURCE_DIR}/Components/Include/Logger.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Urm
diff --git a/resource-tuner/CMakeLists.txt b/resource-tuner/CMakeLists.txt
index 35b573175..688e985db 100644
--- a/resource-tuner/CMakeLists.txt
+++ b/resource-tuner/CMakeLists.txt
@@ -58,3 +58,9 @@ endif()
 
 # Install RestuneCore
 install(TARGETS RestuneCore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+# Install Headers
+install(
+  FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/Include/ResourceRegistry.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Urm
+)