diff --git a/systemmonitor/README.md b/systemmonitor/README.md
new file mode 100644
index 00000000..529d1120
--- /dev/null
+++ b/systemmonitor/README.md
@@ -0,0 +1,3 @@
+# Systemmonitor
+
+
diff --git a/systemmonitor/devicepluginsystemmonitor.cpp b/systemmonitor/devicepluginsystemmonitor.cpp
index d912cb3f..adb45f78 100644
--- a/systemmonitor/devicepluginsystemmonitor.cpp
+++ b/systemmonitor/devicepluginsystemmonitor.cpp
@@ -36,7 +36,7 @@ DevicePluginSystemMonitor::~DevicePluginSystemMonitor()
     }
 }
 
-DeviceManager::DeviceSetupStatus DevicePluginSystemMonitor::setupDevice(Device *device)
+Device::DeviceSetupStatus DevicePluginSystemMonitor::setupDevice(Device *device)
 {
     Q_UNUSED(device)
 
@@ -46,7 +46,7 @@ DeviceManager::DeviceSetupStatus DevicePluginSystemMonitor::setupDevice(Device *
     }
 
 
-    return DeviceManager::DeviceSetupStatusSuccess;
+    return Device::DeviceSetupStatusSuccess;
 }
 
 void DevicePluginSystemMonitor::deviceRemoved(Device *device)
diff --git a/systemmonitor/devicepluginsystemmonitor.h b/systemmonitor/devicepluginsystemmonitor.h
index 7d69e0a9..727fcc23 100644
--- a/systemmonitor/devicepluginsystemmonitor.h
+++ b/systemmonitor/devicepluginsystemmonitor.h
@@ -23,8 +23,8 @@
 #ifndef DEVICEPLUGINSYSTEMMONITOR_H
 #define DEVICEPLUGINSYSTEMMONITOR_H
 
-#include "devicemanager.h"
-#include "plugin/deviceplugin.h"
+#include "devices/devicemanager.h"
+#include "devices/deviceplugin.h"
 #include "plugintimer.h"
 
 #include <QDebug>
@@ -39,9 +39,9 @@ class DevicePluginSystemMonitor: public DevicePlugin {
 
 public:
     explicit DevicePluginSystemMonitor();
-    ~DevicePluginSystemMonitor();
+    ~DevicePluginSystemMonitor() override;
 
-    DeviceManager::DeviceSetupStatus setupDevice(Device *device) override;
+    Device::DeviceSetupStatus setupDevice(Device *device) override;
     void deviceRemoved(Device *device) override;
 
 private slots:
diff --git a/systemmonitor/devicepluginsystemmonitor.json b/systemmonitor/devicepluginsystemmonitor.json
index 442378bb..736a3b3f 100644
--- a/systemmonitor/devicepluginsystemmonitor.json
+++ b/systemmonitor/devicepluginsystemmonitor.json
@@ -4,15 +4,14 @@
     "id": "908b4f18-dc0c-4940-a6f7-c0c01a2861b8",
     "vendors": [
         {
-            "displayName": "guh GmbH",
-            "name": "guh",
+            "displayName": "nymea",
+            "name": "nymea",
             "id": "2062d64d-3232-433c-88bc-0d33c0ba2ba6",
             "deviceClasses": [
                 {
                     "id": "a3a15700-c251-4803-a608-0f3ddfcbd7a8",
                     "name": "systemMonitor",
                     "displayName": "System monitor",
-                    "createMethods": [ "manual" ],
                     "paramTypes": [ ],
                     "stateTypes": [
                         {