diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f1a4fd..71e7293 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ include(ECMPackageConfigHelpers)
 include(GenerateExportHeader)
 
 
-
 #######################################################################
 option(WITH_FRONTENDS  "Build frontends currently only useful if WITH_SNORE_DAEMON=ON" OFF)
 option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications" OFF)
@@ -30,7 +29,7 @@ option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications"
 
 set(SNORE_VERSION_MAJOR 0)
 set(SNORE_VERSION_MINOR 5)
-set(SNORE_VERSION_PATCH 90)
+set(SNORE_VERSION_PATCH 91)
 
 set(SNORE_SUFFIX "-qt5")
 set(SNORE_CamelCase_SUFFIX "Qt5")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0174c15..5ab17b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,4 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/core ${CMAKE_CURRENT_BINARY_DIR}/core)
-
-add_subdirectory(core)
+add_subdirectory(libsnore)
 add_subdirectory(daemon)
 add_subdirectory(settings)
 add_subdirectory(plugins)
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 3136b29..4d90dc9 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -1,7 +1,7 @@
 
 #include "snorenotify.h"
-#include "core/log.h"
-#include "core/version.h"
+#include "libsnore/log.h"
+#include "libsnore/version.h"
 
 #include <QApplication>
 
diff --git a/src/daemon/snorenotify.cpp b/src/daemon/snorenotify.cpp
index 2dfa1c0..824ebd2 100644
--- a/src/daemon/snorenotify.cpp
+++ b/src/daemon/snorenotify.cpp
@@ -18,7 +18,7 @@
 
 #include "snorenotify.h"
 #include "trayicon.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
 
 #include <iostream>
 #include <stdlib.h>
diff --git a/src/daemon/trayicon.cpp b/src/daemon/trayicon.cpp
index 9f26292..1ae7868 100644
--- a/src/daemon/trayicon.cpp
+++ b/src/daemon/trayicon.cpp
@@ -17,9 +17,9 @@
 */
 
 #include "trayicon.h"
-#include "core/settingsdialog.h"
-#include "core/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/settingsdialog.h"
+#include "libsnore/snore.h"
+#include "libsnore/snore_p.h"
 
 #include <QAction>
 #include <QApplication>
@@ -28,7 +28,7 @@
 #include <QSystemTrayIcon>
 #include <QTimer>
 
-#include "core/version.h"
+#include "libsnore/version.h"
 
 using namespace Snore;
 
diff --git a/src/daemon/trayicon.h b/src/daemon/trayicon.h
index c2aefd3..2116300 100644
--- a/src/daemon/trayicon.h
+++ b/src/daemon/trayicon.h
@@ -20,7 +20,7 @@
 #define TRAYICON_H
 
 #include <QAction>
-#include "core/snore.h"
+#include "libsnore/snore.h"
 
 namespace Snore
 {
diff --git a/src/core/CMakeLists.txt b/src/libsnore/CMakeLists.txt
similarity index 92%
rename from src/core/CMakeLists.txt
rename to src/libsnore/CMakeLists.txt
index 755ccaf..2adbc42 100644
--- a/src/core/CMakeLists.txt
+++ b/src/libsnore/CMakeLists.txt
@@ -6,6 +6,8 @@ if(NOT SNORE_REVISION)
     set(SNORE_REVISION "")
 endif()
 
+set(LIBSNORE_INCLUDE_DIR ${KDE_INSTALL_INCLUDEDIR}/libsnore)
+
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/version.cpp")
 
 QT5_ADD_RESOURCES(SNORENOTIFY_RCS ${SNORE_RCS})
@@ -64,12 +66,9 @@ generate_export_header(libsnore
   EXPORT_MACRO_NAME SNORE_EXPORT
 )
 
-#TODO: drop /core/
 target_include_directories(libsnore PUBLIC
-$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-$<INSTALL_INTERFACE:include>
-$<INSTALL_INTERFACE:include/snore/core>)
+$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/>
+$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>)
 
 
 ecm_setup_version("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}" VARIABLE_PREFIX SOLID
@@ -85,7 +84,7 @@ install(TARGETS libsnore EXPORT Libsnore${SNORE_CamelCase_SUFFIX}Target ${KDE_IN
 
 install(EXPORT Libsnore${SNORE_CamelCase_SUFFIX}Target DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/libsnore${SNORE_CamelCase_SUFFIX} NAMESPACE Snore::)
 
-install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core)
+install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR})
 
 install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/Libsnore${SNORE_CamelCase_SUFFIX}Config.cmake
