diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3807b98f..c2145d5cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,8 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Activities Archive CoreAddons GuiAddons Crash DBusAddons Declarative GlobalAccel I18n 
     IconThemes KIO NewStuff Notifications Plasma PlasmaQuick Wayland WindowSystem XmlGui)
 
+find_package(Latte REQUIRED)
+    
 find_package(X11 REQUIRED)
 set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
     URL "http://www.x.org"
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 2390d7072..4fb8b7aae 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -23,7 +23,6 @@ add_subdirectory(settings/views)
 add_subdirectory(settings/widgets)
 add_subdirectory(shortcuts)
 add_subdirectory(tools)
-add_subdirectory(types)
 add_subdirectory(view)
 add_subdirectory(view/helpers)
 add_subdirectory(view/indicator)
diff --git a/app/indicator/factory.h b/app/indicator/factory.h
index b19eca9a5..797a29fa3 100644
--- a/app/indicator/factory.h
+++ b/app/indicator/factory.h
@@ -20,14 +20,14 @@
 #ifndef INDICATORFACTORY_H
 #define INDICATORFACTORY_H
 
-// local
-#include "../types/types.h"
-
 // Qt
 #include <QHash>
 #include <QObject>
 #include <QWidget>
 
+// Latte
+#include <Latte/types.h>
+
 class KPluginMetaData;
 
 namespace Latte {
diff --git a/app/lattecorona.h b/app/lattecorona.h
index 91a1a0075..bf989a1c0 100644
--- a/app/lattecorona.h
+++ b/app/lattecorona.h
@@ -24,7 +24,6 @@
 // local
 #include "plasma/quick/configview.h"
 #include "layout/storage.h"
-#include "types/types.h"
 #include "view/panelshadows_p.h"
 
 // Qt
@@ -37,6 +36,9 @@
 // KDE
 #include <KAboutApplicationDialog>
 
+// Latte
+#include <Latte/types.h>
+
 namespace KDeclarative {
 class QmlObjectSharedEngine;
 }
diff --git a/app/layout/abstractlayout.h b/app/layout/abstractlayout.h
index 7a6be8d28..f0ea350dc 100644
--- a/app/layout/abstractlayout.h
+++ b/app/layout/abstractlayout.h
@@ -20,9 +20,6 @@
 #ifndef ABSTRACTLAYOUT_H
 #define ABSTRACTLAYOUT_H
 
-// local
-#include "../types/types.h"
-
 // Qt
 #include <QObject>
 
@@ -32,6 +29,9 @@
 // Plasma
 #include <Plasma>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Types;
 }
diff --git a/app/layout/centrallayout.cpp b/app/layout/centrallayout.cpp
index 21b618fec..fe998ebbd 100644
--- a/app/layout/centrallayout.cpp
+++ b/app/layout/centrallayout.cpp
@@ -29,12 +29,14 @@
 #include "../layouts/synchronizer.h"
 #include "../settings/universalsettings.h"
 #include "../view/view.h"
-#include "../types/types.h"
 
 // KDE
 #include <KConfigGroup>
 #include <KActivities/Consumer>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 
 CentralLayout::CentralLayout(QObject *parent, QString layoutFile, QString assignedName)
diff --git a/app/layout/genericlayout.h b/app/layout/genericlayout.h
index 6fe9b98bb..3314dad40 100644
--- a/app/layout/genericlayout.h
+++ b/app/layout/genericlayout.h
@@ -22,7 +22,6 @@
 
 // local
 #include "abstractlayout.h"
-#include "../types/types.h"
 
 // Qt
 #include <QObject>
@@ -33,6 +32,9 @@
 // Plasma
 #include <Plasma>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Applet;
 class Containment;
diff --git a/app/layouts/importer.cpp b/app/layouts/importer.cpp
index ca4b62b6f..59fbec03c 100644
--- a/app/layouts/importer.cpp
+++ b/app/layouts/importer.cpp
@@ -26,7 +26,6 @@
 #include "../screenpool.h"
 #include "../layout/abstractlayout.h"
 #include "../settings/universalsettings.h"
-#include "../types/types.h"
 
 // Qt
 #include <QFile>
