diff --git a/smp/Mercedes_E-Klasse-2019-08-08/ACC_lat.raw b/smp/datasetA/ACC_lat.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/ACC_lat.raw
rename to smp/datasetA/ACC_lat.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/ACC_long.raw b/smp/datasetA/ACC_long.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/ACC_long.raw
rename to smp/datasetA/ACC_long.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_AccelPdlPosn.raw b/smp/datasetA/Flex_AccelPdlPosn.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_AccelPdlPosn.raw
rename to smp/datasetA/Flex_AccelPdlPosn.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_AirTemp_Outsd.raw b/smp/datasetA/Flex_AirTemp_Outsd.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_AirTemp_Outsd.raw
rename to smp/datasetA/Flex_AirTemp_Outsd.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_AirTemp_Outsd_IC.raw b/smp/datasetA/Flex_AirTemp_Outsd_IC.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_AirTemp_Outsd_IC.raw
rename to smp/datasetA/Flex_AirTemp_Outsd_IC.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkPdl_Stat.raw b/smp/datasetA/Flex_BrkPdl_Stat.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkPdl_Stat.raw
rename to smp/datasetA/Flex_BrkPdl_Stat.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkTrq_D_V2.raw b/smp/datasetA/Flex_BrkTrq_D_V2.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkTrq_D_V2.raw
rename to smp/datasetA/Flex_BrkTrq_D_V2.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkTrq_R.raw b/smp/datasetA/Flex_BrkTrq_R.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkTrq_R.raw
rename to smp/datasetA/Flex_BrkTrq_R.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkTrq_V2.raw b/smp/datasetA/Flex_BrkTrq_V2.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_BrkTrq_V2.raw
rename to smp/datasetA/Flex_BrkTrq_V2.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_EngLoad_OBD.raw b/smp/datasetA/Flex_EngLoad_OBD.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_EngLoad_OBD.raw
rename to smp/datasetA/Flex_EngLoad_OBD.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_EngRPM.raw b/smp/datasetA/Flex_EngRPM.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_EngRPM.raw
rename to smp/datasetA/Flex_EngRPM.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_Odo.raw b/smp/datasetA/Flex_Odo.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_Odo.raw
rename to smp/datasetA/Flex_Odo.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_PkBrk_Stat.raw b/smp/datasetA/Flex_PkBrk_Stat.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_PkBrk_Stat.raw
rename to smp/datasetA/Flex_PkBrk_Stat.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_StWhl_Angl.raw b/smp/datasetA/Flex_StWhl_Angl.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_StWhl_Angl.raw
rename to smp/datasetA/Flex_StWhl_Angl.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_StWhl_AnglSpd.raw b/smp/datasetA/Flex_StWhl_AnglSpd.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_StWhl_AnglSpd.raw
rename to smp/datasetA/Flex_StWhl_AnglSpd.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_TC_liquidFuelCons1.raw b/smp/datasetA/Flex_TC_liquidFuelCons1.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_TC_liquidFuelCons1.raw
rename to smp/datasetA/Flex_TC_liquidFuelCons1.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_VehSpd_Disp.raw b/smp/datasetA/Flex_VehSpd_Disp.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_VehSpd_Disp.raw
rename to smp/datasetA/Flex_VehSpd_Disp.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_FL.raw b/smp/datasetA/Flex_WhlRPM_FL.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_FL.raw
rename to smp/datasetA/Flex_WhlRPM_FL.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_FR.raw b/smp/datasetA/Flex_WhlRPM_FR.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_FR.raw
rename to smp/datasetA/Flex_WhlRPM_FR.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_RL.raw b/smp/datasetA/Flex_WhlRPM_RL.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_RL.raw
rename to smp/datasetA/Flex_WhlRPM_RL.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_RR.raw b/smp/datasetA/Flex_WhlRPM_RR.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Flex_WhlRPM_RR.raw
rename to smp/datasetA/Flex_WhlRPM_RR.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/GPS.height.raw b/smp/datasetA/GPS.height.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/GPS.height.raw
rename to smp/datasetA/GPS.height.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/GPS.speed.raw b/smp/datasetA/GPS.speed.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/GPS.speed.raw
rename to smp/datasetA/GPS.speed.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/GPS.time.sec.raw b/smp/datasetA/GPS.time.sec.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/GPS.time.sec.raw
rename to smp/datasetA/GPS.time.sec.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Pressure_FL.raw b/smp/datasetA/Pressure_FL.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Pressure_FL.raw
rename to smp/datasetA/Pressure_FL.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Pressure_PC.raw b/smp/datasetA/Pressure_PC.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Pressure_PC.raw
rename to smp/datasetA/Pressure_PC.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Pressure_RR.raw b/smp/datasetA/Pressure_RR.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Pressure_RR.raw
rename to smp/datasetA/Pressure_RR.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Pressure_SC.raw b/smp/datasetA/Pressure_SC.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Pressure_SC.raw
rename to smp/datasetA/Pressure_SC.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_FL.raw b/smp/datasetA/Temp_Disc_FL.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_FL.raw
rename to smp/datasetA/Temp_Disc_FL.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_FR.raw b/smp/datasetA/Temp_Disc_FR.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_FR.raw
rename to smp/datasetA/Temp_Disc_FR.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_RL.raw b/smp/datasetA/Temp_Disc_RL.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_RL.raw
rename to smp/datasetA/Temp_Disc_RL.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_RR.raw b/smp/datasetA/Temp_Disc_RR.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Temp_Disc_RR.raw
rename to smp/datasetA/Temp_Disc_RR.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Temp_Fluid_FL.raw b/smp/datasetA/Temp_Fluid_FL.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Temp_Fluid_FL.raw
rename to smp/datasetA/Temp_Fluid_FL.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Temp_Fluid_RL.raw b/smp/datasetA/Temp_Fluid_RL.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Temp_Fluid_RL.raw
rename to smp/datasetA/Temp_Fluid_RL.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Travel_Piston.raw b/smp/datasetA/Travel_Piston.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Travel_Piston.raw
rename to smp/datasetA/Travel_Piston.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/Vacuum_Booster.raw b/smp/datasetA/Vacuum_Booster.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/Vacuum_Booster.raw
rename to smp/datasetA/Vacuum_Booster.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/setup_id.raw b/smp/datasetA/setup_id.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/setup_id.raw
rename to smp/datasetA/setup_id.raw
diff --git a/smp/Mercedes_E-Klasse-2019-08-08/vehicle_id.raw b/smp/datasetA/vehicle_id.raw
similarity index 100%
rename from smp/Mercedes_E-Klasse-2019-08-08/vehicle_id.raw
rename to smp/datasetA/vehicle_id.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/ABSWarningLamp_HS.raw b/smp/datasetB/ABSWarningLamp_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/ABSWarningLamp_HS.raw
rename to smp/datasetB/ABSWarningLamp_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/ABS_A_Port1.raw b/smp/datasetB/ABS_A_Port1.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/ABS_A_Port1.raw
rename to smp/datasetB/ABS_A_Port1.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/ABS_E_Port1.raw b/smp/datasetB/ABS_E_Port1.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/ABS_E_Port1.raw
rename to smp/datasetB/ABS_E_Port1.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/ACC_vehicle_lat.raw b/smp/datasetB/ACC_vehicle_lat.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/ACC_vehicle_lat.raw
rename to smp/datasetB/ACC_vehicle_lat.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/ACC_vehicle_long.raw b/smp/datasetB/ACC_vehicle_long.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/ACC_vehicle_long.raw
rename to smp/datasetB/ACC_vehicle_long.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/AWD_TerrainMode_HS.raw b/smp/datasetB/AWD_TerrainMode_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/AWD_TerrainMode_HS.raw
rename to smp/datasetB/AWD_TerrainMode_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/AbsThrottlePosition_HS.raw b/smp/datasetB/AbsThrottlePosition_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/AbsThrottlePosition_HS.raw
rename to smp/datasetB/AbsThrottlePosition_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/AccPedalAnalogPos_HS.raw b/smp/datasetB/AccPedalAnalogPos_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/AccPedalAnalogPos_HS.raw
rename to smp/datasetB/AccPedalAnalogPos_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/AmbientAirPressure_HS.raw b/smp/datasetB/AmbientAirPressure_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/AmbientAirPressure_HS.raw
rename to smp/datasetB/AmbientAirPressure_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/AmbientTemp_HS.raw b/smp/datasetB/AmbientTemp_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/AmbientTemp_HS.raw
rename to smp/datasetB/AmbientTemp_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/BrakePedalActiveQF_HS.raw b/smp/datasetB/BrakePedalActiveQF_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/BrakePedalActiveQF_HS.raw
rename to smp/datasetB/BrakePedalActiveQF_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/BrakePressure_HS.raw b/smp/datasetB/BrakePressure_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/BrakePressure_HS.raw
rename to smp/datasetB/BrakePressure_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/EPBStatus_RB.raw b/smp/datasetB/EPBStatus_RB.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/EPBStatus_RB.raw
rename to smp/datasetB/EPBStatus_RB.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/EngineSpeed_HS.raw b/smp/datasetB/EngineSpeed_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/EngineSpeed_HS.raw
rename to smp/datasetB/EngineSpeed_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/GPS.time.sec.raw b/smp/datasetB/GPS.time.sec.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/GPS.time.sec.raw
rename to smp/datasetB/GPS.time.sec.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/GearBoxTrqLoss_HS.raw b/smp/datasetB/GearBoxTrqLoss_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/GearBoxTrqLoss_HS.raw
rename to smp/datasetB/GearBoxTrqLoss_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/Gear_HS.raw b/smp/datasetB/Gear_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/Gear_HS.raw
rename to smp/datasetB/Gear_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/HillDescentMode_HS.raw b/smp/datasetB/HillDescentMode_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/HillDescentMode_HS.raw
rename to smp/datasetB/HillDescentMode_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/LateralAcceleration_HS.raw b/smp/datasetB/LateralAcceleration_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/LateralAcceleration_HS.raw
rename to smp/datasetB/LateralAcceleration_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/LongAccOverGround_HS.raw b/smp/datasetB/LongAccOverGround_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/LongAccOverGround_HS.raw
rename to smp/datasetB/LongAccOverGround_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/LongAcceleration_HS.raw b/smp/datasetB/LongAcceleration_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/LongAcceleration_HS.raw
rename to smp/datasetB/LongAcceleration_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/PCM_D_Port1.raw b/smp/datasetB/PCM_D_Port1.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/PCM_D_Port1.raw
rename to smp/datasetB/PCM_D_Port1.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/RollRateActual_HS.raw b/smp/datasetB/RollRateActual_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/RollRateActual_HS.raw
rename to smp/datasetB/RollRateActual_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/SASM_A_Port1.raw b/smp/datasetB/SASM_A_Port1.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/SASM_A_Port1.raw
rename to smp/datasetB/SASM_A_Port1.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/SteeringAngle_HS.raw b/smp/datasetB/SteeringAngle_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/SteeringAngle_HS.raw
rename to smp/datasetB/SteeringAngle_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Disc_FR.raw b/smp/datasetB/Temp_Disc_FR.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Disc_FR.raw
rename to smp/datasetB/Temp_Disc_FR.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Disc_RR.raw b/smp/datasetB/Temp_Disc_RR.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Disc_RR.raw
rename to smp/datasetB/Temp_Disc_RR.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Fluid_FR.raw b/smp/datasetB/Temp_Fluid_FR.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Fluid_FR.raw
rename to smp/datasetB/Temp_Fluid_FR.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Fluid_RR.raw b/smp/datasetB/Temp_Fluid_RR.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Fluid_RR.raw
rename to smp/datasetB/Temp_Fluid_RR.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Pad_FL.raw b/smp/datasetB/Temp_Pad_FL.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/Temp_Pad_FL.raw
rename to smp/datasetB/Temp_Pad_FL.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/TorsionBarTorque_HS.raw b/smp/datasetB/TorsionBarTorque_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/TorsionBarTorque_HS.raw
rename to smp/datasetB/TorsionBarTorque_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/VehicleSpeed_HS.raw b/smp/datasetB/VehicleSpeed_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/VehicleSpeed_HS.raw
rename to smp/datasetB/VehicleSpeed_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelDirectionRL_HS.raw b/smp/datasetB/WheelDirectionRL_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelDirectionRL_HS.raw
rename to smp/datasetB/WheelDirectionRL_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelDirectionRR_HS.raw b/smp/datasetB/WheelDirectionRR_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelDirectionRR_HS.raw
rename to smp/datasetB/WheelDirectionRR_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedFrL_HS.raw b/smp/datasetB/WheelSpeedFrL_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedFrL_HS.raw
rename to smp/datasetB/WheelSpeedFrL_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedFrR_HS.raw b/smp/datasetB/WheelSpeedFrR_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedFrR_HS.raw
rename to smp/datasetB/WheelSpeedFrR_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedReL_HS.raw b/smp/datasetB/WheelSpeedReL_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedReL_HS.raw
rename to smp/datasetB/WheelSpeedReL_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedReR_HS.raw b/smp/datasetB/WheelSpeedReR_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/WheelSpeedReR_HS.raw
rename to smp/datasetB/WheelSpeedReR_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/YawRateActual_HS.raw b/smp/datasetB/YawRateActual_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/YawRateActual_HS.raw
rename to smp/datasetB/YawRateActual_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/YawRate_HS.raw b/smp/datasetB/YawRate_HS.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/YawRate_HS.raw
rename to smp/datasetB/YawRate_HS.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/pedal_force.raw b/smp/datasetB/pedal_force.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/pedal_force.raw
rename to smp/datasetB/pedal_force.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/piston_travel.raw b/smp/datasetB/piston_travel.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/piston_travel.raw
rename to smp/datasetB/piston_travel.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/pressure_FL.raw b/smp/datasetB/pressure_FL.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/pressure_FL.raw
rename to smp/datasetB/pressure_FL.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/pressure_RL.raw b/smp/datasetB/pressure_RL.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/pressure_RL.raw
rename to smp/datasetB/pressure_RL.raw
diff --git a/smp/Rangerover_Evoque_F-RR534_2019-05-07/pressure_Vacuum.raw b/smp/datasetB/pressure_Vacuum.raw
similarity index 100%
rename from smp/Rangerover_Evoque_F-RR534_2019-05-07/pressure_Vacuum.raw
rename to smp/datasetB/pressure_Vacuum.raw
diff --git a/smp/exampleA.raw b/smp/exampleA.raw
new file mode 100644
index 0000000..d8ff185
--- /dev/null
+++ b/smp/exampleA.raw
@@ -0,0 +1 @@
+|CF,2,1,1;|CK,1,3,1,1;|NO,1,16,1,9,imc-FAMOS,0,;|CG,1,5,1,1,1;|CD,1,31,1.000000000000000E+0,1,0,,0,0,0;|NT,1,27, 3,11,1995,21,10,12.0000000; |CC,1,3,1,1;|CP,1,16,1,8,8,64,0,0,1,0;|Cb,1,41,1,0,1,1,0,8,0,8,1,0.000000000000000E+0,0,;|CR,1,11,0,0,0,1,1,V;|CN,1,36,0,0,0,10,Mittelwert,13,Meßreihe 0815; |CT,1,48,0,12,TxBearbeiter,24,E.Mustermann, 23.10.1995,0,; |CS,1,10,1,...ëQ ̧Î^@;
diff --git a/smp/exampleB.raw b/smp/exampleB.raw
new file mode 100644
index 0000000..68bf617
--- /dev/null
+++ b/smp/exampleB.raw
@@ -0,0 +1 @@
+|CF,2,1,1;|CK,1,3,1,1;|NO,1,16,1,9,imc-FAMOS,0,;|CB,1,15,1,8,Messung1,0,;|CG,1,5,1,1,1;|CD,1,32,5.000000000000000E-1,1,1,s,0,0,0;|NT,1,27, 3,11,1995,21,24, 2.0000000; |CC,1,3,1,1;|CP,1,15,1,1,1,8,0,0,1,0;|Cb,1,41,1,0,1,1,0,3,0,3,1,3.000000000000000E+0,0,;|CR,1,49,1,3.921568627450980E-2,0.000000000000000E+0,1,1,V;|ND,1,50,-1,-1,-1,0.000000000000000E+0,1.000000000000000E+1;|CN,1,17,1,0,0,6,kanal1,0,;|CG,1,5,1,1,1;|CD,1,31,5.000000000000000E-1,1,0,,0,0,0;|NT,1,27, 3,11,1995,21,24, 6.0000000; |CC,1,3,1,1;|CP,1,15,2,1,1,8,0,0,1,0;|Cb,1,41,1,0,2,1,3,3,0,3,1,3.000000000000000E+0,0,;|CR,1,49,1,3.921568627450980E-2,0.000000000000000E+0,1,1,V;|ND,1,50,-1,-1,-1,0.000000000000000E+0,1.000000000000000E+1;|CN,1,17,1,0,0,6,kanal2,0,;|CS,1,8,1,leclass="Code Example" translate="true">|NO,1,37,1,9,                   imc-FAMOS,20,Erzeugt:E.Mustermann; |CG,1,5,2,2,2;|CD,1,31,1.000000000000000E-1,1,0,,0,0,0;|NT,1,27,10, 6,1993,19,18,20.0000000; |CC,1,3,1,1;|CP,1,16,1,4,7,32,0,0,1,0;|Cb,1,40,1,0,1,1,0,16,0,16,1,0.000000000000E+0,0,;|CR,1,11,0,0,0,1,1,V;|CN,1,20,0,0,0,9,E06_6_121,0,;|CC,1,3,2,1;|CP,1,16,2,4,5,32,0,0,1,0;|Cb,1,40,1,0,2,1,16,16,0,16,1,0.00000000000E+0,0,;|CR,1,49,1,1.000000024447218E-1,2.139131538569927E-8,1,1,s;|CS,1,34,1,ˆ D@ ƒ@,Ù•@H ¤@*Hh;
diff --git a/src/main.cpp b/src/main.cpp
index e950f88..816f8ed 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -175,6 +175,7 @@ int main(int argc, char* argv[])
     {
       std::cout<<blk.get_key().get_info()<<"\n";
       std::cout<<blk.get_info()<<"\n";
+      // if ( blk.get_key() == std::string("CR") )
       // for ( auto prm: blk.get_parameters() ) std::cout<<prm.get_info()<<"\n";
     }
   }