diff --git a/src/core/LibsnoreConfig.cmake.in b/src/libsnore/LibsnoreConfig.cmake.in
similarity index 96%
rename from src/core/LibsnoreConfig.cmake.in
rename to src/libsnore/LibsnoreConfig.cmake.in
index bb4fbf2..93cf22a 100644
--- a/src/core/LibsnoreConfig.cmake.in
+++ b/src/libsnore/LibsnoreConfig.cmake.in
@@ -1,9 +1,9 @@
-@PACKAGE_INIT@
-
-find_dependency(Qt5Core REQUIRED)
-find_dependency(Qt5Network REQUIRED)
-find_dependency(Qt5Widgets REQUIRED)
-find_dependency(Qt5Quick REQUIRED)
-
-include("${CMAKE_CURRENT_LIST_DIR}/Libsnore@SNORE_CamelCase_SUFFIX@Target.cmake")
-
+@PACKAGE_INIT@
+
+find_dependency(Qt5Core REQUIRED)
+find_dependency(Qt5Network REQUIRED)
+find_dependency(Qt5Widgets REQUIRED)
+find_dependency(Qt5Quick REQUIRED)
+
+include("${CMAKE_CURRENT_LIST_DIR}/Libsnore@SNORE_CamelCase_SUFFIX@Target.cmake")
+
diff --git a/src/core/alert.cpp b/src/libsnore/alert.cpp
similarity index 100%
rename from src/core/alert.cpp
rename to src/libsnore/alert.cpp
diff --git a/src/core/alert.h b/src/libsnore/alert.h
similarity index 100%
rename from src/core/alert.h
rename to src/libsnore/alert.h
diff --git a/src/core/alert_p.cpp b/src/libsnore/alert_p.cpp
similarity index 100%
rename from src/core/alert_p.cpp
rename to src/libsnore/alert_p.cpp
diff --git a/src/core/alert_p.h b/src/libsnore/alert_p.h
similarity index 100%
rename from src/core/alert_p.h
rename to src/libsnore/alert_p.h
diff --git a/src/core/application.cpp b/src/libsnore/application.cpp
similarity index 100%
rename from src/core/application.cpp
rename to src/libsnore/application.cpp
diff --git a/src/core/application.h b/src/libsnore/application.h
similarity index 100%
rename from src/core/application.h
rename to src/libsnore/application.h
diff --git a/src/core/application_p.cpp b/src/libsnore/application_p.cpp
similarity index 100%
rename from src/core/application_p.cpp
rename to src/libsnore/application_p.cpp
diff --git a/src/core/application_p.h b/src/libsnore/application_p.h
similarity index 100%
rename from src/core/application_p.h
rename to src/libsnore/application_p.h
diff --git a/src/core/hint.cpp b/src/libsnore/hint.cpp
similarity index 100%
rename from src/core/hint.cpp
rename to src/libsnore/hint.cpp
diff --git a/src/core/hint.h b/src/libsnore/hint.h
similarity index 100%
rename from src/core/hint.h
rename to src/libsnore/hint.h
diff --git a/src/core/log.cpp b/src/libsnore/log.cpp
similarity index 100%
rename from src/core/log.cpp
rename to src/libsnore/log.cpp
diff --git a/src/core/log.h b/src/libsnore/log.h
similarity index 100%
rename from src/core/log.h
rename to src/libsnore/log.h
diff --git a/src/core/notification/CMakeLists.txt b/src/libsnore/notification/CMakeLists.txt
similarity index 79%
rename from src/core/notification/CMakeLists.txt
rename to src/libsnore/notification/CMakeLists.txt
index e27efba..8022f0f 100644
--- a/src/core/notification/CMakeLists.txt
+++ b/src/libsnore/notification/CMakeLists.txt
@@ -13,4 +13,4 @@ set(SnoreNotify_HDR
         icon.h
         )
 
-install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core/notification)
+install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR}/notification)
diff --git a/src/core/notification/icon.cpp b/src/libsnore/notification/icon.cpp
similarity index 100%
rename from src/core/notification/icon.cpp
rename to src/libsnore/notification/icon.cpp
diff --git a/src/core/notification/icon.h b/src/libsnore/notification/icon.h
similarity index 98%
rename from src/core/notification/icon.h
rename to src/libsnore/notification/icon.h
index 624aade..eafe9e9 100644
--- a/src/core/notification/icon.h
+++ b/src/libsnore/notification/icon.h
@@ -18,7 +18,7 @@
 
 #ifndef NOTIFICATION_ICON_H
 #define NOTIFICATION_ICON_H
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 
 #include <QSharedData>
 #include <QDebug>
