diff --git a/OBD.NET/ConsoleClient/Program.cs b/OBD.NET/ConsoleClient/Program.cs
index ee49a53..0dc7c29 100644
--- a/OBD.NET/ConsoleClient/Program.cs
+++ b/OBD.NET/ConsoleClient/Program.cs
@@ -6,8 +6,6 @@ using OBD.NET.Devices;
 using OBD.NET.Extensions;
 using OBD.NET.Logging;
 using OBD.NET.OBDData;
-using OBD.NET.OBDData._00_1F;
-using OBD.NET.OBDData._40_5F;
 
 namespace ConsoleClient;
 
diff --git a/OBD.NET/OBD.NET/Communication/EventArgs/DataReceivedEventArgs.cs b/OBD.NET/OBD.NET/Communication/EventArgs/DataReceivedEventArgs.cs
index 91fa717..aafe95b 100644
--- a/OBD.NET/OBD.NET/Communication/EventArgs/DataReceivedEventArgs.cs
+++ b/OBD.NET/OBD.NET/Communication/EventArgs/DataReceivedEventArgs.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.Communication.EventArgs;
+namespace OBD.NET.Communication;
 
 /// <summary>
 /// Event args for receiving serial data
diff --git a/OBD.NET/OBD.NET/Communication/ISerialConnection.cs b/OBD.NET/OBD.NET/Communication/ISerialConnection.cs
index 2203137..94f0e50 100644
--- a/OBD.NET/OBD.NET/Communication/ISerialConnection.cs
+++ b/OBD.NET/OBD.NET/Communication/ISerialConnection.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using OBD.NET.Communication.EventArgs;
 
 namespace OBD.NET.Communication;
 
diff --git a/OBD.NET/OBD.NET/Communication/SerialConnection.cs b/OBD.NET/OBD.NET/Communication/SerialConnection.cs
index 610dc0f..4e97fcf 100644
--- a/OBD.NET/OBD.NET/Communication/SerialConnection.cs
+++ b/OBD.NET/OBD.NET/Communication/SerialConnection.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.IO.Ports;
 using System.Threading.Tasks;
-using OBD.NET.Communication.EventArgs;
 
 namespace OBD.NET.Communication;
 
diff --git a/OBD.NET/OBD.NET/Devices/ELM327.cs b/OBD.NET/OBD.NET/Devices/ELM327.cs
index b62184e..6274015 100644
--- a/OBD.NET/OBD.NET/Devices/ELM327.cs
+++ b/OBD.NET/OBD.NET/Devices/ELM327.cs
@@ -7,7 +7,6 @@ using OBD.NET.Commands;
 using OBD.NET.Communication;
 using OBD.NET.Enums;
 using OBD.NET.Events;
-using OBD.NET.Events.EventArgs;
 using OBD.NET.Extensions;
 using OBD.NET.Logging;
 using OBD.NET.OBDData;
diff --git a/OBD.NET/OBD.NET/Devices/SerialDevice.cs b/OBD.NET/OBD.NET/Devices/SerialDevice.cs
index 19ebb27..982464a 100644
--- a/OBD.NET/OBD.NET/Devices/SerialDevice.cs
+++ b/OBD.NET/OBD.NET/Devices/SerialDevice.cs
@@ -4,7 +4,6 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using OBD.NET.Communication;
-using OBD.NET.Communication.EventArgs;
 using OBD.NET.Exceptions;
 using OBD.NET.Logging;
 
diff --git a/OBD.NET/OBD.NET/Events/EventArgs/DataReceivedEventArgs.cs b/OBD.NET/OBD.NET/Events/EventArgs/DataReceivedEventArgs.cs
index f8ce5a7..d17348a 100644
--- a/OBD.NET/OBD.NET/Events/EventArgs/DataReceivedEventArgs.cs
+++ b/OBD.NET/OBD.NET/Events/EventArgs/DataReceivedEventArgs.cs
@@ -1,7 +1,7 @@
 using System;
 using OBD.NET.OBDData;
 
