diff --git a/dist/main.js b/dist/main.js
index 0486713..89302a4 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -223,13 +223,6 @@ let bedRoomWindowLight = new M433SwitchItem_1.M433SwitchItem('1st', 'BedRoom', '
 bedRoomWindowLight.start();
 allLabeledItems.push(bedRoomWindowLight);
 allRelevantLights.push(bedRoomWindowLight);
-// MySwitchTHing
-let mySwitchThingWolfgang = new MySwitchThing_1.MySwitchThing('1st', 'BedRoom', 'WolfgangsSwitch', [
-    new MySwitchThing_1.MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
-    new MySwitchThing_1.MySwitchSingleItem('IoT/InsLeere/1'),
-    new MySwitchThing_1.MySwitchSingleItem('IoT/InsLeere/2'),
-]);
-mySwitchThingWolfgang.start();
 let windowContactBedroomStreet1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17);
 windowContactBedroomStreet1st.start();
 allLabeledItems.push(windowContactBedroomStreet1st);
@@ -365,15 +358,22 @@ allLabeledItems.push(relayBox);
 let heatingSceneAll = new HeatingScene_1.HeatingScene('Gnd', 'House', 'Heatings', 'Alle Heizungen', allThermostatItems);
 heatingSceneAll.start();
 // ----------------------------------------------------------------------------------------------------------
-let twoLedSignal1 = new TwoLedSignal_1.TwoLedSignal('Gnd', 'Hallway', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger', allRelevantLights, "OFF", "ON", allWindows, "CLOSED", "OPEN");
-twoLedSignal1.start();
-// ----------------------------------------------------------------------------------------------------------
 // Basement
 let workshopLight = new HomematicSwitchItem_1.HomematicSwitchItem('Base', 'Workshop', 'Light', 'Licht Werkstatt', 5);
 workshopLight.start();
 allLabeledItems.push(workshopLight);
 allRelevantLights.push(workshopLight);
 // ----------------------------------------------------------------------------------------------------------
+let twoLedSignal1 = new TwoLedSignal_1.TwoLedSignal('Gnd', 'Hallway', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger', allRelevantLights, "OFF", "ON", allWindows, "CLOSED", "OPEN");
+twoLedSignal1.start();
+// MySwitchTHing
+let mySwitchThingWolfgang = new MySwitchThing_1.MySwitchThing('1st', 'BedRoom', 'WolfgangsSwitch', [
+    new MySwitchThing_1.MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
+    new MySwitchThing_1.MySwitchSingleItem('IoT/InsLeere/1'),
+    new MySwitchThing_1.MySwitchSingleItem('IoT/InsLeere/2'),
+]);
+mySwitchThingWolfgang.start();
+// ----------------------------------------------------------------------------------------------------------
 let testFourButton = new HomematicFourButtonThing_1.HomematicFourButtonThing('Gnd', 'Hallway', 'TestButton', 9, [
     new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/Testlight/dimmerIn'),
     new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/DeskLight/timerIn'),
diff --git a/src/main.ts b/src/main.ts
index 786c886..3975853 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -275,13 +275,6 @@ bedRoomWindowLight.start()
 allLabeledItems.push(bedRoomWindowLight)
 allRelevantLights.push(bedRoomWindowLight)
 
-// MySwitchTHing
-let mySwitchThingWolfgang = new MySwitchThing('1st', 'BedRoom', 'WolfgangsSwitch', [ 
-  new MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
-  new MySwitchSingleItem('IoT/InsLeere/1'),
-  new MySwitchSingleItem('IoT/InsLeere/2'),
-])
-mySwitchThingWolfgang.start()
 
 
 let windowContactBedroomStreet1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17)
@@ -453,11 +446,6 @@ let heatingSceneAll = new HeatingScene('Gnd', 'House', 'Heatings', 'Alle Heizung
 heatingSceneAll.start()
 
 
-// ----------------------------------------------------------------------------------------------------------
-let twoLedSignal1 = new TwoLedSignal('Gnd', 'Hallway', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger',
-  allRelevantLights, "OFF", "ON",
-  allWindows, "CLOSED", "OPEN")
-twoLedSignal1.start()
 
 // ----------------------------------------------------------------------------------------------------------
 // Basement
@@ -467,6 +455,21 @@ allLabeledItems.push(workshopLight)
 allRelevantLights.push(workshopLight)
 
 
+// ----------------------------------------------------------------------------------------------------------
+let twoLedSignal1 = new TwoLedSignal('Gnd', 'Hallway', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger',
+  allRelevantLights, "OFF", "ON",
+  allWindows, "CLOSED", "OPEN")
+twoLedSignal1.start()
+
+// MySwitchTHing
+let mySwitchThingWolfgang = new MySwitchThing('1st', 'BedRoom', 'WolfgangsSwitch', [ 
+  new MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
+  new MySwitchSingleItem('IoT/InsLeere/1'),
+  new MySwitchSingleItem('IoT/InsLeere/2'),
+])
+mySwitchThingWolfgang.start()
+
+
 // ----------------------------------------------------------------------------------------------------------
 let testFourButton = new HomematicFourButtonThing('Gnd', 'Hallway', 'TestButton', 9, [
   new HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/Testlight/dimmerIn'),