@@ -40,6 +39,9 @@
 #include <KLocalizedString>
 #include <KNotification>
 
+// Latte
+#include <Latte/types.h>
+
 enum SessionType
 {
     DefaultSession = 0,
diff --git a/app/layouts/launcherssignals.cpp b/app/layouts/launcherssignals.cpp
index db66b6908..6c5827bdb 100644
--- a/app/layouts/launcherssignals.cpp
+++ b/app/layouts/launcherssignals.cpp
@@ -25,7 +25,6 @@
 #include "../layout/centrallayout.h"
 #include "../layouts/manager.h"
 #include "../layouts/synchronizer.h"
-#include "../types/tasks.h"
 
 // Qt
 #include <QQuickItem>
@@ -34,6 +33,9 @@
 #include <Plasma/Applet>
 #include <Plasma/Containment>
 
+// Latte
+#include <Latte/tasks.h>
+
 namespace Latte {
 namespace Layouts {
 
diff --git a/app/main.cpp b/app/main.cpp
index 3fdb1af62..01610a4da 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -22,8 +22,6 @@
 #include "config-latte.h"
 #include "lattecorona.h"
 #include "layouts/importer.h"
-#include "types/tasks.h"
-#include "types/types.h"
 
 // C++
 #include <memory>
@@ -60,9 +58,6 @@ inline void detectPlatform(int argc, char **argv);
 
 int main(int argc, char **argv)
 {
-    qmlRegisterUncreatableType<Latte::Tasks>("org.kde.latte", 0, 2, "Tasks", "Latte Tasks Types uncreatable");
-    qmlRegisterUncreatableType<Latte::Types>("org.kde.latte", 0, 2, "Types", "Latte Types uncreatable");
-
     //Plasma scales itself to font DPI
     //on X, where we don't have compositor scaling, this generally works fine.
     //also there are bugs on older Qt, especially when it comes to fractional scaling
diff --git a/app/plasma/extended/screengeometries.h b/app/plasma/extended/screengeometries.h
index 7da4dd62d..1f63d397a 100644
--- a/app/plasma/extended/screengeometries.h
+++ b/app/plasma/extended/screengeometries.h
@@ -25,7 +25,8 @@
 #include <QObject>
 #include <QTimer>
 
-#include "../../types/types.h"
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 class Corona;
diff --git a/app/settings/controllers/layoutscontroller.h b/app/settings/controllers/layoutscontroller.h
index 44d2faaa0..73d5c030f 100644
--- a/app/settings/controllers/layoutscontroller.h
+++ b/app/settings/controllers/layoutscontroller.h
@@ -27,7 +27,6 @@
 #include "../views/layoutsheaderview.h"
 #include "../models/layoutsmodel.h"
 #include "../../lattecorona.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QAbstractItemModel>
@@ -35,6 +34,9 @@
 #include <QSortFilterProxyModel>
 #include <QTableView>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class Corona;
 class CentralLayout;
diff --git a/app/settings/data/layoutdata.h b/app/settings/data/layoutdata.h
index f7fdd7322..67921305f 100644
--- a/app/settings/data/layoutdata.h
+++ b/app/settings/data/layoutdata.h
@@ -21,14 +21,14 @@
 #ifndef SETTINGSDATALAYOUT_H
 #define SETTINGSDATALAYOUT_H
 
-//local
-#include "../../types/types.h"
-
 //Qt
 #include <QMetaType>
 #include <QString>
 #include <QStringList>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace Settings {
 namespace Data {
diff --git a/app/settings/data/preferencesdata.h b/app/settings/data/preferencesdata.h
index bac5beb52..f3b04e257 100644
--- a/app/settings/data/preferencesdata.h
+++ b/app/settings/data/preferencesdata.h
@@ -21,7 +21,8 @@
 #ifndef SETTINGSDATAPREFERENCES_H
 #define SETTINGSDATAPREFERENCES_H
 
-#include "../../types/types.h"
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 namespace Settings {
diff --git a/app/settings/dialogs/settingsdialog.cpp b/app/settings/dialogs/settingsdialog.cpp
index 3b9e4c231..84aa7e158 100644
--- a/app/settings/dialogs/settingsdialog.cpp
+++ b/app/settings/dialogs/settingsdialog.cpp
@@ -33,7 +33,6 @@
 #include "../../layouts/manager.h"
 #include "../../layouts/synchronizer.h"
 #include "../../plasma/extended/theme.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QButtonGroup>
diff --git a/app/settings/dialogs/settingsdialog.h b/app/settings/dialogs/settingsdialog.h
index b55918f50..b1e5e1abc 100644
--- a/app/settings/dialogs/settingsdialog.h
+++ b/app/settings/dialogs/settingsdialog.h
@@ -27,7 +27,6 @@
 #include "../controllers/layoutscontroller.h"
 #include "../handlers/tablayoutshandler.h"
 #include "../handlers/tabpreferenceshandler.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QObject>
@@ -41,6 +40,9 @@
 // KDE
 #include <KHelpMenu>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Ui {
 class SettingsDialog;
 }
diff --git a/app/settings/handlers/detailsinfohandler.cpp b/app/settings/handlers/detailsinfohandler.cpp
index e66c9df46..5ad24f685 100644
--- a/app/settings/handlers/detailsinfohandler.cpp
+++ b/app/settings/handlers/detailsinfohandler.cpp
@@ -26,7 +26,9 @@
 #include "../dialogs/detailsdialog.h"
 #include "../widgets/patternwidget.h"
 #include "../../layout/abstractlayout.h"
-#include "../../types/types.h"
+
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 namespace Settings {
diff --git a/app/settings/handlers/tablayoutshandler.cpp b/app/settings/handlers/tablayoutshandler.cpp
index 6f2a8e3b8..59fd169b4 100644
--- a/app/settings/handlers/tablayoutshandler.cpp
+++ b/app/settings/handlers/tablayoutshandler.cpp
@@ -31,7 +31,6 @@
 #include "../../layout/centrallayout.h"
 #include "../../layouts/importer.h"
 #include "../../layouts/manager.h"
-#include "../../types/types.h"
 
 //! Qt
 #include <QFileDialog>
@@ -45,6 +44,9 @@
 #include <KIO/OpenFileManagerWindowJob>
 #include <KNewStuff3/KNS3/DownloadDialog>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace Settings {
 namespace Handler {
diff --git a/app/settings/handlers/tabpreferenceshandler.cpp b/app/settings/handlers/tabpreferenceshandler.cpp
index 3fb6ef069..6fd4dd698 100644
--- a/app/settings/handlers/tabpreferenceshandler.cpp
+++ b/app/settings/handlers/tabpreferenceshandler.cpp
@@ -26,7 +26,9 @@
 #include "../dialogs/settingsdialog.h"
 #include "../../lattecorona.h"
 #include "../../plasma/extended/theme.h"
-#include "../../types/types.h"
+
+// Latte
+#include <Latte/types.h>
 
 namespace Latte {
 namespace Settings {
diff --git a/app/settings/universalsettings.h b/app/settings/universalsettings.h
index d034857b9..6548e1ab7 100644
--- a/app/settings/universalsettings.h
+++ b/app/settings/universalsettings.h
@@ -23,7 +23,6 @@
 
 // local
 #include "../lattecorona.h"
-#include "../types/types.h"
 
 // Qt
 #include <QObject>
@@ -38,6 +37,9 @@
 #include <KConfigGroup>
 #include <KSharedConfig>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace Layouts {
 class Manager;
diff --git a/app/shortcuts/globalshortcuts.h b/app/shortcuts/globalshortcuts.h
index a6948a482..736e34bca 100644
--- a/app/shortcuts/globalshortcuts.h
+++ b/app/shortcuts/globalshortcuts.h
@@ -21,9 +21,6 @@
 #ifndef GLOBALSHORTCUTS_H
 #define GLOBALSHORTCUTS_H
 
-// local
-#include "../types/types.h"
-
 // Qt
 #include <QAction>
 #include <QPointer>
@@ -32,6 +29,9 @@
 // KDE
 #include <kmodifierkeyinfo.h>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Containment;
 }
diff --git a/app/types/CMakeLists.txt b/app/types_deprecated/CMakeLists.txt
similarity index 100%
rename from app/types/CMakeLists.txt
rename to app/types_deprecated/CMakeLists.txt
diff --git a/app/types/tasks.cpp b/app/types_deprecated/tasks.cpp
similarity index 100%
rename from app/types/tasks.cpp
rename to app/types_deprecated/tasks.cpp
diff --git a/app/types/tasks.h b/app/types_deprecated/tasks.h
similarity index 100%
rename from app/types/tasks.h
rename to app/types_deprecated/tasks.h
diff --git a/app/types/types.cpp b/app/types_deprecated/types.cpp
similarity index 100%
rename from app/types/types.cpp
rename to app/types_deprecated/types.cpp
diff --git a/app/types/types.h b/app/types_deprecated/types.h
similarity index 100%
rename from app/types/types.h
rename to app/types_deprecated/types.h
diff --git a/app/view/effects.cpp b/app/view/effects.cpp
index 5e500c511..f1250d3b1 100644
--- a/app/view/effects.cpp
+++ b/app/view/effects.cpp
@@ -23,7 +23,6 @@
 #include "panelshadows_p.h"
 #include "view.h"
 #include "settings/primaryconfigview.h"
-#include "../types/types.h"
 
 // Qt
 #include <QRegion>
@@ -32,6 +31,9 @@
 #include <KWindowEffects>
 #include <KWindowSystem>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace ViewPart {
 
diff --git a/app/view/indicator/indicator.cpp b/app/view/indicator/indicator.cpp
index 7b088f155..c486d70e8 100644
--- a/app/view/indicator/indicator.cpp
+++ b/app/view/indicator/indicator.cpp
@@ -24,7 +24,6 @@
 #include "../view.h"
 #include "../../lattecorona.h"
 #include "../../indicator/factory.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QFileDialog>
@@ -35,6 +34,9 @@
 #include <KDeclarative/ConfigPropertyMap>
 #include <KDeclarative/QmlObjectSharedEngine>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace ViewPart {
 
diff --git a/app/view/positioner.cpp b/app/view/positioner.cpp
index 7b8d5e3af..984ce9775 100644
--- a/app/view/positioner.cpp
+++ b/app/view/positioner.cpp
@@ -26,7 +26,6 @@
 #include "../lattecorona.h"
 #include "../screenpool.h"
 #include "../settings/universalsettings.h"
-#include "../types/types.h"
 
 // Qt
 #include <QDebug>
@@ -36,6 +35,9 @@
 #include <KWayland/Client/surface.h>
 #include <KWindowSystem>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 namespace ViewPart {
 
diff --git a/app/view/settings/primaryconfigview.cpp b/app/view/settings/primaryconfigview.cpp
index 897419ff2..a59a411e9 100644
--- a/app/view/settings/primaryconfigview.cpp
+++ b/app/view/settings/primaryconfigview.cpp
@@ -32,7 +32,6 @@
 #include "../../settings/universalsettings.h"
 #include "../../shortcuts/globalshortcuts.h"
 #include "../../shortcuts/shortcutstracker.h"
-#include "../../types/tasks.h"
 #include "../../wm/abstractwindowinterface.h"
 
 // Qt
@@ -52,6 +51,9 @@
 // Plasma
 #include <Plasma/Package>
 
+// Latte
+#include <Latte/tasks.h>
+
 namespace Latte {
 namespace ViewPart {
 
diff --git a/app/view/settings/primaryconfigview.h b/app/view/settings/primaryconfigview.h
index b13dcf936..44d061f5c 100644
--- a/app/view/settings/primaryconfigview.h
+++ b/app/view/settings/primaryconfigview.h
@@ -24,7 +24,6 @@
 // local
 #include "../../plasma/quick/configview.h"
 #include "../../wm/windowinfowrap.h"
-#include "../../types/types.h"
 
 //Qt
 #include <QObject>
@@ -36,6 +35,9 @@
 #include <plasma/package.h>
 #include <Plasma/FrameSvg>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Applet;
 class Containment;
diff --git a/app/view/settings/secondaryconfigview.h b/app/view/settings/secondaryconfigview.h
index c04298ea7..baeaaa4ba 100644
--- a/app/view/settings/secondaryconfigview.h
+++ b/app/view/settings/secondaryconfigview.h
@@ -22,7 +22,6 @@
 
 // local
 #include "../../wm/windowinfowrap.h"
-#include "../../types/types.h"
 
 //Qt
 #include <QObject>
@@ -34,6 +33,9 @@
 #include <plasma/package.h>
 #include <Plasma/FrameSvg>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Applet;
 class Containment;
diff --git a/app/view/view.h b/app/view/view.h
index b1eb91de5..ba9f93dd7 100644
--- a/app/view/view.h
+++ b/app/view/view.h
@@ -33,7 +33,6 @@
 #include "../layout/genericlayout.h"
 #include "../plasma/quick/containmentview.h"
 #include "../plasma/quick/configview.h"
-#include "../types/types.h"
 
 // C++
 #include <array>
@@ -47,6 +46,9 @@
 #include <QPointer>
 #include <QTimer>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Plasma {
 class Types;
 class Corona;
diff --git a/app/view/visibilitymanager.h b/app/view/visibilitymanager.h
index 7931cc685..1beb45978 100644
--- a/app/view/visibilitymanager.h
+++ b/app/view/visibilitymanager.h
@@ -25,7 +25,6 @@
 
 // local
 #include "../plasma/quick/containmentview.h"
-#include "../types/types.h"
 
 // Qt
 #include <QObject>
@@ -34,6 +33,9 @@
 // Plasma
 #include <Plasma/Containment>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class Corona;
 class View;
diff --git a/app/wm/abstractwindowinterface.h b/app/wm/abstractwindowinterface.h
index 7b2f74d47..d500423d2 100644
--- a/app/wm/abstractwindowinterface.h
+++ b/app/wm/abstractwindowinterface.h
@@ -26,8 +26,6 @@
 #include "tasktools.h"
 #include "windowinfowrap.h"
 #include "tracker/windowstracker.h"
-#include "../types/types.h"
-//#include "../liblatte2/extras.h"
 
 // C++
 #include <unordered_map>
@@ -51,6 +49,9 @@
 // Plasma
 #include <Plasma>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class Corona;
 namespace WindowSystem {
diff --git a/app/wm/tracker/windowstracker.h b/app/wm/tracker/windowstracker.h
index 8dda0bdad..4b502293f 100644
--- a/app/wm/tracker/windowstracker.h
+++ b/app/wm/tracker/windowstracker.h
@@ -22,7 +22,6 @@
 
 // local
 #include "../windowinfowrap.h"
-#include "../../types/types.h"
 
 // Qt
 #include <QObject>
@@ -31,6 +30,9 @@
 #include <QMap>
 #include <QTimer>
 
+// Latte
+#include <Latte/types.h>
+
 namespace Latte {
 class View;
 namespace Layout {
diff --git a/app/wm/waylandinterface.cpp b/app/wm/waylandinterface.cpp
index 560e24287..c7d461e61 100644
--- a/app/wm/waylandinterface.cpp
+++ b/app/wm/waylandinterface.cpp
@@ -25,7 +25,6 @@
 #include "view/view.h"
 #include "view/helpers/screenedgeghostwindow.h"
 #include "../lattecorona.h"
-#include "../types/types.h"
 
 // Qt
 #include <QDebug>
@@ -34,6 +33,9 @@
 #include <QtX11Extras/QX11Info>
 #include <QRasterWindow>
 
+// Latte
+#include <Latte/types.h>
+
 // KDE
 #include <KWindowSystem>
 #include <KWindowInfo>
diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp
index 1b0f83b01..93cdea46a 100644
--- a/app/wm/xwindowinterface.cpp
+++ b/app/wm/xwindowinterface.cpp
@@ -24,7 +24,6 @@
 #include "tasktools.h"
 #include "view/view.h"
 #include "view/helpers/screenedgeghostwindow.h"
-#include "../types/types.h"
 
 // Qt
 #include <QDebug>
@@ -37,6 +36,9 @@
 #include <KWindowInfo>
 #include <KIconThemes/KIconLoader>
 
+// Latte
+#include <Latte/types.h>
+
 // X11
 #include <NETWM>
 #include <xcb/xcb.h>