-namespace OBD.NET.Events.EventArgs;
+namespace OBD.NET.Events;
 
 public class DataReceivedEventArgs<T> where T : IOBDData
 {
diff --git a/OBD.NET/OBD.NET/Events/EventArgs/RawDataReceivedEventArgs.cs b/OBD.NET/OBD.NET/Events/EventArgs/RawDataReceivedEventArgs.cs
index e9a6577..89cf73a 100644
--- a/OBD.NET/OBD.NET/Events/EventArgs/RawDataReceivedEventArgs.cs
+++ b/OBD.NET/OBD.NET/Events/EventArgs/RawDataReceivedEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace OBD.NET.Events.EventArgs;
+namespace OBD.NET.Events;
 
 public class RawDataReceivedEventArgs
 {
diff --git a/OBD.NET/OBD.NET/Events/GenericDataEventManager.cs b/OBD.NET/OBD.NET/Events/GenericDataEventManager.cs
index 2f52a23..f8c6b1d 100644
--- a/OBD.NET/OBD.NET/Events/GenericDataEventManager.cs
+++ b/OBD.NET/OBD.NET/Events/GenericDataEventManager.cs
@@ -1,6 +1,5 @@
 using System;
 using OBD.NET.Devices;
-using OBD.NET.Events.EventArgs;
 using OBD.NET.OBDData;
 
 namespace OBD.NET.Events;
diff --git a/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings b/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings
new file mode 100644
index 0000000..5447bfa
--- /dev/null
+++ b/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings
@@ -0,0 +1,10 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=communication_005Ceventargs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=events_005Ceventargs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C00_002D1f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C20_002D3f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C40_002D5f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C60_002D7f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005C80_002D9f/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005Ca0_002Dbf/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=obddata_005Cc0_002Ddf/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs b/OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs
index ceec4f9..7f3efd0 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class AuxiliaryInputStatus : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs b/OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs
index 58b9bd0..8375135 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class CalculatedEngineLoad : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs b/OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs
index 2775906..e030290 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class CommandedSecondaryAirStatus : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs b/OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs
index 8e08a43..9796f0c 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class EngineCoolantTemperature : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs b/OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs
index dc0a760..e2337a6 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class EngineRPM : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs b/OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs
index 5e3b2e0..d42c96b 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class FuelPressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs b/OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs
index de2b869..f5e6bfe 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class FuelSystemStatus : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs
index 938d11c..425e3e4 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class IntakeAirTemperature : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs
index d2cd3f7..1ae7a87 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class IntakeManifoldAbsolutePressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs
index 7b74f2b..38fd3d1 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class LongTermFuelTrimBank1 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs
index c8e6356..430510c 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class LongTermFuelTrimBank2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs b/OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs
index 30ed0eb..14cb321 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class MAFAirFlowRate : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs
index dd73cb3..48332d7 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OBDStandards : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs
index 8a061d0..ae56a8b 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor1FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs
index 40a886d..600fd28 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor2FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs
index b393e54..b0d3d09 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor3FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs
index b108f60..8e95eda 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor4FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs
index 8f53b12..1ace038 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor5FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs
index b1af73a..b793586 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor6FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs
index c62a85f..7005f07 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor7FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs
index 3f0ec8d..6c7ec4e 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor8FuelTrim : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs
index 71edf3a..9a89f81 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensorPresent : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs
index 547895d..f460324 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensorPresent2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs b/OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs
index fb15836..b43818c 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class PidsSupported01_20 : AbstractPidsSupported
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs b/OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs
index 3b212d1..e6ce57e 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class RunTimeSinceEngineStart : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs
index 8a3d357..c20a91f 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class ShortTermFuelTrimBank1 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs
index e59b29b..de75034 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class ShortTermFuelTrimBank2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs b/OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs
index de135b7..26e80c0 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class ThrottlePosition : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs b/OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs
index 76f4628..624d73f 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class TimingAdvance : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs b/OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs
index 1e1db53..bf0c867 100644
--- a/OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs
+++ b/OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._00_1F;
+namespace OBD.NET.OBDData;
 
 public class VehicleSpeed : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs
index f0ecd04..1805af3 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class AbsoluteBarometricPressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs
index e80c0fe..fcd71b3 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class CatalystTemperatureBank1Sensor1 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs
index 827b014..e0d5331 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class CatalystTemperatureBank1Sensor2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs
index b615c07..b7d9ed9 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class CatalystTemperatureBank2Sensor1 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs
index e86b36f..c0851fe 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class CatalystTemperatureBank2Sensor2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs
index b4751f8..5bc1f33 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class CommandedEGR : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs
index 859b160..5e16c2e 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class CommandedEvaporativePurge : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs
index 7ce094c..b85f9f2 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class DistanceTraveledSinceCodesCleared : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs
index 76b3bc5..2eac822 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class DistanceTraveledWithMILOn : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs b/OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs
index 4545025..79ba049 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class EGRError : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs
index 0a21549..7fbe742 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class EvapSystemVaporPressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs
index 8e8f666..27653aa 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class FuelRailGaugePressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs
index 8c639b4..680f9b9 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class FuelRailPressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs b/OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs
index 84a3b30..75a69a8 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class FuelTankLevelInput : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs
index 7125f46..70fbc50 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor1FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs
index f251ce5..51a13ca 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor1FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs
index 89d7035..4240119 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor2FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs
index 4e1f5c5..a9e0aae 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor2FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs
index aff0c2b..fd13bd1 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor3FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs
index dd75ca3..a928294 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor3FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs
index 6c1e234..ffa0dc8 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor4FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs
index 1d0a314..86099e4 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor4FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs
index d18f636..d83ba6e 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor5FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs
index 2769bdd..ce96e0d 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor5FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs
index 8f5fbdd..03c0d14 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor6FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs
index 037e51b..a64db8b 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor6FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs
index 3fb4a71..df0112d 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor7FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs
index 8fecec7..cbf0076 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor7FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs
index 157cc86..9667417 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor8FuelAir : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs
index 5f361d4..afb7f09 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class OxygenSensor8FuelAir2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs b/OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs
index 70ad556..60948a5 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class PidsSupported21_40 : AbstractPidsSupported
 {
diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs b/OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs
index 9d4bd68..48ab323 100644
--- a/OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs
+++ b/OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._20_3F;
+namespace OBD.NET.OBDData;
 
 public class WarmUpsSinceCodesCleared : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs
index 9c37220..52122ba 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AbsoluteEvapSystemVaporPressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs
index 4cf5edd..ed858a9 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AbsoluteLoadValue : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs
index 02e22a7..292eafd 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AbsoluteThrottlePositionB : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs
index ff4e656..53f23cf 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AbsoluteThrottlePositionC : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs
index e3f2284..52723e5 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AcceleratorPedalPositionD : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs
index da51a06..b266d17 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AcceleratorPedalPositionE : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs
index e09c009..707b981 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AcceleratorPedalPositionF : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs b/OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs
index ec66bfa..9bae1d4 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class AmbientAirTemperature : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs b/OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs
index e9dcfd7..70005f9 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class CommandedThrottleActuator : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs b/OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs
index ac94429..0dbbc0a 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class ControlModuleVoltage : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs
index ed7f947..3f7392d 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class EngineFuelRate : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs
index 12d192c..9875f88 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class EngineOilTemperature : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs
index fbacfe3..69ea9b2 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class EthanolFuel : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs b/OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs
index bc47191..00cc4b5 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class EvapSystemVaporPressure2 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs
index a240588..53109ef 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class FuelAirCommandedEquivalenceRatio : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs
index d81f9a3..bcb4110 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class FuelInjectionTiming : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs
index 9abc22b..50ccaec 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class FuelRailAbsolutePressure : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs b/OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs
index b5e7d21..f57cce2 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class FuelType : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs b/OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs
index fa1d020..aa1aa1c 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class HybridBatteryPackRemainingLife : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs
index 07597ed..e6a5274 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class LongtTermSecondaryOxygenSensorTrimBank13 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs
index 62ca61f..5297ce7 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class LongTermSecondaryOxygenSensorTrimBank24 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs
index d78e74a..9190755 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class MaximumValueForAirFlowRate : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs
index c0879fb..50d8aa4 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class MaximumValues : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs b/OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs
index 3d8890a..19c9a61 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class MonitorStatusThisDriveCycle : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs b/OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs
index 13f1228..c550c77 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class PidsSupported41_60 : AbstractPidsSupported
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs
index 952150f..8318b53 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class RelativeAcceleratorPedalPosition : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs
index 7fa1807..251e65a 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class RelativeThrottlePosition : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs
index 0a8c22c..1797558 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class ShortTermSecondaryOxygenSensorTrimBank13 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs
index 1edfc1e..de8c81c 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class ShortTermSecondaryOxygenSensorTrimBank24 : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs b/OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs
index 3598f7a..b7575ac 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class TimeRunWithMILOn : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs b/OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs
index 6799337..04b98f7 100644
--- a/OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs
+++ b/OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._40_5F;
+namespace OBD.NET.OBDData;
 
 public class TimeSinceTroubleCodesCleared : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs b/OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs
index df4a660..3ae6e71 100644
--- a/OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._60_7F;
+namespace OBD.NET.OBDData;
 
 public class ActualEnginePercentTorque : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs b/OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs
index 83d5765..ec44d66 100644
--- a/OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._60_7F;
+namespace OBD.NET.OBDData;
 
 public class DriversDemandEnginePercentTorque : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/EngineCoolantTemperatureSensor.cs b/OBD.NET/OBD.NET/OBDData/60-7F/EngineCoolantTemperatureSensor.cs
index bbf7695..0ac24f6 100644
--- a/OBD.NET/OBD.NET/OBDData/60-7F/EngineCoolantTemperatureSensor.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/EngineCoolantTemperatureSensor.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._60_7F;
+namespace OBD.NET.OBDData;
 
 public class EngineCoolantTemperatureSensor : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs b/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs
index 45c9d86..201f0e4 100644
--- a/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._60_7F;
+namespace OBD.NET.OBDData;
 
 public class EnginePercentTorqueData : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs b/OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs
index 6369876..85a99f3 100644
--- a/OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._60_7F;
+namespace OBD.NET.OBDData;
 
 public class EngineReferenceTorque : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/IntakeAirTemperatureSensor.cs b/OBD.NET/OBD.NET/OBDData/60-7F/IntakeAirTemperatureSensor.cs
index d9c81a2..cad9ebe 100644
--- a/OBD.NET/OBD.NET/OBDData/60-7F/IntakeAirTemperatureSensor.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/IntakeAirTemperatureSensor.cs
@@ -1,6 +1,6 @@
 using OBD.NET.DataTypes;
 
-namespace OBD.NET.OBDData._60_7F;
+namespace OBD.NET.OBDData;
 
 public class IntakeAirTemperatureSensor : AbstractOBDData
 {
diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs b/OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs
index b59c8b1..008b371 100644
--- a/OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs
+++ b/OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._60_7F;
+namespace OBD.NET.OBDData;
 
 public class PidsSupported61_80 : AbstractPidsSupported
 {
diff --git a/OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs b/OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs
index 49fc8a3..c14e4a0 100644
--- a/OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs
+++ b/OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData._80_9F;
+namespace OBD.NET.OBDData;
 
 public class PidsSupported81_A0 : AbstractPidsSupported
 {
diff --git a/OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs b/OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs
index 7e0525d..bb7910e 100644
--- a/OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs
+++ b/OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData.A0_BF;
+namespace OBD.NET.OBDData;
 
 public class PidsSupportedA1_C0 : AbstractPidsSupported
 {
diff --git a/OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs b/OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs
index f5d7e04..be49ece 100644
--- a/OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs
+++ b/OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs
@@ -1,4 +1,4 @@
-namespace OBD.NET.OBDData.C0_DF;
+namespace OBD.NET.OBDData;
 
 public class PidsSupportedC1_E0 : AbstractPidsSupported
 {