diff --git a/src/core/notification/icon_p.cpp b/src/libsnore/notification/icon_p.cpp
similarity index 100%
rename from src/core/notification/icon_p.cpp
rename to src/libsnore/notification/icon_p.cpp
diff --git a/src/core/notification/icon_p.h b/src/libsnore/notification/icon_p.h
similarity index 100%
rename from src/core/notification/icon_p.h
rename to src/libsnore/notification/icon_p.h
diff --git a/src/core/notification/notification.cpp b/src/libsnore/notification/notification.cpp
similarity index 100%
rename from src/core/notification/notification.cpp
rename to src/libsnore/notification/notification.cpp
diff --git a/src/core/notification/notification.h b/src/libsnore/notification/notification.h
similarity index 98%
rename from src/core/notification/notification.h
rename to src/libsnore/notification/notification.h
index 98d71b7..6809adc 100644
--- a/src/core/notification/notification.h
+++ b/src/libsnore/notification/notification.h
@@ -18,11 +18,11 @@
 
 #ifndef NOTIFICATION_H
 #define NOTIFICATION_H
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 #include "icon.h"
 #include "notificationaction.h"
-#include "../hint.h"
-#include "../application.h"
+#include "libsnore/hint.h"
+#include "libsnore/application.h"
 
 #include <QDebug>
 
diff --git a/src/core/notification/notification_p.cpp b/src/libsnore/notification/notification_p.cpp
similarity index 100%
rename from src/core/notification/notification_p.cpp
rename to src/libsnore/notification/notification_p.cpp
diff --git a/src/core/notification/notification_p.h b/src/libsnore/notification/notification_p.h
similarity index 100%
rename from src/core/notification/notification_p.h
rename to src/libsnore/notification/notification_p.h
diff --git a/src/core/notification/notificationaction.cpp b/src/libsnore/notification/notificationaction.cpp
similarity index 100%
rename from src/core/notification/notificationaction.cpp
rename to src/libsnore/notification/notificationaction.cpp
diff --git a/src/core/notification/notificationaction.h b/src/libsnore/notification/notificationaction.h
similarity index 98%
rename from src/core/notification/notificationaction.h
rename to src/libsnore/notification/notificationaction.h
index 8e3c05a..9e77ec7 100644
--- a/src/core/notification/notificationaction.h
+++ b/src/libsnore/notification/notificationaction.h
@@ -19,7 +19,7 @@
 #ifndef NOTIFICATIONACTION_H
 #define NOTIFICATIONACTION_H
 
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 
 #include <QDataStream>
 
diff --git a/src/core/plugins/CMakeLists.txt b/src/libsnore/plugins/CMakeLists.txt
similarity index 79%
rename from src/core/plugins/CMakeLists.txt
rename to src/libsnore/plugins/CMakeLists.txt
index 6190f54..f37132b 100644
--- a/src/core/plugins/CMakeLists.txt
+++ b/src/libsnore/plugins/CMakeLists.txt
@@ -13,4 +13,4 @@ set(SnoreNotify_HDR
         pluginsettingswidget.h)
 
 
-install(FILES ${SnoreNotify_HDR} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/snore/core/plugins)
+install(FILES ${SnoreNotify_HDR} DESTINATION ${LIBSNORE_INCLUDE_DIR}/plugins)
diff --git a/src/core/plugins/plugincontainer.cpp b/src/libsnore/plugins/plugincontainer.cpp
similarity index 100%
rename from src/core/plugins/plugincontainer.cpp
rename to src/libsnore/plugins/plugincontainer.cpp
diff --git a/src/core/plugins/plugincontainer.h b/src/libsnore/plugins/plugincontainer.h
similarity index 97%
rename from src/core/plugins/plugincontainer.h
rename to src/libsnore/plugins/plugincontainer.h
index c623c26..3670290 100644
--- a/src/core/plugins/plugincontainer.h
+++ b/src/libsnore/plugins/plugincontainer.h
@@ -18,8 +18,8 @@
 
 #ifndef PLUGINCONTAINER_H
 #define PLUGINCONTAINER_H
-#include "snore_exports.h"
-#include "../snore_p.h"
+#include "libsnore/snore_exports.h"
+#include "libsnore/snore_p.h"
 
 #include <QPluginLoader>
 #include <QDir>
