From ef018ec6ef457154f7f536f6fa9dfa110e5f5aec Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 20 Sep 2019 13:56:13 +0200
Subject: [PATCH] removing separate advancedauxiliariesinterfaces project (vb)
 - implement interfaces in c# and update references in other projects

---
 VECTO.sln                                     |  32 ---
 VECTO/AdvancedAuxiliariesModule.vb            |   2 +-
 VECTO/VECTO.vbproj                            |   4 -
 VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj |  74 ++++++-
 .../Impl/Electrics/M00Impl.cs                 |   8 +-
 .../Impl/Electrics/M02Impl.cs                 |   8 +-
 .../Impl/Electrics/M05Impl.cs                 |   6 +-
 .../Impl/Electrics/M0_5Impl.cs                |   9 +-
 .../DownstreamModules/Impl/HVAC/M01Impl.cs    |  10 +-
 .../DownstreamModules/Impl/M06Impl.cs         |  13 +-
 .../DownstreamModules/Impl/M07Impl.cs         |   9 +-
 .../DownstreamModules/Impl/M08Impl.cs         |   9 +-
 .../DownstreamModules/Impl/M09Impl.cs         |  11 +-
 .../DownstreamModules/Impl/M10Impl.cs         |   7 +-
 .../DownstreamModules/Impl/M11Impl.cs         |  11 +-
 .../DownstreamModules/Impl/M12Impl.cs         |   6 +-
 .../DownstreamModules/Impl/M13Impl.cs         |   7 +-
 .../DownstreamModules/Impl/M14Impl.cs         |  10 +-
 .../Impl/Pneumatics/M03Impl.cs                |   8 +-
 .../Impl/Pneumatics/M04Impl.cs                |   6 +-
 .../Electrics/AltUserInput.cs                 |  27 +++
 .../Electrics/AlternatorMapValues.cs          |  13 ++
 .../Electrics/ElectricConstants.cs            |  22 +++
 .../Electrics/IAlternator.cs                  |  48 +++++
 .../Electrics/IAlternatorMap.cs               |  36 ++++
 .../Electrics/ICombinedAlternator.cs          |  13 ++
 .../Electrics/ICombinedAlternatorMapRow.cs    |  12 ++
 .../Electrics/ICombinedAlternatorSignals.cs   |  12 ++
 .../Electrics/IElectricalConsumer.cs          |  31 +++
 .../Electrics/IElectricalConsumerList.cs      |  61 ++++++
 .../Electrics/IElectricsUserInputsConfig.cs   |  99 ++++++++++
 .../Electrics/IResultCard.cs                  |  35 ++++
 .../Electrics/SmartResult.cs                  |  56 ++++++
 .../DownstreamModules/HVAC/Class1.cs          |   8 +
 .../HVAC/IEnvironmentalCondition.cs           |  12 ++
 .../HVAC/IEnvironmentalConditionsMap.cs       |  11 ++
 .../DownstreamModules/HVAC/IHVACConstants.cs  |  25 +++
 .../HVAC/IHVACSteadyStateModel.cs             |  38 ++++
 .../HVAC/IHVACUserInputsConfig.cs             |  18 ++
 .../DownstreamModules/HVAC/ISSMCalculate.cs   |  57 ++++++
 .../DownstreamModules/HVAC/ISSMGenInputs.cs   |  74 +++++++
 .../DownstreamModules/HVAC/ISSMRun.cs         |  16 ++
 .../DownstreamModules/HVAC/ISSMTOOL.cs        |  39 ++++
 .../DownstreamModules/HVAC/ISSMTechList.cs    |  32 +++
 .../HVAC/ITechListBenefitLine.cs              |  36 ++++
 .../DownstreamModules/IAbstractModule.cs      |   4 +
 .../IM0_5_SmartAlternatorSetEfficiency.cs     |  67 +++++++
 .../IM0_NonSmart_AlternatorsSetEfficiency.cs  |  35 ++++
 .../Interfaces/DownstreamModules/IM10.cs      |  28 +++
 .../Interfaces/DownstreamModules/IM11.cs      |  89 +++++++++
 .../Interfaces/DownstreamModules/IM13.cs      |  29 +++
 .../Interfaces/DownstreamModules/IM14.cs      |  12 ++
 .../IM1_AverageHVACLoadDemand.cs              |  47 +++++
 .../IM2_AverageElectrialLoadDemand.cs         |  21 ++
 .../IM3_AveragePneumaticLoadDemand.cs         |  24 +++
 .../DownstreamModules/IM4_AirCompressor.cs    |  77 ++++++++
 .../IM5_SmartAlternatorSetGeneration.cs       |  40 ++++
 .../Interfaces/DownstreamModules/IM6.cs       |  91 +++++++++
 .../Interfaces/DownstreamModules/IM7.cs       |  52 +++++
 .../Interfaces/DownstreamModules/IM8.cs       |  46 +++++
 .../Interfaces/DownstreamModules/IM9.cs       |  66 +++++++
 .../PneumaticSystem/ActuationsKey.cs          |  59 ++++++
 .../PneumaticSystem/ICompressorMap.cs         |  53 +++++
 .../IPneumaticActuationsMAP.cs                |  21 ++
 .../IPneumaticUserInputsConfig.cs             |  17 ++
 .../IPneumaticsAuxilliariesConfig.cs          |  15 ++
 .../BusAuxiliaries/Interfaces/Enumerations.cs |   6 +
 .../Interfaces/IAdvancedAuxiliaries.cs        | 139 +++++++++++++
 .../Interfaces/IAuxiliaryEvent.cs             |  21 ++
 .../Interfaces/IFuelConsumptionMap.cs         |  15 ++
 VECTOAux/BusAuxiliaries/Interfaces/IM12.cs    |  43 ++++
 .../BusAuxiliaries/Interfaces/ISignals.cs     | 185 ++++++++++++++++++
 .../BusAuxiliaries/Interfaces/IVectoInputs.cs |  59 ++++++
 VECTOAux/BusAuxiliaries/Interfaces/Signals.cs |  66 +++++++
 .../BusAuxiliaries/Interfaces/VectoInputs.cs  |  99 ++++++++++
 .../BusAuxiliaries/Properties/AssemblyInfo.cs |   1 -
 .../VectoAuxiliaries/AdvancedAuxiliaries.vb   |  29 +--
 VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb  |   7 +-
 .../DownstreamModules/cMAP.vb                 |   1 +
 .../VectoAuxiliaries/Electrics/Alternator.vb  |   5 +-
 .../Electrics/AlternatorMap.vb                |   4 +-
 .../Electrics/CombinedAlternator.vb           |   8 +-
 .../Electrics/CombinedAlternatorMapRow.vb     |  10 +-
 .../Electrics/CombinedAlternatorSignals.vb    |   2 +-
 .../Electrics/ElectricalConsumer.vb           |   2 +-
 .../Electrics/ElectricalConsumerList.vb       |   2 +-
 .../Electrics/ElectricsUserInputsConfig.vb    |   6 +-
 .../VectoAuxiliaries/Electrics/ResultCard.vb  |   3 +-
 .../Hvac/EnvironmentalCondition.vb            |   2 +-
 .../Hvac/EnvironmentalConditionsMap.vb        |   2 +-
 .../VectoAuxiliaries/Hvac/HVACConstants.vb    |   2 +-
 .../Hvac/HVACSteadyStateModel.vb              |   2 +-
 .../Hvac/HVACUserInputsConfig.vb              |   2 +-
 .../VectoAuxiliaries/Hvac/SSMCalculate.vb     |   2 +-
 .../VectoAuxiliaries/Hvac/SSMGenInputs.vb     |   2 +-
 VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb      |   2 +-
 VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb     |   2 +-
 VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb |   2 +-
 .../Hvac/TechListBenefitLine.vb               |   2 +-
 VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb |   7 +-
 .../My Project/Resources.Designer.vb          |   1 -
 .../Pneumatics/CompressorMap.vb               |   2 +
 .../Pneumatics/PneumaticActuationsMap.vb      |   1 +
 .../Pneumatics/PneumaticUserInputsConfig.vb   |   1 +
 .../VectoAuxiliaries/UI/frmAuxiliaryConfig.vb |   5 +-
 .../UI/frmCombinedAlternators.vb              |   2 +-
 VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb   |   2 +-
 .../VectoAuxiliaries/VectoAuxiliaries.vbproj  |   4 -
 .../IntegrationTests/AuxDemandTest.vb         |   1 +
 .../Mocks/AlternatorMapMock.vb                |  12 +-
 .../Mocks/CompressorMapMock.vb                |   9 +-
 .../Mocks/ElectricalConsumerMock.vb           |   4 +-
 .../VectoAuxiliariesTests/Mocks/M1_Mock.vb    |   6 +-
 .../VectoAuxiliariesTests/Mocks/M2_Mock.vb    |   8 +-
 .../VectoAuxiliariesTests/Mocks/M3_Mock.vb    |   8 +-
 .../VectoAuxiliariesTests/Mocks/M4_Mock.vb    |   8 +-
 .../VectoAuxiliariesTests/Mocks/M5_Mock.vb    |   8 +-
 .../VectoAuxiliariesTests/Mocks/M6_Mock.vb    |   6 +-
 .../VectoAuxiliariesTests/Mocks/M7_Mock.vb    |  12 +-
 .../Mocks/MockFuel50PC.vb                     |   8 +-
 .../My Project/AssemblyInfo.vb                |   2 +-
 .../My Project/Resources.Designer.vb          |   1 -
 .../UnitTests/AirCompressorTests.vb           |   7 +-
 .../UnitTests/AlternatorMapTests.vb           |   5 +-
 .../AuxiliaryEnvironmentComparisonTests.vb    |   9 +-
 .../AuxiliaryEnvironmentPersistanceTests.vb   |   6 +-
 .../AveragePneumaticLoadDemandTests.vb        |   7 +-
 .../UnitTests/BusDatabaseTests.vb             |   3 -
 .../UnitTests/CombinedAlternatorTests.vb      |   6 +-
 .../UnitTests/ElectricalConsumerTests.vb      |   5 +-
 .../UnitTests/FilePathUtilityTests.vb         |   6 +-
 .../M0_5_SmartAlternatorSetEfficiencyTests.vb |  11 +-
 ..._NonSmart_AlternatorsSetEfficiencyTests.vb |  11 +-
 .../UnitTests/M10Tests.vb                     |   8 +-
 .../UnitTests/M11Tests.vb                     |   9 +-
 .../UnitTests/M12Tests.vb                     |   7 +-
 .../UnitTests/M13Tests.vb                     |   8 +-
 .../UnitTests/M14Tests.vb                     |   9 +-
 .../M1_AverageHVACLoadDemandTests.vb          |  13 +-
 .../M2_AverageElectricalLoadTests.vb          |  13 +-
 .../M5_SmartAlternatorSetGenerationTests.vb   |  14 +-
 .../UnitTests/M6Tests.vb                      |   8 +-
 .../UnitTests/M7Tests.vb                      |   8 +-
 .../UnitTests/M8Tests.vb                      |   8 +-
 .../UnitTests/M9Tests.vb                      |  10 +-
 .../UnitTests/PneumaticActuationsMapTests.vb  |   3 +-
 .../UnitTests/ResultCardTests.vb              |   2 +-
 .../UnitTests/SSMTOOLTests.vb                 |   7 +-
 .../VectoAuxiliariesTests.vbproj              |   4 -
 .../AdvancedAuxiliaryInterfaces.vbproj        | 185 ------------------
 .../Diagnostics.vb                            |  44 -----
 .../Electrics/AltUserInput.vb                 |  27 ---
 .../Electrics/AlternatorMapValues.vb          |  23 ---
 .../Electrics/ElectricConstants.vb            |  33 ----
 .../Electrics/IAlternator.vb                  |  49 -----
 .../Electrics/IAlternatorMap.vb               |  32 ---
 .../Electrics/ICombinedAlternator.vb          |  14 --
 .../Electrics/ICombinedAlternatorMapRow.vb    |  12 --
 .../Electrics/ICombinedAlternatorSignals.vb   |  13 --
 .../Electrics/IElectricalConsumer.vb          |  30 ---
 .../Electrics/IElectricalConsumerList.vb      |  59 ------
 .../Electrics/IElectricsUserInputsConfig.vb   |  97 ---------
 .../Electrics/IResultCard.vb                  |  34 ----
 .../Electrics/SmartResult.vb                  |  53 -----
 .../HVAC/IEnvironmentalCondition.vb           |   8 -
 .../HVAC/IEnvironmentalConditionsMap.vb       |   9 -
 .../DownstreamModules/HVAC/IHVACConstants.vb  |  25 ---
 .../HVAC/IHVACSteadyStateModel.vb             |  49 -----
 .../HVAC/IHVACUserInputsConfig.vb             |  30 ---
 .../DownstreamModules/HVAC/ISSMCalculate.vb   |  67 -------
 .../DownstreamModules/HVAC/ISSMGenInputs.vb   |  79 --------
 .../DownstreamModules/HVAC/ISSMRun.vb         |  25 ---
 .../DownstreamModules/HVAC/ISSMTOOL.vb        |  37 ----
 .../DownstreamModules/HVAC/ISSMTechList.vb    |  42 ----
 .../HVAC/ITechListBenefitLine.vb              |  44 -----
 .../DownstreamModules/IAbstractModule.vb      |   5 -
 .../IM0_5_SmartAlternatorSetEfficiency.vb     |  67 -------
 .../IM0_NonSmart_AlternatorsSetEfficiency.vb  |  37 ----
 .../DownstreamModules/IM10.vb                 |  42 ----
 .../DownstreamModules/IM11.vb                 |  92 ---------
 .../DownstreamModules/IM12.vb                 |  55 ------
 .../DownstreamModules/IM13.vb                 |  32 ---
 .../DownstreamModules/IM14.vb                 |  15 --
 .../IM1_AverageHVACLoadDemand.vb              |  47 -----
 .../IM2_AverageElectricalLoadDemand.vb        |  22 ---
 .../IM3_AveragePneumaticLoadDemand.vb         |  25 ---
 .../DownstreamModules/IM4_AirCompressor.vb    |  75 -------
 .../IM5_SmartAlternatorSetGeneration.vb       |  40 ----
 .../DownstreamModules/IM6.vb                  |  91 ---------
 .../DownstreamModules/IM7.vb                  |  55 ------
 .../DownstreamModules/IM8.vb                  |  49 -----
 .../DownstreamModules/IM9.vb                  |  68 -------
 .../PneumaticSystem/ActuationsKey.vb          |  53 -----
 .../PneumaticSystem/ICompressorMap.vb         |  50 -----
 .../IPneumaticActuationsMAP.vb                |  21 --
 .../IPneumaticUserInputsConfig.vb             |  29 ---
 .../IPneumaticsAuxilliariesConfig.vb          |  25 ---
 .../Enumerations.vb                           |  22 ---
 .../IAdvancedAuxiliaries.vb                   | 136 -------------
 .../IAuxiliaryEvent.vb                        |  17 --
 .../IDiagnostics.vb                           |  32 ---
 .../IFuelConsumptionMap.vb                    |  12 --
 .../AdvancedAuxiliaryInterfaces/ISignals.vb   | 181 -----------------
 .../IVectoInputs.vb                           |  55 ------
 .../My Project/Application.Designer.vb        |  13 --
 .../My Project/Application.myapp              |  10 -
 .../My Project/AssemblyInfo.vb                |  35 ----
 .../My Project/Resources.Designer.vb          |  63 ------
 .../My Project/Resources.resx                 | 117 -----------
 .../My Project/Settings.Designer.vb           |  73 -------
 .../My Project/Settings.settings              |   7 -
 .../AdvancedAuxiliaryInterfaces/Signals.vb    |  64 ------
 .../VectoInputs.vb                            |  91 ---------
 .../packages.config                           |   4 -
 .../Impl/BusAuxiliariesAdapter.cs             |   3 +-
 VectoCore/VectoCore/VectoCore.csproj          |   6 +-
 216 files changed, 2694 insertions(+), 3396 deletions(-)
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AltUserInput.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AlternatorMapValues.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ElectricConstants.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternator.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternatorMap.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternator.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumer.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumerList.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IResultCard.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/SmartResult.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/Class1.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalCondition.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACConstants.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMGenInputs.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMRun.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTOOL.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTechList.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ITechListBenefitLine.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IAbstractModule.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM10.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM11.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM13.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM14.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM1_AverageHVACLoadDemand.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM2_AverageElectrialLoadDemand.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM4_AirCompressor.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM6.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM7.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM8.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM9.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ActuationsKey.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ICompressorMap.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/Enumerations.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/IAdvancedAuxiliaries.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/IAuxiliaryEvent.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/IFuelConsumptionMap.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/IM12.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/ISignals.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/IVectoInputs.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/Signals.cs
 create mode 100644 VECTOAux/BusAuxiliaries/Interfaces/VectoInputs.cs
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/Diagnostics.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AltUserInput.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AlternatorMapValues.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ElectricConstants.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternator.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternatorMap.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternator.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumer.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumerList.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IResultCard.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/SmartResult.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalCondition.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACConstants.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMCalculate.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMGenInputs.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMRun.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTOOL.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTechList.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ITechListBenefitLine.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IAbstractModule.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM10.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM11.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM12.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM13.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM14.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM1_AverageHVACLoadDemand.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM2_AverageElectricalLoadDemand.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM4_AirCompressor.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM6.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM7.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM8.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM9.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ActuationsKey.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ICompressorMap.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/Enumerations.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/IAuxiliaryEvent.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/IDiagnostics.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/ISignals.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/IVectoInputs.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.Designer.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.myapp
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/My Project/AssemblyInfo.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.Designer.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.resx
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.Designer.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.settings
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/Signals.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/VectoInputs.vb
 delete mode 100644 VectoCommon/AdvancedAuxiliaryInterfaces/packages.config

diff --git a/VECTO.sln b/VECTO.sln
index 24df0d7aab..d4b07ce4f7 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -13,16 +13,11 @@ EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VectoAuxiliaries", "VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj", "{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCore", "VectoCore\VectoCore\VectoCore.csproj", "{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD} = {B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}
-	EndProjectSection
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VectoAuxiliariesTests", "VECTOAux\VectoAuxiliariesTests\VectoAuxiliariesTests.vbproj", "{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCoreTest", "VectoCore\VectoCoreTest\VectoCoreTest.csproj", "{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AdvancedAuxiliaryInterfaces", "VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj", "{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoConsole", "VectoConsole\VectoConsole.csproj", "{60AD4DF0-6648-4374-83CB-C7A162EFB391}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphDrawer", "Tools\GraphDrawer\GraphDrawer.csproj", "{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}"
@@ -243,32 +238,6 @@ Global
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.ReleaseTUG|Any CPU.Build.0 = Release|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.ReleaseTUG|x64.ActiveCfg = Release|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.ReleaseTUG|x86.ActiveCfg = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug PerformanceStats|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug PerformanceStats|x64.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug PerformanceStats|x86.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug PerformanceTrace|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug PerformanceTrace|x64.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug PerformanceTrace|x86.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|Any CPU.Build.0 = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x64.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Deploy|x86.ActiveCfg = Debug|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|x64.ActiveCfg = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.Release|x86.ActiveCfg = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.ReleaseTUG|Any CPU.Build.0 = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.ReleaseTUG|x64.ActiveCfg = Release|Any CPU
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}.ReleaseTUG|x86.ActiveCfg = Release|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug PerformanceStats|Any CPU.ActiveCfg = Debug|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug PerformanceStats|Any CPU.Build.0 = Debug|Any CPU
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391}.Debug PerformanceStats|x64.ActiveCfg = Debug|Any CPU
@@ -888,7 +857,6 @@ Global
 		{CD36938A-ADD9-4C65-96DA-B397CDEEA90A} = {CC93EA68-F3FE-4BCB-9292-1101F94A4D09}
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D} = {B7C0A40B-E468-44DE-A784-7A5B8DAC1042}
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2} = {CC93EA68-F3FE-4BCB-9292-1101F94A4D09}
-		{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD} = {73A5BF70-6168-456F-95E5-A1402BFA488C}
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
 		{E8B0B447-1A54-4BEC-A160-AF0017000781} = {351FF7E8-B56B-445E-8E98-A61E07C990DA}
diff --git a/VECTO/AdvancedAuxiliariesModule.vb b/VECTO/AdvancedAuxiliariesModule.vb
index 652a5dd037..77e3e99522 100644
--- a/VECTO/AdvancedAuxiliariesModule.vb
+++ b/VECTO/AdvancedAuxiliariesModule.vb
@@ -1,8 +1,8 @@
 Imports System.Collections.Generic
-Imports VectoAuxiliaries
 Imports System.IO
 Imports System.Linq
 Imports System.Runtime.Remoting
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 
 Module AdvancedAuxiliariesModule
 	Public WithEvents AdvancedAuxModel As IAdvancedAuxiliaries
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index e11aa85004..70ba541d40 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -523,10 +523,6 @@
       <Project>{550d99d4-25f7-48d9-b0f0-e5dd6cb3485d}</Project>
       <Name>BusAuxiliaries</Name>
     </ProjectReference>
-    <ProjectReference Include="..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
-      <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
-      <Name>AdvancedAuxiliaryInterfaces</Name>
-    </ProjectReference>
     <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj">
       <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
       <Name>VectoCommon</Name>
diff --git a/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj b/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
index 07e2afca63..e1d74c1abf 100644
--- a/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
+++ b/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
@@ -31,6 +31,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\STUDENTEN_PROJEKTE\Kober_VectoGIT\VECTO_GIT\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -42,6 +46,15 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DownstreamModules\Impl\AbstractModule.cs" />
+    <Compile Include="DownstreamModules\Impl\AlternatorMap.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\Alternator.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\ElectricsUserInputsConfig.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\ResultCard.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\ElectricalConsumer.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\ElectricalConsumerList.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\CombinedAlternatorSignals.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\CombinedAlternatorMapRow.cs" />
+    <Compile Include="DownstreamModules\Impl\Electrics\CombinedAlternator.cs" />
     <Compile Include="DownstreamModules\Impl\Electrics\M00Impl.cs" />
     <Compile Include="DownstreamModules\Impl\Electrics\M02Impl.cs" />
     <Compile Include="DownstreamModules\Impl\Pneumatics\M03Impl.cs" />
@@ -58,18 +71,71 @@
     <Compile Include="DownstreamModules\Impl\M07Impl.cs" />
     <Compile Include="DownstreamModules\Impl\M08Impl.cs" />
     <Compile Include="DownstreamModules\Impl\M09Impl.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\SmartResult.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\IResultCard.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\IElectricsUserInputsConfig.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\IElectricalConsumerList.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\IElectricalConsumer.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\ICombinedAlternatorSignals.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\ICombinedAlternatorMapRow.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\AlternatorMapValues.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\AltUserInput.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\ElectricConstants.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\IAlternator.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\IAlternatorMap.cs" />
