diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/config/config.xml
new file mode 100644
index 000000000..9945d63e8
--- /dev/null
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/config/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config-description:config-descriptions
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description-1.0.0.xsd">
+
+	<config-description uri="thing-type:hdpowerview:repeater">
+		<parameter name="id" type="integer" min="1" required="true">
+			<label>ID</label>
+			<description>The numeric ID of the PowerView Repeater in the Hub</description>
+		</parameter>
+	</config-description>
+
+	<config-description uri="thing-type:hdpowerview:shade">
+		<parameter name="id" type="integer" min="1" required="true">
+			<label>ID</label>
+			<description>The numeric ID of the PowerView Shade in the Hub</description>
+		</parameter>
+	</config-description>
+
+</config-description:config-descriptions>
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/bridge.xml
new file mode 100644
index 000000000..1c20f86e9
--- /dev/null
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/bridge.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="hdpowerview"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<bridge-type id="hub">
+		<label>PowerView Hub</label>
+		<description>Hunter Douglas (Luxaflex) PowerView Hub</description>
+
+		<channel-groups>
+			<channel-group id="scenes" typeId="scenes"/>
+			<channel-group id="sceneGroups" typeId="sceneGroups"/>
+			<channel-group id="automations" typeId="automations"/>
+		</channel-groups>
+
+		<properties>
+			<property name="vendor">Hunter Douglas (Luxaflex)</property>
+			<property name="modelId">PowerView Hub</property>
+		</properties>
+
+		<representation-property>host</representation-property>
+
+		<config-description>
+			<parameter name="host" type="text" required="true">
+				<label>Host</label>
+				<description>The Host address of the PowerView Hub</description>
+				<context>network-address</context>
+			</parameter>
+			<parameter name="refresh" type="integer" required="false">
+				<label>Refresh Interval</label>
+				<description>The number of milliseconds between fetches of the PowerView Hub shade state</description>
+				<default>60000</default>
+			</parameter>
+			<parameter name="hardRefresh" type="integer" required="false">
+				<label>Hard Position Refresh Interval</label>
+				<description>The number of minutes between hard refreshes of positions from the PowerView Hub (or 0 to disable)</description>
+				<default>180</default>
+			</parameter>
+			<parameter name="hardRefreshBatteryLevel" type="integer" required="false">
+				<label>Hard Battery Level Refresh Interval</label>
+				<description>The number of hours between hard refreshes of battery levels from the PowerView Hub (or 0 to disable,
+					default is weekly)</description>
+				<advanced>true</advanced>
+				<default>0</default>
+			</parameter>
+		</config-description>
+	</bridge-type>
+
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/channels.xml
new file mode 100644
index 000000000..110c0a28a
--- /dev/null
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/channels.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="hdpowerview"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<channel-type id="shade-position">
+		<item-type>Rollershutter</item-type>
+		<label>Position</label>
+		<description>The vertical position of the shade</description>
+	</channel-type>
+
+	<channel-type id="shade-vane">
+		<item-type>Dimmer</item-type>
+		<label>Vane</label>
+		<description>The opening of the slats in the shade</description>
+	</channel-type>
+
+	<channel-type id="shade-command" advanced="true">
+		<item-type>String</item-type>
+		<label>Command</label>
+		<description>Send a command to the shade</description>
+		<command>
+			<options>
+				<option value="IDENTIFY">Identify</option>
+				<option value="CALIBRATE">Calibrate</option>
+			</options>
+		</command>
+		<autoUpdatePolicy>veto</autoUpdatePolicy>
+	</channel-type>
+
+	<channel-type id="scene-activate">
+		<item-type>Switch</item-type>
+		<label>Activate</label>
+	</channel-type>
+
+	<channel-type id="scene-group-activate">
+		<item-type>Switch</item-type>
+		<label>Activate</label>
+	</channel-type>
+
+	<channel-type id="automation-enabled">
+		<item-type>Switch</item-type>
+		<label>Enable</label>
+	</channel-type>
+
+	<channel-type id="battery-voltage" advanced="true">
+		<item-type>Number:ElectricPotential</item-type>
+		<label>Battery Voltage</label>
+		<description>Battery voltage reported by the shade</description>
+		<state pattern="%.1f %unit%" readOnly="true"/>
+	</channel-type>
+
+	<channel-type id="repeater-identify">
+		<item-type>String</item-type>
+		<label>Identify</label>
+		<description>Flash repeater to identify</description>
+		<command>
+			<options>
+				<option value="IDENTIFY">Identify</option>
+			</options>
+		</command>
+	</channel-type>
+
+	<channel-type id="repeater-blinking-enabled">
+		<item-type>Switch</item-type>
+		<label>Blinking Enabled</label>
+		<description>Blink during commands</description>
+	</channel-type>
+
+	<channel-group-type id="scenes">
+		<label>Scenes</label>
+	</channel-group-type>
+
+	<channel-group-type id="sceneGroups">
+		<label>Scene Groups</label>
+	</channel-group-type>
+
+	<channel-group-type id="automations">
+		<label>Automations</label>
+	</channel-group-type>
+
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/repeater.xml b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/repeater.xml
new file mode 100644
index 000000000..c415c5140
--- /dev/null
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/repeater.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="hdpowerview"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<thing-type id="repeater">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="hub"/>
+		</supported-bridge-type-refs>
+		<label>PowerView Repeater</label>
+		<description>Hunter Douglas (Luxaflex) PowerView Repeater</description>
+
+		<channels>
+			<channel id="color" typeId="system.color">
+				<description>Controls the color of the LED ring</description>
+			</channel>
+			<channel id="brightness" typeId="system.brightness">
+				<description>Controls the brightness of the LED ring</description>
+			</channel>
+			<channel id="identify" typeId="repeater-identify"/>
+			<channel id="blinkingEnabled" typeId="repeater-blinking-enabled"/>
+		</channels>
+
+		<properties>
+			<property name="vendor">Hunter Douglas (Luxaflex)</property>
+			<property name="modelId">PowerView Repeater</property>
+		</properties>
+
+		<representation-property>id</representation-property>
+
+		<config-description-ref uri="thing-type:hdpowerview:repeater"/>
+	</thing-type>
+
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/shade.xml b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/shade.xml
new file mode 100644
index 000000000..2466dc9f4
--- /dev/null
+++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/shade.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="hdpowerview"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
+
+	<thing-type id="shade">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="hub"/>
+		</supported-bridge-type-refs>
+		<label>PowerView Shade</label>
+		<description>Hunter Douglas (Luxaflex) PowerView Shade</description>
+
+		<channels>
+			<channel id="position" typeId="shade-position"/>
+			<channel id="secondary" typeId="shade-position">
+				<label>Secondary Position</label>
+				<description>The secondary vertical position (on top-down/bottom-up shades)</description>
+			</channel>
+			<channel id="vane" typeId="shade-vane"/>
+			<channel id="command" typeId="shade-command"/>
+			<channel id="lowBattery" typeId="system.low-battery"/>
+			<channel id="batteryLevel" typeId="system.battery-level"/>
+			<channel id="batteryVoltage" typeId="battery-voltage"/>
+			<channel id="signalStrength" typeId="system.signal-strength"/>
+		</channels>
+
+		<properties>
+			<property name="vendor">Hunter Douglas (Luxaflex)</property>
+			<property name="modelId">PowerView Motorized Shade</property>
+		</properties>
+
+		<representation-property>id</representation-property>
+
+		<config-description-ref uri="thing-type:hdpowerview:shade"/>
+	</thing-type>
+
+</thing:thing-descriptions>
diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/thing-types.xml
deleted file mode 100644
index 95aaca7fc..000000000
--- a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/thing/thing-types.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<thing:thing-descriptions bindingId="hdpowerview"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
-
-	<bridge-type id="hub">
-		<label>PowerView Hub</label>
-		<description>Hunter Douglas (Luxaflex) PowerView Hub</description>
-
-		<channel-groups>
-			<channel-group id="scenes" typeId="scenes"/>
-			<channel-group id="sceneGroups" typeId="sceneGroups"/>
-			<channel-group id="automations" typeId="automations"/>
-		</channel-groups>
-
-		<properties>
-			<property name="vendor">Hunter Douglas (Luxaflex)</property>
-			<property name="modelId">PowerView Hub</property>
-		</properties>
-
-		<representation-property>host</representation-property>
-
-		<config-description>
-			<parameter name="host" type="text" required="true">
-				<label>Host</label>
-				<description>The Host address of the PowerView Hub</description>
-				<context>network-address</context>
-			</parameter>
-			<parameter name="refresh" type="integer" required="false">
-				<label>Refresh Interval</label>
-				<description>The number of milliseconds between fetches of the PowerView Hub shade state</description>
-				<default>60000</default>
-			</parameter>
-			<parameter name="hardRefresh" type="integer" required="false">
-				<label>Hard Position Refresh Interval</label>
-				<description>The number of minutes between hard refreshes of positions from the PowerView Hub (or 0 to disable)</description>
-				<default>180</default>
-			</parameter>
-			<parameter name="hardRefreshBatteryLevel" type="integer" required="false">
-				<label>Hard Battery Level Refresh Interval</label>
-				<description>The number of hours between hard refreshes of battery levels from the PowerView Hub (or 0 to disable,
-					default is weekly)</description>
-				<advanced>true</advanced>
-				<default>0</default>
-			</parameter>
-		</config-description>
-	</bridge-type>
-
-	<thing-type id="shade">
-		<supported-bridge-type-refs>
-			<bridge-type-ref id="hub"/>
-		</supported-bridge-type-refs>
-		<label>PowerView Shade</label>
-		<description>Hunter Douglas (Luxaflex) PowerView Shade</description>
-
-		<channels>
-			<channel id="position" typeId="shade-position"/>
-			<channel id="secondary" typeId="shade-position">
-				<label>Secondary Position</label>
-				<description>The secondary vertical position (on top-down/bottom-up shades)</description>
-			</channel>
-			<channel id="vane" typeId="shade-vane"/>
-			<channel id="command" typeId="shade-command"/>
-			<channel id="lowBattery" typeId="system.low-battery"/>
-			<channel id="batteryLevel" typeId="system.battery-level"/>
-			<channel id="batteryVoltage" typeId="battery-voltage"/>
-			<channel id="signalStrength" typeId="system.signal-strength"/>
-		</channels>
-
-		<properties>
-			<property name="vendor">Hunter Douglas (Luxaflex)</property>
-			<property name="modelId">PowerView Motorized Shade</property>
-		</properties>
-		<representation-property>id</representation-property>
-
-		<config-description>
-			<parameter name="id" type="integer" min="1" required="true">
-				<label>ID</label>
-				<description>The numeric ID of the PowerView Shade in the Hub</description>
-			</parameter>
-		</config-description>
-	</thing-type>
-
-	<thing-type id="repeater">
-		<supported-bridge-type-refs>
-			<bridge-type-ref id="hub"/>
-		</supported-bridge-type-refs>
-		<label>PowerView Repeater</label>
-		<description>Hunter Douglas (Luxaflex) PowerView Repeater</description>
-
-		<channels>
-			<channel id="color" typeId="system.color">
-				<description>Controls the color of the LED ring</description>
-			</channel>
-			<channel id="brightness" typeId="system.brightness">
-				<description>Controls the brightness of the LED ring</description>
-			</channel>
-			<channel id="identify" typeId="repeater-identify"/>
-			<channel id="blinkingEnabled" typeId="repeater-blinking-enabled"/>
-		</channels>
-
-		<properties>
-			<property name="vendor">Hunter Douglas (Luxaflex)</property>
-			<property name="modelId">PowerView Repeater</property>
-		</properties>
-
-		<representation-property>id</representation-property>
-
-		<config-description>
-			<parameter name="id" type="integer" min="1" required="true">
-				<label>ID</label>
-				<description>The numeric ID of the PowerView Repeater in the Hub</description>
-			</parameter>
-		</config-description>
-	</thing-type>
-
-	<channel-type id="shade-position">
-		<item-type>Rollershutter</item-type>
-		<label>Position</label>
-		<description>The vertical position of the shade</description>
-	</channel-type>
-
-	<channel-type id="shade-vane">
-		<item-type>Dimmer</item-type>
-		<label>Vane</label>
-		<description>The opening of the slats in the shade</description>
-	</channel-type>
-
-	<channel-type id="shade-command" advanced="true">
-		<item-type>String</item-type>
-		<label>Command</label>
-		<description>Send a command to the shade</description>
-		<command>
-			<options>
-				<option value="IDENTIFY">Identify</option>
-				<option value="CALIBRATE">Calibrate</option>
-			</options>
-		</command>
-		<autoUpdatePolicy>veto</autoUpdatePolicy>
-	</channel-type>
-
-	<channel-type id="scene-activate">
-		<item-type>Switch</item-type>
-		<label>Activate</label>
-	</channel-type>
-
-	<channel-type id="scene-group-activate">
-		<item-type>Switch</item-type>
-		<label>Activate</label>
-	</channel-type>
-
-	<channel-type id="automation-enabled">
-		<item-type>Switch</item-type>
-		<label>Enable</label>
-	</channel-type>
-
-	<channel-type id="battery-voltage" advanced="true">
-		<item-type>Number:ElectricPotential</item-type>
-		<label>Battery Voltage</label>
-		<description>Battery voltage reported by the shade</description>
-		<state pattern="%.1f %unit%" readOnly="true"/>
-	</channel-type>
-
-	<channel-type id="repeater-identify">
-		<item-type>String</item-type>
-		<label>Identify</label>
-		<description>Flash repeater to identify</description>
-		<command>
-			<options>
-				<option value="IDENTIFY">Identify</option>
-			</options>
-		</command>
-	</channel-type>
-
-	<channel-type id="repeater-blinking-enabled">
-		<item-type>Switch</item-type>
-		<label>Blinking Enabled</label>
-		<description>Blink during commands</description>
-	</channel-type>
-
-	<channel-group-type id="scenes">
-		<label>Scenes</label>
-	</channel-group-type>
-
-	<channel-group-type id="sceneGroups">
-		<label>Scene Groups</label>
-	</channel-group-type>
-
-	<channel-group-type id="automations">
-		<label>Automations</label>
-	</channel-group-type>
-
-</thing:thing-descriptions>