diff --git a/device-types/Check Point/SG23800.yaml b/device-types/Check Point/SG23800.yaml
new file mode 100644
index 00000000..878b96b3
--- /dev/null
+++ b/device-types/Check Point/SG23800.yaml	
@@ -0,0 +1,38 @@
+---
+manufacturer: Check Point
+model: SG23800
+slug: cpap-sg23800
+part_number: CPAP-SG23800
+u_height: 2.0
+is_full_depth: true
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
+    maximum_draw: 394
+  - name: PSU1
+    type: iec-60320-c14
+    maximum_draw: 394
+interfaces:
+  - name: LOM
+    type: 1000base-t
+    mgmt_only: true
+  - name: MGMT
+    type: 1000base-t
+    mgmt_only: true
+  - name: SYNC
+    type: 1000base-t
+    mgmt_only: false
+module-bays:
+  - name: '1'
+    position: '1'
+  - name: '2'
+    position: '2'
+  - name: '3'
+    position: '3'
+  - name: '4'
+    position: '4'
+  - name: '5'
+    position: '5'
diff --git a/module-types/Check Point/2-10FSR-BP-B.yaml b/module-types/Check Point/2-10FSR-BP-B.yaml
new file mode 100644
index 00000000..4e718900
--- /dev/null
+++ b/module-types/Check Point/2-10FSR-BP-B.yaml	
@@ -0,0 +1,13 @@
+---
+manufacturer: Check Point
+model: 2 Port 10G Base-SFP+ fail-open network I/O module interface card
+part_number: CPAC-2-10FSR-BP-B
+interfaces:
+  - name: eth{module}-01
+    label: '1'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
+  - name: eth{module}-02
+    label: '2'
+    type: 10gbase-x-sfpp
+    mgmt_only: false
diff --git a/device-types/Check Point/4-10F-C.yaml b/module-types/Check Point/4-10F-C.yaml
similarity index 69%
rename from device-types/Check Point/4-10F-C.yaml
rename to module-types/Check Point/4-10F-C.yaml
index 47ccd1fa..e59d408f 100644
--- a/device-types/Check Point/4-10F-C.yaml	
+++ b/module-types/Check Point/4-10F-C.yaml	
@@ -1,25 +1,21 @@
 ---
 manufacturer: Check Point
 model: 4 Port 10GBase-F SFP+ interface card
-slug: sg6000-card-10gbase-f
 part_number: CPAC-4-10F-C
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 interfaces:
-  - name: eth1-01
+  - name: eth{module}-01
     label: '1'
     type: 10gbase-x-sfpp
     mgmt_only: false
-  - name: eth1-02
+  - name: eth{module}-02
     label: '2'
     type: 10gbase-x-sfpp
     mgmt_only: false
-  - name: eth1-03
+  - name: eth{module}-03
     label: '3'
     type: 10gbase-x-sfpp
     mgmt_only: false
-  - name: eth1-04
+  - name: eth{module}-04
     label: '4'
     type: 10gbase-x-sfpp
     mgmt_only: false
diff --git a/module-types/Check Point/4-1C-BP-B.yaml b/module-types/Check Point/4-1C-BP-B.yaml
new file mode 100644
index 00000000..123773e0
--- /dev/null
+++ b/module-types/Check Point/4-1C-BP-B.yaml	
@@ -0,0 +1,21 @@
+---
+manufacturer: Check Point
+model: 4 Port 10/100/1000 Base-T RJ45 fail-open network I/O module interface card
+part_number: CPAC-4-1C-BP-B
+interfaces:
+  - name: eth{module}-01
+    label: '1'
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth{module}-02
+    label: '2'
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth{module}-03
+    label: '3'
+    type: 1000base-t
+    mgmt_only: false
+  - name: eth{module}-04
+    label: '4'
+    type: 1000base-t
+    mgmt_only: false
diff --git a/device-types/Check Point/4-1F-C.yaml b/module-types/Check Point/4-1F-C.yaml
similarity index 69%
rename from device-types/Check Point/4-1F-C.yaml
rename to module-types/Check Point/4-1F-C.yaml
index 40ca09c7..05fe373c 100644
--- a/device-types/Check Point/4-1F-C.yaml	
+++ b/module-types/Check Point/4-1F-C.yaml	
@@ -1,25 +1,21 @@
 ---
 manufacturer: Check Point
 model: 4 Port 1000Base-F SFP interface card
-slug: sg6000-card-1000base-f
 part_number: CPAC-4-1F-C
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 interfaces:
-  - name: eth1-01
+  - name: eth{module}-01
     label: '1'
     type: 1000base-x-sfp
     mgmt_only: false
-  - name: eth1-02
+  - name: eth{module}-02
     label: '2'
     type: 1000base-x-sfp
     mgmt_only: false
-  - name: eth1-03
+  - name: eth{module}-03
     label: '3'
     type: 1000base-x-sfp
     mgmt_only: false
-  - name: eth1-04
+  - name: eth{module}-04
     label: '4'
     type: 1000base-x-sfp
     mgmt_only: false
diff --git a/device-types/Check Point/8-1C-C.yaml b/module-types/Check Point/8-1C-C.yaml
similarity index 69%
rename from device-types/Check Point/8-1C-C.yaml
rename to module-types/Check Point/8-1C-C.yaml
index efa6956c..a2837d69 100644
--- a/device-types/Check Point/8-1C-C.yaml	
+++ b/module-types/Check Point/8-1C-C.yaml	
@@ -1,25 +1,21 @@
 ---
 manufacturer: Check Point
 model: 8 Port 10/100/1000 Base-T RJ45 interface card
-slug: sg6000-card-1000base-t
 part_number: CPAC-8-1C-C
-u_height: 0
-is_full_depth: false
-subdevice_role: child
 interfaces:
-  - name: eth1-01
+  - name: eth{module}-01
     label: '1'
     type: 1000base-t
     mgmt_only: false
-  - name: eth1-02
+  - name: eth{module}-02
     label: '2'
     type: 1000base-t
     mgmt_only: false
-  - name: eth1-03
+  - name: eth{module}-03
     label: '3'
     type: 1000base-t
     mgmt_only: false
-  - name: eth1-04
+  - name: eth{module}-04
     label: '4'
     type: 1000base-t
     mgmt_only: false