diff --git a/device-types/Panduit/FAP12WAGDLCZ.yaml b/module-types/Panduit/FAP12WAGDLCZ.yaml
similarity index 93%
rename from device-types/Panduit/FAP12WAGDLCZ.yaml
rename to module-types/Panduit/FAP12WAGDLCZ.yaml
index a412f42b6..9ec9dada2 100644
--- a/device-types/Panduit/FAP12WAGDLCZ.yaml
+++ b/module-types/Panduit/FAP12WAGDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (12 LC Duplex APC/24 Strand, Green)
-slug: fap12wagdlcz
 part_number: FAP12WAGDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP12WAQDLCZ.yaml b/module-types/Panduit/FAP12WAQDLCZ.yaml
similarity index 93%
rename from device-types/Panduit/FAP12WAQDLCZ.yaml
rename to module-types/Panduit/FAP12WAQDLCZ.yaml
index 5a1ed4b80..b3e466e22 100644
--- a/device-types/Panduit/FAP12WAQDLCZ.yaml
+++ b/module-types/Panduit/FAP12WAQDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (12 LC Duplex/24 Strand, Aqua)
-slug: fap12waqdlcz
 part_number: FAP12WAQDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP12WBUDLCZ.yaml b/module-types/Panduit/FAP12WBUDLCZ.yaml
similarity index 93%
rename from device-types/Panduit/FAP12WBUDLCZ.yaml
rename to module-types/Panduit/FAP12WBUDLCZ.yaml
index 277015777..124a46e60 100644
--- a/device-types/Panduit/FAP12WBUDLCZ.yaml
+++ b/module-types/Panduit/FAP12WBUDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (12 LC Duplex/24 Strand, Blue)
-slug: fap12wbudlcz
 part_number: FAP12WBUDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP12WBULCZ.yaml b/module-types/Panduit/FAP12WBULCZ.yaml
similarity index 93%
rename from device-types/Panduit/FAP12WBULCZ.yaml
rename to module-types/Panduit/FAP12WBULCZ.yaml
index e66a4bee9..d276d73de 100644
--- a/device-types/Panduit/FAP12WBULCZ.yaml
+++ b/module-types/Panduit/FAP12WBULCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (12 LC Simplex/12 Strand, Blue)
-slug: fap12wbulcz
 part_number: FAP12WBULCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP6WAGDLCZ.yaml b/module-types/Panduit/FAP6WAGDLCZ.yaml
similarity index 89%
rename from device-types/Panduit/FAP6WAGDLCZ.yaml
rename to module-types/Panduit/FAP6WAGDLCZ.yaml
index 06dfbc8fd..4cd4f44ae 100644
--- a/device-types/Panduit/FAP6WAGDLCZ.yaml
+++ b/module-types/Panduit/FAP6WAGDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (6 LC Duplex APC/12 Strand, Green)
-slug: fap6wagdlcz
 part_number: FAP6WAGDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP6WAQDLCZ.yaml b/module-types/Panduit/FAP6WAQDLCZ.yaml
similarity index 89%
rename from device-types/Panduit/FAP6WAQDLCZ.yaml
rename to module-types/Panduit/FAP6WAQDLCZ.yaml
index 9e3a159c4..b806454e2 100644
--- a/device-types/Panduit/FAP6WAQDLCZ.yaml
+++ b/module-types/Panduit/FAP6WAQDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (6 LC Duplex/12 Strand, Aqua)
-slug: fap6waqdlcz
 part_number: FAP6WAQDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP6WBUDLCZ.yaml b/module-types/Panduit/FAP6WBUDLCZ.yaml
similarity index 89%
rename from device-types/Panduit/FAP6WBUDLCZ.yaml
rename to module-types/Panduit/FAP6WBUDLCZ.yaml
index 2d1191259..59818618f 100644
--- a/device-types/Panduit/FAP6WBUDLCZ.yaml
+++ b/module-types/Panduit/FAP6WBUDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (6 LC Duplex/12 Strand, Blue)
-slug: fap6wbudlcz
 part_number: FAP6WBUDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP8WAQDLCZ.yaml b/module-types/Panduit/FAP8WAQDLCZ.yaml
