diff --git a/CVEasy/Cisco/2021/cisco_ios/__init__.py b/CVEasy/Cisco/2021/cisco_ios/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2021/cisco_nxos/__init__.py b/CVEasy/Cisco/2021/cisco_nxos/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2021/cisco_xe/__init__.py b/CVEasy/Cisco/2021/cisco_xe/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2021/cisco_xr/__init__.py b/CVEasy/Cisco/2021/cisco_xr/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211128.py b/CVEasy/Cisco/2021/cve20211128.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211128.py rename to CVEasy/Cisco/2021/cve20211128.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211136.py b/CVEasy/Cisco/2021/cve20211136.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211136.py rename to CVEasy/Cisco/2021/cve20211136.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211220.py b/CVEasy/Cisco/2021/cve20211220.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211220.py rename to CVEasy/Cisco/2021/cve20211220.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211227.py b/CVEasy/Cisco/2021/cve20211227.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211227.py rename to CVEasy/Cisco/2021/cve20211227.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211228.py b/CVEasy/Cisco/2021/cve20211228.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211228.py rename to CVEasy/Cisco/2021/cve20211228.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211229.py b/CVEasy/Cisco/2021/cve20211229.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211229.py rename to CVEasy/Cisco/2021/cve20211229.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211230.py b/CVEasy/Cisco/2021/cve20211230.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211230.py rename to CVEasy/Cisco/2021/cve20211230.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211231.py b/CVEasy/Cisco/2021/cve20211231.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211231.py rename to CVEasy/Cisco/2021/cve20211231.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211243.py b/CVEasy/Cisco/2021/cve20211243.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211243.py rename to CVEasy/Cisco/2021/cve20211243.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211244.py b/CVEasy/Cisco/2021/cve20211244.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211244.py rename to CVEasy/Cisco/2021/cve20211244.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211268.py b/CVEasy/Cisco/2021/cve20211268.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211268.py rename to CVEasy/Cisco/2021/cve20211268.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211281.py b/CVEasy/Cisco/2021/cve20211281.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211281.py rename to CVEasy/Cisco/2021/cve20211281.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211288.py b/CVEasy/Cisco/2021/cve20211288.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211288.py rename to CVEasy/Cisco/2021/cve20211288.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211313.py b/CVEasy/Cisco/2021/cve20211313.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211313.py rename to CVEasy/Cisco/2021/cve20211313.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211352.py b/CVEasy/Cisco/2021/cve20211352.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211352.py rename to CVEasy/Cisco/2021/cve20211352.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211356.py b/CVEasy/Cisco/2021/cve20211356.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211356.py rename to CVEasy/Cisco/2021/cve20211356.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211361.py b/CVEasy/Cisco/2021/cve20211361.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211361.py rename to CVEasy/Cisco/2021/cve20211361.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211367.py b/CVEasy/Cisco/2021/cve20211367.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211367.py rename to CVEasy/Cisco/2021/cve20211367.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211368.py b/CVEasy/Cisco/2021/cve20211368.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211368.py rename to CVEasy/Cisco/2021/cve20211368.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211370.py b/CVEasy/Cisco/2021/cve20211370.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211370.py rename to CVEasy/Cisco/2021/cve20211370.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211371.py b/CVEasy/Cisco/2021/cve20211371.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211371.py rename to CVEasy/Cisco/2021/cve20211371.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211373.py b/CVEasy/Cisco/2021/cve20211373.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211373.py rename to CVEasy/Cisco/2021/cve20211373.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211374.py b/CVEasy/Cisco/2021/cve20211374.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211374.py rename to CVEasy/Cisco/2021/cve20211374.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211375.py b/CVEasy/Cisco/2021/cve20211375.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211375.py rename to CVEasy/Cisco/2021/cve20211375.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211376.py b/CVEasy/Cisco/2021/cve20211376.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211376.py rename to CVEasy/Cisco/2021/cve20211376.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve20211377.py b/CVEasy/Cisco/2021/cve20211377.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve20211377.py rename to CVEasy/Cisco/2021/cve20211377.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211381.py b/CVEasy/Cisco/2021/cve20211381.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211381.py rename to CVEasy/Cisco/2021/cve20211381.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211382.py b/CVEasy/Cisco/2021/cve20211382.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211382.py rename to CVEasy/Cisco/2021/cve20211382.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211383.py b/CVEasy/Cisco/2021/cve20211383.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211383.py rename to CVEasy/Cisco/2021/cve20211383.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211384.py b/CVEasy/Cisco/2021/cve20211384.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211384.py rename to CVEasy/Cisco/2021/cve20211384.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve20211385.py b/CVEasy/Cisco/2021/cve20211385.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve20211385.py rename to CVEasy/Cisco/2021/cve20211385.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211387.py b/CVEasy/Cisco/2021/cve20211387.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211387.py rename to CVEasy/Cisco/2021/cve20211387.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211389.py b/CVEasy/Cisco/2021/cve20211389.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211389.py rename to CVEasy/Cisco/2021/cve20211389.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211390.py b/CVEasy/Cisco/2021/cve20211390.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211390.py rename to CVEasy/Cisco/2021/cve20211390.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve20211391.py b/CVEasy/Cisco/2021/cve20211391.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve20211391.py rename to CVEasy/Cisco/2021/cve20211391.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve20211392.py b/CVEasy/Cisco/2021/cve20211392.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve20211392.py rename to CVEasy/Cisco/2021/cve20211392.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211394.py b/CVEasy/Cisco/2021/cve20211394.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211394.py rename to CVEasy/Cisco/2021/cve20211394.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211398.py b/CVEasy/Cisco/2021/cve20211398.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211398.py rename to CVEasy/Cisco/2021/cve20211398.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211403.py b/CVEasy/Cisco/2021/cve20211403.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211403.py rename to CVEasy/Cisco/2021/cve20211403.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211431.py b/CVEasy/Cisco/2021/cve20211431.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211431.py rename to CVEasy/Cisco/2021/cve20211431.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211432.py b/CVEasy/Cisco/2021/cve20211432.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211432.py rename to CVEasy/Cisco/2021/cve20211432.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211433.py b/CVEasy/Cisco/2021/cve20211433.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211433.py rename to CVEasy/Cisco/2021/cve20211433.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211434.py b/CVEasy/Cisco/2021/cve20211434.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211434.py rename to CVEasy/Cisco/2021/cve20211434.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211435.py b/CVEasy/Cisco/2021/cve20211435.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211435.py rename to CVEasy/Cisco/2021/cve20211435.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211436.py b/CVEasy/Cisco/2021/cve20211436.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211436.py rename to CVEasy/Cisco/2021/cve20211436.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211439.py b/CVEasy/Cisco/2021/cve20211439.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211439.py rename to CVEasy/Cisco/2021/cve20211439.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211440.py b/CVEasy/Cisco/2021/cve20211440.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211440.py rename to CVEasy/Cisco/2021/cve20211440.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211441.py b/CVEasy/Cisco/2021/cve20211441.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211441.py rename to CVEasy/Cisco/2021/cve20211441.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211442.py b/CVEasy/Cisco/2021/cve20211442.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211442.py rename to CVEasy/Cisco/2021/cve20211442.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211443.py b/CVEasy/Cisco/2021/cve20211443.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211443.py rename to CVEasy/Cisco/2021/cve20211443.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211446.py b/CVEasy/Cisco/2021/cve20211446.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211446.py rename to CVEasy/Cisco/2021/cve20211446.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211451.py b/CVEasy/Cisco/2021/cve20211451.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211451.py rename to CVEasy/Cisco/2021/cve20211451.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211452.py b/CVEasy/Cisco/2021/cve20211452.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211452.py rename to CVEasy/Cisco/2021/cve20211452.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211453.py b/CVEasy/Cisco/2021/cve20211453.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211453.py rename to CVEasy/Cisco/2021/cve20211453.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211454.py b/CVEasy/Cisco/2021/cve20211454.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211454.py rename to CVEasy/Cisco/2021/cve20211454.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve20211460.py b/CVEasy/Cisco/2021/cve20211460.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve20211460.py rename to CVEasy/Cisco/2021/cve20211460.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve20211485.py b/CVEasy/Cisco/2021/cve20211485.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve20211485.py rename to CVEasy/Cisco/2021/cve20211485.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211523.py b/CVEasy/Cisco/2021/cve20211523.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211523.py rename to CVEasy/Cisco/2021/cve20211523.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211529.py b/CVEasy/Cisco/2021/cve20211529.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211529.py rename to CVEasy/Cisco/2021/cve20211529.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211565.py b/CVEasy/Cisco/2021/cve20211565.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211565.py rename to CVEasy/Cisco/2021/cve20211565.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211583.py b/CVEasy/Cisco/2021/cve20211583.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211583.py rename to CVEasy/Cisco/2021/cve20211583.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211584.py b/CVEasy/Cisco/2021/cve20211584.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211584.py rename to CVEasy/Cisco/2021/cve20211584.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211586.py b/CVEasy/Cisco/2021/cve20211586.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211586.py rename to CVEasy/Cisco/2021/cve20211586.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211587.py b/CVEasy/Cisco/2021/cve20211587.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211587.py rename to CVEasy/Cisco/2021/cve20211587.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211588.py b/CVEasy/Cisco/2021/cve20211588.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211588.py rename to CVEasy/Cisco/2021/cve20211588.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211590.py b/CVEasy/Cisco/2021/cve20211590.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211590.py rename to CVEasy/Cisco/2021/cve20211590.py diff --git a/CVEasy/Cisco/2021/cisco_nxos/cve20211591.py b/CVEasy/Cisco/2021/cve20211591.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_nxos/cve20211591.py rename to CVEasy/Cisco/2021/cve20211591.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211611.py b/CVEasy/Cisco/2021/cve20211611.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211611.py rename to CVEasy/Cisco/2021/cve20211611.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211612.py b/CVEasy/Cisco/2021/cve20211612.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211612.py rename to CVEasy/Cisco/2021/cve20211612.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211615.py b/CVEasy/Cisco/2021/cve20211615.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211615.py rename to CVEasy/Cisco/2021/cve20211615.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211616.py b/CVEasy/Cisco/2021/cve20211616.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211616.py rename to CVEasy/Cisco/2021/cve20211616.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211619.py b/CVEasy/Cisco/2021/cve20211619.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211619.py rename to CVEasy/Cisco/2021/cve20211619.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve20211620.py b/CVEasy/Cisco/2021/cve20211620.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve20211620.py rename to CVEasy/Cisco/2021/cve20211620.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211621.py b/CVEasy/Cisco/2021/cve20211621.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211621.py rename to CVEasy/Cisco/2021/cve20211621.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211622.py b/CVEasy/Cisco/2021/cve20211622.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211622.py rename to CVEasy/Cisco/2021/cve20211622.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211623.py b/CVEasy/Cisco/2021/cve20211623.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211623.py rename to CVEasy/Cisco/2021/cve20211623.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211624.py b/CVEasy/Cisco/2021/cve20211624.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211624.py rename to CVEasy/Cisco/2021/cve20211624.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve20211625.py b/CVEasy/Cisco/2021/cve20211625.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve20211625.py rename to CVEasy/Cisco/2021/cve20211625.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134696.py b/CVEasy/Cisco/2021/cve202134696.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134696.py rename to CVEasy/Cisco/2021/cve202134696.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134697.py b/CVEasy/Cisco/2021/cve202134697.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134697.py rename to CVEasy/Cisco/2021/cve202134697.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve202134699.py b/CVEasy/Cisco/2021/cve202134699.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve202134699.py rename to CVEasy/Cisco/2021/cve202134699.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve202134703.py b/CVEasy/Cisco/2021/cve202134703.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve202134703.py rename to CVEasy/Cisco/2021/cve202134703.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve202134705.py b/CVEasy/Cisco/2021/cve202134705.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve202134705.py rename to CVEasy/Cisco/2021/cve202134705.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134708.py b/CVEasy/Cisco/2021/cve202134708.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134708.py rename to CVEasy/Cisco/2021/cve202134708.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134709.py b/CVEasy/Cisco/2021/cve202134709.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134709.py rename to CVEasy/Cisco/2021/cve202134709.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134713.py b/CVEasy/Cisco/2021/cve202134713.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134713.py rename to CVEasy/Cisco/2021/cve202134713.py diff --git a/CVEasy/Cisco/2021/cisco_ios/cve202134714.py b/CVEasy/Cisco/2021/cve202134714.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_ios/cve202134714.py rename to CVEasy/Cisco/2021/cve202134714.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134718.py b/CVEasy/Cisco/2021/cve202134718.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134718.py rename to CVEasy/Cisco/2021/cve202134718.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134719.py b/CVEasy/Cisco/2021/cve202134719.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134719.py rename to CVEasy/Cisco/2021/cve202134719.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134720.py b/CVEasy/Cisco/2021/cve202134720.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134720.py rename to CVEasy/Cisco/2021/cve202134720.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134721.py b/CVEasy/Cisco/2021/cve202134721.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134721.py rename to CVEasy/Cisco/2021/cve202134721.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134722.py b/CVEasy/Cisco/2021/cve202134722.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134722.py rename to CVEasy/Cisco/2021/cve202134722.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134723.py b/CVEasy/Cisco/2021/cve202134723.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134723.py rename to CVEasy/Cisco/2021/cve202134723.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134724.py b/CVEasy/Cisco/2021/cve202134724.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134724.py rename to CVEasy/Cisco/2021/cve202134724.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134725.py b/CVEasy/Cisco/2021/cve202134725.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134725.py rename to CVEasy/Cisco/2021/cve202134725.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134727.py b/CVEasy/Cisco/2021/cve202134727.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134727.py rename to CVEasy/Cisco/2021/cve202134727.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134728.py b/CVEasy/Cisco/2021/cve202134728.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134728.py rename to CVEasy/Cisco/2021/cve202134728.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134729.py b/CVEasy/Cisco/2021/cve202134729.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134729.py rename to CVEasy/Cisco/2021/cve202134729.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134737.py b/CVEasy/Cisco/2021/cve202134737.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134737.py rename to CVEasy/Cisco/2021/cve202134737.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134767.py b/CVEasy/Cisco/2021/cve202134767.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134767.py rename to CVEasy/Cisco/2021/cve202134767.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134768.py b/CVEasy/Cisco/2021/cve202134768.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134768.py rename to CVEasy/Cisco/2021/cve202134768.py diff --git a/CVEasy/Cisco/2021/cisco_xe/cve202134769.py b/CVEasy/Cisco/2021/cve202134769.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xe/cve202134769.py rename to CVEasy/Cisco/2021/cve202134769.py diff --git a/CVEasy/Cisco/2021/cisco_xr/cve202134771.py b/CVEasy/Cisco/2021/cve202134771.py similarity index 100% rename from CVEasy/Cisco/2021/cisco_xr/cve202134771.py rename to CVEasy/Cisco/2021/cve202134771.py diff --git a/CVEasy/Cisco/2022/cisco_ios/__init__.py b/CVEasy/Cisco/2022/cisco_ios/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2022/cisco_nxos/__init__.py b/CVEasy/Cisco/2022/cisco_nxos/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2022/cisco_xe/__init__.py b/CVEasy/Cisco/2022/cisco_xe/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2022/cisco_xr/__init__.py b/CVEasy/Cisco/2022/cisco_xr/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/CVEasy/Cisco/2022/cisco_nxos/cve202220623.py b/CVEasy/Cisco/2022/cve202220623.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_nxos/cve202220623.py rename to CVEasy/Cisco/2022/cve202220623.py diff --git a/CVEasy/Cisco/2022/cisco_nxos/cve202220624.py b/CVEasy/Cisco/2022/cve202220624.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_nxos/cve202220624.py rename to CVEasy/Cisco/2022/cve202220624.py diff --git a/CVEasy/Cisco/2022/cisco_nxos/cve202220625.py b/CVEasy/Cisco/2022/cve202220625.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_nxos/cve202220625.py rename to CVEasy/Cisco/2022/cve202220625.py diff --git a/CVEasy/Cisco/2022/cisco_nxos/cve202220650.py b/CVEasy/Cisco/2022/cve202220650.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_nxos/cve202220650.py rename to CVEasy/Cisco/2022/cve202220650.py diff --git a/CVEasy/Cisco/2022/cisco_xr/cve202220655.py b/CVEasy/Cisco/2022/cve202220655.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xr/cve202220655.py rename to CVEasy/Cisco/2022/cve202220655.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220676.py b/CVEasy/Cisco/2022/cve202220676.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220676.py rename to CVEasy/Cisco/2022/cve202220676.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220677.py b/CVEasy/Cisco/2022/cve202220677.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220677.py rename to CVEasy/Cisco/2022/cve202220677.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220678.py b/CVEasy/Cisco/2022/cve202220678.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220678.py rename to CVEasy/Cisco/2022/cve202220678.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220679.py b/CVEasy/Cisco/2022/cve202220679.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220679.py rename to CVEasy/Cisco/2022/cve202220679.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220681.py b/CVEasy/Cisco/2022/cve202220681.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220681.py rename to CVEasy/Cisco/2022/cve202220681.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220682.py b/CVEasy/Cisco/2022/cve202220682.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220682.py rename to CVEasy/Cisco/2022/cve202220682.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220683.py b/CVEasy/Cisco/2022/cve202220683.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220683.py rename to CVEasy/Cisco/2022/cve202220683.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220684.py b/CVEasy/Cisco/2022/cve202220684.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220684.py rename to CVEasy/Cisco/2022/cve202220684.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220692.py b/CVEasy/Cisco/2022/cve202220692.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220692.py rename to CVEasy/Cisco/2022/cve202220692.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220693.py b/CVEasy/Cisco/2022/cve202220693.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220693.py rename to CVEasy/Cisco/2022/cve202220693.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220694.py b/CVEasy/Cisco/2022/cve202220694.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220694.py rename to CVEasy/Cisco/2022/cve202220694.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220697.py b/CVEasy/Cisco/2022/cve202220697.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220697.py rename to CVEasy/Cisco/2022/cve202220697.py diff --git a/CVEasy/Cisco/2022/cisco_xr/cve202220714.py b/CVEasy/Cisco/2022/cve202220714.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xr/cve202220714.py rename to CVEasy/Cisco/2022/cve202220714.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220718.py b/CVEasy/Cisco/2022/cve202220718.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220718.py rename to CVEasy/Cisco/2022/cve202220718.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220719.py b/CVEasy/Cisco/2022/cve202220719.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220719.py rename to CVEasy/Cisco/2022/cve202220719.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220720.py b/CVEasy/Cisco/2022/cve202220720.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220720.py rename to CVEasy/Cisco/2022/cve202220720.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220721.py b/CVEasy/Cisco/2022/cve202220721.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220721.py rename to CVEasy/Cisco/2022/cve202220721.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220722.py b/CVEasy/Cisco/2022/cve202220722.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220722.py rename to CVEasy/Cisco/2022/cve202220722.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220723.py b/CVEasy/Cisco/2022/cve202220723.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220723.py rename to CVEasy/Cisco/2022/cve202220723.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220724.py b/CVEasy/Cisco/2022/cve202220724.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220724.py rename to CVEasy/Cisco/2022/cve202220724.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220725.py b/CVEasy/Cisco/2022/cve202220725.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220725.py rename to CVEasy/Cisco/2022/cve202220725.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220726.py b/CVEasy/Cisco/2022/cve202220726.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220726.py rename to CVEasy/Cisco/2022/cve202220726.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220727.py b/CVEasy/Cisco/2022/cve202220727.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220727.py rename to CVEasy/Cisco/2022/cve202220727.py diff --git a/CVEasy/Cisco/2022/cisco_xr/cve202220758.py b/CVEasy/Cisco/2022/cve202220758.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xr/cve202220758.py rename to CVEasy/Cisco/2022/cve202220758.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220761.py b/CVEasy/Cisco/2022/cve202220761.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220761.py rename to CVEasy/Cisco/2022/cve202220761.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220810.py b/CVEasy/Cisco/2022/cve202220810.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220810.py rename to CVEasy/Cisco/2022/cve202220810.py diff --git a/CVEasy/Cisco/2022/cisco_xr/cve202220821.py b/CVEasy/Cisco/2022/cve202220821.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xr/cve202220821.py rename to CVEasy/Cisco/2022/cve202220821.py diff --git a/CVEasy/Cisco/2022/cisco_nxos/cve202220823.py b/CVEasy/Cisco/2022/cve202220823.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_nxos/cve202220823.py rename to CVEasy/Cisco/2022/cve202220823.py diff --git a/CVEasy/Cisco/2022/cisco_nxos/cve202220824.py b/CVEasy/Cisco/2022/cve202220824.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_nxos/cve202220824.py rename to CVEasy/Cisco/2022/cve202220824.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220837.py b/CVEasy/Cisco/2022/cve202220837.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220837.py rename to CVEasy/Cisco/2022/cve202220837.py diff --git a/CVEasy/Cisco/2022/cisco_xr/cve202220845.py b/CVEasy/Cisco/2022/cve202220845.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xr/cve202220845.py rename to CVEasy/Cisco/2022/cve202220845.py diff --git a/CVEasy/Cisco/2022/cisco_xr/cve202220846.py b/CVEasy/Cisco/2022/cve202220846.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xr/cve202220846.py rename to CVEasy/Cisco/2022/cve202220846.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220847.py b/CVEasy/Cisco/2022/cve202220847.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220847.py rename to CVEasy/Cisco/2022/cve202220847.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220848.py b/CVEasy/Cisco/2022/cve202220848.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220848.py rename to CVEasy/Cisco/2022/cve202220848.py diff --git a/CVEasy/Cisco/2022/cisco_xr/cve202220849.py b/CVEasy/Cisco/2022/cve202220849.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xr/cve202220849.py rename to CVEasy/Cisco/2022/cve202220849.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220851.py b/CVEasy/Cisco/2022/cve202220851.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220851.py rename to CVEasy/Cisco/2022/cve202220851.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220855.py b/CVEasy/Cisco/2022/cve202220855.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220855.py rename to CVEasy/Cisco/2022/cve202220855.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220856.py b/CVEasy/Cisco/2022/cve202220856.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220856.py rename to CVEasy/Cisco/2022/cve202220856.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220864.py b/CVEasy/Cisco/2022/cve202220864.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220864.py rename to CVEasy/Cisco/2022/cve202220864.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220870.py b/CVEasy/Cisco/2022/cve202220870.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220870.py rename to CVEasy/Cisco/2022/cve202220870.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220915.py b/CVEasy/Cisco/2022/cve202220915.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220915.py rename to CVEasy/Cisco/2022/cve202220915.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220919.py b/CVEasy/Cisco/2022/cve202220919.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220919.py rename to CVEasy/Cisco/2022/cve202220919.py diff --git a/CVEasy/Cisco/2022/cisco_ios/cve202220920.py b/CVEasy/Cisco/2022/cve202220920.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_ios/cve202220920.py rename to CVEasy/Cisco/2022/cve202220920.py diff --git a/CVEasy/Cisco/2022/cisco_xe/cve202220944.py b/CVEasy/Cisco/2022/cve202220944.py similarity index 100% rename from CVEasy/Cisco/2022/cisco_xe/cve202220944.py rename to CVEasy/Cisco/2022/cve202220944.py