diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcb73fffb..ee3cc552f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,8 +82,8 @@ find_package(OpenSSL REQUIRED)
 include_directories(${OPENSSL_INCLUDE_DIR})
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib ${CMAKE_CURRENT_SOURCE_DIR}/components
-  ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR}/components
+  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/lib
+  ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/lib
 )
 
 #set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
@@ -157,7 +157,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 add_subdirectory(third-party)
 add_subdirectory(tools)
 add_subdirectory(lib)
-add_subdirectory(components)
 add_subdirectory(icinga-app)
 add_subdirectory(etc)
 add_subdirectory(itl)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
deleted file mode 100644
index 737807c54..000000000
--- a/components/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_subdirectory(checker)
-add_subdirectory(compat)
-add_subdirectory(db_ido_mysql)
-add_subdirectory(db_ido_pgsql)
-add_subdirectory(demo)
-add_subdirectory(livestatus)
-add_subdirectory(notification)
-add_subdirectory(perfdata)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index ca35ac0e6..d246681d9 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -23,3 +23,11 @@ add_subdirectory(db_ido)
 add_subdirectory(methods)
 add_subdirectory(hello)
 add_subdirectory(remote)
+add_subdirectory(checker)
+add_subdirectory(compat)
+add_subdirectory(db_ido_mysql)
+add_subdirectory(db_ido_pgsql)
+add_subdirectory(demo)
+add_subdirectory(livestatus)
+add_subdirectory(notification)
+add_subdirectory(perfdata)
diff --git a/components/checker/CMakeLists.txt b/lib/checker/CMakeLists.txt
similarity index 100%
rename from components/checker/CMakeLists.txt
rename to lib/checker/CMakeLists.txt
diff --git a/components/checker/checker-type.conf b/lib/checker/checker-type.conf
similarity index 100%
rename from components/checker/checker-type.conf
rename to lib/checker/checker-type.conf
diff --git a/components/checker/checkercomponent.cpp b/lib/checker/checkercomponent.cpp
similarity index 100%
rename from components/checker/checkercomponent.cpp
rename to lib/checker/checkercomponent.cpp
diff --git a/components/checker/checkercomponent.hpp b/lib/checker/checkercomponent.hpp
similarity index 100%
rename from components/checker/checkercomponent.hpp
rename to lib/checker/checkercomponent.hpp
diff --git a/components/checker/checkercomponent.ti b/lib/checker/checkercomponent.ti
similarity index 100%
rename from components/checker/checkercomponent.ti
rename to lib/checker/checkercomponent.ti
diff --git a/components/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt
similarity index 100%
rename from components/compat/CMakeLists.txt
rename to lib/compat/CMakeLists.txt
diff --git a/components/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp
similarity index 100%
rename from components/compat/checkresultreader.cpp
rename to lib/compat/checkresultreader.cpp
diff --git a/components/compat/checkresultreader.hpp b/lib/compat/checkresultreader.hpp
similarity index 100%
rename from components/compat/checkresultreader.hpp
rename to lib/compat/checkresultreader.hpp
diff --git a/components/compat/checkresultreader.ti b/lib/compat/checkresultreader.ti
similarity index 100%
rename from components/compat/checkresultreader.ti
rename to lib/compat/checkresultreader.ti
diff --git a/components/compat/compat-type.conf b/lib/compat/compat-type.conf
similarity index 100%
rename from components/compat/compat-type.conf
rename to lib/compat/compat-type.conf
diff --git a/components/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp
similarity index 100%
rename from components/compat/compatlogger.cpp
rename to lib/compat/compatlogger.cpp
diff --git a/components/compat/compatlogger.hpp b/lib/compat/compatlogger.hpp
similarity index 100%
rename from components/compat/compatlogger.hpp
rename to lib/compat/compatlogger.hpp
diff --git a/components/compat/compatlogger.ti b/lib/compat/compatlogger.ti
similarity index 100%
rename from components/compat/compatlogger.ti
rename to lib/compat/compatlogger.ti
diff --git a/components/compat/externalcommandlistener.cpp b/lib/compat/externalcommandlistener.cpp
similarity index 100%
rename from components/compat/externalcommandlistener.cpp
rename to lib/compat/externalcommandlistener.cpp
diff --git a/components/compat/externalcommandlistener.hpp b/lib/compat/externalcommandlistener.hpp
similarity index 100%
rename from components/compat/externalcommandlistener.hpp
rename to lib/compat/externalcommandlistener.hpp
diff --git a/components/compat/externalcommandlistener.ti b/lib/compat/externalcommandlistener.ti
similarity index 100%
rename from components/compat/externalcommandlistener.ti
rename to lib/compat/externalcommandlistener.ti
diff --git a/components/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp
similarity index 100%
rename from components/compat/statusdatawriter.cpp
rename to lib/compat/statusdatawriter.cpp
diff --git a/components/compat/statusdatawriter.hpp b/lib/compat/statusdatawriter.hpp
similarity index 100%
rename from components/compat/statusdatawriter.hpp
rename to lib/compat/statusdatawriter.hpp
diff --git a/components/compat/statusdatawriter.ti b/lib/compat/statusdatawriter.ti
similarity index 100%
rename from components/compat/statusdatawriter.ti
rename to lib/compat/statusdatawriter.ti
diff --git a/components/db_ido_mysql/CMakeLists.txt b/lib/db_ido_mysql/CMakeLists.txt
similarity index 100%
rename from components/db_ido_mysql/CMakeLists.txt
rename to lib/db_ido_mysql/CMakeLists.txt
diff --git a/components/db_ido_mysql/db_ido_mysql-type.conf b/lib/db_ido_mysql/db_ido_mysql-type.conf
similarity index 100%
rename from components/db_ido_mysql/db_ido_mysql-type.conf
rename to lib/db_ido_mysql/db_ido_mysql-type.conf
diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
similarity index 100%
rename from components/db_ido_mysql/idomysqlconnection.cpp
rename to lib/db_ido_mysql/idomysqlconnection.cpp
diff --git a/components/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp
similarity index 100%
rename from components/db_ido_mysql/idomysqlconnection.hpp
rename to lib/db_ido_mysql/idomysqlconnection.hpp
diff --git a/components/db_ido_mysql/idomysqlconnection.ti b/lib/db_ido_mysql/idomysqlconnection.ti
similarity index 100%
rename from components/db_ido_mysql/idomysqlconnection.ti
rename to lib/db_ido_mysql/idomysqlconnection.ti
diff --git a/components/db_ido_mysql/schema/mysql.sql b/lib/db_ido_mysql/schema/mysql.sql
similarity index 100%
rename from components/db_ido_mysql/schema/mysql.sql
rename to lib/db_ido_mysql/schema/mysql.sql
diff --git a/components/db_ido_mysql/schema/upgrade/2.0.2.sql b/lib/db_ido_mysql/schema/upgrade/2.0.2.sql
similarity index 100%
rename from components/db_ido_mysql/schema/upgrade/2.0.2.sql
rename to lib/db_ido_mysql/schema/upgrade/2.0.2.sql
diff --git a/components/db_ido_mysql/schema/upgrade/2.1.0.sql b/lib/db_ido_mysql/schema/upgrade/2.1.0.sql
similarity index 100%
rename from components/db_ido_mysql/schema/upgrade/2.1.0.sql
rename to lib/db_ido_mysql/schema/upgrade/2.1.0.sql
diff --git a/components/db_ido_pgsql/CMakeLists.txt b/lib/db_ido_pgsql/CMakeLists.txt
similarity index 100%
rename from components/db_ido_pgsql/CMakeLists.txt
rename to lib/db_ido_pgsql/CMakeLists.txt
diff --git a/components/db_ido_pgsql/db_ido_pgsql-type.conf b/lib/db_ido_pgsql/db_ido_pgsql-type.conf
similarity index 100%
rename from components/db_ido_pgsql/db_ido_pgsql-type.conf
rename to lib/db_ido_pgsql/db_ido_pgsql-type.conf
diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
similarity index 100%
rename from components/db_ido_pgsql/idopgsqlconnection.cpp
rename to lib/db_ido_pgsql/idopgsqlconnection.cpp
diff --git a/components/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp
similarity index 100%
rename from components/db_ido_pgsql/idopgsqlconnection.hpp
rename to lib/db_ido_pgsql/idopgsqlconnection.hpp
diff --git a/components/db_ido_pgsql/idopgsqlconnection.ti b/lib/db_ido_pgsql/idopgsqlconnection.ti
similarity index 100%
rename from components/db_ido_pgsql/idopgsqlconnection.ti
rename to lib/db_ido_pgsql/idopgsqlconnection.ti
diff --git a/components/db_ido_pgsql/schema/pgsql.sql b/lib/db_ido_pgsql/schema/pgsql.sql
similarity index 100%
rename from components/db_ido_pgsql/schema/pgsql.sql
rename to lib/db_ido_pgsql/schema/pgsql.sql
diff --git a/components/db_ido_pgsql/schema/upgrade/2.0.2.sql b/lib/db_ido_pgsql/schema/upgrade/2.0.2.sql
similarity index 100%
rename from components/db_ido_pgsql/schema/upgrade/2.0.2.sql
rename to lib/db_ido_pgsql/schema/upgrade/2.0.2.sql
diff --git a/components/db_ido_pgsql/schema/upgrade/2.1.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.1.0.sql
similarity index 100%
rename from components/db_ido_pgsql/schema/upgrade/2.1.0.sql
rename to lib/db_ido_pgsql/schema/upgrade/2.1.0.sql
diff --git a/components/demo/CMakeLists.txt b/lib/demo/CMakeLists.txt
similarity index 100%
rename from components/demo/CMakeLists.txt
rename to lib/demo/CMakeLists.txt
diff --git a/components/demo/demo-type.conf b/lib/demo/demo-type.conf
similarity index 100%
rename from components/demo/demo-type.conf
rename to lib/demo/demo-type.conf
diff --git a/components/demo/demo.cpp b/lib/demo/demo.cpp
similarity index 100%
rename from components/demo/demo.cpp
rename to lib/demo/demo.cpp
diff --git a/components/demo/demo.hpp b/lib/demo/demo.hpp
similarity index 100%
rename from components/demo/demo.hpp
rename to lib/demo/demo.hpp
diff --git a/components/demo/demo.ti b/lib/demo/demo.ti
similarity index 100%
rename from components/demo/demo.ti
rename to lib/demo/demo.ti
diff --git a/components/livestatus/CMakeLists.txt b/lib/livestatus/CMakeLists.txt
similarity index 100%
rename from components/livestatus/CMakeLists.txt
rename to lib/livestatus/CMakeLists.txt
diff --git a/components/livestatus/aggregator.cpp b/lib/livestatus/aggregator.cpp
similarity index 100%
rename from components/livestatus/aggregator.cpp
rename to lib/livestatus/aggregator.cpp
diff --git a/components/livestatus/aggregator.hpp b/lib/livestatus/aggregator.hpp
similarity index 100%
rename from components/livestatus/aggregator.hpp
rename to lib/livestatus/aggregator.hpp
diff --git a/components/livestatus/andfilter.cpp b/lib/livestatus/andfilter.cpp
similarity index 100%
rename from components/livestatus/andfilter.cpp
rename to lib/livestatus/andfilter.cpp
diff --git a/components/livestatus/andfilter.hpp b/lib/livestatus/andfilter.hpp
similarity index 100%
rename from components/livestatus/andfilter.hpp
rename to lib/livestatus/andfilter.hpp
diff --git a/components/livestatus/attributefilter.cpp b/lib/livestatus/attributefilter.cpp
similarity index 100%
rename from components/livestatus/attributefilter.cpp
rename to lib/livestatus/attributefilter.cpp
diff --git a/components/livestatus/attributefilter.hpp b/lib/livestatus/attributefilter.hpp
similarity index 100%
rename from components/livestatus/attributefilter.hpp
rename to lib/livestatus/attributefilter.hpp
diff --git a/components/livestatus/avgaggregator.cpp b/lib/livestatus/avgaggregator.cpp
similarity index 100%
rename from components/livestatus/avgaggregator.cpp
rename to lib/livestatus/avgaggregator.cpp
diff --git a/components/livestatus/avgaggregator.hpp b/lib/livestatus/avgaggregator.hpp
similarity index 100%
rename from components/livestatus/avgaggregator.hpp
rename to lib/livestatus/avgaggregator.hpp
diff --git a/components/livestatus/column.cpp b/lib/livestatus/column.cpp
similarity index 100%
rename from components/livestatus/column.cpp
rename to lib/livestatus/column.cpp
diff --git a/components/livestatus/column.hpp b/lib/livestatus/column.hpp
similarity index 100%
rename from components/livestatus/column.hpp
rename to lib/livestatus/column.hpp
diff --git a/components/livestatus/combinerfilter.cpp b/lib/livestatus/combinerfilter.cpp
similarity index 100%
rename from components/livestatus/combinerfilter.cpp
rename to lib/livestatus/combinerfilter.cpp
diff --git a/components/livestatus/combinerfilter.hpp b/lib/livestatus/combinerfilter.hpp
similarity index 100%
rename from components/livestatus/combinerfilter.hpp
rename to lib/livestatus/combinerfilter.hpp
diff --git a/components/livestatus/commandstable.cpp b/lib/livestatus/commandstable.cpp
similarity index 100%
rename from components/livestatus/commandstable.cpp
rename to lib/livestatus/commandstable.cpp
diff --git a/components/livestatus/commandstable.hpp b/lib/livestatus/commandstable.hpp
similarity index 100%
rename from components/livestatus/commandstable.hpp
rename to lib/livestatus/commandstable.hpp
diff --git a/components/livestatus/commentstable.cpp b/lib/livestatus/commentstable.cpp
similarity index 100%
rename from components/livestatus/commentstable.cpp
rename to lib/livestatus/commentstable.cpp
diff --git a/components/livestatus/commentstable.hpp b/lib/livestatus/commentstable.hpp
similarity index 100%
rename from components/livestatus/commentstable.hpp
rename to lib/livestatus/commentstable.hpp
diff --git a/components/livestatus/contactgroupstable.cpp b/lib/livestatus/contactgroupstable.cpp
similarity index 100%
rename from components/livestatus/contactgroupstable.cpp
rename to lib/livestatus/contactgroupstable.cpp
diff --git a/components/livestatus/contactgroupstable.hpp b/lib/livestatus/contactgroupstable.hpp
similarity index 100%
rename from components/livestatus/contactgroupstable.hpp
rename to lib/livestatus/contactgroupstable.hpp
diff --git a/components/livestatus/contactstable.cpp b/lib/livestatus/contactstable.cpp
similarity index 100%
rename from components/livestatus/contactstable.cpp
rename to lib/livestatus/contactstable.cpp
diff --git a/components/livestatus/contactstable.hpp b/lib/livestatus/contactstable.hpp
similarity index 100%
rename from components/livestatus/contactstable.hpp
rename to lib/livestatus/contactstable.hpp
diff --git a/components/livestatus/countaggregator.cpp b/lib/livestatus/countaggregator.cpp
similarity index 100%
rename from components/livestatus/countaggregator.cpp
rename to lib/livestatus/countaggregator.cpp
diff --git a/components/livestatus/countaggregator.hpp b/lib/livestatus/countaggregator.hpp
similarity index 100%
rename from components/livestatus/countaggregator.hpp
rename to lib/livestatus/countaggregator.hpp
diff --git a/components/livestatus/downtimestable.cpp b/lib/livestatus/downtimestable.cpp
similarity index 100%
rename from components/livestatus/downtimestable.cpp
rename to lib/livestatus/downtimestable.cpp
diff --git a/components/livestatus/downtimestable.hpp b/lib/livestatus/downtimestable.hpp
similarity index 100%
rename from components/livestatus/downtimestable.hpp
rename to lib/livestatus/downtimestable.hpp
diff --git a/components/livestatus/endpointstable.cpp b/lib/livestatus/endpointstable.cpp
similarity index 100%
rename from components/livestatus/endpointstable.cpp
rename to lib/livestatus/endpointstable.cpp
diff --git a/components/livestatus/endpointstable.hpp b/lib/livestatus/endpointstable.hpp
similarity index 100%
rename from components/livestatus/endpointstable.hpp
rename to lib/livestatus/endpointstable.hpp
diff --git a/components/livestatus/filter.cpp b/lib/livestatus/filter.cpp
similarity index 100%
rename from components/livestatus/filter.cpp
rename to lib/livestatus/filter.cpp
diff --git a/components/livestatus/filter.hpp b/lib/livestatus/filter.hpp
similarity index 100%
rename from components/livestatus/filter.hpp
rename to lib/livestatus/filter.hpp
diff --git a/components/livestatus/historytable.cpp b/lib/livestatus/historytable.cpp
similarity index 100%
rename from components/livestatus/historytable.cpp
rename to lib/livestatus/historytable.cpp
diff --git a/components/livestatus/historytable.hpp b/lib/livestatus/historytable.hpp
similarity index 100%
rename from components/livestatus/historytable.hpp
rename to lib/livestatus/historytable.hpp
diff --git a/components/livestatus/hostgroupstable.cpp b/lib/livestatus/hostgroupstable.cpp
similarity index 100%
rename from components/livestatus/hostgroupstable.cpp
rename to lib/livestatus/hostgroupstable.cpp
diff --git a/components/livestatus/hostgroupstable.hpp b/lib/livestatus/hostgroupstable.hpp
similarity index 100%
rename from components/livestatus/hostgroupstable.hpp
rename to lib/livestatus/hostgroupstable.hpp
diff --git a/components/livestatus/hoststable.cpp b/lib/livestatus/hoststable.cpp
similarity index 100%
rename from components/livestatus/hoststable.cpp
rename to lib/livestatus/hoststable.cpp
diff --git a/components/livestatus/hoststable.hpp b/lib/livestatus/hoststable.hpp
similarity index 100%
rename from components/livestatus/hoststable.hpp
rename to lib/livestatus/hoststable.hpp
diff --git a/components/livestatus/invavgaggregator.cpp b/lib/livestatus/invavgaggregator.cpp
similarity index 100%
rename from components/livestatus/invavgaggregator.cpp
rename to lib/livestatus/invavgaggregator.cpp
diff --git a/components/livestatus/invavgaggregator.hpp b/lib/livestatus/invavgaggregator.hpp
similarity index 100%
rename from components/livestatus/invavgaggregator.hpp
rename to lib/livestatus/invavgaggregator.hpp
diff --git a/components/livestatus/invsumaggregator.cpp b/lib/livestatus/invsumaggregator.cpp
similarity index 100%
rename from components/livestatus/invsumaggregator.cpp
rename to lib/livestatus/invsumaggregator.cpp
diff --git a/components/livestatus/invsumaggregator.hpp b/lib/livestatus/invsumaggregator.hpp
similarity index 100%
rename from components/livestatus/invsumaggregator.hpp
rename to lib/livestatus/invsumaggregator.hpp
diff --git a/components/livestatus/livestatus-type.conf b/lib/livestatus/livestatus-type.conf
similarity index 100%
rename from components/livestatus/livestatus-type.conf
rename to lib/livestatus/livestatus-type.conf
diff --git a/components/livestatus/livestatuslistener.cpp b/lib/livestatus/livestatuslistener.cpp
similarity index 100%
rename from components/livestatus/livestatuslistener.cpp
rename to lib/livestatus/livestatuslistener.cpp
diff --git a/components/livestatus/livestatuslistener.hpp b/lib/livestatus/livestatuslistener.hpp
similarity index 100%
rename from components/livestatus/livestatuslistener.hpp
rename to lib/livestatus/livestatuslistener.hpp
diff --git a/components/livestatus/livestatuslistener.ti b/lib/livestatus/livestatuslistener.ti
similarity index 100%
rename from components/livestatus/livestatuslistener.ti
rename to lib/livestatus/livestatuslistener.ti
diff --git a/components/livestatus/livestatuslogutility.cpp b/lib/livestatus/livestatuslogutility.cpp
similarity index 100%
rename from components/livestatus/livestatuslogutility.cpp
rename to lib/livestatus/livestatuslogutility.cpp
diff --git a/components/livestatus/livestatuslogutility.hpp b/lib/livestatus/livestatuslogutility.hpp
similarity index 100%
rename from components/livestatus/livestatuslogutility.hpp
rename to lib/livestatus/livestatuslogutility.hpp
diff --git a/components/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp
similarity index 100%
rename from components/livestatus/livestatusquery.cpp
rename to lib/livestatus/livestatusquery.cpp
diff --git a/components/livestatus/livestatusquery.hpp b/lib/livestatus/livestatusquery.hpp
similarity index 100%
rename from components/livestatus/livestatusquery.hpp
rename to lib/livestatus/livestatusquery.hpp
diff --git a/components/livestatus/logtable.cpp b/lib/livestatus/logtable.cpp
similarity index 100%
rename from components/livestatus/logtable.cpp
rename to lib/livestatus/logtable.cpp
diff --git a/components/livestatus/logtable.hpp b/lib/livestatus/logtable.hpp
similarity index 100%
rename from components/livestatus/logtable.hpp
rename to lib/livestatus/logtable.hpp
diff --git a/components/livestatus/maxaggregator.cpp b/lib/livestatus/maxaggregator.cpp
similarity index 100%
rename from components/livestatus/maxaggregator.cpp
rename to lib/livestatus/maxaggregator.cpp
diff --git a/components/livestatus/maxaggregator.hpp b/lib/livestatus/maxaggregator.hpp
similarity index 100%
rename from components/livestatus/maxaggregator.hpp
rename to lib/livestatus/maxaggregator.hpp
diff --git a/components/livestatus/minaggregator.cpp b/lib/livestatus/minaggregator.cpp
similarity index 100%
rename from components/livestatus/minaggregator.cpp
rename to lib/livestatus/minaggregator.cpp
diff --git a/components/livestatus/minaggregator.hpp b/lib/livestatus/minaggregator.hpp
similarity index 100%
rename from components/livestatus/minaggregator.hpp
rename to lib/livestatus/minaggregator.hpp
diff --git a/components/livestatus/negatefilter.cpp b/lib/livestatus/negatefilter.cpp
similarity index 100%
rename from components/livestatus/negatefilter.cpp
rename to lib/livestatus/negatefilter.cpp
diff --git a/components/livestatus/negatefilter.hpp b/lib/livestatus/negatefilter.hpp
similarity index 100%
rename from components/livestatus/negatefilter.hpp
rename to lib/livestatus/negatefilter.hpp
diff --git a/components/livestatus/orfilter.cpp b/lib/livestatus/orfilter.cpp
similarity index 100%
rename from components/livestatus/orfilter.cpp
rename to lib/livestatus/orfilter.cpp
diff --git a/components/livestatus/orfilter.hpp b/lib/livestatus/orfilter.hpp
similarity index 100%
rename from components/livestatus/orfilter.hpp
rename to lib/livestatus/orfilter.hpp
diff --git a/components/livestatus/servicegroupstable.cpp b/lib/livestatus/servicegroupstable.cpp
similarity index 100%
rename from components/livestatus/servicegroupstable.cpp
rename to lib/livestatus/servicegroupstable.cpp
diff --git a/components/livestatus/servicegroupstable.hpp b/lib/livestatus/servicegroupstable.hpp
similarity index 100%
rename from components/livestatus/servicegroupstable.hpp
rename to lib/livestatus/servicegroupstable.hpp
diff --git a/components/livestatus/servicestable.cpp b/lib/livestatus/servicestable.cpp
similarity index 100%
rename from components/livestatus/servicestable.cpp
rename to lib/livestatus/servicestable.cpp
diff --git a/components/livestatus/servicestable.hpp b/lib/livestatus/servicestable.hpp
similarity index 100%
rename from components/livestatus/servicestable.hpp
rename to lib/livestatus/servicestable.hpp
diff --git a/components/livestatus/statehisttable.cpp b/lib/livestatus/statehisttable.cpp
similarity index 100%
rename from components/livestatus/statehisttable.cpp
rename to lib/livestatus/statehisttable.cpp
diff --git a/components/livestatus/statehisttable.hpp b/lib/livestatus/statehisttable.hpp
similarity index 100%
rename from components/livestatus/statehisttable.hpp
rename to lib/livestatus/statehisttable.hpp
diff --git a/components/livestatus/statustable.cpp b/lib/livestatus/statustable.cpp
similarity index 100%
rename from components/livestatus/statustable.cpp
rename to lib/livestatus/statustable.cpp
diff --git a/components/livestatus/statustable.hpp b/lib/livestatus/statustable.hpp
similarity index 100%
rename from components/livestatus/statustable.hpp
rename to lib/livestatus/statustable.hpp
diff --git a/components/livestatus/stdaggregator.cpp b/lib/livestatus/stdaggregator.cpp
similarity index 100%
rename from components/livestatus/stdaggregator.cpp
rename to lib/livestatus/stdaggregator.cpp
diff --git a/components/livestatus/stdaggregator.hpp b/lib/livestatus/stdaggregator.hpp
similarity index 100%
rename from components/livestatus/stdaggregator.hpp
rename to lib/livestatus/stdaggregator.hpp
diff --git a/components/livestatus/sumaggregator.cpp b/lib/livestatus/sumaggregator.cpp
similarity index 100%
rename from components/livestatus/sumaggregator.cpp
rename to lib/livestatus/sumaggregator.cpp
diff --git a/components/livestatus/sumaggregator.hpp b/lib/livestatus/sumaggregator.hpp
similarity index 100%
rename from components/livestatus/sumaggregator.hpp
rename to lib/livestatus/sumaggregator.hpp
diff --git a/components/livestatus/table.cpp b/lib/livestatus/table.cpp
similarity index 100%
rename from components/livestatus/table.cpp
rename to lib/livestatus/table.cpp
diff --git a/components/livestatus/table.hpp b/lib/livestatus/table.hpp
similarity index 100%
rename from components/livestatus/table.hpp
rename to lib/livestatus/table.hpp
diff --git a/components/livestatus/timeperiodstable.cpp b/lib/livestatus/timeperiodstable.cpp
similarity index 100%
rename from components/livestatus/timeperiodstable.cpp
rename to lib/livestatus/timeperiodstable.cpp
diff --git a/components/livestatus/timeperiodstable.hpp b/lib/livestatus/timeperiodstable.hpp
similarity index 100%
rename from components/livestatus/timeperiodstable.hpp
rename to lib/livestatus/timeperiodstable.hpp
diff --git a/components/notification/CMakeLists.txt b/lib/notification/CMakeLists.txt
similarity index 100%
rename from components/notification/CMakeLists.txt
rename to lib/notification/CMakeLists.txt
diff --git a/components/notification/notification-type.conf b/lib/notification/notification-type.conf
similarity index 100%
rename from components/notification/notification-type.conf
rename to lib/notification/notification-type.conf
diff --git a/components/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp
similarity index 100%
rename from components/notification/notificationcomponent.cpp
rename to lib/notification/notificationcomponent.cpp
diff --git a/components/notification/notificationcomponent.hpp b/lib/notification/notificationcomponent.hpp
similarity index 100%
rename from components/notification/notificationcomponent.hpp
rename to lib/notification/notificationcomponent.hpp
diff --git a/components/notification/notificationcomponent.ti b/lib/notification/notificationcomponent.ti
similarity index 100%
rename from components/notification/notificationcomponent.ti
rename to lib/notification/notificationcomponent.ti
diff --git a/components/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt
similarity index 100%
rename from components/perfdata/CMakeLists.txt
rename to lib/perfdata/CMakeLists.txt
diff --git a/components/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp
similarity index 100%
rename from components/perfdata/graphitewriter.cpp
rename to lib/perfdata/graphitewriter.cpp
diff --git a/components/perfdata/graphitewriter.hpp b/lib/perfdata/graphitewriter.hpp
similarity index 100%
rename from components/perfdata/graphitewriter.hpp
rename to lib/perfdata/graphitewriter.hpp
diff --git a/components/perfdata/graphitewriter.ti b/lib/perfdata/graphitewriter.ti
similarity index 100%
rename from components/perfdata/graphitewriter.ti
rename to lib/perfdata/graphitewriter.ti
diff --git a/components/perfdata/perfdata-type.conf b/lib/perfdata/perfdata-type.conf
similarity index 100%
rename from components/perfdata/perfdata-type.conf
rename to lib/perfdata/perfdata-type.conf
diff --git a/components/perfdata/perfdatawriter.cpp b/lib/perfdata/perfdatawriter.cpp
similarity index 100%
rename from components/perfdata/perfdatawriter.cpp
rename to lib/perfdata/perfdatawriter.cpp
diff --git a/components/perfdata/perfdatawriter.hpp b/lib/perfdata/perfdatawriter.hpp
similarity index 100%
rename from components/perfdata/perfdatawriter.hpp
rename to lib/perfdata/perfdatawriter.hpp
diff --git a/components/perfdata/perfdatawriter.ti b/lib/perfdata/perfdatawriter.ti
similarity index 100%
rename from components/perfdata/perfdatawriter.ti
rename to lib/perfdata/perfdatawriter.ti