diff --git a/device-types/cisco-ncs540-acc-sys.yaml b/device-types/Cisco/cisco-ncs540-acc-sys.yaml
similarity index 67%
rename from device-types/cisco-ncs540-acc-sys.yaml
rename to device-types/Cisco/cisco-ncs540-acc-sys.yaml
index 74abb1413..87a5f0eb4 100644
--- a/device-types/cisco-ncs540-acc-sys.yaml
+++ b/device-types/Cisco/cisco-ncs540-acc-sys.yaml
@@ -5,199 +5,119 @@ slug: ncs-540
 part_number: N540-ACC-SYS
 u_height: 1
 is_full_depth: false
-subdevice_role: ''
-comments: ''
 console-ports:
   - name: Console
     type: rj-45
-    label: ''
-    description: ''
 power-ports:
   - name: PM0
     type: iec-60320-c14
     maximum_draw: 400
-    allocated_draw:
-    label: ''
-    description: ''
   - name: PM1
     type: iec-60320-c14
     maximum_draw: 400
-    allocated_draw:
-    label: ''
-    description: ''
 interfaces:
   - name: TenGigE0/0/0/0
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/1
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/2
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/3
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/4
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/5
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/6
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/7
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/8
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/9
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/10
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/11
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/12
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/13
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/14
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/15
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/16
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/17
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/18
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/19
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/20
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/21
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/22
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TenGigE0/0/0/23
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/24
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/25
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/26
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/27
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/28
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/29
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/30
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: TwentyFiveGigE0/0/0/31
     type: 25gbase-x-sfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: HundredGigE0/0/1/0
     type: 100gbase-x-qsfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: HundredGigE0/0/1/1
     type: 100gbase-x-qsfp28
     mgmt_only: false
-    label: ''
-    description: ''
   - name: MgmtEth0/RP0/CPU0/0
     type: 1000base-t
     mgmt_only: true
-    label: MGMT
-    description: ''
diff --git a/device-types/huawei-s5720-56c-ei-48s-ac.yaml b/device-types/Huawei/huawei-s5720-56c-ei-48s-ac.yaml
similarity index 100%
rename from device-types/huawei-s5720-56c-ei-48s-ac.yaml
rename to device-types/Huawei/huawei-s5720-56c-ei-48s-ac.yaml