diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/plugin.json b/plugins/hal-tibber/src/se/hal/plugin/tibber/plugin.json
deleted file mode 100644
index b8ea4937..00000000
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/plugin.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "version": 0.1,
-    "name": "Hal-Tibber",
-    "description": "Plugin that connects to the Tibber API.",
-    "interfaces": [
-        {"se.hal.intf.HalAutostartController": "se.hal.plugin.tibber.TibberController"},
-
-        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.tibber.device.TibberElectricityCostSensor"},
-        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.tibber.device.TibberElectricityPriceSensor"},
-        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.tibber.device.TibberPowerConsumptionSensor"}
-    ]
-}
\ No newline at end of file
diff --git a/plugins/hal-tibber/build.gradle b/plugins/hal-vendor-tibber/build.gradle
similarity index 100%
rename from plugins/hal-tibber/build.gradle
rename to plugins/hal-vendor-tibber/build.gradle
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/TibberAPIClient.java b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberAPIClient.java
similarity index 94%
rename from plugins/hal-tibber/src/se/hal/plugin/tibber/TibberAPIClient.java
rename to plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberAPIClient.java
index f49bd62a..3b6c11b0 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/TibberAPIClient.java
+++ b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberAPIClient.java
@@ -22,23 +22,16 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.tibber;
+package se.hal.plugin.vendor.tibber;
 
 import se.hal.HalContext;
-import se.hal.plugin.tibber.device.TibberElectricityCostSensor;
-import se.hal.plugin.tibber.device.TibberElectricityPriceSensor;
-import se.hal.plugin.tibber.device.TibberPowerConsumptionSensor;
-import se.hal.struct.devicedata.PriceSensorData;
-import se.hal.util.ListenerUtil;
 import zutil.ObjectUtil;
 import zutil.log.LogUtil;
 import zutil.net.http.HttpClient;
 import zutil.net.http.HttpHeader;
 import zutil.parser.DataNode;
 import zutil.parser.json.JSONParser;
-import zutil.ui.UserMessageManager;
 
-import javax.xml.crypto.Data;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/TibberController.java b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberController.java
similarity index 91%
rename from plugins/hal-tibber/src/se/hal/plugin/tibber/TibberController.java
rename to plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberController.java
index a120f53e..061a8ed6 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/TibberController.java
+++ b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberController.java
@@ -22,25 +22,18 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.tibber;
+package se.hal.plugin.vendor.tibber;
 
 import se.hal.HalContext;
 import se.hal.HalServer;
 import se.hal.intf.*;
-import se.hal.plugin.tibber.device.TibberElectricityCostSensor;
-import se.hal.plugin.tibber.device.TibberElectricityPriceSensor;
-import se.hal.plugin.tibber.device.TibberPowerConsumptionSensor;
+import se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensor;
+import se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensor;
+import se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensor;
 import se.hal.struct.devicedata.PriceSensorData;
 import se.hal.util.ListenerUtil;
-import zutil.ObjectUtil;
 import zutil.log.LogUtil;
-import zutil.net.http.HttpClient;
-import zutil.net.http.HttpHeader;
-import zutil.parser.DataNode;
-import zutil.parser.json.JSONParser;
-import zutil.ui.UserMessageManager;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/TibberDevice.java b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberDevice.java
similarity index 93%
rename from plugins/hal-tibber/src/se/hal/plugin/tibber/TibberDevice.java
rename to plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberDevice.java
index b05ea79f..a82418c6 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/TibberDevice.java
+++ b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/TibberDevice.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2024 Ziver Koc
+ * Copyright (c) 2024-2025 Ziver Koc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.tibber;
+package se.hal.plugin.vendor.tibber;
 
 public interface TibberDevice {
 }
\ No newline at end of file
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberElectricityCostSensor.java b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityCostSensor.java
similarity index 93%
rename from plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberElectricityCostSensor.java
rename to plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityCostSensor.java
index 0afe0ceb..49cc6dd2 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberElectricityCostSensor.java
+++ b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityCostSensor.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2024 Ziver Koc
+ * Copyright (c) 2024-2025 Ziver Koc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,12 +22,12 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.tibber.device;
+package se.hal.plugin.vendor.tibber.device;
 
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
-import se.hal.plugin.tibber.TibberController;
+import se.hal.plugin.vendor.tibber.TibberController;
 import se.hal.struct.devicedata.CostSensorData;
 
 /**
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberElectricityPriceSensor.java b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityPriceSensor.java
similarity index 93%
rename from plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberElectricityPriceSensor.java
rename to plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityPriceSensor.java
index b3418bbf..b7879fa5 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberElectricityPriceSensor.java
+++ b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberElectricityPriceSensor.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2024 Ziver Koc
+ * Copyright (c) 2024-2025 Ziver Koc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,12 +22,12 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.tibber.device;
+package se.hal.plugin.vendor.tibber.device;
 
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
-import se.hal.plugin.tibber.TibberController;
+import se.hal.plugin.vendor.tibber.TibberController;
 import se.hal.struct.devicedata.PriceSensorData;
 
 /**
diff --git a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberPowerConsumptionSensor.java b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberPowerConsumptionSensor.java
similarity index 93%
rename from plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberPowerConsumptionSensor.java
rename to plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberPowerConsumptionSensor.java
index b11e63af..7df1ecf1 100644
--- a/plugins/hal-tibber/src/se/hal/plugin/tibber/device/TibberPowerConsumptionSensor.java
+++ b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/device/TibberPowerConsumptionSensor.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2024 Ziver Koc
+ * Copyright (c) 2024-2025 Ziver Koc
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,13 +22,13 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.tibber.device;
+package se.hal.plugin.vendor.tibber.device;
 
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
 import se.hal.struct.devicedata.PowerConsumptionSensorData;
-import se.hal.plugin.tibber.TibberController;
+import se.hal.plugin.vendor.tibber.TibberController;
 
 
 public class TibberPowerConsumptionSensor implements HalSensorConfig {
diff --git a/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/plugin.json b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/plugin.json
new file mode 100644
index 00000000..a1dfac72
--- /dev/null
+++ b/plugins/hal-vendor-tibber/src/se/hal/plugin/vendor/tibber/plugin.json
@@ -0,0 +1,12 @@
+{
+    "version": 0.1,
+    "name": "Hal-Vendor-Tibber",
+    "description": "Plugin that connects to the Tibber API.",
+    "interfaces": [
+        {"se.hal.intf.HalAutostartController": "se.hal.plugin.vendor.tibber.TibberController"},
+
+        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityCostSensor"},
+        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberElectricityPriceSensor"},
+        {"se.hal.intf.HalSensorConfig": "se.hal.plugin.vendor.tibber.device.TibberPowerConsumptionSensor"}
+    ]
+}
\ No newline at end of file