diff --git a/src/core/plugins/plugins.cpp b/src/libsnore/plugins/plugins.cpp
similarity index 100%
rename from src/core/plugins/plugins.cpp
rename to src/libsnore/plugins/plugins.cpp
diff --git a/src/core/plugins/plugins.h b/src/libsnore/plugins/plugins.h
similarity index 95%
rename from src/core/plugins/plugins.h
rename to src/libsnore/plugins/plugins.h
index ab3712b..78de606 100644
--- a/src/core/plugins/plugins.h
+++ b/src/libsnore/plugins/plugins.h
@@ -18,10 +18,10 @@
 
 #ifndef SNORE_PLUGINS_H
 #define SNORE_PLUGINS_H
-#include "snore_exports.h"
-#include "snoreglobals.h"
+#include "libsnore/snore_exports.h"
+#include "libsnore/snoreglobals.h"
+#include "libsnore/notification/notification.h"
 #include "pluginsettingswidget.h"
-#include "../notification/notification.h"
 
 #include <QHash>
 
diff --git a/src/core/plugins/pluginsettingswidget.cpp b/src/libsnore/plugins/pluginsettingswidget.cpp
similarity index 100%
rename from src/core/plugins/pluginsettingswidget.cpp
rename to src/libsnore/plugins/pluginsettingswidget.cpp
diff --git a/src/core/plugins/pluginsettingswidget.h b/src/libsnore/plugins/pluginsettingswidget.h
similarity index 97%
rename from src/core/plugins/pluginsettingswidget.h
rename to src/libsnore/plugins/pluginsettingswidget.h
index 41646b6..e83a1ee 100644
--- a/src/core/plugins/pluginsettingswidget.h
+++ b/src/libsnore/plugins/pluginsettingswidget.h
@@ -18,7 +18,7 @@
 #ifndef PLUGINSETTINGSWIDGET_H
 #define PLUGINSETTINGSWIDGET_H
 
-#include "snore_exports.h"
+#include "libsnore/snore_exports.h"
 
 #include <QWidget>
 #include <QFormLayout>
diff --git a/src/core/plugins/snorebackend.cpp b/src/libsnore/plugins/snorebackend.cpp
similarity index 100%
rename from src/core/plugins/snorebackend.cpp
rename to src/libsnore/plugins/snorebackend.cpp
diff --git a/src/core/plugins/snorebackend.h b/src/libsnore/plugins/snorebackend.h
similarity index 95%
rename from src/core/plugins/snorebackend.h
rename to src/libsnore/plugins/snorebackend.h
index 6e6f23a..e98d494 100644
--- a/src/core/plugins/snorebackend.h
+++ b/src/libsnore/plugins/snorebackend.h
@@ -18,10 +18,10 @@
 
 #ifndef SNORE_BACKEND_H
 #define SNORE_BACKEND_H
