From 4f81b7aa0b701920f1e05ac8095f529a42be3eef Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Sat, 11 Apr 2020 15:18:17 +0200
Subject: [PATCH] Refactor

---
 lib/controller.js                                   | 4 ++--
 lib/extension/{ => legacy}/bridgeLegacy.js          | 8 ++++----
 lib/extension/{ => legacy}/deviceGroupMembership.js | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename lib/extension/{ => legacy}/bridgeLegacy.js (98%)
 rename lib/extension/{ => legacy}/deviceGroupMembership.js (91%)

diff --git a/lib/controller.js b/lib/controller.js
index e7ef3d1ca..e50cf2bef 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -14,8 +14,8 @@ const ExtensionNetworkMap = require('./extension/networkMap');
 const ExtensionSoftReset = require('./extension/softReset');
 const ExtensionHomeAssistant = require('./extension/homeassistant');
 const ExtensionDeviceConfigure = require('./extension/deviceConfigure');
-const ExtensionDeviceGroupMembership = require('./extension/deviceGroupMembership');
-const ExtensionBridgeLegacy = require('./extension/bridgeLegacy');
+const ExtensionDeviceGroupMembership = require('./extension/legacy/deviceGroupMembership');
+const ExtensionBridgeLegacy = require('./extension/legacy/bridgeLegacy');
 const ExtensionGroups = require('./extension/groups');
 const ExtensionDeviceAvailability = require('./extension/deviceAvailability');
 const ExtensionDeviceBind = require('./extension/deviceBind');
diff --git a/lib/extension/bridgeLegacy.js b/lib/extension/legacy/bridgeLegacy.js
similarity index 98%
rename from lib/extension/bridgeLegacy.js
rename to lib/extension/legacy/bridgeLegacy.js
index 15c7be941..04c7819bb 100644
--- a/lib/extension/bridgeLegacy.js
+++ b/lib/extension/legacy/bridgeLegacy.js
@@ -1,9 +1,9 @@
-const settings = require('../util/settings');
-const logger = require('../util/logger');
+const settings = require('../../util/settings');
+const logger = require('../../util/logger');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
-const utils = require('../util/utils');
+const utils = require('../../util/utils');
 const assert = require('assert');
-const BaseExtension = require('./baseExtension');
+const BaseExtension = require('../baseExtension');
 
 const configRegex =
     new RegExp(`${settings.get().mqtt.base_topic}/bridge/config/((?:\\w+/get)|(?:\\w+/factory_reset)|(?:\\w+))`);
diff --git a/lib/extension/deviceGroupMembership.js b/lib/extension/legacy/deviceGroupMembership.js
similarity index 91%
rename from lib/extension/deviceGroupMembership.js
rename to lib/extension/legacy/deviceGroupMembership.js
index 978881e9f..7280fd697 100644
--- a/lib/extension/deviceGroupMembership.js
+++ b/lib/extension/legacy/deviceGroupMembership.js
@@ -1,7 +1,7 @@
 /* istanbul ignore file */
-const settings = require('../util/settings');
-const logger = require('../util/logger');
-const BaseExtension = require('./baseExtension');
+const settings = require('../../util/settings');
+const logger = require('../../util/logger');
+const BaseExtension = require('../baseExtension');
 
 const topicRegex = new RegExp(`^${settings.get().mqtt.base_topic}/bridge/device/(.+)/get_group_membership$`);