similarity index 91%
rename from device-types/Panduit/FAP8WAQDLCZ.yaml
rename to module-types/Panduit/FAP8WAQDLCZ.yaml
index dafe255fe..6f0d2f29f 100644
--- a/device-types/Panduit/FAP8WAQDLCZ.yaml
+++ b/module-types/Panduit/FAP8WAQDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (8 LC Duplex/16 Strand, Aqua)
-slug: fap8waqdlcz
 part_number: FAP8WAQDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FAP8WBUDLCZ.yaml b/module-types/Panduit/FAP8WBUDLCZ.yaml
similarity index 91%
rename from device-types/Panduit/FAP8WBUDLCZ.yaml
rename to module-types/Panduit/FAP8WBUDLCZ.yaml
index 3fc3567b6..7c6a8166c 100644
--- a/device-types/Panduit/FAP8WBUDLCZ.yaml
+++ b/module-types/Panduit/FAP8WBUDLCZ.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom Fiber Adapter Panel (8 LC Duplex/16 Strand, Blue)
-slug: fap8wbudlcz
 part_number: FAP8WBUDLCZ
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FC29N-24-10AS.yaml b/module-types/Panduit/FC29N-24-10AS.yaml
similarity index 93%
rename from device-types/Panduit/FC29N-24-10AS.yaml
rename to module-types/Panduit/FC29N-24-10AS.yaml
index 28cf3347e..855dd4fc6 100644
--- a/device-types/Panduit/FC29N-24-10AS.yaml
+++ b/module-types/Panduit/FC29N-24-10AS.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom MPO-LC Fiber Cassette OS2, 24 Fiber, Method A
-slug: fc29n-24-10as
 part_number: FC29N-24-10AS
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FC29N-24-10U.yaml b/module-types/Panduit/FC29N-24-10U.yaml
similarity index 93%
rename from device-types/Panduit/FC29N-24-10U.yaml
rename to module-types/Panduit/FC29N-24-10U.yaml
index fc737fc95..2bdcd9e64 100644
--- a/device-types/Panduit/FC29N-24-10U.yaml
+++ b/module-types/Panduit/FC29N-24-10U.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom MPO-LC Fiber Cassette OS2, 24 Fiber, Universal
-slug: fc29n-24-10u
 part_number: FC29N-24-10U
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FC2XO-24-10AS.yaml b/module-types/Panduit/FC2XO-24-10AS.yaml
similarity index 93%
rename from device-types/Panduit/FC2XO-24-10AS.yaml
rename to module-types/Panduit/FC2XO-24-10AS.yaml
index c79e65193..305a08510 100644
--- a/device-types/Panduit/FC2XO-24-10AS.yaml
+++ b/module-types/Panduit/FC2XO-24-10AS.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom MPO-LC Fiber Cassette OM3, 24 Fiber, Method A
-slug: fc2xo-24-10as
 part_number: FC2XO-24-10AS
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc
diff --git a/device-types/Panduit/FC2XO-24-10U.yaml b/module-types/Panduit/FC2XO-24-10U.yaml
similarity index 93%
rename from device-types/Panduit/FC2XO-24-10U.yaml
rename to module-types/Panduit/FC2XO-24-10U.yaml
index a9b07c908..18078d570 100644
--- a/device-types/Panduit/FC2XO-24-10U.yaml
+++ b/module-types/Panduit/FC2XO-24-10U.yaml
@@ -1,11 +1,7 @@
 ---
 manufacturer: Panduit
 model: Opticom MPO-LC Fiber Cassette OM3, 24 Fiber, Universal
-slug: fc2xo-24-10u
 part_number: FC2XO-24-10U
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 front-ports:
   - name: '01'
     type: lc