-#include "snore_exports.h"
-#include "plugins.h"
-#include "../notification/notification.h"
-#include "../snore.h"
+#include "libsnore/snore_exports.h"
+#include "libsnore/plugins/plugins.h"
+#include "libsnore/notification/notification.h"
+#include "libsnore/snore.h"
 
 namespace Snore
 {
diff --git a/src/core/plugins/snorefrontend.cpp b/src/libsnore/plugins/snorefrontend.cpp
similarity index 100%
rename from src/core/plugins/snorefrontend.cpp
rename to src/libsnore/plugins/snorefrontend.cpp
diff --git a/src/core/plugins/snorefrontend.h b/src/libsnore/plugins/snorefrontend.h
similarity index 100%
rename from src/core/plugins/snorefrontend.h
rename to src/libsnore/plugins/snorefrontend.h
diff --git a/src/core/settingsdialog.cpp b/src/libsnore/settingsdialog.cpp
similarity index 100%
rename from src/core/settingsdialog.cpp
rename to src/libsnore/settingsdialog.cpp
diff --git a/src/core/settingsdialog.h b/src/libsnore/settingsdialog.h
similarity index 100%
rename from src/core/settingsdialog.h
rename to src/libsnore/settingsdialog.h
diff --git a/src/core/settingsdialog.ui b/src/libsnore/settingsdialog.ui
similarity index 96%
rename from src/core/settingsdialog.ui
rename to src/libsnore/settingsdialog.ui
index 19e45d1..d4ef8b7 100644
--- a/src/core/settingsdialog.ui
+++ b/src/libsnore/settingsdialog.ui
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SettingsDialog</class>
- <widget class="QWidget" name="SettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>979</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Settings</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../../data/snore.qrc">
-    <normaloff>:/root/snore.png</normaloff>:/root/snore.png</iconset>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="tabPosition">
-      <enum>QTabWidget::North</enum>
-     </property>
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>General</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <layout class="QFormLayout" name="formLayout">
-         <property name="fieldGrowthPolicy">
-          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="primaryBackendLabel">
-           <property name="text">
-            <string>Primary Backend</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QComboBox" name="primaryBackendComboBox"/>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="timeoutLabel">
-           <property name="text">
-            <string>Timeout</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QSpinBox" name="timeoutSpinBox">
-           <property name="suffix">
-            <string>s</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_backends">
-      <attribute name="title">
-       <string>Primary Backends</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QTabWidget" name="tabWidget_backends"/>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_secondaryBackends">
-      <attribute name="title">
-       <string>Secondary Bckends</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QTabWidget" name="tabWidget_secondary_backends"/>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_frontends">
-      <attribute name="title">
-       <string>Frontends</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <item>
-        <widget class="QTabWidget" name="tabWidget_frontends"/>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_plugins">
-      <attribute name="title">
-       <string>Plugins</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <widget class="QTabWidget" name="tabWidget_plugins"/>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="pushButton">
-     <property name="text">
-      <string>Display Test Notification</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../../data/snore.qrc"/>
- </resources>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SettingsDialog</class>
+ <widget class="QWidget" name="SettingsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>979</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Settings</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/snore.qrc">
+    <normaloff>:/root/snore.png</normaloff>:/root/snore.png</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="tabPosition">
+      <enum>QTabWidget::North</enum>
+     </property>
+     <property name="tabShape">
+      <enum>QTabWidget::Rounded</enum>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>General</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <layout class="QFormLayout" name="formLayout">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="primaryBackendLabel">
+           <property name="text">
+            <string>Primary Backend</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QComboBox" name="primaryBackendComboBox"/>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="timeoutLabel">
+           <property name="text">
+            <string>Timeout</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="timeoutSpinBox">
+           <property name="suffix">
+            <string>s</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_backends">
+      <attribute name="title">
+       <string>Primary Backends</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QTabWidget" name="tabWidget_backends"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_secondaryBackends">
+      <attribute name="title">
+       <string>Secondary Bckends</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QTabWidget" name="tabWidget_secondary_backends"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_frontends">
+      <attribute name="title">
+       <string>Frontends</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <widget class="QTabWidget" name="tabWidget_frontends"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_plugins">
+      <attribute name="title">
+       <string>Plugins</string>
+      </attribute>
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
+       <item>
+        <widget class="QTabWidget" name="tabWidget_plugins"/>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="pushButton">
+     <property name="text">
+      <string>Display Test Notification</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../data/snore.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/core/snore.cpp b/src/libsnore/snore.cpp
similarity index 100%
rename from src/core/snore.cpp
rename to src/libsnore/snore.cpp
diff --git a/src/core/snore.h b/src/libsnore/snore.h
similarity index 100%
rename from src/core/snore.h
rename to src/libsnore/snore.h
diff --git a/src/core/snore_p.cpp b/src/libsnore/snore_p.cpp
similarity index 100%
rename from src/core/snore_p.cpp
rename to src/libsnore/snore_p.cpp
diff --git a/src/core/snore_p.h b/src/libsnore/snore_p.h
similarity index 100%
rename from src/core/snore_p.h
rename to src/libsnore/snore_p.h
diff --git a/src/core/snoreglobals.h b/src/libsnore/snoreglobals.h
similarity index 100%
rename from src/core/snoreglobals.h
rename to src/libsnore/snoreglobals.h
diff --git a/src/core/version.cpp.in b/src/libsnore/version.cpp.in
similarity index 95%
rename from src/core/version.cpp.in
rename to src/libsnore/version.cpp.in
index a959c71..ff5e1e1 100644
--- a/src/core/version.cpp.in
+++ b/src/libsnore/version.cpp.in
@@ -1,30 +1,30 @@
-#include "version.h"
-
-namespace Snore{
-
-const QString Version::version()
-{
-    return QLatin1String("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}");
-}
-
-const QString Version::major(){
-    return QLatin1String("${SNORE_VERSION_MAJOR}");
-}
-
-const QString Version::minor(){
-    return QLatin1String("${SNORE_VERSION_MINOR}");
-}
-
-const QString Version::patch(){
-    return QLatin1String("${SNORE_VERSION_PATCH}");
-}
-
-const QString Version::revision(){
-    return QLatin1String("${SNORE_REVISION}");
-}
-
-const QString Version::buildTime(){
-    return QLatin1String(__TIMESTAMP__);
-}
-
-}
+#include "version.h"
+
+namespace Snore{
+
+const QString Version::version()
+{
+    return QLatin1String("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}.${SNORE_VERSION_PATCH}");
+}
+
+const QString Version::major(){
+    return QLatin1String("${SNORE_VERSION_MAJOR}");
+}
+
+const QString Version::minor(){
+    return QLatin1String("${SNORE_VERSION_MINOR}");
+}
+
+const QString Version::patch(){
+    return QLatin1String("${SNORE_VERSION_PATCH}");
+}
+
+const QString Version::revision(){
+    return QLatin1String("${SNORE_REVISION}");
+}
+
+const QString Version::buildTime(){
+    return QLatin1String(__TIMESTAMP__);
+}
+
+}
diff --git a/src/core/version.h b/src/libsnore/version.h
similarity index 100%
rename from src/core/version.h
rename to src/libsnore/version.h
diff --git a/src/plugins/backends/freedesktop/fredesktopnotification.h b/src/plugins/backends/freedesktop/fredesktopnotification.h
index e7b338f..1263292 100644
--- a/src/plugins/backends/freedesktop/fredesktopnotification.h
+++ b/src/plugins/backends/freedesktop/fredesktopnotification.h
@@ -19,7 +19,7 @@
 #ifndef FreedesktopNotification_H
 #define FreedesktopNotification_H
 
-#include "core/notification/notification.h"
+#include "libsnore/notification/notification.h"
 
 #include <QMetaType>
 #include <QDBusArgument>
diff --git a/src/plugins/backends/growl/growlbackend.cpp b/src/plugins/backends/growl/growlbackend.cpp
index a85cb9a..eb68cf1 100644
--- a/src/plugins/backends/growl/growlbackend.cpp
+++ b/src/plugins/backends/growl/growlbackend.cpp
@@ -19,8 +19,8 @@
 #include "growlbackend.h"
 #include "growlsettings.h"
 
-#include "core/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/snore.h"
+#include "libsnore/snore_p.h"
 
 using namespace Snore;
 
diff --git a/src/plugins/backends/growl/growlbackend.h b/src/plugins/backends/growl/growlbackend.h
index 6d24a3b..9ba19ae 100644
--- a/src/plugins/backends/growl/growlbackend.h
+++ b/src/plugins/backends/growl/growlbackend.h
@@ -18,7 +18,7 @@
 
 #ifndef GROWL_BACKEND_H
 #define GROWL_BACKEND_H
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include "growl.hpp"
 #include <string>
diff --git a/src/plugins/backends/snarl/snarl.cpp b/src/plugins/backends/snarl/snarl.cpp
index cbfc499..5c6aa57 100644
--- a/src/plugins/backends/snarl/snarl.cpp
+++ b/src/plugins/backends/snarl/snarl.cpp
@@ -19,11 +19,11 @@
 #include "snarl.h"
 #include "snarlsettings.h"
 
-#include "core/snore.h"
-#include "core/snore_p.h"
-#include "core/plugins/plugins.h"
-#include "core/plugins/snorebackend.h"
-#include "core/notification/notification_p.h"
+#include "libsnore/snore.h"
+#include "libsnore/snore_p.h"
+#include "libsnore/plugins/plugins.h"
+#include "libsnore/plugins/snorebackend.h"
+#include "libsnore/notification/notification_p.h"
 
 #include <QWidget>
 
diff --git a/src/plugins/backends/snarl/snarl.h b/src/plugins/backends/snarl/snarl.h
index 50af797..90ba516 100644
--- a/src/plugins/backends/snarl/snarl.h
+++ b/src/plugins/backends/snarl/snarl.h
@@ -18,7 +18,7 @@
 
 #ifndef SNARL_BACKEND_H
 #define SNARL_BACKEND_H
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 #include "SnarlInterface.h"
 
 class SnarlBackend: public Snore::SnoreBackend
diff --git a/src/plugins/backends/snore/notifywidget.cpp b/src/plugins/backends/snore/notifywidget.cpp
index ffc0497..419e710 100644
--- a/src/plugins/backends/snore/notifywidget.cpp
+++ b/src/plugins/backends/snore/notifywidget.cpp
@@ -18,7 +18,7 @@
 
 #include "notifywidget.h"
 #include "snorenotifier.h"
-#include "core/log.h"
+#include "libsnore/log.h"
 
 using namespace Snore;
 
diff --git a/src/plugins/backends/snore/notifywidget.h b/src/plugins/backends/snore/notifywidget.h
index c9ea727..265a4d4 100644
--- a/src/plugins/backends/snore/notifywidget.h
+++ b/src/plugins/backends/snore/notifywidget.h
@@ -20,7 +20,7 @@
 #define NOTIFYWIDGET_H
 
 #include <QSharedMemory>
-#include "core/notification/notification.h"
+#include "libsnore/notification/notification.h"
 
 #include <QtQuick/QtQuick>
 
diff --git a/src/plugins/backends/snore/snorenotifier.cpp b/src/plugins/backends/snore/snorenotifier.cpp
index 6e0fcf5..b00ad2e 100644
--- a/src/plugins/backends/snore/snorenotifier.cpp
+++ b/src/plugins/backends/snore/snorenotifier.cpp
@@ -19,8 +19,8 @@
 #include "snorenotifier.h"
 #include "notifywidget.h"
 #include "snorenotifiersettings.h"
-#include "core/notification/notification_p.h"
-#include "core/snore_p.h"
+#include "libsnore/notification/notification_p.h"
+#include "libsnore/snore_p.h"
 
 #include <QThread>
 
diff --git a/src/plugins/backends/snore/snorenotifier.h b/src/plugins/backends/snore/snorenotifier.h
index 3d84ef3..50a46a1 100644
--- a/src/plugins/backends/snore/snorenotifier.h
+++ b/src/plugins/backends/snore/snorenotifier.h
@@ -19,7 +19,7 @@
 #ifndef SNORENOTIFIER_H
 #define SNORENOTIFIER_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include "notifywidget.h"
 
diff --git a/src/plugins/backends/snoretoast/snoretoast.cpp b/src/plugins/backends/snoretoast/snoretoast.cpp
index aa0d835..bca7cba 100644
--- a/src/plugins/backends/snoretoast/snoretoast.cpp
+++ b/src/plugins/backends/snoretoast/snoretoast.cpp
@@ -1,8 +1,8 @@
 #include "snoretoast.h"
-#include "core/snore.h"
-#include "core/snore_p.h"
-#include "core/plugins/plugins.h"
-#include "core/plugins/snorebackend.h"
+#include "libsnore/snore.h"
+#include "libsnore/snore_p.h"
+#include "libsnore/plugins/plugins.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include <QDir>
 #include <QApplication>
diff --git a/src/plugins/backends/snoretoast/snoretoast.h b/src/plugins/backends/snoretoast/snoretoast.h
index ffc0b83..79160c7 100644
--- a/src/plugins/backends/snoretoast/snoretoast.h
+++ b/src/plugins/backends/snoretoast/snoretoast.h
@@ -1,7 +1,7 @@
 #ifndef TOASTER_H
 #define TOASTER_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 #include <QProcess>
 
 class SnoreToast : public Snore::SnoreBackend
diff --git a/src/plugins/backends/trayicon/trayiconnotifer.cpp b/src/plugins/backends/trayicon/trayiconnotifer.cpp
index 3d67f31..4dc3253 100644
--- a/src/plugins/backends/trayicon/trayiconnotifer.cpp
+++ b/src/plugins/backends/trayicon/trayiconnotifer.cpp
@@ -1,6 +1,6 @@
 #include "trayiconnotifer.h"
-#include "core/snore.h"
-#include "core/snore_p.h"
+#include "libsnore/snore.h"
+#include "libsnore/snore_p.h"
 
 #include <QSystemTrayIcon>
 using namespace Snore;
diff --git a/src/plugins/backends/trayicon/trayiconnotifer.h b/src/plugins/backends/trayicon/trayiconnotifer.h
index b64d19d..e646433 100644
--- a/src/plugins/backends/trayicon/trayiconnotifer.h
+++ b/src/plugins/backends/trayicon/trayiconnotifer.h
@@ -1,7 +1,7 @@
 #ifndef TRAYICONNOTIFER_H
 #define TRAYICONNOTIFER_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 namespace Snore
 {
diff --git a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
index cec0a81..1faf623 100644
--- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
+++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
@@ -20,9 +20,9 @@
 #include "notificationsadaptor.h"
 
 #include "plugins/backends/freedesktop/fredesktopnotification.h"
-#include "core/snore.h"
-#include "core/version.h"
-#include "core/notification/notification_p.h"
+#include "libsnore/snore.h"
+#include "libsnore/version.h"
+#include "libsnore/notification/notification_p.h"
 
 #include <QImage>
 #include <QIcon>
diff --git a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
index ca4a84a..14af551 100644
--- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
+++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
@@ -18,8 +18,8 @@
 
 #ifndef FREEDESKTOPNOTIFICATION_FRONTEND_H
 #define FREEDESKTOPNOTIFICATION_FRONTEND_H
-#include "core/plugins/snorefrontend.h"
-#include "core/application.h"
+#include "libsnore/plugins/snorefrontend.h"
+#include "libsnore/application.h"
 
 class NotificationsAdaptor;
 
diff --git a/src/plugins/frontends/snarlnetwork/parser.cpp b/src/plugins/frontends/snarlnetwork/parser.cpp
index e0fd4a9..c629ff0 100644
--- a/src/plugins/frontends/snarlnetwork/parser.cpp
+++ b/src/plugins/frontends/snarlnetwork/parser.cpp
@@ -19,9 +19,9 @@
 #include "parser.h"
 #include "snarlnetwork.h"
 
-#include "core/snore.h"
-#include "core/notification/notification.h"
-#include "core/notification/notification_p.h"
+#include "libsnore/snore.h"
+#include "libsnore/notification/notification.h"
+#include "libsnore/notification/notification_p.h"
 
 #include <QObject>
 #include <QTcpSocket>
diff --git a/src/plugins/frontends/snarlnetwork/parser.h b/src/plugins/frontends/snarlnetwork/parser.h
index 8c0f51b..160ee20 100644
--- a/src/plugins/frontends/snarlnetwork/parser.h
+++ b/src/plugins/frontends/snarlnetwork/parser.h
@@ -20,7 +20,7 @@
 #define PARSER_H
 #include <QString>
 #include <QHash>
-#include "core/notification/notification.h"
+#include "libsnore/notification/notification.h"
 #include <QSharedPointer>
 #include <QObject>
 
diff --git a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
index 45ce16f..43317be 100644
--- a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
+++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
@@ -17,7 +17,7 @@
 */
 
 #include "snarlnetwork.h"
-#include "core/snore.h"
+#include "libsnore/snore.h"
 
 #include <QTcpServer>
 #include <QTcpSocket>
diff --git a/src/plugins/frontends/snarlnetwork/snarlnetwork.h b/src/plugins/frontends/snarlnetwork/snarlnetwork.h
index c5a72a5..385fbd8 100644
--- a/src/plugins/frontends/snarlnetwork/snarlnetwork.h
+++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.h
@@ -18,8 +18,8 @@
 
 #ifndef SNARLNETWORK_H
 #define SNARLNETWORK_H
-#include "core/plugins/snorefrontend.h"
-#include "core/log.h"
+#include "libsnore/plugins/snorefrontend.h"
+#include "libsnore/log.h"
 #include "parser.h"
 
 #include <QTcpSocket>
diff --git a/src/plugins/secondary_backends/sound/sound.h b/src/plugins/secondary_backends/sound/sound.h
index f68ce96..707ec5a 100644
--- a/src/plugins/secondary_backends/sound/sound.h
+++ b/src/plugins/secondary_backends/sound/sound.h
@@ -18,7 +18,7 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 class Sound : public Snore::SnoreSecondaryBackend
 {
diff --git a/src/plugins/secondary_backends/toasty/toasty.h b/src/plugins/secondary_backends/toasty/toasty.h
index 1a8979f..9f4d32a 100644
--- a/src/plugins/secondary_backends/toasty/toasty.h
+++ b/src/plugins/secondary_backends/toasty/toasty.h
@@ -18,7 +18,7 @@
 #ifndef TOASTY_H
 #define TOASTY_H
 
-#include "core/plugins/snorebackend.h"
+#include "libsnore/plugins/snorebackend.h"
 
 #include <QNetworkAccessManager>
 
diff --git a/src/settings/main.cpp b/src/settings/main.cpp
index bfebbd7..07f95d9 100644
--- a/src/settings/main.cpp
+++ b/src/settings/main.cpp
@@ -1,6 +1,6 @@
 
-#include "core/snore.h"
-#include "core/version.h"
+#include "libsnore/snore.h"
+#include "libsnore/version.h"
 #include "settingswindow.h"
 
 #include <QApplication>
diff --git a/src/settings/settingswindow.ui b/src/settings/settingswindow.ui
index 13394f6..ca7e15d 100644
--- a/src/settings/settingswindow.ui
+++ b/src/settings/settingswindow.ui
@@ -49,7 +49,7 @@
   <customwidget>
    <class>Snore::SettingsDialog</class>
    <extends>QWidget</extends>
-   <header location="global">core/settingsdialog.h</header>
+   <header location="global">libsnore/settingsdialog.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>