+    <Compile Include="Interfaces\DownstreamModules\Electrics\ICombinedAlternator.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\Class1.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\ISSMTOOL.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\ISSMTechList.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\ISSMRun.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\ISSMGenInputs.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\ISSMCalculate.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\IHVACUserInputsConfig.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\IHVACSteadyStateModel.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\IHVACConstants.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\IEnvironmentalConditionsMap.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\IEnvironmentalCondition.cs" />
+    <Compile Include="Interfaces\DownstreamModules\HVAC\ITechListBenefitLine.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IAbstractModule.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM0_5_SmartAlternatorSetEfficiency.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM0_NonSmart_AlternatorsSetEfficiency.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM10.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM11.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM13.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM14.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM1_AverageHVACLoadDemand.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM2_AverageElectrialLoadDemand.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM3_AveragePneumaticLoadDemand.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM4_AirCompressor.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM5_SmartAlternatorSetGeneration.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM6.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM7.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM8.cs" />
+    <Compile Include="Interfaces\DownstreamModules\IM9.cs" />
+    <Compile Include="Interfaces\DownstreamModules\PneumaticSystem\ActuationsKey.cs" />
+    <Compile Include="Interfaces\DownstreamModules\PneumaticSystem\IPneumaticUserInputsConfig.cs" />
+    <Compile Include="Interfaces\DownstreamModules\PneumaticSystem\IPneumaticsAuxilliariesConfig.cs" />
+    <Compile Include="Interfaces\DownstreamModules\PneumaticSystem\IPneumaticActuationsMAP.cs" />
+    <Compile Include="Interfaces\DownstreamModules\PneumaticSystem\ICompressorMap.cs" />
+    <Compile Include="Interfaces\Enumerations.cs" />
+    <Compile Include="Interfaces\IAdvancedAuxiliaries.cs" />
+    <Compile Include="Interfaces\IAuxiliaryEvent.cs" />
+    <Compile Include="Interfaces\IFuelConsumptionMap.cs" />
+    <Compile Include="Interfaces\IM12.cs" />
+    <Compile Include="Interfaces\ISignals.cs" />
+    <Compile Include="Interfaces\IVectoInputs.cs" />
+    <Compile Include="Interfaces\Signals.cs" />
+    <Compile Include="Interfaces\VectoInputs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Util\FilePathUtils.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
-      <Project>{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}</Project>
-      <Name>AdvancedAuxiliaryInterfaces</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
       <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
       <Name>VectoCommon</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs
index f0d4272287..49acda8ec8 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M00Impl.cs
@@ -1,10 +1,10 @@
 using System;
+using DownstreamModules.Electrics;
+using Electrics;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules.Electrics;
-using VectoAuxiliaries.Electrics;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
 
-namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 {
 	public class M00Impl : AbstractModule, IM0_NonSmart_AlternatorsSetEfficiency
 	{
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M02Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M02Impl.cs
index 517cfb97eb..e8a8b47ac3 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M02Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M02Impl.cs
@@ -1,10 +1,10 @@
 using System;
+using DownstreamModules.Electrics;
+using Electrics;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules.Electrics;
-using VectoAuxiliaries.Electrics;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
 
-namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 {
 	public class M02Impl : AbstractModule, IM2_AverageElectricalLoadDemand
 	{
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M05Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M05Impl.cs
index a4af601f2a..7aeab7f919 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M05Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M05Impl.cs
@@ -1,9 +1,9 @@
 using System;
+using DownstreamModules.Electrics;
+using Electrics;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries.DownstreamModules.Electrics;
-using VectoAuxiliaries.Electrics;
 
-namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 {
 	public class M05Impl : AbstractModule, IM5_SmartAlternatorSetGeneration
 	{
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs
index 6a22571a85..037ce76ee8 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Electrics/M0_5Impl.cs
@@ -1,10 +1,11 @@
 using System;
+using DownstreamModules.Electrics;
+using Electrics;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules.Electrics;
-using VectoAuxiliaries.Electrics;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics;
 
-namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 {
 	public class M0_5Impl : AbstractModule, IM0_5_SmartAlternatorSetEfficiency
 	{
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs
index d275331ca4..9c0763ddd8 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/M01Impl.cs
@@ -1,11 +1,11 @@
 using System;
+using DownstreamModules.Electrics;
+using Electrics;
+using Hvac;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules.Electrics;
-using VectoAuxiliaries.Electrics;
-using VectoAuxiliaries.Hvac;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
 
-namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 {
 	public class M01Impl : AbstractModule, IM1_AverageHVACLoadDemand
 	{
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M06Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M06Impl.cs
index 37afc61473..468174e0bb 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M06Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M06Impl.cs
@@ -1,9 +1,10 @@
-using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
-using VectoAuxiliaries.Electrics;
-using VectoAuxiliaries.Hvac;
-using VectoAuxiliaries.Pneumatics;
+using DownstreamModules;
+using Electrics;
+using Hvac;
+using Pneumatics;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M07Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M07Impl.cs
index 4c897e1669..a9e9a811e8 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M07Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M07Impl.cs
@@ -1,7 +1,8 @@
-using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
-using VectoAuxiliaries.Electrics;
+using DownstreamModules;
+using Electrics;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M08Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M08Impl.cs
index 37a899b30b..e7a41e3961 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M08Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M08Impl.cs
@@ -1,7 +1,8 @@
-using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
-using VectoAuxiliaries.Hvac;
+using DownstreamModules;
+using Hvac;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs
index 162f4fbea6..eea410b8fe 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M09Impl.cs
@@ -1,9 +1,10 @@
 using System;
+using DownstreamModules;
+using Hvac;
+using Pneumatics;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
-using VectoAuxiliaries.Hvac;
-using VectoAuxiliaries.Pneumatics;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
@@ -49,7 +50,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 
 		#region Implementation of IAuxiliaryEvent
 
-		public event IAuxiliaryEvent.AuxiliaryEventEventHandler AuxiliaryEvent;
+		public event AuxiliaryEventEventHandler AuxiliaryEvent;
 
 		#endregion
 
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M10Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M10Impl.cs
index 8bd326904d..1d57472aae 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M10Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M10Impl.cs
@@ -1,8 +1,9 @@
 using System;
+using DownstreamModules;
+using Pneumatics;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
-using VectoAuxiliaries.Pneumatics;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs
index c24717ee08..a828361c94 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M11Impl.cs
@@ -1,8 +1,9 @@
-using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
-using VectoAuxiliaries.Hvac;
-using VectoAuxiliaries.Pneumatics;
+using DownstreamModules;
+using Hvac;
+using Pneumatics;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M12Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M12Impl.cs
index ae8c057645..c8f079c857 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M12Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M12Impl.cs
@@ -1,7 +1,7 @@
-using System;
+using DownstreamModules;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M13Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M13Impl.cs
index b6e08d7031..f193e70e90 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M13Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M13Impl.cs
@@ -1,6 +1,7 @@
-using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
+using DownstreamModules;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M14Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M14Impl.cs
index 04ca5e2985..8c7d4998b7 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M14Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/M14Impl.cs
@@ -1,8 +1,8 @@
-using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.DownstreamModules;
-using VectoAuxiliaries.DownstreamModules.HVAC;
-using VectoAuxiliaries.Hvac;
+using DownstreamModules;
+using DownstreamModules.HVAC;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
 
 namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 {
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs
index 0e67617888..625981d7cf 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs
@@ -1,8 +1,8 @@
-using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.Pneumatics;
+using Pneumatics;
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
 
-namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
 {
 	public class M03Impl : AbstractModule, IM3_AveragePneumaticLoadDemand
 	{
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs
index 76ab64701c..5bbfa8428c 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M04Impl.cs
@@ -1,9 +1,9 @@
 using System;
+using Pneumatics;
 using TUGraz.VectoCommon.Utils;
-using VectoAuxiliaries;
-using VectoAuxiliaries.Pneumatics;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
 
-namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
 {
 	public class M04Impl : AbstractModule, IM4_AirCompressor
 	{
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AltUserInput.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AltUserInput.cs
new file mode 100644
index 0000000000..7770866c13
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AltUserInput.cs
@@ -0,0 +1,27 @@
+using System;
+
+
+namespace DownstreamModules.Electrics
+{
+	// Used by the Combined Alternator Form/Classes to accept user input for the combined alternators efficiency
+	// At different Current Demands
+	public class AltUserInput
+	{
+		public double Amps;
+		public double Eff;
+
+		// Constructor
+		public AltUserInput(double amps, double eff)
+		{
+			this.Amps = amps;
+			this.Eff = eff;
+		}
+
+		// Equality
+		public bool IsEqual(AltUserInput other, int rounding = 7)
+		{
+			return Math.Round(this.Amps, rounding) == Math.Round(other.Amps, rounding) &&
+					Math.Round(this.Eff, rounding) == Math.Round(other.Eff, rounding);
+		}
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AlternatorMapValues.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AlternatorMapValues.cs
new file mode 100644
index 0000000000..80d81c06fd
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/AlternatorMapValues.cs
@@ -0,0 +1,13 @@
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+{
+	// Originally was going to hold more than one value type.
+	public struct AlternatorMapValues
+	{
+		public readonly double Efficiency;
+
+		public AlternatorMapValues(double efficiency)
+		{
+			this.Efficiency = efficiency;
+		}
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ElectricConstants.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ElectricConstants.cs
new file mode 100644
index 0000000000..d459d3a36d
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ElectricConstants.cs
@@ -0,0 +1,22 @@
+namespace DownstreamModules.Electrics
+{
+	public class ElectricConstants
+	{
+		// Anticipated Min and Max Allowable values for Powernet, normally 26.3 volts but could be 48 in the future.
+		public const double PowenetVoltageMin = 6;
+		public const double PowenetVoltageMax = 50;
+
+		// Duty Cycle IE Percentage of use
+		public const double PhaseIdleTractionOnMin = 0;
+		public const double PhaseIdleTractionMax = 1;
+
+		// Max Min Expected Consumption for a Single Consumer, negative values allowed as bonuses.
+		public const int NonminalConsumerConsumptionAmpsMin = -10;
+		public const int NominalConsumptionAmpsMax = 100;
+
+
+		// Alternator
+		public const double AlternatorPulleyEfficiencyMin = 0.1;
+		public const double AlternatorPulleyEfficiencyMax = 1;
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternator.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternator.cs
new file mode 100644
index 0000000000..c0a100e423
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternator.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+
+namespace DownstreamModules.Electrics
+{
+	public class Table4Row
+	{
+		public double RPM;
+		public double Efficiency;
+
+		public Table4Row(double rpm, double eff)
+		{
+			this.RPM = rpm;
+			this.Efficiency = eff;
+		}
+	}
+
+	// Used By Combined Alternator.
+	// Model based on CombinedALTS_V02_Editable.xlsx
+	public interface IAlternator
+	{
+		// D6
+		string AlternatorName { get; set; }
+
+		// G6
+		double PulleyRatio { get; set; }
+
+		// S9
+		double SpindleSpeed { get; }
+
+		// S10
+		double Efficiency { get; }
+
+		// C10-D15
+		List<AltUserInput> InputTable2000 { get; set; }
+
+		// F10-G15
+		List<AltUserInput> InputTable4000 { get; set; }
+
+		// I10-J15
+		List<AltUserInput> InputTable6000 { get; set; }
+
+		// M10-N15
+		List<Table4Row> RangeTable { get; set; }
+
+		// Test Equality
+		bool IsEqualTo(IAlternator other);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternatorMap.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternatorMap.cs
new file mode 100644
index 0000000000..e68bd0b740
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IAlternatorMap.cs
@@ -0,0 +1,36 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics;
+
+namespace DownstreamModules.Electrics
+{
+	public interface IAlternatorMap : IAuxiliaryEvent
+	{
+
+		/// <summary>
+		/// 	Initialise the map from supplied csv data
+		/// 	</summary>
+		/// 	<returns>Boolean - true if map is created successfully</returns>
+		/// 	<remarks></remarks>
+		bool Initialise();
+
+		/// <summary>
+		/// 	Returns the alternator efficiency at given rpm
+		/// 	</summary>
+		/// 	<param name="rpm">alternator rotation speed</param>
+		/// 	<returns>Single</returns>
+		/// 	<remarks></remarks>
+		AlternatorMapValues GetEfficiency(double rpm, Ampere amps);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternator.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternator.cs
new file mode 100644
index 0000000000..aa89af1bdd
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternator.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace DownstreamModules.Electrics
+{
+	public interface ICombinedAlternator
+	{
+		// Alternators List
+		List<IAlternator> Alternators { get; set; }
+
+		// Test Equality
+		bool IsEqualTo(ICombinedAlternator other);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.cs
new file mode 100644
index 0000000000..80cb4ae09e
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.cs
@@ -0,0 +1,12 @@
+namespace DownstreamModules.Electrics
+{
+	// Reflects stored data in pesisted CombinedAlternator Map .AALT
+	public interface ICombinedAlternatorMapRow
+	{
+		string AlternatorName { get; set; }
+		double RPM { get; set; }
+		double Amps { get; set; }
+		double Efficiency { get; set; }
+		double PulleyRatio { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.cs
new file mode 100644
index 0000000000..d1a9bb73d6
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.cs
@@ -0,0 +1,12 @@
+using TUGraz.VectoCommon.Utils;
+
+namespace DownstreamModules.Electrics
+{
+	// Used by CombinedAlternator
+	public interface ICombinedAlternatorSignals
+	{
+		int NumberOfAlternators { get; set; }
+		double CrankRPM { get; set; }
+		Ampere CurrentDemandAmps { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumer.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumer.cs
new file mode 100644
index 0000000000..3fd03cb75f
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumer.cs
@@ -0,0 +1,31 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+using System;
+using System.ComponentModel;
+using TUGraz.VectoCommon.Utils;
+
+namespace DownstreamModules.Electrics
+{
+	public interface IElectricalConsumer : INotifyPropertyChanged
+	{
+		string Category { get; set; }
+		string ConsumerName { get; set; }
+		bool BaseVehicle { get; set; }
+		double NominalConsumptionAmps { get; set; }
+		double PhaseIdle_TractionOn { get; set; }
+		int NumberInActualVehicle { get; set; }
+		double PowerNetVoltage { get; set; }
+		double AvgConsumptionAmps { get; set; }
+		string Info { get; set; }
+		Ampere TotalAvgConumptionAmps(double PhaseIdle_TractionOnBasedOnCycle = default(Double));
+		Watt TotalAvgConsumptionInWatts(double PhaseIdle_TractionOnBasedOnCycle = 0.0);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumerList.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumerList.cs
new file mode 100644
index 0000000000..378199f78d
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricalConsumerList.cs
@@ -0,0 +1,61 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using System.Collections.Generic;
+using TUGraz.VectoCommon.Utils;
+
+namespace DownstreamModules.Electrics
+{
+	public interface IElectricalConsumerList
+	{
+		/// <summary>
+		/// 	List of Electrical Consumers
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		List<IElectricalConsumer> Items { get; }
+
+		/// <summary>
+		/// 	Add New Electrical Consumer
+		/// 	</summary>
+		/// 	<param name="consumer"></param>
+		/// 	<remarks></remarks>
+		void AddConsumer(IElectricalConsumer consumer);
+
+		/// <summary>
+		/// 	Remove Electrical Consumer
+		/// 	</summary>
+		/// 	<param name="consumer"></param>
+		/// 	<remarks></remarks>
+		void RemoveConsumer(IElectricalConsumer consumer);
+
+		/// <summary>
+		/// 	Get Total Average Demand In Amps 
+		/// 	</summary>
+		/// 	<param name="excludeOnBase">Exclude those on base vehicle</param>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Ampere GetTotalAverageDemandAmps(bool excludeOnBase);
+
+		/// <summary>
+		/// 	Door Actuation Time Fraction ( Total Time Spent Operational during cycle )
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		double DoorDutyCycleFraction { get; set; }
+
+		// Merge Info data from ElectricalConsumer in a Default set into live set
+		// This is required because the info is stored in the AAUX file and we do not want to use a persistance stored version.
+		void MergeInfoData();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.cs
new file mode 100644
index 0000000000..8ebefc20f8
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.cs
@@ -0,0 +1,99 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics;
+
+namespace DownstreamModules.Electrics
+{
+	public interface IElectricsUserInputsConfig
+	{
+		/// <summary>
+		/// 	Power Net Voltage - The supply voltage used on the vehilce.
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		double PowerNetVoltage { get; set; }
+
+		/// <summary>
+		/// 	The Path for the Alternator map
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		string AlternatorMap { get; set; }
+
+		/// <summary>
+		/// 	Alternator Gear Efficiency
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		double AlternatorGearEfficiency { get; set; }
+
+		/// <summary>
+		/// 	List of Electrical Consumers
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		IElectricalConsumerList ElectricalConsumers { get; set; }
+
+		/// <summary>
+		/// 	Door Actuation Time In Seconds ( Time Taken to Open/Close the door )
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		int DoorActuationTimeSecond { get; set; }
+
+		/// <summary>
+		/// 	Result Card Taken During Idle.
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		IResultCard ResultCardIdle { get; set; }
+
+		/// <summary>
+		/// 	Result Card Taken During Traction
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		IResultCard ResultCardTraction { get; set; }
+
+		/// <summary>
+		/// 	Result Card Taken During Overrun
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		IResultCard ResultCardOverrun { get; set; }
+
+		/// <summary>
+		/// 	Smart Electrical System
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns>True For Smart Electrical Systems/ False For non Smart.</returns>
+		/// 	<remarks></remarks>
+		bool SmartElectrical { get; set; }
+
+		/// <summary>
+		/// 	Stored Energy Efficiency
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns>Stored Energy Efficiency</returns>
+		/// 	<remarks></remarks>
+		double StoredEnergyEfficiency { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IResultCard.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IResultCard.cs
new file mode 100644
index 0000000000..0773c9664b
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/IResultCard.cs
@@ -0,0 +1,35 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using System.Collections.Generic;
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+{
+	public interface IResultCard
+	{
+		/// <summary>
+		/// 	Returns a List of (SmartResult )
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		List<SmartResult> Results { get; }
+
+		/// <summary>
+		/// 	Returns the Smart Current (A)
+		/// 	</summary>
+		/// 	<param name="amps"></param>
+		/// 	<returns></returns>
+		/// 	<remarks>Defaults to 10 Amps if no readings present</remarks>
+		Ampere GetSmartCurrentResult(Ampere amps);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/SmartResult.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/SmartResult.cs
new file mode 100644
index 0000000000..e1ed684801
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/Electrics/SmartResult.cs
@@ -0,0 +1,56 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using System;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+{
+	public class SmartResult : IComparable<SmartResult>
+	{
+		public double Amps { get; set; }
+		public double SmartAmps { get; set; }
+
+		// Constructors
+		public SmartResult()
+		{
+		}
+
+		public SmartResult(double amps, double smartAmps)
+		{
+			Amps = amps;
+			SmartAmps = smartAmps;
+		}
+
+		// Comparison
+		public int CompareTo(SmartResult other)
+		{
+			if (other.Amps > Amps)
+				return -1;
+			if (other.Amps == Amps)
+				return 0;
+
+			return 1;
+		}
+
+		// Comparison Overrides
+		public override bool Equals(object obj)
+		{
+			SmartResult other = (SmartResult)obj;
+
+			return Amps == other.Amps;
+		}
+
+		public override int GetHashCode()
+		{
+			return 0;
+		}
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/Class1.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/Class1.cs
new file mode 100644
index 0000000000..1bc55a51a8
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/Class1.cs
@@ -0,0 +1,8 @@
+namespace DownstreamModules.HVAC
+{
+	public enum TechLineType
+	{
+		Normal,
+		HVCActiveSelection
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalCondition.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalCondition.cs
new file mode 100644
index 0000000000..5fc78f0d50
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalCondition.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace DownstreamModules.HVAC
+{
+	public interface IEnvironmentalCondition
+	{
+		double GetTemperature();
+		double GetSolar();
+		double GetWeighting();
+		double GetNormalisedWeighting(List<IEnvironmentalCondition> map);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.cs
new file mode 100644
index 0000000000..00ab72bcff
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace DownstreamModules.HVAC
+{
+	public interface IEnvironmentalConditionsMap
+	{
+		bool Initialise();
+
+		List<IEnvironmentalCondition> GetEnvironmentalConditions();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACConstants.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACConstants.cs
new file mode 100644
index 0000000000..82fa85c6d9
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACConstants.cs
@@ -0,0 +1,25 @@
+using TUGraz.VectoCommon.Utils;
+
+namespace DownstreamModules.HVAC
+{
+	public interface IHVACConstants
+	{
+		/// <summary>
+		/// 	Diesel: 44800   [J/g]
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		JoulePerKilogramm DieselGCVJperGram { get; }
+
+		/// <summary>
+		/// 	835  [g/l]
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		KilogramPerCubicMeter FuelDensity { get; }
+
+		double FuelDensityAsGramPerLiter { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.cs
new file mode 100644
index 0000000000..47baf5a025
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.cs
@@ -0,0 +1,38 @@
+namespace DownstreamModules.HVAC
+{
+	public interface IHVACSteadyStateModel
+	{
+		/// <summary>
+		/// 	Initialised Values From Map
+		/// 	</summary>
+		/// 	<param name="filePath"></param>
+		/// 	<param name="message"></param>
+		/// 	<returns>True if successfull, and False if not.</returns>
+		/// 	<remarks></remarks>
+		bool SetValuesFromMap(string filePath, ref string message);
+
+		/// <summary>
+		/// 	HVAC Mechanical Load Power  (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		float HVACMechanicalLoadPowerWatts { get; set; }
+
+		/// <summary>
+		/// 	HVAC Electrical Load Power (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		float HVACElectricalLoadPowerWatts { get; set; }
+
+		/// <summary>
+		/// 	HVAC Fuelling (L/H)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns>Liters per hour</returns>
+		/// 	<remarks></remarks>
+		float HVACFuellingLitresPerHour { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.cs
new file mode 100644
index 0000000000..c627716ae8
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.cs
@@ -0,0 +1,18 @@
+namespace DownstreamModules.HVAC
+{
+	public interface IHVACUserInputsConfig
+	{
+		// Property  SteadyStateModel As IHVACSteadyStateModel
+		/// <summary>
+		/// 	PathName of the Steady State Model File
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		string SSMFilePath { get; set; }
+
+		string BusDatabasePath { get; set; }
+
+		bool SSMDisabled { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
new file mode 100644
index 0000000000..763b9b37c3
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
@@ -0,0 +1,57 @@
+namespace DownstreamModules.HVAC
+{
+	public interface ISSMCalculate
+	{
+		ISSMRun Run1 { get; set; }
+		ISSMRun Run2 { get; set; }
+
+
+		double ElectricalWBase { get; }
+		double MechanicalWBase { get; }
+		double FuelPerHBase { get; }
+
+		double ElectricalWAdjusted { get; }
+		double MechanicalWBaseAdjusted { get; }
+		double FuelPerHBaseAdjusted { get; }
+
+
+		// BaseValues
+		// - Heating
+		double BaseHeatingW_Mechanical { get; }
+		double BaseHeatingW_ElectricalCoolingHeating { get; }
+		double BaseHeatingW_ElectricalVentilation { get; }
+		double BaseHeatingW_FuelFiredHeating { get; }
+
+		// Cooling                                                    
+		double BaseCoolingW_Mechanical { get; }
+		double BaseCoolingW_ElectricalCoolingHeating { get; }
+		double BaseCoolingW_ElectricalVentilation { get; }
+		double BaseCoolingW_FuelFiredHeating { get; }
+
+		// Cooling
+		double BaseVentilationW_Mechanical { get; }
+		double BaseVentilationW_ElectricalCoolingHeating { get; }
+		double BaseVentilationW_ElectricalVentilation { get; }
+		double BaseVentilationW_FuelFiredHeating { get; }
+
+
+		// TechListBenefits
+		// - Heating
+		double TechListAdjustedHeatingW_Mechanical { get; }
+		double TechListAdjustedHeatingW_ElectricalCoolingHeating { get; }
+		double TechListAdjustedHeatingW_ElectricalVentilation { get; }
+		double TechListAdjustedHeatingW_FuelFiredHeating { get; }
+
+		// Cooling          TechListAdjusted                                      
+		double TechListAdjustedCoolingW_Mechanical { get; }
+		double TechListAdjustedCoolingW_ElectricalCoolingHeating { get; }
+		double TechListAdjustedCoolingW_ElectricalVentilation { get; }
+		double TechListAdjustedCoolingW_FuelFiredHeating { get; }
+
+		// Cooling          TechListAdjusted
+		double TechListAdjustedVentilationW_Mechanical { get; }
+		double TechListAdjustedVentilationW_ElectricalCoolingHeating { get; }
+		double TechListAdjustedVentilationW_ElectricalVentilation { get; }
+		double TechListAdjustedVentilationW_FuelFiredHeating { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMGenInputs.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMGenInputs.cs
new file mode 100644
index 0000000000..75a5d1b58e
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMGenInputs.cs
@@ -0,0 +1,74 @@
+namespace DownstreamModules.HVAC
+{
+	public interface ISSMGenInputs
+	{
+
+		// Bus Parameterisation	
+		string BP_BusModel { get; set; }
+		double BP_NumberOfPassengers { get; set; }
+		string BP_BusFloorType { get; set; }
+		bool BP_DoubleDecker { get; set; }
+		double BP_BusLength { get; set; }
+		double BP_BusWidth { get; set; }
+		double BP_BusHeight { get; set; }
+
+		double BP_BusFloorSurfaceArea { get; }
+		double BP_BusWindowSurface { get; }
+		double BP_BusSurfaceAreaM2 { get; }
+		double BP_BusVolume { get; }
+
+		// Boundary Conditions:			
+		double BC_GFactor { get; set; }
+		double BC_SolarClouding { get; }
+		double BC_HeatPerPassengerIntoCabinW { get; }
+		double BC_PassengerBoundaryTemperature { get; set; }
+		double BC_PassengerDensityLowFloor { get; }
+		double BC_PassengerDensitySemiLowFloor { get; }
+		double BC_PassengerDensityRaisedFloor { get; }
+		double BC_CalculatedPassengerNumber { get; }
+		double BC_UValues { get; }
+		double BC_HeatingBoundaryTemperature { get; set; }
+		double BC_CoolingBoundaryTemperature { get; set; }
+		double BC_TemperatureCoolingTurnsOff { get; }
+		double BC_HighVentilation { get; set; }
+		double BC_lowVentilation { get; set; }
+		double BC_High { get; }
+		double BC_Low { get; }
+		double BC_HighVentPowerW { get; }
+		double BC_LowVentPowerW { get; }
+		double BC_SpecificVentilationPower { get; set; }
+		double BC_AuxHeaterEfficiency { get; set; }
+		double BC_GCVDieselOrHeatingOil { get; set; }
+		double BC_WindowAreaPerUnitBusLength { get; }
+		double BC_FrontRearWindowArea { get; }
+		double BC_MaxTemperatureDeltaForLowFloorBusses { get; set; }
+		double BC_MaxPossibleBenefitFromTechnologyList { get; set; }
+
+		// EnviromentalConditions				
+		double EC_EnviromentalTemperature { get; set; }
+		double EC_Solar { get; set; }
+		IEnvironmentalConditionsMap EC_EnvironmentalConditionsMap { get; }
+		string EC_EnviromentalConditions_BatchFile { get; set; }
+		bool EC_EnviromentalConditions_BatchEnabled { get; set; }
+
+		// AC-system				            
+		string AC_CompressorType { get; set; }
+		string AC_CompressorTypeDerived { get; }
+		double AC_CompressorCapacitykW { get; set; }
+		double AC_COP { get; }
+
+		// Ventilation				
+		bool VEN_VentilationOnDuringHeating { get; set; }
+		bool VEN_VentilationWhenBothHeatingAndACInactive { get; set; }
+		bool VEN_VentilationDuringAC { get; set; }
+		string VEN_VentilationFlowSettingWhenHeatingAndACInactive { get; set; }
+		string VEN_VentilationDuringHeating { get; set; }
+		string VEN_VentilationDuringCooling { get; set; }
+
+		// Aux. Heater				
+		double AH_EngineWasteHeatkW { get; set; }
+		double AH_FuelFiredHeaterkW { get; set; }
+		double AH_FuelEnergyToHeatToCoolant { get; set; }
+		double AH_CoolantHeatTransferredToAirCabinHeater { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMRun.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMRun.cs
new file mode 100644
index 0000000000..eac78d1871
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMRun.cs
@@ -0,0 +1,16 @@
+namespace DownstreamModules.HVAC
+{
+	public interface ISSMRun
+	{
+		double HVACOperation { get; }
+		double TCalc { get; }
+		double TemperatureDelta { get; }
+		double QWall { get; }
+		double WattsPerPass { get; }
+		double Solar { get; }
+		double TotalW { get; }
+		double TotalKW { get; }
+		double FuelW { get; }
+		double TechListAmendedFuelW { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTOOL.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTOOL.cs
new file mode 100644
index 0000000000..8c81a8930f
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTOOL.cs
@@ -0,0 +1,39 @@
+using DownstreamModules.HVAC;
+
+public interface ISSMTOOL
+{
+	ISSMGenInputs GenInputs { get; set; }
+	ISSMTechList TechList { get; set; }
+	ISSMCalculate Calculate { get; set; }
+	bool SSMDisabled { get; set; }
+	IHVACConstants HVACConstants { get; set; }
+
+	double ElectricalWBase { get; } // Watt
+	double MechanicalWBase { get; } // Watt
+	double FuelPerHBase { get; } // LiterPerHour
+
+	double ElectricalWAdjusted { get; } // Watt
+	double MechanicalWBaseAdjusted { get; } // Watt
+	double FuelPerHBaseAdjusted { get; } // LiterPerHour
+
+	void Clone(ISSMTOOL from);
+
+	bool Load(string filePath);
+
+	bool Save(string filePath);
+
+	bool IsEqualTo(ISSMTOOL source);
+
+	/// <summary>
+	/// This alters the waste heat and returns an adjusted fueling value
+	/// </summary>
+	/// <param name="AverageUseableEngineWasteHeatKW"></param>
+	/// <returns></returns>
+	/// <remarks></remarks>
+	double FuelPerHBaseAsjusted(double AverageUseableEngineWasteHeatKW);
+
+	event MessageEventHandler Message;
+
+}
+
+public delegate void MessageEventHandler(ref object sender, string message, AdvancedAuxiliaryMessageType messageType);
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTechList.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTechList.cs
new file mode 100644
index 0000000000..c733c4c464
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMTechList.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace DownstreamModules.HVAC
+{
+	public interface ISSMTechList
+	{
+		List<ITechListBenefitLine> TechLines { get; set; }
+
+		void Clear();
+		bool Add(ITechListBenefitLine item, ref string feedback);
+		bool Delete(ITechListBenefitLine item, ref string feedback);
+		bool Modify(ITechListBenefitLine originalItem, ITechListBenefitLine modifiedItem, ref string feedback);
+
+		void SetSSMGeneralInputs(ISSMGenInputs genInputs);
+
+		double HValueVariation { get; }
+		double VHValueVariation { get; }
+		double VVValueVariation { get; }
+		double VCValueVariation { get; }
+		double CValueVariation { get; }
+
+		double HValueVariationKW { get; }
+		double VHValueVariationKW { get; }
+		double VVValueVariationKW { get; }
+		double VCValueVariationKW { get; }
+		double CValueVariationKW { get; }
+
+
+		bool Initialise();
+		bool Initialise(string filePath);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ITechListBenefitLine.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ITechListBenefitLine.cs
new file mode 100644
index 0000000000..6f323f25f3
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ITechListBenefitLine.cs
@@ -0,0 +1,36 @@
+namespace DownstreamModules.HVAC {
+	public interface ITechListBenefitLine
+	{
+		string Units { get; set; }
+		string Category { get; set; }
+		string BenefitName { get; set; }
+
+		double LowFloorH { get; set; }
+		double LowFloorV { get; set; }
+		double LowFloorC { get; set; }
+
+		double SemiLowFloorH { get; set; }
+		double SemiLowFloorV { get; set; }
+		double SemiLowFloorC { get; set; }
+
+		double RaisedFloorH { get; set; }
+		double RaisedFloorV { get; set; }
+		double RaisedFloorC { get; set; }
+
+		bool OnVehicle { get; set; }
+		bool ActiveVH { get; set; }
+		bool ActiveVV { get; set; }
+		bool ActiveVC { get; set; }
+		TechLineType LineType { get; set; }
+
+		double H { get; }
+		double VH { get; }
+		double VV { get; }
+		double VC { get; }
+		double C { get; }
+
+		void CloneFrom(ITechListBenefitLine source);
+
+		bool IsEqualTo(ITechListBenefitLine source);
+	}
+}
\ No newline at end of file
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IAbstractModule.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IAbstractModule.cs
new file mode 100644
index 0000000000..17325bf0d6
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IAbstractModule.cs
@@ -0,0 +1,4 @@
+public interface IAbstractModule
+{
+	void ResetCalculations();
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.cs
new file mode 100644
index 0000000000..159fb12d36
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.cs
@@ -0,0 +1,67 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace Electrics
+{
+	public interface IM0_5_SmartAlternatorSetEfficiency : IAbstractModule
+	{
+
+		/// <summary>
+		/// Smart Idle Current (A)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Ampere SmartIdleCurrent { get; }
+
+		/// <summary>
+		/// Alternators Efficiency In Idle ( Fraction )
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		double AlternatorsEfficiencyIdleResultCard { get; }
+
+		/// <summary>
+		/// Smart Traction Current (A)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Ampere SmartTractionCurrent { get; }
+
+		/// <summary>
+		/// Alternators Efficiency In Traction ( Fraction )
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		double AlternatorsEfficiencyTractionOnResultCard { get; }
+
+		/// <summary>
+		/// Smart Overrrun Current (A)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Ampere SmartOverrunCurrent { get; }
+
+		/// <summary>
+		/// Alternators Efficiency In Overrun ( Fraction )
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		double AlternatorsEfficiencyOverrunResultCard { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.cs
new file mode 100644
index 0000000000..c3b94b2408
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.cs
@@ -0,0 +1,35 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace Electrics
+{
+	public interface IM0_NonSmart_AlternatorsSetEfficiency : IAbstractModule
+	{
+
+		/// <summary>
+		///  Gets HVAC Electrical Power Demand (A)
+		///  </summary>
+		///  <value></value>
+		///  <returns></returns>
+		///  <remarks></remarks>
+		Ampere GetHVACElectricalPowerDemandAmps { get; }
+
+		/// <summary>
+		///  Gets Alternator Efficiency (0-1)
+		///  </summary>
+		///  <value></value>
+		///  <returns></returns>
+		///  <remarks></remarks>
+		double AlternatorsEfficiency { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM10.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM10.cs
new file mode 100644
index 0000000000..b714a2a7a5
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM10.cs
@@ -0,0 +1,28 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+
+namespace DownstreamModules
+{
+	public interface IM10 : IAbstractModule
+	{
+
+		// AverageLoadsFuelConsumptionInterpolatedForPneumatics
+		Kilogram AverageLoadsFuelConsumptionInterpolatedForPneumatics { get; }
+
+		// Interpolated FC between points 2-3-1 Representing smart Pneumatics = Fuel consumption with smart Pneumatics and average electrical  power demand
+		Kilogram FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand { get; }
+
+		void CycleStep(Second stepTimeInSeconds);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM11.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM11.cs
new file mode 100644
index 0000000000..e57b6a99bf
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM11.cs
@@ -0,0 +1,89 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+
+namespace DownstreamModules
+{
+	public interface IM11 : IAbstractModule
+	{
+
+		/// <summary>
+		/// Smart Electrical Total Cycle Electrical Energy Generated During Overrun Only(J)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Joule SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly { get; }
+
+		/// <summary>
+		/// Smart Electrical Total Cycle Eletrical EnergyGenerated (J)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Joule SmartElectricalTotalCycleEletricalEnergyGenerated { get; }
+
+		/// <summary>
+		/// Total Cycle Electrical Demand (J)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Joule TotalCycleElectricalDemand { get; }
+
+		/// <summary>
+		/// Total Cycle Fuel Consumption: Smart Electrical Load (g)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Kilogram TotalCycleFuelConsumptionSmartElectricalLoad { get; }
+
+		/// <summary>
+		/// Total Cycle Fuel Consumption: Zero Electrical Load (g)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Kilogram TotalCycleFuelConsumptionZeroElectricalLoad { get; }
+
+		/// <summary>
+		/// Stop Start Sensitive: Total Cycle Electrical Demand (J)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Joule StopStartSensitiveTotalCycleElectricalDemand { get; }
+
+		/// <summary>
+		/// Total Cycle Fuel Consuption : Average Loads (g)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Kilogram TotalCycleFuelConsuptionAverageLoads { get; }
+
+		/// <summary>
+		/// Clears aggregated values ( Sets them to zero ).
+		/// </summary>
+		/// <remarks></remarks>
+		void ClearAggregates();
+
+		/// <summary>
+		/// Increments all aggregated outputs
+		/// </summary>
+		/// <param name="stepTimeInSeconds">Single : Mutiplies the values to be aggregated by number of seconds</param>
+		/// <remarks></remarks>
+		void CycleStep(Second stepTimeInSeconds);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM13.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM13.cs
new file mode 100644
index 0000000000..ffd033cbc6
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM13.cs
@@ -0,0 +1,29 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+
+using TUGraz.VectoCommon.Utils;
+
+
+namespace DownstreamModules
+{
+	public interface IM13 : IAbstractModule
+	{
+
+		/// <summary>
+		/// Total Cycle Fuel Consumption Grams
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>WHTC and Start Stop Adjusted</remarks>
+		Kilogram WHTCTotalCycleFuelConsumptionGrams { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM14.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM14.cs
new file mode 100644
index 0000000000..2fdb84c6ba
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM14.cs
@@ -0,0 +1,12 @@
+using TUGraz.VectoCommon.Utils;
+
+
+namespace DownstreamModules
+{
+	public interface IM14 : IAbstractModule
+	{
+		Kilogram TotalCycleFCGrams { get; }
+
+		Liter TotalCycleFCLitres { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM1_AverageHVACLoadDemand.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM1_AverageHVACLoadDemand.cs
new file mode 100644
index 0000000000..388aac78b8
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM1_AverageHVACLoadDemand.cs
@@ -0,0 +1,47 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace Hvac
+{
+	public interface IM1_AverageHVACLoadDemand : IAbstractModule
+	{
+
+		/// <summary>
+		/// 	Average Power Demand At Crank From HVAC Mechanicals (W)
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AveragePowerDemandAtCrankFromHVACMechanicalsWatts();
+
+		/// <summary>
+		/// 	Average Power Demand At Alternator From HVAC Electrics (W)
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AveragePowerDemandAtAlternatorFromHVACElectricsWatts();
+
+		/// <summary>
+		/// 	Average Power Demand At Crank From HVAC Electrics  (W)
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AveragePowerDemandAtCrankFromHVACElectricsWatts();
+
+		/// <summary>
+		/// 	HVAC Fueling   (L/H)
+		/// 	</summary>
+		/// 	<returns>Litres Per Hour</returns>
+		/// 	<remarks></remarks>
+		LiterPerSecond HVACFuelingLitresPerHour();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM2_AverageElectrialLoadDemand.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM2_AverageElectrialLoadDemand.cs
new file mode 100644
index 0000000000..5af93198d4
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM2_AverageElectrialLoadDemand.cs
@@ -0,0 +1,21 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace Electrics
+{
+	public interface IM2_AverageElectricalLoadDemand : IAbstractModule
+	{
+		Watt GetAveragePowerDemandAtAlternator();
+		Watt GetAveragePowerAtCrankFromElectrics();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.cs
new file mode 100644
index 0000000000..c9c745d440
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.cs
@@ -0,0 +1,24 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace Pneumatics
+{
+	public interface IM3_AveragePneumaticLoadDemand : IAbstractModule
+	{
+		Watt GetAveragePowerDemandAtCrankFromPneumatics();
+
+		NormLiterPerSecond AverageAirConsumedPerSecondLitre();
+
+		NormLiter TotalAirDemand { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM4_AirCompressor.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM4_AirCompressor.cs
new file mode 100644
index 0000000000..043021e216
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM4_AirCompressor.cs
@@ -0,0 +1,77 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace Pneumatics
+{
+	public interface IM4_AirCompressor : IAbstractModule
+	{
+
+		/// <summary>
+		/// 	Ratio of Gear or Pulley used to drive the compressor
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		double PulleyGearRatio { get; set; }
+
+		/// <summary>
+		/// 	Efficiency of the Pulley or Gear used to drive the compressor
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		double PulleyGearEfficiency { get; set; }
+
+		/// <summary>
+		/// 	Initialises the AirCompressor Class
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		bool Initialise();
+
+		/// <summary>
+		/// 	Returns the flow rate [litres/second] of compressor for the given engine rpm
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		NormLiterPerSecond GetFlowRate();
+
+		/// <summary>
+		/// 	Returns the power consumed for the given engine rpm when compressor is off
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt GetPowerCompressorOff();
+
+		/// <summary>
+		/// 	Returns the power consumed for the given engine rpm when compressor is on
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt GetPowerCompressorOn();
+
+		/// <summary>
+		/// 	Returns the difference in power between compressonr on and compressor off operation at the given engine rpm
+		/// 	</summary>
+		/// 	<returns>Single / Watts</returns>
+		/// 	<remarks></remarks>
+		Watt GetPowerDifference();
+
+		/// <summary>
+		/// 	Returns Average PoweDemand PeCompressor UnitFlowRate 
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		SI GetAveragePowerDemandPerCompressorUnitFlowRate();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.cs
new file mode 100644
index 0000000000..cdec493959
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.cs
@@ -0,0 +1,40 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace Electrics
+{
+	public interface IM5_SmartAlternatorSetGeneration : IAbstractModule
+	{
+
+		/// <summary>
+		/// 	Alternators Generation Power At Crank Idle (W)
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AlternatorsGenerationPowerAtCrankIdleWatts();
+
+		/// <summary>
+		/// 	Alternators Generation Power At Crank Traction On  (W)
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AlternatorsGenerationPowerAtCrankTractionOnWatts();
+
+		/// <summary>
+		/// 	Alternators Generation Power At Crank Overrun  (W)
+		/// 	</summary>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AlternatorsGenerationPowerAtCrankOverrunWatts();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM6.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM6.cs
new file mode 100644
index 0000000000..ed47f1f8da
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM6.cs
@@ -0,0 +1,91 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace DownstreamModules
+{
+	public interface IM6 : IAbstractModule
+	{
+
+		/// <summary>
+		/// 	OverrunFlag
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns>0 = Not in overrun, 1 = In Overrun</returns>
+		/// 	<remarks></remarks>
+		bool OverrunFlag { get; }
+
+		/// <summary>
+		/// 	Smart Elec And Pneumatics Compressor Flag
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		bool SmartElecAndPneumaticsCompressorFlag { get; }
+
+		/// <summary>
+		/// 	Smart Elec And Pneumatic: Alternator Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartElecAndPneumaticAltPowerGenAtCrank { get; }
+
+		/// <summary>
+		/// 	Smart Elec And Pneumatic: Air Compressor Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartElecAndPneumaticAirCompPowerGenAtCrank { get; }
+
+		/// <summary>
+		/// 	Smart Electrics Only :  Alternator Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartElecOnlyAltPowerGenAtCrank { get; }
+
+		/// <summary>
+		/// 	Average Power Demand At Crank From Pneumatics (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AveragePowerDemandAtCrankFromPneumatics { get; }
+
+		/// <summary>
+		/// 	Smart Pneumatic Only Air Comp Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartPneumaticOnlyAirCompPowerGenAtCrank { get; }
+
+		/// <summary>
+		/// 	Avgerage Power Demand At Crank From Electrics Including HVAC electrics (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AvgPowerDemandAtCrankFromElectricsIncHVAC { get; }
+
+		/// <summary>
+		/// 	Smart Pneumatics Only CompressorFlag
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns>Less than Zero = No, Greater then Zero = Yes </returns>
+		/// 	<remarks></remarks>
+		bool SmartPneumaticsOnlyCompressorFlag { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM7.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM7.cs
new file mode 100644
index 0000000000..1184a27940
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM7.cs
@@ -0,0 +1,52 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+
+namespace DownstreamModules
+{
+	public interface IM7 : IAbstractModule
+	{
+
+		/// <summary>
+		/// 	Smart Electrical And Pneumatic Aux: Alternator Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartElectricalAndPneumaticAuxAltPowerGenAtCrank { get; }
+
+		/// <summary>
+		/// 	Smart Electrical And Pneumatic Aux : Air Compressor Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank { get; }
+
+		/// <summary>
+		/// 	Smart Electrical Only Aux : Alternator Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartElectricalOnlyAuxAltPowerGenAtCrank { get; }
+
+		/// <summary>
+		/// 	Smart Pneumatic Only Aux : Air Comppressor Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartPneumaticOnlyAuxAirCompPowerGenAtCrank { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM8.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM8.cs
new file mode 100644
index 0000000000..e7f5560135
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM8.cs
@@ -0,0 +1,46 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+
+using TUGraz.VectoCommon.Utils;
+
+
+namespace DownstreamModules
+{
+	public interface IM8 : IAbstractModule
+	{
+
+		// OUT1
+		/// <summary>
+		/// 	Aux Power At Crank From Electrical HVAC And Pneumatics Ancilaries (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries { get; }
+		// OUT2
+		/// <summary>
+		/// 	Smart Electrical Alternator Power Gen At Crank (W)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Watt SmartElectricalAlternatorPowerGenAtCrank { get; }
+		// OUT3
+		/// <summary>
+		/// 	Compressor Flag
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		bool CompressorFlag { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM9.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM9.cs
new file mode 100644
index 0000000000..b06e7ca672
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/IM9.cs
@@ -0,0 +1,66 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
+
+namespace DownstreamModules
+{
+	public interface IM9 : IAuxiliaryEvent, IAbstractModule
+	{
+
+		/// <summary>
+		/// 	Clears aggregated values ( Sets them to zero )
+		/// 	</summary>
+		/// 	<remarks></remarks>
+		void ClearAggregates();
+
+		/// <summary>
+		/// 	Increments all aggregated outputs
+		/// 	</summary>
+		/// 	<param name="stepTimeInSeconds">Single : Mutiplies the values to be aggregated by number of seconds</param>
+		/// 	<remarks></remarks>
+		void CycleStep(Second stepTimeInSeconds);
+
+		/// <summary>
+		/// 	Litres Of Air: Compressor On Continually (L)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks>Start/Stop Sensitive</remarks>
+		NormLiter LitresOfAirCompressorOnContinually { get; }
+
+		/// <summary>
+		/// 	Litres Of Air Compressor On Only In Overrun (L)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		NormLiter LitresOfAirCompressorOnOnlyInOverrun { get; }
+
+		/// <summary>
+		/// 	Total Cycle Fuel Consumption Compressor *On* Continuously (G)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Kilogram TotalCycleFuelConsumptionCompressorOnContinuously { get; }
+
+		/// <summary>
+		/// 	Total Cycle Fuel Consumption Compressor *OFF* Continuously (G)
+		/// 	</summary>
+		/// 	<value></value>
+		/// 	<returns></returns>
+		/// 	<remarks></remarks>
+		Kilogram TotalCycleFuelConsumptionCompressorOffContinuously { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ActuationsKey.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ActuationsKey.cs
new file mode 100644
index 0000000000..5a2488ebc5
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ActuationsKey.cs
@@ -0,0 +1,59 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using System;
+
+namespace Pneumatics
+{
+	public class ActuationsKey
+	{
+		private string _consumerName;
+		private string _cycleName;
+
+		// Properties
+		public string ConsumerName
+		{
+			get {
+				return _consumerName;
+			}
+		}
+
+		public string CycleName
+		{
+			get {
+				return _cycleName;
+			}
+		}
+
+		// Constructor
+		public ActuationsKey(string consumerName, string cycleName)
+		{
+			if (consumerName.Trim().Length == 0 | cycleName.Trim().Length == 0)
+				throw new ArgumentException("ConsumerName and CycleName must be provided");
+			_consumerName = consumerName;
+			_cycleName = cycleName;
+		}
+
+
+		// Overrides to enable this class to be used as a dictionary key in the ActuationsMap.
+		public override bool Equals(object obj)
+		{
+			ActuationsKey other = (ActuationsKey)obj;
+
+			return other.ConsumerName == this.ConsumerName && other.CycleName == this.CycleName;
+		}
+
+		public override int GetHashCode()
+		{
+			return 0;
+		}
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ICompressorMap.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ICompressorMap.cs
new file mode 100644
index 0000000000..e3fb0293b6
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/ICompressorMap.cs
@@ -0,0 +1,53 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
+
+namespace Pneumatics
+{
+	public interface ICompressorMap : IAuxiliaryEvent
+	{
+
+		/// <summary>
+		/// 	Initilaises the map from the supplied csv data
+		/// 	</summary>
+		/// 	<remarks></remarks>
+		bool Initialise();
+
+		/// <summary>
+		/// 	Returns compressor flow rate at the given rotation speed
+		/// 	</summary>
+		/// 	<param name="rpm">compressor rotation speed</param>
+		/// 	<returns></returns>
+		/// 	<remarks>Single</remarks>
+		NormLiterPerSecond GetFlowRate(double rpm);
+
+		/// <summary>
+		/// 	Returns mechanical power at rpm when compressor is on
+		/// 	</summary>
+		/// 	<param name="rpm">compressor rotation speed</param>
+		/// 	<returns></returns>
+		/// 	<remarks>Single</remarks>
+		Watt GetPowerCompressorOn(double rpm);
+
+		/// <summary>
+		/// 	Returns mechanical power at rpm when compressor is off
+		/// 	</summary>
+		/// 	<param name="rpm">compressor rotation speed</param>
+		/// 	<returns></returns>
+		/// 	<remarks>Single</remarks>
+		Watt GetPowerCompressorOff(double rpm);
+
+		// Returns Average Power Demand Per Compressor Unit FlowRate
+		double GetAveragePowerDemandPerCompressorUnitFlowRate();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.cs
new file mode 100644
index 0000000000..7d8c912a98
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.cs
@@ -0,0 +1,21 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+
+namespace Pneumatics
+{
+	public interface IPneumaticActuationsMAP
+	{
+		int GetNumActuations(ActuationsKey key);
+
+		bool Initialise();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.cs
new file mode 100644
index 0000000000..8679d67f5d
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.cs
@@ -0,0 +1,17 @@
+namespace Pneumatics
+{
+	public interface IPneumaticUserInputsConfig
+	{
+		string CompressorMap { get; set; }
+		double CompressorGearEfficiency { get; set; }
+		double CompressorGearRatio { get; set; }
+		string ActuationsMap { get; set; }
+		bool SmartAirCompression { get; set; }
+		bool SmartRegeneration { get; set; }
+		bool RetarderBrake { get; set; }
+		double KneelingHeightMillimeters { get; set; }
+		string AirSuspensionControl { get; set; } // mechanical or electrical
+		string AdBlueDosing { get; set; } // pnmeumatic or electric
+		string Doors { get; set; } // pneumatic or electric
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.cs
new file mode 100644
index 0000000000..51b0715ed4
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.cs
@@ -0,0 +1,15 @@
+public interface IPneumaticsAuxilliariesConfig
+{
+	double OverrunUtilisationForCompressionFraction { get; set; }
+	double BrakingWithRetarderNIperKG { get; set; }
+	double BrakingNoRetarderNIperKG { get; set; }
+	double BreakingPerKneelingNIperKGinMM { get; set; }
+	double PerDoorOpeningNI { get; set; }
+	double PerStopBrakeActuationNIperKG { get; set; }
+	double AirControlledSuspensionNIperMinute { get; set; }
+	double AdBlueNIperMinute { get; set; }
+	double NonSmartRegenFractionTotalAirDemand { get; set; }
+	double SmartRegenFractionTotalAirDemand { get; set; }
+	double DeadVolumeLitres { get; set; }
+	double DeadVolBlowOutsPerLitresperHour { get; set; }
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/Enumerations.cs b/VECTOAux/BusAuxiliaries/Interfaces/Enumerations.cs
new file mode 100644
index 0000000000..7df4a69036
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/Enumerations.cs
@@ -0,0 +1,6 @@
+public enum AdvancedAuxiliaryMessageType
+{
+	Information = 1,
+	Warning = 2,
+	Critical = 3
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/IAdvancedAuxiliaries.cs b/VECTOAux/BusAuxiliaries/Interfaces/IAdvancedAuxiliaries.cs
new file mode 100644
index 0000000000..d7a0f3d125
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/IAdvancedAuxiliaries.cs
@@ -0,0 +1,139 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces {
+
+	//public delegate void AuxiliaryEventEventHandler(ref object sender, string message, AdvancedAuxiliaryMessageType messageType);
+
+	public interface IAdvancedAuxiliaries
+	{
+		// Inherits IAuxiliaryEvent
+
+		event AuxiliaryEventEventHandler AuxiliaryEvent;
+
+		// Information
+		bool Running { get; }
+
+		string AuxiliaryName { get; }
+		string AuxiliaryVersion { get; }
+
+		// Additional Permenent Monitoring Signals - Required by engineering
+		double AA_NonSmartAlternatorsEfficiency { get; }
+		Ampere AA_SmartIdleCurrent_Amps { get; }
+		double AA_SmartIdleAlternatorsEfficiency { get; }
+		Ampere AA_SmartTractionCurrent_Amps { get; }
+		double AA_SmartTractionAlternatorEfficiency { get; }
+		Ampere AA_SmartOverrunCurrent_Amps { get; }
+		double AA_SmartOverrunAlternatorEfficiency { get; }
+		NormLiterPerSecond AA_CompressorFlowRate_LitrePerSec { get; }
+		bool AA_OverrunFlag { get; }
+		int? AA_EngineIdleFlag { get; }
+		bool AA_CompressorFlag { get; }
+		Kilogram AA_TotalCycleFC_Grams { get; }
+		Liter AA_TotalCycleFC_Litres { get; }
+		Watt AA_AveragePowerDemandCrankHVACMechanicals { get; }
+		Watt AA_AveragePowerDemandCrankHVACElectricals { get; }
+		Watt AA_AveragePowerDemandCrankElectrics { get; }
+		Watt AA_AveragePowerDemandCrankPneumatics { get; }
+		Kilogram AA_TotalCycleFuelConsumptionCompressorOff { get; }
+		Kilogram AA_TotalCycleFuelConsumptionCompressorOn { get; }
+
+		/// <summary>
+		/// Total Cycle Fuel In Grams
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Kilogram TotalFuelGRAMS { get; }
+
+		/// <summary>
+		/// Total Cycle Fuel in Litres
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Liter TotalFuelLITRES { get; }
+
+		/// <summary>
+		/// Total Power Demans At Crank From Auxuliaries (W)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Watt AuxiliaryPowerAtCrankWatts { get; }
+
+
+		/// <summary>
+		/// Vecto Inputs
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		IVectoInputs VectoInputs { get; set; }
+
+		/// <summary>
+		/// Signals From Vecto 
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		ISignals Signals { get; set; }
+
+		/// <summary>
+		/// Configure Auxuliaries ( Launches Config Form )
+		/// </summary>
+		/// <param name="filePath"></param>
+		/// <param name="vectoFilePath"></param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		bool Configure(string filePath, string vectoFilePath);
+
+		/// <summary>
+		/// Validate AAUX file path supplied.
+		/// </summary>
+		/// <param name="filePath"></param>
+		/// <param name="message"></param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		bool ValidateAAUXFile(string filePath, ref string message);
+
+		// Command
+		/// <summary>
+		/// Cycle Step - Used to calculate fuelling
+		/// </summary>
+		/// <param name="seconds"></param>
+		/// <param name="message"></param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		bool CycleStep(Second seconds, ref string message);
+
+		/// <summary>
+		/// Initialises AAUX Environment ( Begin Processs )
+		/// </summary>
+		/// <param name="auxFilePath"></param>
+		/// <param name="vectoFilePath"></param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		bool RunStart(string auxFilePath, string vectoFilePath);
+
+		/// <summary>
+		/// Any Termination Which Needs to be done ( Model depenent )
+		/// </summary>
+		/// <param name="message"></param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		bool RunStop(ref string message);
+
+		void ResetCalculations();
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/IAuxiliaryEvent.cs b/VECTOAux/BusAuxiliaries/Interfaces/IAuxiliaryEvent.cs
new file mode 100644
index 0000000000..7d47c4fab4
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/IAuxiliaryEvent.cs
@@ -0,0 +1,21 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces {
+	public interface IAuxiliaryEvent
+	{
+		event AuxiliaryEventEventHandler AuxiliaryEvent;
+
+	}
+
+
+	public delegate void AuxiliaryEventEventHandler(ref object sender, string message, AdvancedAuxiliaryMessageType messageType);
+}
\ No newline at end of file
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/IFuelConsumptionMap.cs b/VECTOAux/BusAuxiliaries/Interfaces/IFuelConsumptionMap.cs
new file mode 100644
index 0000000000..88271f2374
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/IFuelConsumptionMap.cs
@@ -0,0 +1,15 @@
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces {
+	public interface IFuelConsumptionMap
+	{
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="torque"></param>
+		/// <param name="angularVelocity"></param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		KilogramPerSecond GetFuelConsumption(NewtonMeter torque, PerSecond angularVelocity);
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/IM12.cs b/VECTOAux/BusAuxiliaries/Interfaces/IM12.cs
new file mode 100644
index 0000000000..a9187abd6e
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/IM12.cs
@@ -0,0 +1,43 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces
+{
+	public interface IM12 : IAbstractModule
+	{
+
+		/// <summary>
+		/// Fuel consumption with smart Electrics and Average Pneumatic Power Demand
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Kilogram FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand { get; }
+
+		/// <summary>
+		/// Base Fuel Consumption With Average Auxiliary Loads
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Kilogram BaseFuelConsumptionWithTrueAuxiliaryLoads { get; }
+
+		/// <summary>
+		/// Stop Start Correction
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		double StopStartCorrection { get; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/ISignals.cs b/VECTOAux/BusAuxiliaries/Interfaces/ISignals.cs
new file mode 100644
index 0000000000..92a2a4a0bd
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/ISignals.cs
@@ -0,0 +1,185 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces {
+	public interface ISignals
+	{
+		/// <summary>
+		/// Pre Existing Aux Power (KW)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input</remarks>
+		Watt PreExistingAuxPower { get; set; }
+
+		/// <summary>
+		/// Engine Motoring Power (KW)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input</remarks>
+		Watt EngineMotoringPower { get; set; }
+
+		/// <summary>
+		/// Engine Driveline Power (KW)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Watt EngineDrivelinePower { get; set; }
+
+		/// <summary>
+		/// Smart Electrics
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Should be true if fitted to the vehicle - AAUX Input</remarks>
+		bool SmartElectrics { get; set; }
+
+		/// <summary>
+		/// Clucth Engaged
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input</remarks>
+		bool ClutchEngaged { get; set; }
+
+		/// <summary>
+		/// Engine Speed 1/NU
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// 	'''
+		PerSecond EngineSpeed { get; set; }
+
+		/// <summary>
+		/// Smart Pneumatics
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>should be true if fitted to the vehicle- AAux Config Input</remarks>
+		bool SmartPneumatics { get; set; }
+
+		/// <summary>
+		/// Total Cycle Time In Seconds
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input</remarks>
+		int TotalCycleTimeSeconds { get; set; }
+
+		/// <summary>
+		/// Current Cycle Time In Seconds 
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>( Will Increment during Cycle )</remarks>
+		double CurrentCycleTimeInSeconds { get; set; }
+
+		/// <summary>
+		/// Engine Driveline Torque
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input</remarks>
+		NewtonMeter EngineDrivelineTorque { get; set; }
+
+		/// <summary>
+		/// Engine Idle
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input</remarks>
+		bool Idle { get; set; }
+
+		/// <summary>
+		/// In Neutral
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input</remarks>
+		bool InNeutral { get; set; }
+
+		/// <summary>
+		/// Auxiliary Event Reporting Level
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Can be used by Vecto to choose the level of reporting</remarks>
+		AdvancedAuxiliaryMessageType AuxiliaryEventReportingLevel { get; set; }
+
+		/// <summary>
+		/// Engine Stopped 
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>'Vecto Input - Used to Cut Fueling in AAux model</remarks>
+		bool EngineStopped { get; set; }
+
+		/// <summary>
+		/// WHTC ( Correction factor to be applied )
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>'Vecto Input</remarks>
+		double WHTC { get; set; }
+
+		/// <summary>
+		/// Declaration Mode
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>Vecto Input - Used to decide if to apply WHTC/Possiblye other things in future</remarks>
+		bool DeclarationMode { get; set; }
+
+		/// <summary>
+		/// Engine Idle Speed ( Associated with the vehicle bein tested )
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		PerSecond EngineIdleSpeed { get; set; }
+
+		/// <summary>
+		/// Pneumatic Overrun Utilisation
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		double PneumaticOverrunUtilisation { get; set; }
+
+		/// <summary>
+		/// Stored Energy Efficiency
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		double StoredEnergyEfficiency { get; set; }
+
+		/// <summary>
+		/// Running Calc
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		bool RunningCalc { get; set; }
+
+		/// <summary>
+		/// Running Calc
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Watt InternalEnginePower { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/IVectoInputs.cs b/VECTOAux/BusAuxiliaries/Interfaces/IVectoInputs.cs
new file mode 100644
index 0000000000..cad879530f
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/IVectoInputs.cs
@@ -0,0 +1,59 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces {
+	public interface IVectoInputs
+	{
+		/// <summary>
+		/// Vehicle Mass (KG)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Kilogram VehicleWeightKG { get; set; }
+
+		/// <summary>
+		/// Cycle ( Urban, Interurban etc )
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		string Cycle { get; set; }
+
+		/// <summary>
+		/// PowerNet Voltage (V) Volts available on the bus by Batteries
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		Volt PowerNetVoltage { get; set; }
+
+		/// <summary>
+		/// Fuel Map Used in Vecto.
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		IFuelConsumptionMap FuelMap { get; set; }
+
+		string FuelMapFile { get; set; }
+
+		/// <summary>
+		/// Fuel density used in Vecto.
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		KilogramPerCubicMeter FuelDensity { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/Signals.cs b/VECTOAux/BusAuxiliaries/Interfaces/Signals.cs
new file mode 100644
index 0000000000..f10eecce83
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/Signals.cs
@@ -0,0 +1,66 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces {
+	public class Signals : ISignals
+	{
+
+		// Backing variables
+		private double _WHTCCorretion = 1;
+		private bool _smartElectrics;
+
+		public bool ClutchEngaged { get; set; }
+		public Watt EngineDrivelinePower { get; set; }
+		public NewtonMeter EngineDrivelineTorque { get; set; }
+		public Watt EngineMotoringPower { get; set; }
+		public PerSecond EngineSpeed { get; set; }
+
+		public bool SmartElectrics
+		{
+			get {
+				return _smartElectrics;
+			}
+			set {
+				_smartElectrics = value;
+			}
+		}
+
+		public bool SmartPneumatics { get; set; }
+		public int TotalCycleTimeSeconds { get; set; }
+		public double CurrentCycleTimeInSeconds { get; set; }
+		public Watt PreExistingAuxPower { get; set; }
+		public bool Idle { get; set; }
+		public bool InNeutral { get; set; }
+
+		public AdvancedAuxiliaryMessageType AuxiliaryEventReportingLevel { get; set; }
+
+		public bool EngineStopped { get; set; }
+		public bool DeclarationMode { get; set; }
+
+		public double WHTC
+		{
+			set {
+				_WHTCCorretion = value;
+			}
+			get {
+				return _WHTCCorretion;
+			}
+		}
+
+		public PerSecond EngineIdleSpeed { get; set; }
+		public double PneumaticOverrunUtilisation { get; set; }
+		public double StoredEnergyEfficiency { get; set; }
+		public bool RunningCalc { get; set; }
+		public Watt InternalEnginePower { get; set; }
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/VectoInputs.cs b/VECTOAux/BusAuxiliaries/Interfaces/VectoInputs.cs
new file mode 100644
index 0000000000..4f6339a4fa
--- /dev/null
+++ b/VECTOAux/BusAuxiliaries/Interfaces/VectoInputs.cs
@@ -0,0 +1,99 @@
+// Copyright 2017 European Union.
+// Licensed under the EUPL (the 'Licence');
+// 
+// * You may not use this work except in compliance with the Licence.
+// * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+// * Unless required by applicable law or agreed to in writing,
+// software distributed under the Licence is distributed on an "AS IS" basis,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the LICENSE.txt for the specific language governing permissions and limitations.
+
+using Newtonsoft.Json;
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.BusAuxiliaries.Interfaces {
+	public class VectoInputs : IVectoInputs
+	{
+
+		/// <summary>
+		/// Name of the Cycle ( Urban, Interurban etc )
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		public string Cycle { get; set; }
+
+		/// <summary>
+		/// Vehicle Mass (KG)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		[JsonIgnore]
+		public Kilogram VehicleWeightKG
+		{
+			get {
+				return _vehicleWeight.SI<Kilogram>();
+			}
+			set {
+				_vehicleWeight = value.Value();
+			}
+		}
+
+		[JsonProperty("VehicleWeightKG")]
+		private double _vehicleWeight;
+
+		/// <summary>
+		/// Powernet Voltage (V)
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks>This is the power voltage available in the bus - usually 26.3 Volts</remarks>
+		[JsonIgnore]
+		public Volt PowerNetVoltage
+		{
+			get {
+				return _powerNetVoltage.SI<Volt>();
+			}
+			set {
+				_powerNetVoltage = value.Value();
+			}
+		}
+
+		[JsonProperty("PowerNetVoltage")]
+		private double _powerNetVoltage;
+
+		/// <summary>
+		/// Fuel Map Same One as used in Vecto.
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		[JsonIgnore]
+		public IFuelConsumptionMap FuelMap { get; set; }
+
+		[JsonProperty("FuelMap")]
+		public string FuelMapFile { get; set; }
+
+		/// <summary>
+		/// Fuel Density as used in Vecto.
+		/// </summary>
+		/// <value></value>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		[JsonIgnore]
+		public KilogramPerCubicMeter FuelDensity
+		{
+			get {
+				return _fuelDensity.SI<KilogramPerCubicMeter>();
+			}
+			set {
+				_fuelDensity = value.Value();
+			}
+		}
+
+		[JsonProperty("FuelDensity")]
+		private double _fuelDensity;
+	}
+}
diff --git a/VECTOAux/BusAuxiliaries/Properties/AssemblyInfo.cs b/VECTOAux/BusAuxiliaries/Properties/AssemblyInfo.cs
index 0efaa050d3..902014cc5b 100644
--- a/VECTOAux/BusAuxiliaries/Properties/AssemblyInfo.cs
+++ b/VECTOAux/BusAuxiliaries/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index be173d480d..022ffe820c 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -13,11 +13,18 @@ Imports System.Runtime.CompilerServices
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
 Imports System.Windows.Forms
+Imports DownstreamModules
+Imports DownstreamModules.Electrics
+Imports Electrics
+Imports Hvac
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 
 <Assembly: InternalsVisibleTo("VectoCore")>
 
@@ -200,7 +207,7 @@ Public Class AdvancedAuxiliaries
         Implements IAdvancedAuxiliaries.AuxiliaryEvent
 
     Public Function Configure(filePath As String, vectoFilePath As String) As Boolean _
-        Implements VectoAuxiliaries.IAdvancedAuxiliaries.Configure
+        Implements IAdvancedAuxiliaries.Configure
 
         Try
 
@@ -232,7 +239,7 @@ Public Class AdvancedAuxiliaries
     End Function
 
     Public Function CycleStep(seconds As Second, ByRef message As String) As Boolean _
-        Implements VectoAuxiliaries.IAdvancedAuxiliaries.CycleStep
+        Implements IAdvancedAuxiliaries.CycleStep
 
         Try
             M9.CycleStep(seconds)
@@ -249,14 +256,14 @@ Public Class AdvancedAuxiliaries
         Return True
     End Function
 
-    Public ReadOnly Property Running As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.Running
+    Public ReadOnly Property Running As Boolean Implements IAdvancedAuxiliaries.Running
         Get
             Throw New NotImplementedException
         End Get
     End Property
 
     Public Function RunStart(ByVal auxFilePath As String, ByVal vectoFilePath As String) As Boolean _
-        Implements VectoAuxiliaries.IAdvancedAuxiliaries.RunStart
+        Implements IAdvancedAuxiliaries.RunStart
 
         Try
 
@@ -271,7 +278,7 @@ Public Class AdvancedAuxiliaries
         Return True
     End Function
 
-    Public Function RunStop(ByRef message As String) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.RunStop
+    Public Function RunStop(ByRef message As String) As Boolean Implements IAdvancedAuxiliaries.RunStop
         Throw New NotImplementedException
     End Function
 
@@ -283,7 +290,7 @@ Public Class AdvancedAuxiliaries
         Next
     End Sub
 
-    Public ReadOnly Property TotalFuelGRAMS As Kilogram Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelGRAMS
+    Public ReadOnly Property TotalFuelGRAMS As Kilogram Implements IAdvancedAuxiliaries.TotalFuelGRAMS
         Get
             If Not M13 Is Nothing Then
                 Return M14.TotalCycleFCGrams
@@ -293,7 +300,7 @@ Public Class AdvancedAuxiliaries
         End Get
     End Property
 
-    Public ReadOnly Property TotalFuelLITRES As Liter Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelLITRES
+    Public ReadOnly Property TotalFuelLITRES As Liter Implements IAdvancedAuxiliaries.TotalFuelLITRES
         Get
             If Not M14 Is Nothing Then
                 Return M14.TotalCycleFCLitres
@@ -303,13 +310,13 @@ Public Class AdvancedAuxiliaries
         End Get
     End Property
 
-    Public ReadOnly Property AuxiliaryName As String Implements VectoAuxiliaries.IAdvancedAuxiliaries.AuxiliaryName
+    Public ReadOnly Property AuxiliaryName As String Implements IAdvancedAuxiliaries.AuxiliaryName
         Get
             Return "BusAuxiliaries"
         End Get
     End Property
 
-    Public ReadOnly Property AuxiliaryVersion As String Implements VectoAuxiliaries.IAdvancedAuxiliaries.AuxiliaryVersion
+    Public ReadOnly Property AuxiliaryVersion As String Implements IAdvancedAuxiliaries.AuxiliaryVersion
         Get
             Return "Version 1.0 Beta"
         End Get
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index eff014808d..11fa30aeaf 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -14,10 +14,13 @@ Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
 Imports System.IO
 Imports System.Windows.Forms
+Imports DownstreamModules.Electrics
+Imports DownstreamModules.HVAC
 Imports Newtonsoft.Json
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 <Serializable()>
 Public Class AuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
index f183a2031d..fc315c0880 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
@@ -10,6 +10,7 @@
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 Imports System.Globalization
 Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 
 Public Class cMAP
     Implements IFuelConsumptionMap
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
index 7168b4d889..2c96a5af45 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
@@ -1,5 +1,6 @@
 Option Strict On
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+
+Imports DownstreamModules.Electrics
 
 Namespace Electrics
 
@@ -14,7 +15,7 @@ Namespace Electrics
         'D6
         Public Property AlternatorName As String Implements IAlternator.AlternatorName
         'G6
-        Public Property PulleyRatio As Single Implements IAlternator.PulleyRatio
+        Public Property PulleyRatio As Double Implements IAlternator.PulleyRatio
         'C10-D15
         Public Property InputTable2000 As New List(Of AltUserInput) Implements IAlternator.InputTable2000
         'F10-G15
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
index 4639751628..71a09675fa 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
@@ -11,8 +11,10 @@
 Imports System.Globalization
 Imports System.IO
 Imports System.Text
+Imports DownstreamModules.Electrics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 Namespace Electrics
 	Public Class AlternatorMap
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
index fe151c8cba..3e9126db2f 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
@@ -2,8 +2,10 @@
 Imports System.Text
 Imports System.IO
 Imports System.Globalization
+Imports DownstreamModules.Electrics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 
 Namespace Electrics
@@ -53,7 +55,7 @@ Namespace Electrics
             For Each alt As IEnumerable(Of ICombinedAlternatorMapRow) In map.GroupBy(Function(g) g.AlternatorName)
 
                 Dim altName As String = alt.First().AlternatorName
-                Dim pulleyRatio As Single = alt.First().PulleyRatio
+                Dim pulleyRatio As Double = alt.First().PulleyRatio
 
 
                 Dim alternator As IAlternator = New Alternator(altSignals, alt.ToList())
@@ -150,7 +152,7 @@ Namespace Electrics
             Dim returnValue As Boolean = True
 
             Dim altName As String = list.First().AlternatorName
-            Dim pulleyRatio As Single = list.First().PulleyRatio
+            Dim pulleyRatio As Double = list.First().PulleyRatio
 
             'Check alt does not already exist in list
             If Alternators.Where(Function(w) w.AlternatorName = altName).Count > 0 Then
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
index d93a0d83b5..1829dce3c5 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
@@ -1,4 +1,4 @@
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports DownstreamModules.Electrics
 
 Namespace Electrics
 	'This class is reflective of the stored entries for the combined alternator
@@ -8,10 +8,10 @@ Namespace Electrics
 		Implements ICombinedAlternatorMapRow
 
 		Public Property AlternatorName As String Implements ICombinedAlternatorMapRow.AlternatorName
-		Public Property RPM As Single Implements ICombinedAlternatorMapRow.RPM
-		Public Property Amps As Single Implements ICombinedAlternatorMapRow.Amps
-		Public Property Efficiency As Single Implements ICombinedAlternatorMapRow.Efficiency
-		Public Property PulleyRatio As Single Implements ICombinedAlternatorMapRow.PulleyRatio
+		Public Property RPM As Double Implements ICombinedAlternatorMapRow.RPM
+		Public Property Amps As Double Implements ICombinedAlternatorMapRow.Amps
+		Public Property Efficiency As Double Implements ICombinedAlternatorMapRow.Efficiency
+		Public Property PulleyRatio As Double Implements ICombinedAlternatorMapRow.PulleyRatio
 
 		'Constructors
 		Sub New()
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
index bf834a54d5..71d64aa05a 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
@@ -1,6 +1,6 @@
 
+Imports DownstreamModules.Electrics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
 
 Namespace Electrics
 	'Used by the CombinedAlternator class and any other related classes.
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
index 151f476e71..4b86f8c77b 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
@@ -1,6 +1,6 @@
 Imports System.ComponentModel
+Imports DownstreamModules.Electrics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
 
 ' Copyright 2017 European Union.
 ' Licensed under the EUPL (the 'Licence');
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
index 316a38c70b..ffa571378f 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
@@ -10,8 +10,8 @@
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
 
+Imports DownstreamModules.Electrics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
 
 Namespace Electrics
     Public Class ElectricalConsumerList
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
index c7b8872b31..c45a3f5c49 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
@@ -9,7 +9,9 @@
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 Namespace Electrics
     Public Class ElectricsUserInputsConfig
@@ -23,7 +25,7 @@ Namespace Electrics
             Implements IElectricsUserInputsConfig.ElectricalConsumers
 
         Public Property DoorActuationTimeSecond As Integer Implements IElectricsUserInputsConfig.DoorActuationTimeSecond
-        Public Property StoredEnergyEfficiency As Single Implements IElectricsUserInputsConfig.StoredEnergyEfficiency
+        Public Property StoredEnergyEfficiency As Double Implements IElectricsUserInputsConfig.StoredEnergyEfficiency
 
         Public Property ResultCardIdle As IResultCard Implements IElectricsUserInputsConfig.ResultCardIdle
         Public Property ResultCardTraction As IResultCard Implements IElectricsUserInputsConfig.ResultCardTraction
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb b/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
index 91c2d010dd..ccb86a31f7 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
@@ -9,8 +9,9 @@
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
+Imports DownstreamModules.Electrics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 Namespace Electrics
     Public Class ResultCard
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb
index a65e0068ef..ade4f8acef 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb
@@ -1,4 +1,4 @@
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
 	Public Class EnvironmentalCondition
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
index d3a66c320e..26e5f7f092 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
@@ -1,6 +1,6 @@
 Imports System.Globalization
 Imports System.IO
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
 	Public Class EnvironmentalConditionsMap
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
index fccca9573b..6d9abc638a 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
@@ -8,9 +8,9 @@
 '   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
+Imports DownstreamModules.HVAC
 Imports Newtonsoft.Json
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.HVAC
 
 Namespace Hvac
 	Public Class HVACConstants
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
index f3a058b7f7..41ebd4fa8d 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
@@ -10,7 +10,7 @@
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
 Imports System.IO
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
 	Public Class HVACSteadyStateModel
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
index 779b4ae20e..651ec540f6 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
@@ -9,7 +9,7 @@
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
     Public Class HVACUserInputsConfig
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
index 19651325a0..c039fab319 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
@@ -1,5 +1,5 @@
 Imports System.Text
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
     'Modeling SSHVAC V07
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
index d6a86093af..86495e15e4 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
@@ -1,4 +1,4 @@
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
     'Used by SSMHVAC Class
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
index 955250b7cc..b9c414c6c2 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
@@ -1,5 +1,5 @@
 Imports System.Text
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
 
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
index 9bf09d4c1e..2d434cb578 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
@@ -3,7 +3,7 @@ Imports Newtonsoft.Json
 Imports System.IO
 Imports System.Reflection
 Imports System.Text
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
     'Used by frmHVACTool
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
index 221a48554d..2c2e1c8244 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
@@ -1,7 +1,7 @@
 Imports System.Globalization
 Imports System.IO
+Imports DownstreamModules.HVAC
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.HVAC
 
 Namespace Hvac
 	'Used By SSMTOOL Class.
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb b/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
index 80e29ac70f..9fda90d03d 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
@@ -1,5 +1,5 @@
 
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Namespace Hvac
 	
diff --git a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
index 70b9877d3e..4bb790cdf6 100644
--- a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
@@ -9,9 +9,10 @@
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.Electrics
+Imports DownstreamModules.HVAC
+Imports Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 
 
 Public Interface IAuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb b/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
index 9945d2f64d..02dcd6f1f6 100644
--- a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb	
+++ b/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb	
@@ -11,7 +11,6 @@
 Option Strict On
 Option Explicit On
 
-Imports System
 
 Namespace My.Resources
     
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb
index 66a9abdebb..efb1a494cc 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/CompressorMap.vb
@@ -11,7 +11,9 @@
 
 Imports System.Globalization
 Imports System.IO
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 
 Namespace Pneumatics
 	''' <summary>
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb
index 1af67ca9c9..2d15d9a972 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb
@@ -11,6 +11,7 @@
 
 Imports System.Globalization
 Imports System.IO
+Imports Pneumatics
 
 Namespace Pneumatics
 	Public Class PneumaticActuationsMAP
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
index 47dc0fcca3..e5722d5749 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
@@ -8,6 +8,7 @@
 '   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
+Imports Pneumatics
 
 Namespace Pneumatics
 	Public Class PneumaticUserInputsConfig
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index 761763d7a9..e48536ee56 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -16,8 +16,9 @@ Imports System.Windows.Forms
 Imports System.Drawing
 Imports VectoAuxiliaries.Hvac
 Imports System.IO
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.Electrics
+Imports DownstreamModules.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 
 Public Class frmAuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb b/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
index 4f827fd217..261588b63a 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
@@ -4,7 +4,7 @@ Imports System.Drawing
 Imports System.Windows.Forms
 Imports VectoAuxiliaries.Electrics
 Imports System.ComponentModel
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports DownstreamModules.Electrics
 
 
 Public Class frmCombinedAlternators
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
index 6c58400c0b..74b21011f8 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
@@ -3,7 +3,7 @@ Imports VectoAuxiliaries.Hvac
 Imports System.ComponentModel
 Imports System.Drawing
 Imports System.Globalization
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
 
 Public Class frmHVACTool
 	'Fields
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 2a4dac642c..e0f46d2138 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -231,10 +231,6 @@
     </Resource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
-      <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
-      <Name>AdvancedAuxiliaryInterfaces</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
       <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
       <Name>VectoCommon</Name>
diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index 57f7121eae..180a51db1d 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -1,6 +1,7 @@
 Imports System.IO
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports VectoAuxiliaries
 
 Namespace IntegrationTests
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
index 04e060039b..e4d2cfe0d9 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
@@ -1,6 +1,7 @@
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.Electrics
+Imports DownstreamModules.Electrics
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 Namespace Mocks
 
@@ -28,10 +29,7 @@ Namespace Mocks
 		End Function
 
 
-		Public Event AuxiliaryEvent(ByRef sender As Object, message As String, messageType As VectoAuxiliaries.AdvancedAuxiliaryMessageType) Implements VectoAuxiliaries.IAuxiliaryEvent.AuxiliaryEvent
-
-
-
+		Public Event IAuxiliaryEvent_AuxiliaryEvent As AuxiliaryEventEventHandler Implements IAuxiliaryEvent.AuxiliaryEvent
 	End Class
 
 End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
index f78f43a9a8..1054166f34 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
@@ -1,6 +1,6 @@
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Pneumatics
+Imports Pneumatics
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 
 Namespace Mocks
 	Public Class CompressorMapMock
@@ -40,7 +40,6 @@ Namespace Mocks
 		End Function
 
 
-		Public Event AuxiliaryEvent(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
-			Implements IAuxiliaryEvent.AuxiliaryEvent
+        Public Event AuxiliaryEvent As AuxiliaryEventEventHandler Implements IAuxiliaryEvent.AuxiliaryEvent
 	End Class
 End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
index 19e6cae555..3bd1be8939 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
@@ -1,7 +1,7 @@
-Imports VectoAuxiliaries.Electrics
+
 Imports System.ComponentModel
+Imports DownstreamModules.Electrics
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
 
 Namespace Mocks
 	Public Class ElectricalConsumerMock
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
index a383992682..98b8fb24c8 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
@@ -1,10 +1,6 @@
 
+Imports Hvac
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
 
 
 Public Class M1_Mock
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
index 842efa8fce..26fed9f2fd 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
@@ -1,9 +1,5 @@
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports Electrics
+Imports TUGraz.VectoCommon.Utils
 
 Public Class M2_Mock
 	Implements IM2_AverageElectricalLoadDemand
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
index 0ac50f2286..ccdf98bf45 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
@@ -1,9 +1,5 @@
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports Pneumatics
+Imports TUGraz.VectoCommon.Utils
 
 Public Class M3_Mock
 	Implements IM3_AveragePneumaticLoadDemand
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
index a2ec9ba03e..22d123936e 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
@@ -1,9 +1,5 @@
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports Pneumatics
+Imports TUGraz.VectoCommon.Utils
 
 Public Class M4_Mock
 	Implements IM4_AirCompressor
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
index 3655c69f8d..2e8b795040 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
@@ -1,9 +1,5 @@
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports Electrics
+Imports TUGraz.VectoCommon.Utils
 
 Public Class M5_Mock
 	Implements IM5_SmartAlternatorSetGeneration
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
index 300b1d03b4..c68f4a0fbe 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
@@ -1,10 +1,6 @@
 
+Imports DownstreamModules
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
 
 
 Public Class M6_Mock
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
index ae499990fa..327b3bca71 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
@@ -1,10 +1,6 @@
 
+Imports DownstreamModules
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
 
 
 Public Class M7_Mock
@@ -59,7 +55,7 @@ Public Class M7_Mock
 		_SmartPneumaticOnlyAuxAirCompPowerGenAtCrank = SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
 	End Sub
 
-    Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations
-        Throw New NotImplementedException
-    End Sub
+	Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations
+		Throw New NotImplementedException
+	End Sub
 End Class
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
index 0c46f104e4..e2bd2bc8bc 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
@@ -1,10 +1,6 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
-Imports NUnit.Framework
+
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
+Imports IFuelConsumptionMap = TUGraz.VectoCore.BusAuxiliaries.Interfaces.IFuelConsumptionMap
 
 Public Class MockFuel50PC
 	Implements IFuelConsumptionMap
diff --git a/VECTOAux/VectoAuxiliariesTests/My Project/AssemblyInfo.vb b/VECTOAux/VectoAuxiliariesTests/My Project/AssemblyInfo.vb
index 8a817cbc68..eeac372c0e 100644
--- a/VECTOAux/VectoAuxiliariesTests/My Project/AssemblyInfo.vb	
+++ b/VECTOAux/VectoAuxiliariesTests/My Project/AssemblyInfo.vb	
@@ -1,4 +1,4 @@
-Imports System
+
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 
diff --git a/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb b/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb
index 1d5344126a..85d6bfb2c0 100644
--- a/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb	
+++ b/VECTOAux/VectoAuxiliariesTests/My Project/Resources.Designer.vb	
@@ -11,7 +11,6 @@
 Option Strict On
 Option Explicit On
 
-Imports System
 
 Namespace My.Resources
     
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
index 3ac39d62ef..eeb4d446ec 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
@@ -1,9 +1,10 @@
 Imports NUnit.Framework
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
 Imports VectoAuxiliariesTests.Mocks
-Imports VectoAuxiliaries
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 5eadb113ee..0119be8957 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -1,8 +1,7 @@
-Imports VectoAuxiliaries.Electrics
+Imports DownstreamModules.Electrics
+Imports VectoAuxiliaries.Electrics
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.DownstreamModules.Electrics
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
index a695b90f87..03fc4d7939 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
@@ -1,12 +1,7 @@
-Imports System.Text
+
 Imports NUnit.Framework
-Imports NUnit
-Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 Imports VectoAuxiliaries
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
index 9c5ee5828b..a22ecf0f66 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
@@ -1,10 +1,6 @@
-Imports System.Text
+
 Imports NUnit.Framework
-Imports NUnit
 Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
 
 Namespace UnitTests
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index 8ca7a4b982..cee72171c3 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -2,10 +2,11 @@
 Imports System.IO
 Imports VectoAuxiliaries.Pneumatics
 Imports NUnit.Framework
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliariesTests.Mocks
-Imports VectoAuxiliaries
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
index 6b529e596a..fbbf7adad5 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
@@ -1,7 +1,4 @@
 Imports NUnit.Framework
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliariesTests.Mocks
-Imports VectoAuxiliaries
 Imports VectoAuxiliaries.Hvac
 
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 7c9106fa25..94a3e3700d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -3,11 +3,9 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliariesTests.Mocks
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Hvac
 Imports System.IO
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 Namespace UnitTests
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
index a287ebcb01..559c761257 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
@@ -1,7 +1,6 @@
-Imports VectoAuxiliaries.Electrics
+Imports DownstreamModules.Electrics
+Imports VectoAuxiliaries.Electrics
 Imports NUnit.Framework
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
index 1d2bad92c3..101ee543f9 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
@@ -1,11 +1,7 @@
 
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+
 Imports NUnit.Framework
 Imports VectoAuxiliaries
-Imports Moq
 
 Namespace UnitTests
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index 3340062452..d6172474c4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -1,10 +1,13 @@
-Imports VectoAuxiliaries.Electrics
+Imports Electrics
+Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 57823cc8ec..798263c5d7 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -1,14 +1,13 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliariesTests.Mocks
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Hvac
 Imports System.IO
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.Electrics
+Imports DownstreamModules.HVAC
+Imports Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 Namespace UnitTests
     <TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
index ec799c3e98..a53d079c11 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
@@ -1,12 +1,10 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
 Imports NUnit.Framework
-Imports VectoAuxiliaries
 Imports Moq
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
index c223ad3545..7e5d3ede15 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -1,12 +1,11 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
+Imports Hvac
 Imports NUnit.Framework
-Imports VectoAuxiliaries
 Imports Moq
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
index ca9d5ee9cd..76fead1504 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -1,12 +1,9 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
 Imports NUnit.Framework
-Imports VectoAuxiliaries
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index 107ff3b990..471e95402f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -1,12 +1,10 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
 Imports NUnit.Framework
-Imports VectoAuxiliaries
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index 67d2e7a7e2..4f5c106eea 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -1,13 +1,12 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
+
+Imports DownstreamModules
+Imports DownstreamModules.HVAC
 Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
 Imports NUnit.Framework
-Imports VectoAuxiliaries
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index 9899daafd4..fab5a15657 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -1,11 +1,14 @@
-Imports NUnit.Framework
+Imports DownstreamModules.Electrics
+Imports Electrics
+Imports Hvac
+Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
 Imports VectoAuxiliaries.Hvac
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index 1255d542d4..6dad4560c0 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -1,12 +1,13 @@
-Imports VectoAuxiliaries.Electrics
+Imports DownstreamModules.Electrics
+Imports DownstreamModules.HVAC
+Imports Electrics
+Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Hvac
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliariesTests.Mocks
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 12321eb59a..13cc444bd1 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -1,13 +1,13 @@
-Imports NUnit.Framework
+Imports DownstreamModules.HVAC
+Imports Electrics
+Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliariesTests.Mocks
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 Imports VectoAuxiliaries.Electrics
 Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.DownstreamModules.Electrics
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index d9decce857..e1f0aadcba 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -1,12 +1,8 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
 Imports NUnit.Framework
-Imports VectoAuxiliaries
-Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
index 040469f304..20b20e6b25 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
@@ -1,11 +1,9 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports VectoAuxiliaries
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
+Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
index 219eb3519a..bba3d958aa 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
@@ -1,12 +1,10 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
+Imports Hvac
 Imports NUnit.Framework
-Imports VectoAuxiliaries
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index b665dfe295..9486d76532 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -1,12 +1,12 @@
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
+Imports DownstreamModules
+Imports Hvac
 Imports NUnit.Framework
-Imports VectoAuxiliaries
 Imports Moq
+Imports Pneumatics
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports IFuelConsumptionMap = TUGraz.VectoCore.BusAuxiliaries.Interfaces.IFuelConsumptionMap
+Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
index 7eeb49bcde..1495fe6ec4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
@@ -1,7 +1,8 @@
-Imports NUnit
+
 Imports VectoAuxiliaries.Pneumatics
 Imports NUnit.Framework
 Imports System.IO
+Imports Pneumatics
 
 Namespace Pneumatics
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
index be98bd8160..04fbadb8b4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
@@ -1,6 +1,6 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 Imports VectoAuxiliaries.Electrics
 
 <TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index 902c393b78..9132eb6f1f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -1,8 +1,5 @@
-Imports NUnit.Framework
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliariesTests.Mocks
-Imports VectoAuxiliaries
-Imports VectoAuxiliaries.DownstreamModules.HVAC
+Imports DownstreamModules.HVAC
+Imports NUnit.Framework
 Imports VectoAuxiliaries.Hvac
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index ddb7c44130..fbc4cc4b88 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -391,10 +391,6 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
-      <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
-      <Name>AdvancedAuxiliaryInterfaces</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
       <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
       <Name>VectoCommon</Name>
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj b/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
deleted file mode 100644
index 0210fb5863..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>VectoAuxiliaries</RootNamespace>
-    <AssemblyName>AdvancedAuxiliaryInterfaces</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>AdvancedAuxiliaryInterfaces.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>AdvancedAuxiliaryInterfaces.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DownstreamModules\Electrics\AlternatorMapValues.vb" />
-    <Compile Include="DownstreamModules\Electrics\AltUserInput.vb" />
-    <Compile Include="DownstreamModules\Electrics\ElectricConstants.vb" />
-    <Compile Include="DownstreamModules\Electrics\IAlternator.vb" />
-    <Compile Include="DownstreamModules\Electrics\IAlternatorMap.vb" />
-    <Compile Include="DownstreamModules\Electrics\ICombinedAlternator.vb" />
-    <Compile Include="DownstreamModules\Electrics\ICombinedAlternatorMapRow.vb" />
-    <Compile Include="DownstreamModules\Electrics\ICombinedAlternatorSignals.vb" />
-    <Compile Include="DownstreamModules\Electrics\IElectricalConsumer.vb" />
-    <Compile Include="DownstreamModules\Electrics\IElectricalConsumerList.vb" />
-    <Compile Include="DownstreamModules\Electrics\IElectricsUserInputsConfig.vb" />
-    <Compile Include="DownstreamModules\Electrics\IResultCard.vb" />
-    <Compile Include="DownstreamModules\Electrics\SmartResult.vb" />
-    <Compile Include="DownstreamModules\HVAC\IEnvironmentalCondition.vb" />
-    <Compile Include="DownstreamModules\HVAC\IEnvironmentalConditionsMap.vb" />
-    <Compile Include="DownstreamModules\HVAC\IHVACConstants.vb" />
-    <Compile Include="DownstreamModules\HVAC\IHVACSteadyStateModel.vb" />
-    <Compile Include="DownstreamModules\HVAC\IHVACUserInputsConfig.vb" />
-    <Compile Include="DownstreamModules\HVAC\ISSMCalculate.vb" />
-    <Compile Include="DownstreamModules\HVAC\ISSMGenInputs.vb" />
-    <Compile Include="DownstreamModules\HVAC\ISSMRun.vb" />
-    <Compile Include="DownstreamModules\HVAC\ISSMTechList.vb" />
-    <Compile Include="DownstreamModules\HVAC\ISSMTOOL.vb" />
-    <Compile Include="DownstreamModules\HVAC\ITechListBenefitLine.vb" />
-    <Compile Include="DownstreamModules\IAbstractModule.vb" />
-    <Compile Include="DownstreamModules\IM0_5_SmartAlternatorSetEfficiency.vb" />
-    <Compile Include="DownstreamModules\IM0_NonSmart_AlternatorsSetEfficiency.vb" />
-    <Compile Include="DownstreamModules\IM10.vb" />
-    <Compile Include="DownstreamModules\IM11.vb" />
-    <Compile Include="DownstreamModules\IM12.vb" />
-    <Compile Include="DownstreamModules\IM13.vb" />
-    <Compile Include="DownstreamModules\IM14.vb" />
-    <Compile Include="DownstreamModules\IM1_AverageHVACLoadDemand.vb" />
-    <Compile Include="DownstreamModules\IM2_AverageElectricalLoadDemand.vb" />
-    <Compile Include="DownstreamModules\IM3_AveragePneumaticLoadDemand.vb" />
-    <Compile Include="DownstreamModules\IM4_AirCompressor.vb" />
-    <Compile Include="DownstreamModules\IM5_SmartAlternatorSetGeneration.vb" />
-    <Compile Include="DownstreamModules\IM6.vb" />
-    <Compile Include="DownstreamModules\IM7.vb" />
-    <Compile Include="DownstreamModules\IM8.vb" />
-    <Compile Include="DownstreamModules\IM9.vb" />
-    <Compile Include="DownstreamModules\PneumaticSystem\ActuationsKey.vb" />
-    <Compile Include="DownstreamModules\PneumaticSystem\ICompressorMap.vb" />
-    <Compile Include="DownstreamModules\PneumaticSystem\IPneumaticActuationsMAP.vb" />
-    <Compile Include="DownstreamModules\PneumaticSystem\IPneumaticsAuxilliariesConfig.vb" />
-    <Compile Include="DownstreamModules\PneumaticSystem\IPneumaticUserInputsConfig.vb" />
-    <Compile Include="Enumerations.vb" />
-    <Compile Include="IAdvancedAuxiliaries.vb" />
-    <Compile Include="IAuxiliaryEvent.vb" />
-    <Compile Include="IFuelConsumptionMap.vb" />
-    <Compile Include="ISignals.vb" />
-    <Compile Include="IVectoInputs.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="Signals.vb" />
-    <Compile Include="VectoInputs.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\VectoCommon\VectoCommon.csproj">
-      <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
-      <Name>VectoCommon</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/Diagnostics.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/Diagnostics.vb
deleted file mode 100644
index f79919703e..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/Diagnostics.vb
+++ /dev/null
@@ -1,44 +0,0 @@
-' Copyright 2015 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Public Class Diagnostics
-Implements IDiagnostics
-
-
-    Public Property AA_CompressorFlag As Integer Implements IDiagnostics.AA_CompressorFlag
-
-    Public Property AA_CompressorFlowRate_LitrePerSec As Single Implements IDiagnostics.AA_CompressorFlowRate_LitrePerSec
-
-    Public Property AA_EngineIdleFlag As Integer Implements IDiagnostics.AA_EngineIdleFlag
-
-    Public Property AA_NonSmartAlternatorsEfficiency As Single Implements IDiagnostics.AA_NonSmartAlternatorsEfficiency
-
-    Public Property AA_OverrunFlag As Integer Implements IDiagnostics.AA_OverrunFlag
-
-    Public Property AA_SmartIdleAlternatorsEfficiency As Single Implements IDiagnostics.AA_SmartIdleAlternatorsEfficiency
-
-    Public Property AA_SmartIdleCurrent_Amps As Single Implements IDiagnostics.AA_SmartIdleCurrent_Amps
-
-    Public Property AA_SmartOverrunAlternatorEfficiency As Single Implements IDiagnostics.AA_SmartOverrunAlternatorEfficiency
-
-    Public Property AA_SmartOverrunCurrent_Amps As Single Implements IDiagnostics.AA_SmartOverrunCurrent_Amps
-
-    Public Property AA_SmartTractionAlternatorEfficiency As Single Implements IDiagnostics.AA_SmartTractionAlternatorEfficiency
-
-    Public Property AA_SmartTractionCurrent_Amps As Single Implements IDiagnostics.AA_SmartTractionCurrent_Amps
-
-    Public Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As Single Implements IDiagnostics.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams
-
-    Public Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As Single Implements IDiagnostics.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres
-
-
-End Class
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AltUserInput.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AltUserInput.vb
deleted file mode 100644
index 07d7088fd1..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AltUserInput.vb
+++ /dev/null
@@ -1,27 +0,0 @@
-Option Strict On
-
-
-Namespace DownstreamModules.Electrics
-'Used by the Combined Alternator Form/Classes to accept user input for the combined alternators efficiency
-'At different Current Demands
-	Public class AltUserInput
-		Public Amps As Double
-		Public Eff As Double
-
-		'Constructor
-		Sub New(amps As Double, eff As Double)
-
-			Me.Amps = amps
-			Me.Eff = eff
-		End Sub
-
-		'Equality
-		Public Function IsEqual(other As AltUserInput, Optional rounding As Integer = 7) As Boolean
-
-			Return Math.round(Me.Amps, rounding) = Math.Round(other.Amps, rounding) AndAlso
-					Math.Round(Me.Eff, rounding) = Math.Round(other.eff, rounding)
-		End Function
-	End class
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AlternatorMapValues.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AlternatorMapValues.vb
deleted file mode 100644
index e735d7bc82..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/AlternatorMapValues.vb
+++ /dev/null
@@ -1,23 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-Namespace DownstreamModules.Electrics
-	'Originally was going to hold more than one value type.
-	Public Structure AlternatorMapValues
-		Public ReadOnly Efficiency As Double
-
-		Public Sub New(ByVal efficiency As Double)
-			Me.Efficiency = efficiency
-		End Sub
-	End Structure
-End Namespace
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ElectricConstants.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ElectricConstants.vb
deleted file mode 100644
index 68f60549b9..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ElectricConstants.vb
+++ /dev/null
@@ -1,33 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Namespace DownstreamModules.Electrics
-	Public Class ElectricConstants
-		'Anticipated Min and Max Allowable values for Powernet, normally 26.3 volts but could be 48 in the future.
-		Public Const PowenetVoltageMin As Double = 6
-		Public Const PowenetVoltageMax As Double = 50
-
-		'Duty Cycle IE Percentage of use
-		Public Const PhaseIdleTractionOnMin As Double = 0
-		Public Const PhaseIdleTractionMax As Double = 1
-
-		'Max Min Expected Consumption for a Single Consumer, negative values allowed as bonuses.
-		Public Const NonminalConsumerConsumptionAmpsMin As Integer = - 10
-		Public Const NominalConsumptionAmpsMax As Integer = 100
-
-
-		'Alternator
-		public const AlternatorPulleyEfficiencyMin as single = 0.1
-		public const AlternatorPulleyEfficiencyMax as single = 1
-	End Class
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternator.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternator.vb
deleted file mode 100644
index 4129a96b12..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternator.vb
+++ /dev/null
@@ -1,49 +0,0 @@
-
-Imports VectoAuxiliaries.Electrics
-
-Namespace DownstreamModules.Electrics
-
-    Public Class Table4Row
-        Public RPM As Double
-        Public Efficiency As Double
-
-        Public Sub New(rpm As Double, eff As Double)
-
-            Me.RPM = rpm
-            Me.Efficiency = eff
-        End Sub
-    End Class
-
-	'Used By Combined Alternator.
-	'Model based on CombinedALTS_V02_Editable.xlsx
-	Public Interface IAlternator
-		'D6
-		Property AlternatorName As String
-
-		'G6
-		Property PulleyRatio As Single
-
-		'S9
-		ReadOnly Property SpindleSpeed As Double
-
-		'S10
-		ReadOnly Property Efficiency As Double
-
-		'C10-D15
-		Property InputTable2000 As List(Of AltUserInput)
-
-		'F10-G15
-		Property InputTable4000 As List(Of AltUserInput)
-
-		'I10-J15
-		Property InputTable6000 As List(Of AltUserInput)
-
-		'M10-N15
-		Property RangeTable As List(Of Table4Row)
-
-		'Test Equality
-		Function IsEqualTo(other As IAlternator) As Boolean
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternatorMap.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternatorMap.vb
deleted file mode 100644
index 74f337144e..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IAlternatorMap.vb
+++ /dev/null
@@ -1,32 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace DownstreamModules.Electrics
-	Public Interface IAlternatorMap
-		Inherits IAuxiliaryEvent
-
-		''' <summary>
-		''' Initialise the map from supplied csv data
-		''' </summary>
-		''' <returns>Boolean - true if map is created successfully</returns>
-		''' <remarks></remarks>
-		Function Initialise() As Boolean
-
-		''' <summary>
-		''' Returns the alternator efficiency at given rpm
-		''' </summary>
-		''' <param name="rpm">alternator rotation speed</param>
-		''' <returns>Single</returns>
-		''' <remarks></remarks>
-		Function GetEfficiency(ByVal rpm As Double, ByVal amps As Ampere) As AlternatorMapValues
-	End Interface
-End Namespace
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternator.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternator.vb
deleted file mode 100644
index 1486a4fd39..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternator.vb
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-Namespace DownstreamModules.Electrics
-	Public Interface ICombinedAlternator
-		'Alternators List
-		Property Alternators As List(Of IAlternator)
-
-		'Test Equality
-		Function IsEqualTo(other As ICombinedAlternator) As Boolean
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.vb
deleted file mode 100644
index 4dcf42c851..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorMapRow.vb
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Namespace DownstreamModules.Electrics
-'Reflects stored data in pesisted CombinedAlternator Map .AALT
-	Public Interface ICombinedAlternatorMapRow
-		Property AlternatorName As String
-		Property RPM As Single
-		Property Amps As Single
-		Property Efficiency As Single
-		Property PulleyRatio As Single
-	End Interface
-End Namespace
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.vb
deleted file mode 100644
index edd85af8ae..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/ICombinedAlternatorSignals.vb
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Imports TUGraz.VectoCommon.Utils
-
-Namespace DownstreamModules.Electrics
-	'Used by CombinedAlternator
-	Public Interface ICombinedAlternatorSignals
-		Property NumberOfAlternators As Integer
-		Property CrankRPM As Double
-		Property CurrentDemandAmps As Ampere
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumer.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumer.vb
deleted file mode 100644
index 36ccc467fc..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumer.vb
+++ /dev/null
@@ -1,30 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports System.ComponentModel
-Imports TUGraz.VectoCommon.Utils
-
-Namespace DownstreamModules.Electrics
-	Public Interface IElectricalConsumer
-		Inherits INotifyPropertyChanged
-
-		Property Category As String
-		Property ConsumerName As String
-		Property BaseVehicle As Boolean
-		Property NominalConsumptionAmps As Double
-		Property PhaseIdle_TractionOn As Double
-		Property NumberInActualVehicle As Integer
-		Property PowerNetVoltage As Double
-		Property AvgConsumptionAmps As Double
-		Property Info As String
-		Function TotalAvgConumptionAmps(Optional PhaseIdle_TractionOnBasedOnCycle As Double = Nothing) As Ampere
-		Function TotalAvgConsumptionInWatts(Optional PhaseIdle_TractionOnBasedOnCycle As Double = 0.0) As Watt
-	End Interface
-End Namespace
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumerList.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumerList.vb
deleted file mode 100644
index f6951cd096..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricalConsumerList.vb
+++ /dev/null
@@ -1,59 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace DownstreamModules.Electrics
-	Public Interface IElectricalConsumerList
-		''' <summary>
-		''' List of Electrical Consumers
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property Items As List(Of IElectricalConsumer)
-
-		''' <summary>
-		''' Add New Electrical Consumer
-		''' </summary>
-		''' <param name="consumer"></param>
-		''' <remarks></remarks>
-		Sub AddConsumer(consumer As IElectricalConsumer)
-
-		''' <summary>
-		''' Remove Electrical Consumer
-		''' </summary>
-		''' <param name="consumer"></param>
-		''' <remarks></remarks>
-		Sub RemoveConsumer(consumer As IElectricalConsumer)
-
-		''' <summary>
-		''' Get Total Average Demand In Amps 
-		''' </summary>
-		''' <param name="excludeOnBase">Exclude those on base vehicle</param>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function GetTotalAverageDemandAmps(excludeOnBase As Boolean) As Ampere
-
-		''' <summary>
-		''' Door Actuation Time Fraction ( Total Time Spent Operational during cycle )
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property DoorDutyCycleFraction As Double
-
-		'Merge Info data from ElectricalConsumer in a Default set into live set
-		'This is required because the info is stored in the AAUX file and we do not want to use a persistance stored version.
-		Sub MergeInfoData()
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.vb
deleted file mode 100644
index 09932ea9d4..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IElectricsUserInputsConfig.vb
+++ /dev/null
@@ -1,97 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-Namespace DownstreamModules.Electrics
-	Public Interface IElectricsUserInputsConfig
-		''' <summary>
-		''' Power Net Voltage - The supply voltage used on the vehilce.
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property PowerNetVoltage As Double
-
-		''' <summary>
-		''' The Path for the Alternator map
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property AlternatorMap As String
-
-		''' <summary>
-		''' Alternator Gear Efficiency
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property AlternatorGearEfficiency As Double
-
-		''' <summary>
-		''' List of Electrical Consumers
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property ElectricalConsumers As IElectricalConsumerList
-
-		''' <summary>
-		''' Door Actuation Time In Seconds ( Time Taken to Open/Close the door )
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property DoorActuationTimeSecond As Integer
-
-		''' <summary>
-		''' Result Card Taken During Idle.
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property ResultCardIdle As IResultCard
-
-		''' <summary>
-		''' Result Card Taken During Traction
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property ResultCardTraction As IResultCard
-
-		''' <summary>
-		''' Result Card Taken During Overrun
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property ResultCardOverrun As IResultCard
-
-		''' <summary>
-		''' Smart Electrical System
-		''' </summary>
-		''' <value></value>
-		''' <returns>True For Smart Electrical Systems/ False For non Smart.</returns>
-		''' <remarks></remarks>
-		Property SmartElectrical As Boolean
-
-		''' <summary>
-		''' Stored Energy Efficiency
-		''' </summary>
-		''' <value></value>
-		''' <returns>Stored Energy Efficiency</returns>
-		''' <remarks></remarks>
-		Property StoredEnergyEfficiency As Single
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IResultCard.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IResultCard.vb
deleted file mode 100644
index 70f5885680..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/IResultCard.vb
+++ /dev/null
@@ -1,34 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-
-Namespace DownstreamModules.Electrics
-	Public Interface IResultCard
-		''' <summary>
-		''' Returns a List of (SmartResult )
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property Results As List(Of SmartResult)
-
-		''' <summary>
-		''' Returns the Smart Current (A)
-		''' </summary>
-		''' <param name="Amps"></param>
-		''' <returns></returns>
-		''' <remarks>Defaults to 10 Amps if no readings present</remarks>
-		Function GetSmartCurrentResult(ByVal Amps As Ampere) As Ampere
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/SmartResult.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/SmartResult.vb
deleted file mode 100644
index 2c37c17154..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/Electrics/SmartResult.vb
+++ /dev/null
@@ -1,53 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Namespace DownstreamModules.Electrics
-	Public Class SmartResult
-		Implements IComparable(Of SmartResult)
-
-		Public Property Amps As Double
-		Public Property SmartAmps As Double
-
-		'Constructors
-		Public Sub new()
-			'An empty constructor is requried. Do not remove.
-		End Sub
-
-		Public Sub New(amps As Double, smartAmps As Double)
-
-			Me.Amps = amps
-			Me.SmartAmps = smartAmps
-		End Sub
-
-		'Comparison
-		Public Function CompareTo(other As SmartResult) As Integer Implements IComparable(Of SmartResult).CompareTo
-
-			If other.Amps > Me.Amps then return - 1
-			If other.Amps = Me.Amps then Return 0
-
-			Return 1
-		End Function
-
-		'Comparison Overrides
-		Public Overrides Function Equals(obj As Object) As Boolean
-
-			Dim other as SmartResult = Ctype(Obj, SmartResult)
-
-			Return Me.Amps = other.Amps
-		End Function
-
-		Public Overrides Function GetHashCode() As Integer
-			Return 0
-		End Function
-	End Class
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalCondition.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalCondition.vb
deleted file mode 100644
index 5883647fa9..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalCondition.vb
+++ /dev/null
@@ -1,8 +0,0 @@
-Namespace DownstreamModules.HVAC
-	Public Interface IEnvironmentalCondition
-		Function GetTemperature() As Double
-		Function GetSolar() As Double
-		Function GetWeighting() As Double
-		Function GetNormalisedWeighting(map As List(Of IEnvironmentalCondition)) As Double
-	End Interface
-End Namespace
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.vb
deleted file mode 100644
index fa7ee4704b..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IEnvironmentalConditionsMap.vb
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-Namespace DownstreamModules.HVAC
-	Public Interface IEnvironmentalConditionsMap
-		Function Initialise() As Boolean
-
-		Function GetEnvironmentalConditions() As List(Of IEnvironmentalCondition)
-	End Interface
-End Namespace
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACConstants.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACConstants.vb
deleted file mode 100644
index fdb3031025..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACConstants.vb
+++ /dev/null
@@ -1,25 +0,0 @@
-Imports TUGraz.VectoCommon.Utils
-
-Namespace DownstreamModules.HVAC
-	Public Interface IHVACConstants
-		''' <summary>
-		''' Diesel: 44800   [J/g]
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property DieselGCVJperGram As JoulePerKilogramm
-
-		''' <summary>
-		''' 835  [g/l]
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property FuelDensity As KilogramPerCubicMeter
-
-		ReadOnly Property FuelDensityAsGramPerLiter As Double
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.vb
deleted file mode 100644
index f0054f1392..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACSteadyStateModel.vb
+++ /dev/null
@@ -1,49 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Namespace DownstreamModules.HVAC
-	Public Interface IHVACSteadyStateModel
-		''' <summary>
-		''' Initialised Values From Map
-		''' </summary>
-		''' <param name="filePath"></param>
-		''' <param name="message"></param>
-		''' <returns>True if successfull, and False if not.</returns>
-		''' <remarks></remarks>
-		Function SetValuesFromMap(byval filePath As String, ByRef message As string) As Boolean
-
-		''' <summary>
-		''' HVAC Mechanical Load Power  (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property HVACMechanicalLoadPowerWatts As Single
-
-		''' <summary>
-		''' HVAC Electrical Load Power (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property HVACElectricalLoadPowerWatts As Single
-
-		''' <summary>
-		''' HVAC Fuelling (L/H)
-		''' </summary>
-		''' <value></value>
-		''' <returns>Liters per hour</returns>
-		''' <remarks></remarks>
-		Property HVACFuellingLitresPerHour As single
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.vb
deleted file mode 100644
index 3b1b2d38a8..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/IHVACUserInputsConfig.vb
+++ /dev/null
@@ -1,30 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-Namespace DownstreamModules.HVAC
-	Public Interface IHVACUserInputsConfig
-		' Property  SteadyStateModel As IHVACSteadyStateModel
-		''' <summary>
-		''' PathName of the Steady State Model File
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property SSMFilePath As String
-
-		Property BusDatabasePath As String
-
-		Property SSMDisabled As Boolean
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMCalculate.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMCalculate.vb
deleted file mode 100644
index 88e26fc162..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMCalculate.vb
+++ /dev/null
@@ -1,67 +0,0 @@
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules.HVAC
-
-	Public Interface ISSMCalculate
-
-		Property Run1 As ISSMRun
-		Property Run2 As ISSMRun
-
-
-		ReadOnly Property ElectricalWBase As Double
-		ReadOnly Property MechanicalWBase As Double
-		ReadOnly Property FuelPerHBase As Double
-
-		ReadOnly Property ElectricalWAdjusted As Double
-		ReadOnly Property MechanicalWBaseAdjusted As Double
-		ReadOnly Property FuelPerHBaseAdjusted As Double
-
-
-		'BaseValues
-		'- Heating
-		ReadOnly Property BaseHeatingW_Mechanical As Double
-		ReadOnly Property BaseHeatingW_ElectricalCoolingHeating As Double
-		ReadOnly Property BaseHeatingW_ElectricalVentilation As Double
-		ReadOnly Property BaseHeatingW_FuelFiredHeating As Double
-
-		'Cooling                                                    
-		ReadOnly Property BaseCoolingW_Mechanical As Double
-		ReadOnly Property BaseCoolingW_ElectricalCoolingHeating As Double
-		ReadOnly Property BaseCoolingW_ElectricalVentilation As Double
-		ReadOnly Property BaseCoolingW_FuelFiredHeating As Double
-
-		'Cooling
-		ReadOnly Property BaseVentilationW_Mechanical As Double
-		ReadOnly Property BaseVentilationW_ElectricalCoolingHeating As Double
-		ReadOnly Property BaseVentilationW_ElectricalVentilation As Double
-		ReadOnly Property BaseVentilationW_FuelFiredHeating As Double
-
-
-		'TechListBenefits
-		'- Heating
-		ReadOnly Property TechListAdjustedHeatingW_Mechanical As Double
-		ReadOnly Property TechListAdjustedHeatingW_ElectricalCoolingHeating As Double
-		ReadOnly Property TechListAdjustedHeatingW_ElectricalVentilation As Double
-		ReadOnly Property TechListAdjustedHeatingW_FuelFiredHeating As Double
-
-		'Cooling          TechListAdjusted                                      
-		ReadOnly Property TechListAdjustedCoolingW_Mechanical As Double
-		ReadOnly Property TechListAdjustedCoolingW_ElectricalCoolingHeating As Double
-		ReadOnly Property TechListAdjustedCoolingW_ElectricalVentilation As Double
-		ReadOnly Property TechListAdjustedCoolingW_FuelFiredHeating As Double
-
-		'Cooling          TechListAdjusted
-		ReadOnly Property TechListAdjustedVentilationW_Mechanical As Double
-		ReadOnly Property TechListAdjustedVentilationW_ElectricalCoolingHeating As Double
-		ReadOnly Property TechListAdjustedVentilationW_ElectricalVentilation As Double
-		ReadOnly Property TechListAdjustedVentilationW_FuelFiredHeating As Double
-
-
-	End Interface
-
-
-
-End Namespace
-
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMGenInputs.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMGenInputs.vb
deleted file mode 100644
index 44870806d7..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMGenInputs.vb
+++ /dev/null
@@ -1,79 +0,0 @@
-
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules.HVAC
-
-	Public Interface ISSMGenInputs
-
-		'Bus Parameterisation	
-		Property BP_BusModel As String
-		Property BP_NumberOfPassengers As Double
-		Property BP_BusFloorType As String
-		Property BP_DoubleDecker As Boolean
-		Property BP_BusLength As Double
-		Property BP_BusWidth As Double
-		Property BP_BusHeight As Double
-
-		ReadOnly Property BP_BusFloorSurfaceArea As Double
-		ReadOnly Property BP_BusWindowSurface As Double
-		ReadOnly Property BP_BusSurfaceAreaM2 As Double
-		ReadOnly Property BP_BusVolume As Double
-
-		'Boundary Conditions:			
-		Property BC_GFactor As Double
-		ReadOnly Property BC_SolarClouding As Double
-		ReadOnly Property BC_HeatPerPassengerIntoCabinW As Double
-		Property BC_PassengerBoundaryTemperature As Double
-		ReadOnly Property BC_PassengerDensityLowFloor As Double
-		ReadOnly Property BC_PassengerDensitySemiLowFloor As Double
-		ReadOnly Property BC_PassengerDensityRaisedFloor As Double
-		ReadOnly Property BC_CalculatedPassengerNumber As Double
-		ReadOnly Property BC_UValues As Double
-		Property BC_HeatingBoundaryTemperature As Double
-		Property BC_CoolingBoundaryTemperature As Double
-		ReadOnly Property BC_TemperatureCoolingTurnsOff As Double
-		Property BC_HighVentilation As Double
-		Property BC_lowVentilation As Double
-		ReadOnly Property BC_High As Double
-		ReadOnly Property BC_Low As Double
-		ReadOnly Property BC_HighVentPowerW As Double
-		ReadOnly Property BC_LowVentPowerW As Double
-		Property BC_SpecificVentilationPower As Double
-		Property BC_AuxHeaterEfficiency As Double
-		Property BC_GCVDieselOrHeatingOil As Double
-		ReadOnly Property BC_WindowAreaPerUnitBusLength As Double
-		ReadOnly Property BC_FrontRearWindowArea As Double
-		Property BC_MaxTemperatureDeltaForLowFloorBusses As Double
-		Property BC_MaxPossibleBenefitFromTechnologyList As Double
-
-		'EnviromentalConditions				
-		Property EC_EnviromentalTemperature As Double
-		Property EC_Solar As Double
-		ReadOnly Property EC_EnvironmentalConditionsMap As IEnvironmentalConditionsMap
-		Property EC_EnviromentalConditions_BatchFile As String
-		Property EC_EnviromentalConditions_BatchEnabled As Boolean
-
-		'AC-system				            
-		Property AC_CompressorType As String
-		ReadOnly Property AC_CompressorTypeDerived As String
-		Property AC_CompressorCapacitykW As Double
-		ReadOnly Property AC_COP As Double
-
-		'Ventilation				
-		Property VEN_VentilationOnDuringHeating As Boolean
-		Property VEN_VentilationWhenBothHeatingAndACInactive As Boolean
-		Property VEN_VentilationDuringAC As Boolean
-		Property VEN_VentilationFlowSettingWhenHeatingAndACInactive As String
-		Property VEN_VentilationDuringHeating As String
-		Property VEN_VentilationDuringCooling As String
-
-		'Aux. Heater				
-		Property AH_EngineWasteHeatkW As Double
-		Property AH_FuelFiredHeaterkW As Double
-		Property AH_FuelEnergyToHeatToCoolant As Double
-		Property AH_CoolantHeatTransferredToAirCabinHeater As Double
-	End Interface
-
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMRun.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMRun.vb
deleted file mode 100644
index 1e39a961c9..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMRun.vb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Namespace DownstreamModules.HVAC
-
-
-	Public Interface ISSMRun
-
-		ReadOnly Property HVACOperation As Double
-		ReadOnly Property TCalc As Double
-		ReadOnly Property TemperatureDelta As Double
-		ReadOnly Property QWall As Double
-		ReadOnly Property WattsPerPass As Double
-		ReadOnly Property Solar As Double
-		ReadOnly Property TotalW As Double
-		ReadOnly Property TotalKW As Double
-		ReadOnly Property FuelW As Double
-		ReadOnly Property TechListAmendedFuelW As Double
-
-	End Interface
-
-
-
-
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTOOL.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTOOL.vb
deleted file mode 100644
index f1e080e5c0..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTOOL.vb
+++ /dev/null
@@ -1,37 +0,0 @@
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.DownstreamModules.HVAC
-Imports VectoAuxiliaries.Hvac
-
-Public Interface ISSMTOOL
-	Property GenInputs As ISSMGenInputs
-	Property TechList As ISSMTechList
-	Property Calculate As ISSMCalculate
-	Property SSMDisabled As Boolean
-	Property HVACConstants As IHVACConstants
-
-	ReadOnly Property ElectricalWBase As Double	'Watt
-	ReadOnly Property MechanicalWBase As Double	' Watt
-	ReadOnly Property FuelPerHBase As Double ' LiterPerHour
-
-	ReadOnly Property ElectricalWAdjusted As Double	' Watt
-	ReadOnly Property MechanicalWBaseAdjusted As Double	' Watt
-	ReadOnly Property FuelPerHBaseAdjusted As Double ' LiterPerHour
-
-	Sub Clone(from As ISSMTOOL)
-
-	Function Load(filePath As String) As Boolean
-
-	Function Save(filePath As String) As Boolean
-
-	Function IsEqualTo(source As ISSMTOOL) As Boolean
-
-	''' <summary>
-	''' This alters the waste heat and returns an adjusted fueling value
-	''' </summary>
-	''' <param name="AverageUseableEngineWasteHeatKW"></param>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Function FuelPerHBaseAsjusted(AverageUseableEngineWasteHeatKW As Double) As Double
-
-	Event Message(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType)
-End Interface
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTechList.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTechList.vb
deleted file mode 100644
index 29f2661135..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ISSMTechList.vb
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules.HVAC
-
-	Public Interface ISSMTechList
-
-		Property TechLines As List(Of ITechListBenefitLine)
-
-		Sub Clear()
-		Function Add(item As ITechListBenefitLine, ByRef feedback As String) As Boolean
-		Function Delete(item As ITechListBenefitLine, ByRef feedback As String) As Boolean
-		Function Modify(originalItem As ITechListBenefitLine, modifiedItem As ITechListBenefitLine, ByRef feedback As String) As Boolean
-
-		Sub SetSSMGeneralInputs(genInputs As ISSMGenInputs)
-
-		ReadOnly Property HValueVariation As Double
-		ReadOnly Property VHValueVariation As Double
-		ReadOnly Property VVValueVariation As Double
-		ReadOnly Property VCValueVariation As Double
-		ReadOnly Property CValueVariation As Double
-
-		ReadOnly Property HValueVariationKW As Double
-		ReadOnly Property VHValueVariationKW As Double
-		ReadOnly Property VVValueVariationKW As Double
-		ReadOnly Property VCValueVariationKW As Double
-		ReadOnly Property CValueVariationKW As Double
-
-
-		Function Initialise() As Boolean
-		Function Initialise(filePath As String) As Boolean
-
-
-
-
-	End Interface
-
-
-
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ITechListBenefitLine.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ITechListBenefitLine.vb
deleted file mode 100644
index bc58aa2253..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/HVAC/ITechListBenefitLine.vb
+++ /dev/null
@@ -1,44 +0,0 @@
-Namespace DownstreamModules.HVAC
-
-	Public Enum TechLineType
-
-		Normal
-		HVCActiveSelection
-	End Enum
-
-	Public Interface ITechListBenefitLine
-		Property Units As string
-		Property Category As String
-		Property BenefitName As String
-
-		Property LowFloorH As double
-		Property LowFloorV As double
-		Property LowFloorC As double
-
-		Property SemiLowFloorH As double
-		Property SemiLowFloorV As double
-		Property SemiLowFloorC As double
-
-		Property RaisedFloorH As double
-		Property RaisedFloorV As double
-		Property RaisedFloorC As double
-
-		Property OnVehicle As Boolean
-		Property ActiveVH As Boolean
-		Property ActiveVV As Boolean
-		Property ActiveVC As Boolean
-		Property LineType As TechLineType
-
-		ReadOnly Property H As Double
-		ReadOnly Property VH As Double
-		ReadOnly Property VV As Double
-		ReadOnly Property VC As Double
-		ReadOnly Property C As Double
-
-		Sub CloneFrom(source As ITechListBenefitLine)
-
-		Function IsEqualTo(source As ITechListBenefitLine) As Boolean
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IAbstractModule.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IAbstractModule.vb
deleted file mode 100644
index bd20a32f7b..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IAbstractModule.vb
+++ /dev/null
@@ -1,5 +0,0 @@
-Public Interface IAbstractModule
-    
-    Sub ResetCalculations()
-
-End Interface
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.vb
deleted file mode 100644
index fd5e135501..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_5_SmartAlternatorSetEfficiency.vb
+++ /dev/null
@@ -1,67 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Electrics
-	Public Interface IM0_5_SmartAlternatorSetEfficiency
-        Inherits IAbstractModule
-
-		''' <summary>
-		''' Smart Idle Current (A)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartIdleCurrent() As Ampere
-
-		''' <summary>
-		''' Alternators Efficiency In Idle ( Fraction )
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property AlternatorsEfficiencyIdleResultCard() As Double
-
-		''' <summary>
-		''' Smart Traction Current (A)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartTractionCurrent As Ampere
-
-		''' <summary>
-		''' Alternators Efficiency In Traction ( Fraction )
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property AlternatorsEfficiencyTractionOnResultCard() As Double
-
-		''' <summary>
-		''' Smart Overrrun Current (A)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartOverrunCurrent As Ampere
-
-		''' <summary>
-		''' Alternators Efficiency In Overrun ( Fraction )
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property AlternatorsEfficiencyOverrunResultCard() As Double
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.vb
deleted file mode 100644
index a57b7c9ec4..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM0_NonSmart_AlternatorsSetEfficiency.vb
+++ /dev/null
@@ -1,37 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Electrics
-	Public Interface IM0_NonSmart_AlternatorsSetEfficiency
-		Inherits IAbstractModule
-
-		''' <summary>
-		''' Gets HVAC Electrical Power Demand (A)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property GetHVACElectricalPowerDemandAmps() As Ampere
-
-		''' <summary>
-		''' Gets Alternator Efficiency (0-1)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property AlternatorsEfficiency() As Double
-
-		
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM10.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM10.vb
deleted file mode 100644
index d98d24eae2..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM10.vb
+++ /dev/null
@@ -1,42 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
-
-Namespace DownstreamModules
-	Public Interface IM10
-	    Inherits IAbstractModule
-
-		'AverageLoadsFuelConsumptionInterpolatedForPneumatics
-		ReadOnly Property AverageLoadsFuelConsumptionInterpolatedForPneumatics As Kilogram
-
-		'Interpolated FC between points 2-3-1 Representing smart Pneumatics = Fuel consumption with smart Pneumatics and average electrical  power demand
-		ReadOnly Property FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand As Kilogram
-
-		Sub CycleStep(stepTimeInSeconds As Second)
-
-		'Added for diagnostic inspection purposes only, does not materially affect the class function.
-		'ReadOnly Property P1X As NormLiter
-		'ReadOnly Property P1Y As Kilogram
-		'ReadOnly Property P2X As NormLiter
-		'ReadOnly Property P2Y As Kilogram
-		'ReadOnly Property P3X As NormLiter
-		'ReadOnly Property P3Y As Kilogram
-		'ReadOnly Property XTAIN As NormLiter
-		'ReadOnly Property INTRP1 As Kilogram
-		'ReadOnly Property INTRP2 As Kilogram
-	End Interface
-End Namespace
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM11.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM11.vb
deleted file mode 100644
index c961a4a911..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM11.vb
+++ /dev/null
@@ -1,92 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules
-	Public Interface IM11
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' Smart Electrical Total Cycle Electrical Energy Generated During Overrun Only(J)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly As Joule
-
-		''' <summary>
-		''' Smart Electrical Total Cycle Eletrical EnergyGenerated (J)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElectricalTotalCycleEletricalEnergyGenerated As Joule
-
-		''' <summary>
-		''' Total Cycle Electrical Demand (J)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property TotalCycleElectricalDemand As Joule
-
-		''' <summary>
-		''' Total Cycle Fuel Consumption: Smart Electrical Load (g)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property TotalCycleFuelConsumptionSmartElectricalLoad As Kilogram
-
-		''' <summary>
-		''' Total Cycle Fuel Consumption: Zero Electrical Load (g)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property TotalCycleFuelConsumptionZeroElectricalLoad As Kilogram
-
-		''' <summary>
-		''' Stop Start Sensitive: Total Cycle Electrical Demand (J)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property StopStartSensitiveTotalCycleElectricalDemand As Joule
-
-		''' <summary>
-		''' Total Cycle Fuel Consuption : Average Loads (g)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property TotalCycleFuelConsuptionAverageLoads As Kilogram
-
-		''' <summary>
-		''' Clears aggregated values ( Sets them to zero ).
-		''' </summary>
-		''' <remarks></remarks>
-		Sub ClearAggregates()
-
-		''' <summary>
-		''' Increments all aggregated outputs
-		''' </summary>
-		''' <param name="stepTimeInSeconds">Single : Mutiplies the values to be aggregated by number of seconds</param>
-		''' <remarks></remarks>
-		Sub CycleStep(stepTimeInSeconds As Second)
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM12.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM12.vb
deleted file mode 100644
index f4dab4f71c..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM12.vb
+++ /dev/null
@@ -1,55 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace DownstreamModules
-	Public Interface IM12
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' Fuel consumption with smart Electrics and Average Pneumatic Power Demand
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand As Kilogram
-
-		''' <summary>
-		''' Base Fuel Consumption With Average Auxiliary Loads
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property BaseFuelConsumptionWithTrueAuxiliaryLoads As Kilogram
-
-		''' <summary>
-		''' Stop Start Correction
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property StopStartCorrection As Double
-
-
-		'Diagnostic Signals Only For Testing - No Material interference with operation of class.
-		'ReadOnly Property P1X As Joule
-		'ReadOnly Property P1Y As Kilogram
-		'ReadOnly Property P2X As Joule
-		'ReadOnly Property P2Y As Kilogram
-		'ReadOnly Property P3X As Joule
-		'ReadOnly Property P3Y As Kilogram
-		'ReadOnly Property XTAIN As Joule
-		'ReadOnly Property INTRP1 As Kilogram
-		'ReadOnly Property INTRP2 As Kilogram
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM13.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM13.vb
deleted file mode 100644
index a1f3b2b106..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM13.vb
+++ /dev/null
@@ -1,32 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules
-	Public Interface IM13
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' Total Cycle Fuel Consumption Grams
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks>WHTC and Start Stop Adjusted</remarks>
-		ReadOnly Property WHTCTotalCycleFuelConsumptionGrams As Kilogram
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM14.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM14.vb
deleted file mode 100644
index bc3be11ecb..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM14.vb
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules
-	Public Interface IM14
-	    Inherits IAbstractModule
-
-		ReadOnly Property TotalCycleFCGrams As Kilogram
-
-		ReadOnly Property TotalCycleFCLitres As Liter
-	End Interface
-End Namespace
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM1_AverageHVACLoadDemand.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM1_AverageHVACLoadDemand.vb
deleted file mode 100644
index 982ed1b811..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM1_AverageHVACLoadDemand.vb
+++ /dev/null
@@ -1,47 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Hvac
-	Public Interface IM1_AverageHVACLoadDemand
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' Average Power Demand At Crank From HVAC Mechanicals (W)
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function AveragePowerDemandAtCrankFromHVACMechanicalsWatts() As Watt
-
-		''' <summary>
-		''' Average Power Demand At Alternator From HVAC Electrics (W)
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function AveragePowerDemandAtAlternatorFromHVACElectricsWatts() As Watt
-
-		''' <summary>
-		''' Average Power Demand At Crank From HVAC Electrics  (W)
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Watt
-
-		''' <summary>
-		''' HVAC Fueling   (L/H)
-		''' </summary>
-		''' <returns>Litres Per Hour</returns>
-		''' <remarks></remarks>
-		Function HVACFuelingLitresPerHour() As LiterPerSecond
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM2_AverageElectricalLoadDemand.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM2_AverageElectricalLoadDemand.vb
deleted file mode 100644
index ce6ac8e0ea..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM2_AverageElectricalLoadDemand.vb
+++ /dev/null
@@ -1,22 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Electrics
-	Public Interface IM2_AverageElectricalLoadDemand
-	    Inherits IAbstractModule
-
-		Function GetAveragePowerDemandAtAlternator() As Watt
-		Function GetAveragePowerAtCrankFromElectrics() As Watt
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.vb
deleted file mode 100644
index a2e0cad59a..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM3_AveragePneumaticLoadDemand.vb
+++ /dev/null
@@ -1,25 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Pneumatics
-	Public Interface IM3_AveragePneumaticLoadDemand
-	    Inherits IAbstractModule
-
-		Function GetAveragePowerDemandAtCrankFromPneumatics() As Watt
-
-		Function AverageAirConsumedPerSecondLitre() As NormLiterPerSecond
-
-        ReadOnly Property TotalAirDemand As NormLiter
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM4_AirCompressor.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM4_AirCompressor.vb
deleted file mode 100644
index 86f75cf3ee..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM4_AirCompressor.vb
+++ /dev/null
@@ -1,75 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Pneumatics
-	Public Interface IM4_AirCompressor
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' Ratio of Gear or Pulley used to drive the compressor
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property PulleyGearRatio() As Double
-
-		''' <summary>
-		''' Efficiency of the Pulley or Gear used to drive the compressor
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Property PulleyGearEfficiency() As Double
-
-		''' <summary>
-		''' Initialises the AirCompressor Class
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function Initialise() As Boolean
-
-		''' <summary>
-		''' Returns the flow rate [litres/second] of compressor for the given engine rpm
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function GetFlowRate() As NormLiterPerSecond
-
-		''' <summary>
-		''' Returns the power consumed for the given engine rpm when compressor is off
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function GetPowerCompressorOff() As Watt
-
-		''' <summary>
-		''' Returns the power consumed for the given engine rpm when compressor is on
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function GetPowerCompressorOn() As Watt
-
-		''' <summary>
-		''' Returns the difference in power between compressonr on and compressor off operation at the given engine rpm
-		''' </summary>
-		''' <returns>Single / Watts</returns>
-		''' <remarks></remarks>
-		Function GetPowerDifference() As Watt
-
-		''' <summary>
-		''' Returns Average PoweDemand PeCompressor UnitFlowRate 
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function GetAveragePowerDemandPerCompressorUnitFlowRate() As SI
-	End Interface
-End Namespace
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.vb
deleted file mode 100644
index 5d83538977..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM5_SmartAlternatorSetGeneration.vb
+++ /dev/null
@@ -1,40 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Electrics
-	Public Interface IM5_SmartAlternatorSetGeneration
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' Alternators Generation Power At Crank Idle (W)
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function AlternatorsGenerationPowerAtCrankIdleWatts() As Watt
-
-		''' <summary>
-		''' Alternators Generation Power At Crank Traction On  (W)
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function AlternatorsGenerationPowerAtCrankTractionOnWatts() As Watt
-
-		''' <summary>
-		''' Alternators Generation Power At Crank Overrun  (W)
-		''' </summary>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		Function AlternatorsGenerationPowerAtCrankOverrunWatts() As Watt
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM6.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM6.vb
deleted file mode 100644
index e6601a915d..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM6.vb
+++ /dev/null
@@ -1,91 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace DownstreamModules
-	Public Interface IM6
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' OverrunFlag
-		''' </summary>
-		''' <value></value>
-		''' <returns>0 = Not in overrun, 1 = In Overrun</returns>
-		''' <remarks></remarks>
-		ReadOnly Property OverrunFlag As Boolean
-
-		''' <summary>
-		''' Smart Elec And Pneumatics Compressor Flag
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElecAndPneumaticsCompressorFlag As Boolean
-
-		''' <summary>
-		''' Smart Elec And Pneumatic: Alternator Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElecAndPneumaticAltPowerGenAtCrank As Watt
-
-		''' <summary>
-		''' Smart Elec And Pneumatic: Air Compressor Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElecAndPneumaticAirCompPowerGenAtCrank As Watt
-
-		''' <summary>
-		''' Smart Electrics Only :  Alternator Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElecOnlyAltPowerGenAtCrank As Watt
-
-		''' <summary>
-		''' Average Power Demand At Crank From Pneumatics (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property AveragePowerDemandAtCrankFromPneumatics As Watt
-
-		''' <summary>
-		''' Smart Pneumatic Only Air Comp Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartPneumaticOnlyAirCompPowerGenAtCrank As Watt
-
-		''' <summary>
-		''' Avgerage Power Demand At Crank From Electrics Including HVAC electrics (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property AvgPowerDemandAtCrankFromElectricsIncHVAC As Watt
-
-		''' <summary>
-		''' Smart Pneumatics Only CompressorFlag
-		''' </summary>
-		''' <value></value>
-		''' <returns>Less than Zero = No, Greater then Zero = Yes </returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartPneumaticsOnlyCompressorFlag As Boolean
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM7.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM7.vb
deleted file mode 100644
index c7e00bc2a4..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM7.vb
+++ /dev/null
@@ -1,55 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules
-	Public Interface IM7
-	    Inherits IAbstractModule
-
-		''' <summary>
-		''' Smart Electrical And Pneumatic Aux: Alternator Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Watt
-
-		''' <summary>
-		''' Smart Electrical And Pneumatic Aux : Air Compressor Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Watt
-
-		''' <summary>
-		''' Smart Electrical Only Aux : Alternator Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElectricalOnlyAuxAltPowerGenAtCrank As Watt
-
-		''' <summary>
-		''' Smart Pneumatic Only Aux : Air Comppressor Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartPneumaticOnlyAuxAirCompPowerGenAtCrank As Watt
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM8.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM8.vb
deleted file mode 100644
index 3328f1002b..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM8.vb
+++ /dev/null
@@ -1,49 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules
-	Public Interface IM8
-	    Inherits IAbstractModule
-
-'OUT1
-		''' <summary>
-		''' Aux Power At Crank From Electrical HVAC And Pneumatics Ancilaries (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries As Watt
-'OUT2
-		''' <summary>
-		''' Smart Electrical Alternator Power Gen At Crank (W)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property SmartElectricalAlternatorPowerGenAtCrank As Watt
-'OUT3
-		''' <summary>
-		''' Compressor Flag
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property CompressorFlag As Boolean
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM9.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM9.vb
deleted file mode 100644
index cc10d1bd7b..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/IM9.vb
+++ /dev/null
@@ -1,68 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-
-Namespace DownstreamModules
-	Public Interface IM9
-		Inherits IAuxiliaryEvent, IAbstractModule
-
-		''' <summary>
-		''' Clears aggregated values ( Sets them to zero )
-		''' </summary>
-		''' <remarks></remarks>
-		Sub ClearAggregates()
-
-		''' <summary>
-		''' Increments all aggregated outputs
-		''' </summary>
-		''' <param name="stepTimeInSeconds">Single : Mutiplies the values to be aggregated by number of seconds</param>
-		''' <remarks></remarks>
-		Sub CycleStep(stepTimeInSeconds As Second)
-
-		''' <summary>
-		''' Litres Of Air: Compressor On Continually (L)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks>Start/Stop Sensitive</remarks>
-		ReadOnly Property LitresOfAirCompressorOnContinually As NormLiter
-
-		''' <summary>
-		''' Litres Of Air Compressor On Only In Overrun (L)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property LitresOfAirCompressorOnOnlyInOverrun As NormLiter
-
-		''' <summary>
-		''' Total Cycle Fuel Consumption Compressor *On* Continuously (G)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property TotalCycleFuelConsumptionCompressorOnContinuously As Kilogram
-
-		''' <summary>
-		''' Total Cycle Fuel Consumption Compressor *OFF* Continuously (G)
-		''' </summary>
-		''' <value></value>
-		''' <returns></returns>
-		''' <remarks></remarks>
-		ReadOnly Property TotalCycleFuelConsumptionCompressorOffContinuously As Kilogram
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ActuationsKey.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ActuationsKey.vb
deleted file mode 100644
index 25a1844be1..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ActuationsKey.vb
+++ /dev/null
@@ -1,53 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Namespace Pneumatics
-	Public Class ActuationsKey
-		Private _consumerName As String
-		Private _cycleName As String
-
-'Properties
-		Public ReadOnly Property ConsumerName As String
-			Get
-				Return _consumerName
-			End Get
-		End Property
-
-		Public ReadOnly Property CycleName As String
-			Get
-				Return _cycleName
-			End Get
-		End Property
-
-'Constructor
-		Public Sub New(consumerName As String, cycleName As String)
-
-			If consumerName.Trim.Length = 0 Or cycleName.Trim.Length = 0 Then _
-				Throw New ArgumentException("ConsumerName and CycleName must be provided")
-			_consumerName = consumerName
-			_cycleName = cycleName
-		End Sub
-
-
-		'Overrides to enable this class to be used as a dictionary key in the ActuationsMap.
-		Public Overrides Function Equals(obj As Object) As Boolean
-
-			Dim other As ActuationsKey = CType(obj, ActuationsKey)
-
-			Return other.ConsumerName = Me.ConsumerName AndAlso other.CycleName = Me.CycleName
-		End Function
-
-		Public Overrides Function GetHashCode() As Integer
-			Return 0
-		End Function
-	End Class
-End Namespace
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ICompressorMap.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ICompressorMap.vb
deleted file mode 100644
index 54a44ba6a2..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/ICompressorMap.vb
+++ /dev/null
@@ -1,50 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Namespace Pneumatics
-	Public Interface ICompressorMap
-		Inherits IAuxiliaryEvent
-
-		''' <summary>
-		''' Initilaises the map from the supplied csv data
-		''' </summary>
-		''' <remarks></remarks>
-		Function Initialise() As Boolean
-
-		''' <summary>
-		''' Returns compressor flow rate at the given rotation speed
-		''' </summary>
-		''' <param name="rpm">compressor rotation speed</param>
-		''' <returns></returns>
-		''' <remarks>Single</remarks>
-		Function GetFlowRate(ByVal rpm As Double) As NormLiterPerSecond
-
-		''' <summary>
-		''' Returns mechanical power at rpm when compressor is on
-		''' </summary>
-		''' <param name="rpm">compressor rotation speed</param>
-		''' <returns></returns>
-		''' <remarks>Single</remarks>
-		Function GetPowerCompressorOn(ByVal rpm As Double) As Watt
-
-		''' <summary>
-		''' Returns mechanical power at rpm when compressor is off
-		''' </summary>
-		''' <param name="rpm">compressor rotation speed</param>
-		''' <returns></returns>
-		''' <remarks>Single</remarks>
-		Function GetPowerCompressorOff(ByVal rpm As Double) As Watt
-
-		'Returns Average Power Demand Per Compressor Unit FlowRate
-		Function GetAveragePowerDemandPerCompressorUnitFlowRate() As Double
-	End Interface
-End Namespace
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.vb
deleted file mode 100644
index a70dc531c3..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticActuationsMAP.vb
+++ /dev/null
@@ -1,21 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-Namespace Pneumatics
-	Public Interface IPneumaticActuationsMAP
-		Function GetNumActuations(key As ActuationsKey) As Integer
-
-		Function Initialise() As Boolean
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.vb
deleted file mode 100644
index 9b483698dc..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticUserInputsConfig.vb
+++ /dev/null
@@ -1,29 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-Namespace Pneumatics
-	Public Interface IPneumaticUserInputsConfig
-		Property CompressorMap As String
-		Property CompressorGearEfficiency As Double
-		Property CompressorGearRatio As Double
-		Property ActuationsMap As String
-		Property SmartAirCompression As Boolean
-		Property SmartRegeneration As Boolean
-		Property RetarderBrake As Boolean
-		Property KneelingHeightMillimeters As Double
-		Property AirSuspensionControl As String 'mechanical or electrical
-		Property AdBlueDosing As String 'pnmeumatic or electric
-		Property Doors As String 'pneumatic or electric
-	End Interface
-End Namespace
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.vb
deleted file mode 100644
index 02d7ea34bf..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/DownstreamModules/PneumaticSystem/IPneumaticsAuxilliariesConfig.vb
+++ /dev/null
@@ -1,25 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Public Interface IPneumaticsAuxilliariesConfig
-	Property OverrunUtilisationForCompressionFraction As Double
-	Property BrakingWithRetarderNIperKG As Double
-	Property BrakingNoRetarderNIperKG As Double
-	Property BreakingPerKneelingNIperKGinMM As Double
-	Property PerDoorOpeningNI As Double
-	Property PerStopBrakeActuationNIperKG As Double
-	Property AirControlledSuspensionNIperMinute As Double
-	Property AdBlueNIperMinute As Double
-	Property NonSmartRegenFractionTotalAirDemand As Double
-	Property SmartRegenFractionTotalAirDemand As Double
-	Property DeadVolumeLitres As Double
-	Property DeadVolBlowOutsPerLitresperHour As Double
-End Interface
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/Enumerations.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/Enumerations.vb
deleted file mode 100644
index 91fbeb0836..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/Enumerations.vb
+++ /dev/null
@@ -1,22 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-'Used to classify messages to the invoking host.
-
-Public Enum AdvancedAuxiliaryMessageType 
-
-   Information=1
-   Warning=2
-   Critical=3
-
-
-End Enum
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
deleted file mode 100644
index 935f386c75..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb
+++ /dev/null
@@ -1,136 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Public Interface IAdvancedAuxiliaries
-	' Inherits IAuxiliaryEvent
-
-	Event AuxiliaryEvent(ByRef sender As Object, ByVal message As String, ByVal messageType As AdvancedAuxiliaryMessageType)
-
-
-	'Information
-	ReadOnly Property Running As Boolean
-
-	ReadOnly Property AuxiliaryName As String
-	ReadOnly Property AuxiliaryVersion As String
-
-	'Additional Permenent Monitoring Signals - Required by engineering
-	ReadOnly Property AA_NonSmartAlternatorsEfficiency As Double
-	ReadOnly Property AA_SmartIdleCurrent_Amps As Ampere
-	ReadOnly Property AA_SmartIdleAlternatorsEfficiency As Double
-	ReadOnly Property AA_SmartTractionCurrent_Amps As Ampere
-	ReadOnly Property AA_SmartTractionAlternatorEfficiency As Double
-	ReadOnly Property AA_SmartOverrunCurrent_Amps As Ampere
-	ReadOnly Property AA_SmartOverrunAlternatorEfficiency As Double
-	ReadOnly Property AA_CompressorFlowRate_LitrePerSec As NormLiterPerSecond
-	ReadOnly Property AA_OverrunFlag As Boolean
-	ReadOnly Property AA_EngineIdleFlag As Integer?
-	ReadOnly Property AA_CompressorFlag As Boolean
-	ReadOnly Property AA_TotalCycleFC_Grams As Kilogram
-	ReadOnly Property AA_TotalCycleFC_Litres As Liter
-	ReadOnly Property AA_AveragePowerDemandCrankHVACMechanicals As Watt
-	ReadOnly Property AA_AveragePowerDemandCrankHVACElectricals As Watt
-	ReadOnly Property AA_AveragePowerDemandCrankElectrics As Watt
-	ReadOnly Property AA_AveragePowerDemandCrankPneumatics As Watt
-	ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Kilogram
-	ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Kilogram
-
-	''' <summary>
-	''' Total Cycle Fuel In Grams
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	ReadOnly Property TotalFuelGRAMS As Kilogram
-
-	''' <summary>
-	''' Total Cycle Fuel in Litres
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	ReadOnly Property TotalFuelLITRES As Liter
-
-	''' <summary>
-	''' Total Power Demans At Crank From Auxuliaries (W)
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	ReadOnly Property AuxiliaryPowerAtCrankWatts As Watt
-
-
-	''' <summary>
-	''' Vecto Inputs
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property VectoInputs As IVectoInputs
-
-	''' <summary>
-	''' Signals From Vecto 
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property Signals As ISignals
-
-	''' <summary>
-	''' Configure Auxuliaries ( Launches Config Form )
-	''' </summary>
-	''' <param name="filePath"></param>
-	''' <param name="vectoFilePath"></param>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Function Configure(filePath As String, vectoFilePath As String) As Boolean
-
-	''' <summary>
-	''' Validate AAUX file path supplied.
-	''' </summary>
-	''' <param name="filePath"></param>
-	''' <param name="message"></param>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Function ValidateAAUXFile(ByVal filePath As String, ByRef message As String) As Boolean
-
-	'Command
-	''' <summary>
-	''' Cycle Step - Used to calculate fuelling
-	''' </summary>
-	''' <param name="seconds"></param>
-	''' <param name="message"></param>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Function CycleStep(seconds As Second, ByRef message As String) As Boolean
-
-	''' <summary>
-	''' Initialises AAUX Environment ( Begin Processs )
-	''' </summary>
-	''' <param name="auxFilePath"></param>
-	''' <param name="vectoFilePath"></param>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Function RunStart(ByVal auxFilePath As String, ByVal vectoFilePath As String) As Boolean
-
-	''' <summary>
-	''' Any Termination Which Needs to be done ( Model depenent )
-	''' </summary>
-	''' <param name="message"></param>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Function RunStop(ByRef message As String) As Boolean
-
-    Sub ResetCalculations()
-
-End Interface
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/IAuxiliaryEvent.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/IAuxiliaryEvent.vb
deleted file mode 100644
index 44721ccf16..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/IAuxiliaryEvent.vb
+++ /dev/null
@@ -1,17 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Public Interface IAuxiliaryEvent
-
-  Event AuxiliaryEvent( ByRef sender As Object, byval message As String, ByVal messageType As AdvancedAuxiliaryMessageType )
-
-End interface
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/IDiagnostics.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/IDiagnostics.vb
deleted file mode 100644
index 0ac7de6ec6..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/IDiagnostics.vb
+++ /dev/null
@@ -1,32 +0,0 @@
-
-' Copyright 2015 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Public Interface IDiagnostics
-
-
-    Property AA_NonSmartAlternatorsEfficiency As single
-    Property AA_SmartIdleCurrent_Amps As single
-    Property AA_SmartIdleAlternatorsEfficiency As single
-    Property AA_SmartTractionCurrent_Amps As single
-    Property AA_SmartTractionAlternatorEfficiency As single
-    Property AA_SmartOverrunCurrent_Amps As Single
-    Property AA_SmartOverrunAlternatorEfficiency As Single
-    Property AA_CompressorFlowRate_LitrePerSec As Single
-    Property AA_OverrunFlag As integer
-    Property AA_EngineIdleFlag As integer
-    Property AA_CompressorFlag As integer
-    Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As single
-    Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As single
-
-
-
-End Interface
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb
deleted file mode 100644
index 3d5d0a3e3e..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/IFuelConsumptionMap.vb
+++ /dev/null
@@ -1,12 +0,0 @@
-Imports TUGraz.VectoCommon.Utils
-
-Public Interface IFuelConsumptionMap
-	''' <summary>
-	''' 
-	''' </summary>
-	''' <param name="torque"></param>
-	''' <param name="angularVelocity"></param>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As PerSecond) As KilogramPerSecond
-End Interface
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/ISignals.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/ISignals.vb
deleted file mode 100644
index 3d3095e85a..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/ISignals.vb
+++ /dev/null
@@ -1,181 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Public Interface ISignals
-	''' <summary>
-	''' Pre Existing Aux Power (KW)
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input</remarks>
-	Property PreExistingAuxPower As Watt
-
-	''' <summary>
-	''' Engine Motoring Power (KW)
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input</remarks>
-	Property EngineMotoringPower As Watt
-
-	''' <summary>
-	''' Engine Driveline Power (KW)
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property EngineDrivelinePower As Watt
-
-	''' <summary>
-	''' Smart Electrics
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Should be true if fitted to the vehicle - AAUX Input</remarks>
-	Property SmartElectrics As Boolean
-
-	''' <summary>
-	''' Clucth Engaged
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input</remarks>
-	Property ClutchEngaged As Boolean
-
-	''' <summary>
-	''' Engine Speed 1/NU
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' 
-	Property EngineSpeed As PerSecond
-
-	''' <summary>
-	''' Smart Pneumatics
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>should be true if fitted to the vehicle- AAux Config Input</remarks>
-	Property SmartPneumatics As Boolean
-
-	''' <summary>
-	''' Total Cycle Time In Seconds
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input</remarks>
-	Property TotalCycleTimeSeconds As Integer
-
-	''' <summary>
-	''' Current Cycle Time In Seconds 
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>( Will Increment during Cycle )</remarks>
-	Property CurrentCycleTimeInSeconds As Double
-
-	''' <summary>
-	''' Engine Driveline Torque
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input</remarks>
-	Property EngineDrivelineTorque As NewtonMeter
-
-	''' <summary>
-	''' Engine Idle
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input</remarks>
-	Property Idle As Boolean
-
-	''' <summary>
-	''' In Neutral
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input</remarks>
-	Property InNeutral As Boolean
-
-	''' <summary>
-	''' Auxiliary Event Reporting Level
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Can be used by Vecto to choose the level of reporting</remarks>
-	Property AuxiliaryEventReportingLevel As AdvancedAuxiliaryMessageType
-
-	''' <summary>
-	''' Engine Stopped 
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>'Vecto Input - Used to Cut Fueling in AAux model</remarks>
-	Property EngineStopped As Boolean
-
-	''' <summary>
-	''' WHTC ( Correction factor to be applied )
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>'Vecto Input</remarks>
-	Property WHTC As Double
-
-	''' <summary>
-	''' Declaration Mode
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>Vecto Input - Used to decide if to apply WHTC/Possiblye other things in future</remarks>
-	Property DeclarationMode As Boolean
-
-	''' <summary>
-	''' Engine Idle Speed ( Associated with the vehicle bein tested )
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property EngineIdleSpeed As PerSecond
-
-	''' <summary>
-	''' Pneumatic Overrun Utilisation
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property PneumaticOverrunUtilisation As Double
-
-	''' <summary>
-	''' Stored Energy Efficiency
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property StoredEnergyEfficiency As Double
-
-	''' <summary>
-	''' Running Calc
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property RunningCalc As Boolean
-
-	''' <summary>
-	''' Running Calc
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property InternalEnginePower As Watt
-End Interface
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/IVectoInputs.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/IVectoInputs.vb
deleted file mode 100644
index 491315a450..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/IVectoInputs.vb
+++ /dev/null
@@ -1,55 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Public Interface IVectoInputs
-	''' <summary>
-	''' Vehicle Mass (KG)
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property VehicleWeightKG As Kilogram
-
-	''' <summary>
-	''' Cycle ( Urban, Interurban etc )
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property Cycle As String
-
-	''' <summary>
-	''' PowerNet Voltage (V) Volts available on the bus by Batteries
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property PowerNetVoltage As Volt
-
-	''' <summary>
-	''' Fuel Map Used in Vecto.
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property FuelMap As IFuelConsumptionMap
-
-	Property FuelMapFile As String
-
-	''' <summary>
-	''' Fuel density used in Vecto.
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Property FuelDensity As KilogramPerCubicMeter
-End Interface
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.Designer.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.Designer.vb
deleted file mode 100644
index 8ab460ba03..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.Designer.vb	
+++ /dev/null
@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.myapp b/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.myapp
deleted file mode 100644
index 758895def2..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Application.myapp	
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <MySubMain>false</MySubMain>
-  <SingleInstance>false</SingleInstance>
-  <ShutdownMode>0</ShutdownMode>
-  <EnableVisualStyles>true</EnableVisualStyles>
-  <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>1</ApplicationType>
-  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/AssemblyInfo.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/AssemblyInfo.vb
deleted file mode 100644
index b0d273e2a8..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/AssemblyInfo.vb	
+++ /dev/null
@@ -1,35 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following 
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("AdvancedAuxiliaryInterfaces")> 
-<Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("AEA Group")> 
-<Assembly: AssemblyProduct("AdvancedAuxiliaryInterfaces")> 
-<Assembly: AssemblyCopyright("Copyright © AEA Group 2014")> 
-<Assembly: AssemblyTrademark("")> 
-
-<Assembly: ComVisible(False)>
-
-'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("199bde21-c55e-4442-a77c-90f437a7cf27")> 
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Version
-'      Minor Version 
-'      Build Number
-'      Revision
-'
-' You can specify all the values or you can default the Build and Revision Numbers 
-' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("1.0.*")> 
-
-<Assembly: AssemblyVersion("1.0.0.0")> 
-<Assembly: AssemblyFileVersion("1.0.0.0")> 
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.Designer.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.Designer.vb
deleted file mode 100644
index 0b266d4e9c..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.Designer.vb	
+++ /dev/null
@@ -1,63 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-
-Namespace My.Resources
-    
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
-    Friend Module Resources
-        
-        Private resourceMan As Global.System.Resources.ResourceManager
-        
-        Private resourceCulture As Global.System.Globalization.CultureInfo
-        
-        '''<summary>
-        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
-            Get
-                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VectoAuxiliaries.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.resx b/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.resx
deleted file mode 100644
index af7dbebbac..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Resources.resx	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.Designer.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.Designer.vb
deleted file mode 100644
index 950881703c..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.Designer.vb	
+++ /dev/null
@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"),  _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-    Partial Friend NotInheritable Class MySettings
-        Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
-#Region "Funktion zum automatischen Speichern von My.Settings"
-#If _MyType = "WindowsForms" Then
-    Private Shared addedHandler As Boolean
-
-    Private Shared addedHandlerLockObject As New Object
-
-    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
-        If My.Application.SaveMySettingsOnExit Then
-            My.Settings.Save()
-        End If
-    End Sub
-#End If
-#End Region
-        
-        Public Shared ReadOnly Property [Default]() As MySettings
-            Get
-                
-#If _MyType = "WindowsForms" Then
-               If Not addedHandler Then
-                    SyncLock addedHandlerLockObject
-                        If Not addedHandler Then
-                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                            addedHandler = True
-                        End If
-                    End SyncLock
-                End If
-#End If
-                Return defaultInstance
-            End Get
-        End Property
-    End Class
-End Namespace
-
-Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
-    Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.VectoAuxiliaries.My.MySettings
-            Get
-                Return Global.VectoAuxiliaries.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.settings b/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.settings
deleted file mode 100644
index 85b890b3c6..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/My Project/Settings.settings	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/Signals.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/Signals.vb
deleted file mode 100644
index 37e4d27d57..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/Signals.vb
+++ /dev/null
@@ -1,64 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports TUGraz.VectoCommon.Utils
-
-Public Class Signals
-	Implements ISignals
-
-	'Backing variables
-	Private _WHTCCorretion As Single = 1
-	Private _smartElectrics As Boolean
-
-	Public Property ClutchEngaged As Boolean Implements ISignals.ClutchEngaged
-	Public Property EngineDrivelinePower As Watt Implements ISignals.EngineDrivelinePower
-	Public Property EngineDrivelineTorque As NewtonMeter Implements ISignals.EngineDrivelineTorque
-	Public Property EngineMotoringPower As Watt Implements ISignals.EngineMotoringPower
-	Public Property EngineSpeed As PerSecond Implements ISignals.EngineSpeed
-
-	Public Property SmartElectrics As Boolean Implements ISignals.SmartElectrics
-		Get
-			Return _smartElectrics
-		End Get
-		Set(value As Boolean)
-			_smartElectrics = value
-		End Set
-	End Property
-
-	Public Property SmartPneumatics As Boolean Implements ISignals.SmartPneumatics
-	Public Property TotalCycleTimeSeconds As Integer Implements ISignals.TotalCycleTimeSeconds
-	Public Property CurrentCycleTimeInSeconds As Double Implements ISignals.CurrentCycleTimeInSeconds
-	Public Property PreExistingAuxPower As Watt Implements ISignals.PreExistingAuxPower
-	Public Property Idle As Boolean Implements ISignals.Idle
-	Public Property InNeutral As Boolean Implements ISignals.InNeutral
-
-	Public Property AuxiliaryEventReportingLevel As AdvancedAuxiliaryMessageType _
-		Implements ISignals.AuxiliaryEventReportingLevel
-
-	Public Property EngineStopped As Boolean Implements ISignals.EngineStopped
-	Public Property DeclarationMode As Boolean Implements ISignals.DeclarationMode
-
-	Public Property WHTC As Double Implements ISignals.WHTC
-		Set(value As Double)
-			_WHTCCorretion = value
-		End Set
-		Get
-			Return _WHTCCorretion
-		End Get
-	End Property
-
-	Public Property EngineIdleSpeed As PerSecond Implements ISignals.EngineIdleSpeed
-	Public Property PneumaticOverrunUtilisation As Double Implements ISignals.PneumaticOverrunUtilisation
-	Public Property StoredEnergyEfficiency As Double Implements ISignals.StoredEnergyEfficiency
-	Public Property RunningCalc As Boolean Implements ISignals.RunningCalc
-	Public Property InternalEnginePower As Watt Implements ISignals.InternalEnginePower
-End Class
-
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/VectoInputs.vb b/VectoCommon/AdvancedAuxiliaryInterfaces/VectoInputs.vb
deleted file mode 100644
index 657a872779..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/VectoInputs.vb
+++ /dev/null
@@ -1,91 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports Newtonsoft.Json
-Imports TUGraz.VectoCommon.Utils
-
-Public Class VectoInputs
-	Implements IVectoInputs
-
-	''' <summary>
-	''' Name of the Cycle ( Urban, Interurban etc )
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	Public Property Cycle As String Implements IVectoInputs.Cycle
-
-	''' <summary>
-	''' Vehicle Mass (KG)
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	<JsonIgnore>
-	Public Property VehicleWeightKG As Kilogram Implements IVectoInputs.VehicleWeightKG
-		Get
-			Return _vehicleWeight.SI(Of Kilogram)()
-		End Get
-		Set(value As Kilogram)
-			_vehicleWeight = value.Value()
-		End Set
-	End Property
-
-	<JsonProperty("VehicleWeightKG")> Dim _vehicleWeight As Double
-
-	''' <summary>
-	''' Powernet Voltage (V)
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks>This is the power voltage available in the bus - usually 26.3 Volts</remarks>
-	<JsonIgnore>
-	Public Property PowerNetVoltage As Volt Implements IVectoInputs.PowerNetVoltage
-		Get
-			Return _powerNetVoltage.SI(Of Volt)()
-		End Get
-		Set(value As Volt)
-			_powerNetVoltage = value.Value()
-		End Set
-	End Property
-
-	<JsonProperty("PowerNetVoltage")> Dim _powerNetVoltage As Double
-
-	''' <summary>
-	''' Fuel Map Same One as used in Vecto.
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	<JsonIgnore>
-	Public Property FuelMap As IFuelConsumptionMap Implements IVectoInputs.FuelMap
-
-	<JsonProperty("FuelMap")>
-	Public Property FuelMapFile As String Implements IVectoInputs.FuelMapFile
-
-	''' <summary>
-	''' Fuel Density as used in Vecto.
-	''' </summary>
-	''' <value></value>
-	''' <returns></returns>
-	''' <remarks></remarks>
-	<JsonIgnore>
-	Public Property FuelDensity As KilogramPerCubicMeter Implements IVectoInputs.FuelDensity
-		Get
-			Return _fuelDensity.SI(Of KilogramPerCubicMeter)()
-		End Get
-		Set(value As KilogramPerCubicMeter)
-			_fuelDensity = value.Value()
-		End Set
-	End Property
-
-	<JsonProperty("FuelDensity")> Dim _fuelDensity As Double
-End Class
-
diff --git a/VectoCommon/AdvancedAuxiliaryInterfaces/packages.config b/VectoCommon/AdvancedAuxiliaryInterfaces/packages.config
deleted file mode 100644
index 6b50e260ed..0000000000
--- a/VectoCommon/AdvancedAuxiliaryInterfaces/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" requireReinstallation="True" />
-</packages>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 39197ddea9..1fd7136f6b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -32,8 +32,10 @@
 using System;
 using System.IO;
 using System.Linq;
+using Pneumatics;
 using TUGraz.VectoCommon.Models;
 using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.BusAuxiliaries.Interfaces;
 using TUGraz.VectoCore.Models.Declaration;
 using TUGraz.VectoCore.Models.Simulation;
 using TUGraz.VectoCore.Models.Simulation.Data;
@@ -41,7 +43,6 @@ using TUGraz.VectoCore.Models.Simulation.DataBus;
 using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
 using TUGraz.VectoCore.OutputData;
 using VectoAuxiliaries;
-using VectoAuxiliaries.Pneumatics;
 
 namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 {
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 2c1299b072..95cd85ccd4 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -719,9 +719,9 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
-      <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
-      <Name>AdvancedAuxiliaryInterfaces</Name>
+    <ProjectReference Include="..\..\VECTOAux\BusAuxiliaries\BusAuxiliaries.csproj">
+      <Project>{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}</Project>
+      <Name>BusAuxiliaries</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
       <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
-- 
GitLab