diff --git a/CMakeLists.txt b/CMakeLists.txt
index 599a0dab69d8d40bf708386c6e77a22a3d7d12bc..64d8b5b1120b9771a94e71245cb1d0ad84e5ea79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,10 @@
 cmake_minimum_required(VERSION 3.12)
 
-exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --tags --abbrev=0" OUTPUT_VARIABLE GIT_TAG)
+exec_program("git" ${CMAKE_CURRENT_SOURCE_DIR} ARGS "describe --abbrev=0 --tags" OUTPUT_VARIABLE GIT_TAG)
 
 cmake_policy (SET CMP0020 NEW)
 
+message("Git tag: " ${GIT_TAG})
 project(RF_behavior_loader
     VERSION ${GIT_TAG}
     LANGUAGES CXX)
@@ -17,8 +18,8 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING
 
 set(TN RF_behavior_loader)
 add_library(${TN} STATIC)
-set_target_properties(${TN} PROPERTIES OUTPUT_NAME RF_behavior_loader)
-include(SrcUtility/CMakeLists.txt)
+set_target_properties(${TN} PROPERTIES OUTPUT_NAME rf_utility)
+include(SrcBehaviorLoader/CMakeLists.txt)
 
 install(
     TARGETS
@@ -68,7 +69,6 @@ install(
 
 install(
     FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/BehaviourPlugin.cmake
         ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VSSugar.cmake
     DESTINATION ${INSTALL_CONFIGDIR}/Modules/${PROJECT_NAME}
 )
diff --git a/SrcBehaviorLoader/PluginLoader.cpp b/SrcBehaviorLoader/PluginLoader.cpp
index 08c47c9001fd26e4a502acf2d26707e3760c029f..ca4aa39e0e1e769dec5c7a387e176dbeb500371a 100644
--- a/SrcBehaviorLoader/PluginLoader.cpp
+++ b/SrcBehaviorLoader/PluginLoader.cpp
@@ -7,6 +7,7 @@ PluginLoader::PluginLoader(QObject *parent)
 	m_PluginLoader = new QPluginLoader(this);
 }
 
+/*---------------------------------------*/
 bool PluginLoader::loadPluginFromFilename(QString const& filename)
 {
 	bool retval = false;
@@ -27,7 +28,7 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
 		QString s = m_PluginLoader->errorString();
 		std::string ss = s.toStdString();
 
-        if (!m_PluginLoader->isLoaded())
+    if (!m_PluginLoader->isLoaded())
 		{
 		    qWarning() << ss.c_str();
 		}
@@ -39,16 +40,19 @@ bool PluginLoader::loadPluginFromFilename(QString const& filename)
 	return retval;
 }
 
+/*---------------------------------------*/
 IBehaviourFactory* PluginLoader::getPluginInstance()
 {
 	return qobject_cast<IBehaviourFactory*>(m_PluginLoader->instance());
 }
 
+/*---------------------------------------*/
 QJsonObject PluginLoader::getPluginMetaData() const
 {
 	return m_MetaData;
 }
 
+/*---------------------------------------*/
 void PluginLoader::readMetaDataFromPlugin()
 {
 	m_MetaData = m_PluginLoader->metaData().value("MetaData").toObject();
diff --git a/SrcBehaviorLoader/PluginLoader.h b/SrcBehaviorLoader/PluginLoader.h
index 5e9ae9bccbedef490a11795ee7d11e45720bf281..8f230063b5f124a414b2b6be155d522da67fdda5 100644
--- a/SrcBehaviorLoader/PluginLoader.h
+++ b/SrcBehaviorLoader/PluginLoader.h
@@ -1,4 +1,3 @@
-
 #ifndef PLUGINLOADER_H
 #define PLUGINLOADER_H
 
@@ -8,7 +7,7 @@
 #include "QPointer"
 
 class PluginLoader : QObject
-{ 
+{
 	Q_OBJECT
 public:
 	explicit PluginLoader(QObject *parent = 0);
@@ -24,4 +23,4 @@ private:
 	QJsonObject m_MetaData;
 };
 
-#endif // PLUGINLOADER_H
\ No newline at end of file
+#endif // PLUGINLOADER_H
diff --git a/cmake/RF_behavior_loaderConfig.cmake.in b/cmake/RF_behavior_loaderConfig.cmake.in
new file mode 100644
index 0000000000000000000000000000000000000000..f5d43d2acd8e6b585ec35f45b2441833f3ec03ed
--- /dev/null
+++ b/cmake/RF_behavior_loaderConfig.cmake.in
@@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+find_package(RF_Interfaces 0.1.0 REQUIRED)
+
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules")
diff --git a/CMake/VSSugar.cmake b/cmake/VSSugar.cmake
similarity index 100%
rename from CMake/VSSugar.cmake
rename to cmake/VSSugar.cmake