From 2007823699793643d7085c1a50bfb4c380b302d6 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 24 Sep 2019 10:48:18 +0200
Subject: [PATCH] renaming generated binaries, cleanup imports, adapt testdata
 to new namespaces of types (.ahsm, .aaux), make testcases run

---
 VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj |   2 +-
 .../Impl/HVAC/SSMCalculate.cs                 |  23 ++-
 .../DownstreamModules/Impl/HVAC/SSMTOOL.cs    |   2 +-
 .../DownstreamModules/HVAC/ISSMCalculate.cs   |   4 +-
 VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs |   2 +-
 .../VectoAuxiliaries/AdvancedAuxiliaries.vb   |  96 +++++++------
 VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb  |   9 +-
 VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb |   6 +-
 .../VectoAuxiliaries/VectoAuxiliaries.vbproj  |   9 +-
 .../IntegrationTests/AuxDemandTest.vb         |   1 -
 .../TestFiles/AdvAuxTest.aaux                 |  62 ++++----
 .../TestFiles/Integration/AdvAuxTest.aaux     |  62 ++++----
 .../TestFiles/Integration/testHVACssm.AHSM    |  60 ++++----
 .../VectoAuxiliariesTests/TestFiles/ssm.Ahsm  | 136 +++++++++---------
 .../UnitTests/AirCompressorTests.vb           |   4 +-
 .../UnitTests/AlternatorMapTests.vb           |   1 -
 .../AuxiliaryEnvironmentComparisonTests.vb    |   4 +-
 .../AuxiliaryEnvironmentPersistanceTests.vb   |   4 +-
 .../AveragePneumaticLoadDemandTests.vb        |   5 +-
 .../UnitTests/BusDatabaseTests.vb             |   1 -
 .../UnitTests/CombinedAlternatorTests.vb      |   3 +-
 .../UnitTests/CompressorMapTests.vb           |   2 +-
 .../UnitTests/ElectricalConsumerListTests.vb  |   2 +-
 .../UnitTests/ElectricalConsumerTests.vb      |   2 +-
 .../UnitTests/FilePathUtilityTests.vb         |   4 +-
 .../UnitTests/HVACSSMMapTests.vb              |   1 -
 .../M0_5_SmartAlternatorSetEfficiencyTests.vb |   4 +-
 ..._NonSmart_AlternatorsSetEfficiencyTests.vb |   2 -
 .../UnitTests/M10Tests.vb                     |   3 +-
 .../UnitTests/M11Tests.vb                     |   3 +-
 .../UnitTests/M12Tests.vb                     |   3 +-
 .../UnitTests/M13Tests.vb                     |   2 -
 .../UnitTests/M14Tests.vb                     |   1 -
 .../M1_AverageHVACLoadDemandTests.vb          |  16 +--
 .../M2_AverageElectricalLoadTests.vb          |   4 +-
 .../M5_SmartAlternatorSetGenerationTests.vb   |   5 +-
 .../UnitTests/M6Tests.vb                      |   2 +-
 .../UnitTests/M7Tests.vb                      |   3 +-
 .../UnitTests/M8Tests.vb                      |   2 +-
 .../UnitTests/M9Tests.vb                      |   3 +-
 .../UnitTests/PneumaticActuationsMapTests.vb  |   1 -
 .../UnitTests/ResultCardTests.vb              |   2 +-
 .../UnitTests/SSMTOOLTests.vb                 |  10 +-
 .../VectoAuxiliariesTests.vbproj              |   4 -
 44 files changed, 293 insertions(+), 284 deletions(-)

diff --git a/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj b/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
index b4889beeed..b4cdb4b1be 100644
--- a/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
+++ b/VECTOAux/BusAuxiliaries/BusAuxiliaries.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TUGraz.VectoCore.BusAuxiliaries</RootNamespace>
-    <AssemblyName>BusAuxiliariesC</AssemblyName>
+    <AssemblyName>BusAuxiliaries</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs
index b206d71468..5e96572d75 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMCalculate.cs
@@ -8,13 +8,14 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 	public class SSMCalculate : ISSMCalculate
 	{
 		private ISSMTOOL ssmTOOL;
-		public ISSMRun Run1 { get; set; }
-		public ISSMRun Run2 { get; set; }
+
+		private ISSMRun Run1; // { get; set; }
+		private ISSMRun Run2 { get; set; }
 
 		// Constructor
 		public SSMCalculate(ISSMTOOL ssmTool)
 		{
-			this.ssmTOOL = ssmTool;
+			ssmTOOL = ssmTool;
 			Run1 = new SSMRun(this.ssmTOOL, 1);
 			Run2 = new SSMRun(this.ssmTOOL, 2);
 		}
@@ -383,7 +384,21 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 				// Dim C43 As Double   =  gen.BC_MaxPossibleBenefitFromTechnologyList
 				// Dim C53 As string   =  gen.AC_CompressorType
 
-				result = gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0 > 0 ? Math.Min(gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0, gen.BC_MaxPossibleBenefitFromTechnologyList) : Math.Max(gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0, -gen.BC_MaxPossibleBenefitFromTechnologyList);
+				//result = If(If(gen.AC_CompressorType.ToLower() = "mechanical", tl.CValueVariation, 0) > 0,
+				//			Math.Min(If(gen.AC_CompressorType.ToLower() = "mechanical", tl.CValueVariation, 0),
+				//					gen.BC_MaxPossibleBenefitFromTechnologyList),
+				//			Math.Max(If(gen.AC_CompressorType.ToLower() = "mechanical", tl.CValueVariation, 0),
+				//					-gen.BC_MaxPossibleBenefitFromTechnologyList))
+
+				result = (gen.AC_CompressorType.ToLower() == "mechanical"
+					? tl.CValueVariation
+					: 0) > 0
+						? Math.Min(
+							gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0,
+							gen.BC_MaxPossibleBenefitFromTechnologyList)
+						: Math.Max(
+							gen.AC_CompressorType.ToLower() == "mechanical" ? tl.CValueVariation : 0,
+							-gen.BC_MaxPossibleBenefitFromTechnologyList);
 
 				return result;
 			}
diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
index f95831aa13..94c9ce57fd 100644
--- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
+++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/HVAC/SSMTOOL.cs
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 		{
 			var feedback = string.Empty;
 
-			GenInputs.InjectFrom((SSMTOOL)from.GenInputs);
+			GenInputs.InjectFrom(((SSMTOOL)from).GenInputs);
 
 			TechList.Clear();
 
diff --git a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
index 4f3a63eebc..2517041bef 100644
--- a/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
+++ b/VECTOAux/BusAuxiliaries/Interfaces/DownstreamModules/HVAC/ISSMCalculate.cs
@@ -2,8 +2,8 @@
 {
 	public interface ISSMCalculate
 	{
-		ISSMRun Run1 { get; set; }
-		ISSMRun Run2 { get; set; }
+		//ISSMRun Run1 { get; set; }
+		//ISSMRun Run2 { get; set; }
 
 
 		double ElectricalWBase { get; }
diff --git a/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs b/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs
index 5a5db65d9c..34385bbcfe 100644
--- a/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs
+++ b/VECTOAux/BusAuxiliaries/Util/FilePathUtils.cs
@@ -89,7 +89,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.Util {
 		{
 
 			// No Vecto Path supplied
-			if (vectoPath == "")
+			if (string.IsNullOrEmpty(vectoPath))
 				return filename;
 
 			// This is not relative
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 022ffe820c..6a8179abea 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -71,15 +71,15 @@ Public Class AdvancedAuxiliaries
     Private hvacConstants As HVACConstants
 
     'Event Handler top level bubble.
-    Public Sub VectoEventHandler(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
-        Handles compressorMap.AuxiliaryEvent, alternatorMap.AuxiliaryEvent, ssmTool.Message, ssmToolModule14.Message
+    'Public Sub VectoEventHandler(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
+    '    Handles compressorMap.AuxiliaryEvent, alternatorMap.AuxiliaryEvent, ssmTool.Message, ssmToolModule14.Message
 
-        If Signals.AuxiliaryEventReportingLevel <= messageType Then
+    '    If Signals.AuxiliaryEventReportingLevel <= messageType Then
 
-            RaiseEvent AuxiliaryEvent(sender, message, messageType)
+    '        RaiseEvent AuxiliaryEvent(sender, message, messageType)
 
-        End If
-    End Sub
+    '    End If
+    'End Sub
 
     'Constructor
     Public Sub New()
@@ -105,16 +105,19 @@ Public Class AdvancedAuxiliaries
         Signals.SmartElectrics = auxConfig.ElectricalUserInputsConfig.SmartElectrical
         Signals.StoredEnergyEfficiency = auxConfig.ElectricalUserInputsConfig.StoredEnergyEfficiency
         Signals.SmartPneumatics = auxConfig.PneumaticUserInputsConfig.SmartAirCompression
-        Signals.PneumaticOverrunUtilisation = auxConfig.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
+        Signals.PneumaticOverrunUtilisation =
+            auxConfig.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
 
         alternatorMap = New CombinedAlternator(
             FilePathUtils.ResolveFilePath(vectoDirectory, auxConfig.ElectricalUserInputsConfig.AlternatorMap), Signals)
 
         actuationsMap = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
-                                                                                auxConfig.PneumaticUserInputsConfig.ActuationsMap))
+                                                                                 auxConfig.PneumaticUserInputsConfig.
+                                                                                    ActuationsMap))
 
         compressorMap = New CompressorMap(FilePathUtils.ResolveFilePath(vectoDirectory,
-                                                                        auxConfig.PneumaticUserInputsConfig.CompressorMap))
+                                                                        auxConfig.PneumaticUserInputsConfig.
+                                                                           CompressorMap))
         compressorMap.Initialise()
 
         'fuelMap = New cMAP()
@@ -131,7 +134,7 @@ Public Class AdvancedAuxiliaries
         'SSM HVAC
         Dim ssmPath As String = FilePathUtils.ResolveFilePath(vectoDirectory, auxConfig.HvacUserInputsConfig.SSMFilePath)
         Dim BusDatabase As String = FilePathUtils.ResolveFilePath(vectoDirectory,
-                                                                auxConfig.HvacUserInputsConfig.BusDatabasePath)
+                                                                  auxConfig.HvacUserInputsConfig.BusDatabasePath)
         ssmTool = New SSMTOOL(ssmPath, hvacConstants, auxConfig.HvacUserInputsConfig.SSMDisabled)
 
         'This duplicate SSM is being created for use in M14 as its properties will be dynamically changed at that point
@@ -147,46 +150,50 @@ Public Class AdvancedAuxiliaries
 
 
         M0 = New M00Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
-                                                    alternatorMap,
-                                                    auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
-                                                    Signals,
-                                                    ssmTool)
+                         alternatorMap,
+                         auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
+                         Signals,
+                         ssmTool)
 
 
         Dim M05tmp As IM0_5_SmartAlternatorSetEfficiency = New M0_5Impl(M0,
-                                                                                                auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
-                                                                                                alternatorMap,
-                                                                                                auxConfig.ElectricalUserInputsConfig.ResultCardIdle,
-                                                                                                auxConfig.ElectricalUserInputsConfig.ResultCardTraction,
-                                                                                                auxConfig.ElectricalUserInputsConfig.ResultCardOverrun, Signals)
+                                                                        auxConfig.ElectricalUserInputsConfig.
+                                                                           ElectricalConsumers,
+                                                                        alternatorMap,
+                                                                        auxConfig.ElectricalUserInputsConfig.
+                                                                           ResultCardIdle,
+                                                                        auxConfig.ElectricalUserInputsConfig.
+                                                                           ResultCardTraction,
+                                                                        auxConfig.ElectricalUserInputsConfig.
+                                                                           ResultCardOverrun, Signals)
         M05 = M05tmp
 
         M1 = New M01Impl(M0,
-                                        auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
-                                        auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
-                                        auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
-                                        Signals,
-                                        ssmTool)
+                         auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
+                         auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
+                         auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
+                         Signals,
+                         ssmTool)
 
 
         M2 = New M02Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
-                                                M0,
-                                                auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
-                                                auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt), Signals)
+                         M0,
+                         auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
+                         auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt), Signals)
 
 
         M3 = New M03Impl(auxConfig.PneumaticUserInputsConfig,
-                                                auxConfig.PneumaticAuxillariesConfig,
-                                                actuationsMap,
-                                                compressorMap,
-                                                VectoInputs.VehicleWeightKG,
-                                                VectoInputs.Cycle,
-                                                Signals)
+                         auxConfig.PneumaticAuxillariesConfig,
+                         actuationsMap,
+                         compressorMap,
+                         VectoInputs.VehicleWeightKG,
+                         VectoInputs.Cycle,
+                         Signals)
 
         M4 = New M04Impl(compressorMap, auxConfig.PneumaticUserInputsConfig.CompressorGearRatio,
-                                auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency, Signals)
-        M5 = New M05Impl(M05tmp, auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
-                                                auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency)
+                         auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency, Signals)
+        M5 = New M05Impl(M05tmp, auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
+                         auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency)
         M6 = New M06Impl(M1, M2, M3, M4, M5, Signals)
         M7 = New M07Impl(M5, M6, Signals)
         M8 = New M08Impl(M1, M6, M7, Signals)
@@ -295,7 +302,7 @@ Public Class AdvancedAuxiliaries
             If Not M13 Is Nothing Then
                 Return M14.TotalCycleFCGrams
             Else
-                Return 0.SI(Of Kilogram)()
+                Return 0.SI (Of Kilogram)()
             End If
         End Get
     End Property
@@ -305,7 +312,7 @@ Public Class AdvancedAuxiliaries
             If Not M14 Is Nothing Then
                 Return M14.TotalCycleFCLitres
             Else
-                Return 0.SI(Of Liter)()
+                Return 0.SI (Of Liter)()
             End If
         End Get
     End Property
@@ -328,14 +335,16 @@ Public Class AdvancedAuxiliaries
     'Helpers
     Private Function GetDoorActuationTimeFraction() As Single
 
-        Dim actuationsMap As PneumaticActuationsMAP = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
-                                                                                                                auxConfig.PneumaticUserInputsConfig.ActuationsMap))
+        Dim actuationsMap As PneumaticActuationsMAP =
+                New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
+                                                                         auxConfig.PneumaticUserInputsConfig.
+                                                                            ActuationsMap))
         Dim actuationsKey As ActuationsKey = New ActuationsKey("Park brake + 2 doors", VectoInputs.Cycle)
 
         Dim numActuations As Single = actuationsMap.GetNumActuations(actuationsKey)
         Dim secondsPerActuation As Single = auxConfig.ElectricalUserInputsConfig.DoorActuationTimeSecond
 
-        Dim doorDutyCycleFraction As Single = (numActuations * secondsPerActuation) / Signals.TotalCycleTimeSeconds
+        Dim doorDutyCycleFraction As Single = (numActuations*secondsPerActuation)/Signals.TotalCycleTimeSeconds
 
         Return doorDutyCycleFraction
     End Function
@@ -420,7 +429,9 @@ Public Class AdvancedAuxiliaries
 
             Return _
                 If _
-                    (Signals.EngineSpeed <= _Signals.EngineIdleSpeed AndAlso (Not Signals.ClutchEngaged OrElse Signals.InNeutral), 1, 0)
+                    (
+                        Signals.EngineSpeed <= _Signals.EngineIdleSpeed AndAlso
+                        (Not Signals.ClutchEngaged OrElse Signals.InNeutral), 1, 0)
         End Get
     End Property
 
@@ -490,5 +501,4 @@ Public Class AdvancedAuxiliaries
             Return M9.TotalCycleFuelConsumptionCompressorOnContinuously
         End Get
     End Property
-
 End Class
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index 11fa30aeaf..b79a10ba6e 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -14,13 +14,16 @@ 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 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
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
+Imports TUGraz.VectoCore.BusAuxiliaries.Legacy
 
 <Serializable()>
 Public Class AuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
index 4bb790cdf6..4b0efbda20 100644
--- a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
@@ -9,10 +9,10 @@
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
-Imports DownstreamModules.Electrics
-Imports DownstreamModules.HVAC
-Imports Pneumatics
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
 
 
 Public Interface IAuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index b046902f05..8f603b7556 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>VectoAuxiliaries</RootNamespace>
-    <AssemblyName>BusAuxiliaries</AssemblyName>
+    <AssemblyName>BusAuxiliariesGUI</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
@@ -27,7 +27,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>BusAuxiliaries.xml</DocumentationFile>
+    <DocumentationFile>BusAuxiliariesGUI.xml</DocumentationFile>
     <NoWarn>
     </NoWarn>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
@@ -39,7 +39,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>BusAuxiliaries.xml</DocumentationFile>
+    <DocumentationFile>BusAuxiliariesGUI.xml</DocumentationFile>
     <NoWarn>
     </NoWarn>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
@@ -90,9 +90,6 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AuxiliaryConfig.vb" />
-    <Compile Include="FilePathUtils.vb" />
-    <Compile Include="IAuxiliaryConfig.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index 5ebd431a07..6ae0157c8a 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -4,7 +4,6 @@ Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Legacy
-Imports VectoAuxiliaries
 
 Namespace IntegrationTests
     <TestFixture>
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux b/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux
index 5e8e8ba738..af74193dca 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/AdvAuxTest.aaux
@@ -1,7 +1,7 @@
 {
-  "$type": "VectoAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
+  "$type": "TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
   "VectoInputs": {
-    "$type": "VectoAuxiliaries.VectoInputs, AdvancedAuxiliaryInterfaces",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.Interfaces.VectoInputs, AdvancedAuxiliaryInterfaces",
     "Cycle": "Urban",
     "VehicleWeightKG": 16500.0,
     "PowerNetVoltage": 28.3,
@@ -9,16 +9,16 @@
     "FuelDensity": 0.832
   },
   "ElectricalUserInputsConfig": {
-    "$type": "VectoAuxiliaries.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
     "PowerNetVoltage": 28.3,
     "AlternatorMap": "testCombAlternatorMap_1Alt.AALT",
     "AlternatorGearEfficiency": 0.92,
     "ElectricalConsumers": {
-      "$type": "VectoAuxiliaries.Electrics.ElectricalConsumerList, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumerList, BusAuxiliaries",
       "DoorDutyCycleFraction": 0.096,
       "Items": [
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Doors",
           "ConsumerName": "Doors per Door",
@@ -29,7 +29,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": true,
           "Category": "Veh Electronics &Engine",
           "ConsumerName": "Controllers,Valves etc",
@@ -40,7 +40,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Radio City",
@@ -51,7 +51,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Radio Intercity",
@@ -62,7 +62,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Radio/Audio Tourism",
@@ -73,7 +73,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Fridge",
@@ -84,7 +84,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Kitchen Standard",
@@ -95,7 +95,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Interior lights City/ Intercity + Doorlights [1/m]",
@@ -106,7 +106,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "LED Interior lights ceiling city/ontercity + door [1/m]",
@@ -117,7 +117,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Interior lights Tourism + reading [1/m]",
@@ -128,7 +128,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "LED Interior lights ceiling Tourism + LED reading [1/m]",
@@ -139,7 +139,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Customer Specific Equipment",
           "ConsumerName": "External Displays Font/Side/Rear",
@@ -150,7 +150,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Customer Specific Equipment",
           "ConsumerName": "Internal display per unit ( front side rear)",
@@ -161,7 +161,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Customer Specific Equipment",
           "ConsumerName": "CityBus Ref EBSF Table4 Devices ITS No Displays",
@@ -172,7 +172,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Exterior Lights BULB",
@@ -183,7 +183,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Day running lights LED bonus",
@@ -194,7 +194,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Antifog rear lights LED bonus",
@@ -205,7 +205,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Position lights LED bonus",
@@ -216,7 +216,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Direction lights LED bonus",
@@ -227,7 +227,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Brake Lights LED bonus",
@@ -241,21 +241,21 @@
     },
     "DoorActuationTimeSecond": 4,
     "ResultCardIdle": {
-      "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
       "Results": []
     },
     "ResultCardTraction": {
-      "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
       "Results": []
     },
     "ResultCardOverrun": {
-      "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
       "Results": []
     },
     "SmartElectrical": false
   },
   "PneumaticUserInputsConfig": {
-    "$type": "VectoAuxiliaries.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
     "CompressorMap": "DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP",
     "CompressorGearRatio": 1.0,
     "CompressorGearEfficiency": 0.8,
@@ -269,7 +269,7 @@
     "SmartRegeneration": true
   },
   "PneumaticAuxillariesConfig": {
-    "$type": "VectoAuxiliaries.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
     "AdBlueNIperMinute": 21.25,
     "AirControlledSuspensionNIperMinute": 15.0,
     "BrakingNoRetarderNIperKG": 0.00081,
@@ -284,13 +284,13 @@
     "SmartRegenFractionTotalAirDemand": 0.12
   },
   "HvacUserInputsConfig": {
-    "$type": "VectoAuxiliaries.Hvac.HVACUserInputsConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Hvac.HVACUserInputsConfig, BusAuxiliaries",
     "SSMFilePath": "testHVACssm.AHSM",
     "BusDatabasePath": "BusDatabase.abdb",
     "SSMDisabled": false
   },
   "Signals": {
-    "$type": "VectoAuxiliaries.Signals, AdvancedAuxiliaryInterfaces",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Signals, AdvancedAuxiliaryInterfaces",
     "ClutchEngaged": false,
     "EngineDrivelinePower": 0.0,
     "EngineDrivelineTorque": 0.0,
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux
index 5e8e8ba738..134d8d901c 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux
@@ -1,7 +1,7 @@
 {
-  "$type": "VectoAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
+  "$type": "TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig, BusAuxiliaries",
   "VectoInputs": {
-    "$type": "VectoAuxiliaries.VectoInputs, AdvancedAuxiliaryInterfaces",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.Interfaces.VectoInputs, BusAuxiliaries",
     "Cycle": "Urban",
     "VehicleWeightKG": 16500.0,
     "PowerNetVoltage": 28.3,
@@ -9,16 +9,16 @@
     "FuelDensity": 0.832
   },
   "ElectricalUserInputsConfig": {
-    "$type": "VectoAuxiliaries.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricsUserInputsConfig, BusAuxiliaries",
     "PowerNetVoltage": 28.3,
     "AlternatorMap": "testCombAlternatorMap_1Alt.AALT",
     "AlternatorGearEfficiency": 0.92,
     "ElectricalConsumers": {
-      "$type": "VectoAuxiliaries.Electrics.ElectricalConsumerList, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumerList, BusAuxiliaries",
       "DoorDutyCycleFraction": 0.096,
       "Items": [
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Doors",
           "ConsumerName": "Doors per Door",
@@ -29,7 +29,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": true,
           "Category": "Veh Electronics &Engine",
           "ConsumerName": "Controllers,Valves etc",
@@ -40,7 +40,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Radio City",
@@ -51,7 +51,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Radio Intercity",
@@ -62,7 +62,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Radio/Audio Tourism",
@@ -73,7 +73,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Fridge",
@@ -84,7 +84,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Kitchen Standard",
@@ -95,7 +95,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Interior lights City/ Intercity + Doorlights [1/m]",
@@ -106,7 +106,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "LED Interior lights ceiling city/ontercity + door [1/m]",
@@ -117,7 +117,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "Interior lights Tourism + reading [1/m]",
@@ -128,7 +128,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Vehicle basic equipment",
           "ConsumerName": "LED Interior lights ceiling Tourism + LED reading [1/m]",
@@ -139,7 +139,7 @@
           "Info": "1 Per metre length of bus"
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Customer Specific Equipment",
           "ConsumerName": "External Displays Font/Side/Rear",
@@ -150,7 +150,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Customer Specific Equipment",
           "ConsumerName": "Internal display per unit ( front side rear)",
@@ -161,7 +161,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Customer Specific Equipment",
           "ConsumerName": "CityBus Ref EBSF Table4 Devices ITS No Displays",
@@ -172,7 +172,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Exterior Lights BULB",
@@ -183,7 +183,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Day running lights LED bonus",
@@ -194,7 +194,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Antifog rear lights LED bonus",
@@ -205,7 +205,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Position lights LED bonus",
@@ -216,7 +216,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Direction lights LED bonus",
@@ -227,7 +227,7 @@
           "Info": ""
         },
         {
-          "$type": "VectoAuxiliaries.Electrics.ElectricalConsumer, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ElectricalConsumer, BusAuxiliaries",
           "BaseVehicle": false,
           "Category": "Lights",
           "ConsumerName": "Brake Lights LED bonus",
@@ -241,21 +241,21 @@
     },
     "DoorActuationTimeSecond": 4,
     "ResultCardIdle": {
-      "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
       "Results": []
     },
     "ResultCardTraction": {
-      "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
       "Results": []
     },
     "ResultCardOverrun": {
-      "$type": "VectoAuxiliaries.Electrics.ResultCard, BusAuxiliaries",
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics.ResultCard, BusAuxiliaries",
       "Results": []
     },
     "SmartElectrical": false
   },
   "PneumaticUserInputsConfig": {
-    "$type": "VectoAuxiliaries.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticUserInputsConfig, BusAuxiliaries",
     "CompressorMap": "DEFAULT_2-Cylinder_1-Stage_650ccm.ACMP",
     "CompressorGearRatio": 1.0,
     "CompressorGearEfficiency": 0.8,
@@ -269,7 +269,7 @@
     "SmartRegeneration": true
   },
   "PneumaticAuxillariesConfig": {
-    "$type": "VectoAuxiliaries.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics.PneumaticsAuxilliariesConfig, BusAuxiliaries",
     "AdBlueNIperMinute": 21.25,
     "AirControlledSuspensionNIperMinute": 15.0,
     "BrakingNoRetarderNIperKG": 0.00081,
@@ -284,13 +284,13 @@
     "SmartRegenFractionTotalAirDemand": 0.12
   },
   "HvacUserInputsConfig": {
-    "$type": "VectoAuxiliaries.Hvac.HVACUserInputsConfig, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.HVACUserInputsConfig, BusAuxiliaries",
     "SSMFilePath": "testHVACssm.AHSM",
     "BusDatabasePath": "BusDatabase.abdb",
     "SSMDisabled": false
   },
   "Signals": {
-    "$type": "VectoAuxiliaries.Signals, AdvancedAuxiliaryInterfaces",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Signals, AdvancedAuxiliaryInterfaces",
     "ClutchEngaged": false,
     "EngineDrivelinePower": 0.0,
     "EngineDrivelineTorque": 0.0,
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM
index 1b75fdccf6..770ed286ea 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM
@@ -1,7 +1,7 @@
 {
-  "$type": "VectoAuxiliaries.Hvac.SSMTOOL, BusAuxiliaries",
+  "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTOOL, BusAuxiliaries",
   "GenInputs": {
-    "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
     "BP_BusModel": "DummyBus",
     "BP_NumberOfPassengers": 47.0,
     "BP_BusFloorType": "raised floor",
@@ -41,7 +41,7 @@
     "EC_EnviromentalTemperature": 25.0,
     "EC_Solar": 400.0,
     "EC_EnvironmentalConditionsMap": {
-      "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+      "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
     },
     "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
     "EC_EnviromentalConditions_BatchEnabled": true,
@@ -61,12 +61,12 @@
     "AH_CoolantHeatTransferredToAirCabinHeater": 0.75
   },
   "TechList": {
-    "$type": "VectoAuxiliaries.Hvac.SSMTechList, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTechList, BusAuxiliaries",
     "TechLines": [
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -106,7 +106,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -149,9 +149,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -191,7 +191,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -234,9 +234,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -276,7 +276,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -319,9 +319,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -361,7 +361,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -404,9 +404,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -446,7 +446,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -489,9 +489,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -531,7 +531,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -574,9 +574,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -616,7 +616,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -659,9 +659,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "DummyBus",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -701,7 +701,7 @@
           "EC_EnviromentalTemperature": 25.0,
           "EC_Solar": 400.0,
           "EC_EnvironmentalConditionsMap": {
-            "$type": "VectoAuxiliaries.Hvac.EnvironmentalConditionsMap, BusAuxiliaries"
+            "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.EnvironmentalConditionsMap, BusAuxiliaries"
           },
           "EC_EnviromentalConditions_BatchFile": "DefaultClimatic.aenv",
           "EC_EnviromentalConditions_BatchEnabled": true,
@@ -756,7 +756,7 @@
     "VVValueVariationKW": 0.0
   },
   "Calculate": {
-    "$type": "VectoAuxiliaries.Hvac.SSMCalculate, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMCalculate, BusAuxiliaries",
     "ElectricalWBase": 692.2979,
     "MechanicalWBase": 349.774,
     "FuelLPerHBase": 0.151278213,
@@ -790,7 +790,7 @@
   },
   "SSMDisabled": false,
   "HVACConstants": {
-    "$type": "VectoAuxiliaries.Hvac.HVACConstants, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.HVACConstants, BusAuxiliaries",
     "DieselGCVJperGram": 44800.0,
     "FuelDensity": 0.832
   },
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm b/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm
index 138a5abfef..54e3c00b52 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm
@@ -1,7 +1,7 @@
 {
-  "$type": "VectoAuxiliaries.Hvac.SSMTOOL, BusAuxiliaries",
+  "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTOOL, BusAuxiliaries",
   "GenInputs": {
-    "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
     "BP_BusModel": "IVECO - Arway Intercity 10.6m",
     "BP_NumberOfPassengers": 47.0,
     "BP_BusFloorType": "raised floor",
@@ -52,12 +52,12 @@
     "AH_FuelFiredHeaterkW": 10.0
   },
   "TechList": {
-    "$type": "VectoAuxiliaries.Hvac.SSMTechList, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMTechList, BusAuxiliaries",
     "TechLines": [
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -131,9 +131,9 @@
         "C": 0.01
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -207,9 +207,9 @@
         "C": 0.025
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -283,9 +283,9 @@
         "C": 0.024
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -359,9 +359,9 @@
         "C": -0.032
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -435,9 +435,9 @@
         "C": 0.05
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -511,9 +511,9 @@
         "C": 0.012
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -587,9 +587,9 @@
         "C": 0.021
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -663,9 +663,9 @@
         "C": 0.041
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -739,9 +739,9 @@
         "C": 0.029
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -815,9 +815,9 @@
         "C": 0.025
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -891,9 +891,9 @@
         "C": 0.012
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -967,9 +967,9 @@
         "C": 0.02
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1043,9 +1043,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1119,9 +1119,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1195,9 +1195,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1271,9 +1271,9 @@
         "C": -0.032
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1347,9 +1347,9 @@
         "C": -0.032
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1423,9 +1423,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1499,9 +1499,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1575,9 +1575,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1651,9 +1651,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1727,9 +1727,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1803,9 +1803,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1879,9 +1879,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -1955,9 +1955,9 @@
         "C": 0.02
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -2031,9 +2031,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -2107,9 +2107,9 @@
         "C": -0.2
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -2183,9 +2183,9 @@
         "C": 0.0
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -2259,9 +2259,9 @@
         "C": 0.012
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -2335,9 +2335,9 @@
         "C": 0.021
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -2411,9 +2411,9 @@
         "C": 0.012
       },
       {
-        "$type": "VectoAuxiliaries.Hvac.TechListBenefitLine, BusAuxiliaries",
+        "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.TechListBenefitLine, BusAuxiliaries",
         "inputSheet": {
-          "$type": "VectoAuxiliaries.Hvac.SSMGenInputs, BusAuxiliaries",
+          "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMGenInputs, BusAuxiliaries",
           "BP_BusModel": "IVECO - Arway Intercity 10.6m",
           "BP_NumberOfPassengers": 47.0,
           "BP_BusFloorType": "raised floor",
@@ -2499,7 +2499,7 @@
     "VVValueVariationKW": 0.0
   },
   "Calculate": {
-    "$type": "VectoAuxiliaries.Hvac.SSMCalculate, BusAuxiliaries",
+    "$type": "TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC.SSMCalculate, BusAuxiliaries",
     "ElectricalWBase": 296.699127,
     "MechanicalWBase": 1180.55444,
     "FuelLPerHBase": 0.0,
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
index ba6e2dd275..87e07497cd 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
@@ -1,11 +1,11 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
 Imports VectoAuxiliariesTests.Mocks
-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 1f65c5efdf..54d5a03dd5 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -1,5 +1,4 @@
 Imports System.IO
-Imports VectoAuxiliaries.Electrics
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
index df12234459..bca8b75ec5 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
@@ -1,8 +1,8 @@
 
 Imports NUnit.Framework
+Imports TUGraz.VectoCore.BusAuxiliaries
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
-Imports VectoAuxiliaries
-Imports AuxiliaryConfig = TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig
+
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
index 000dab5df4..9fc040fe60 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
@@ -1,7 +1,7 @@
 
 Imports NUnit.Framework
-Imports VectoAuxiliaries
-Imports AuxiliaryConfig = TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig
+Imports TUGraz.VectoCore.BusAuxiliaries
+
 
 Namespace UnitTests
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index e7e10954c7..8fb6266266 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -1,13 +1,10 @@
 
 Imports System.IO
-Imports VectoAuxiliaries.Pneumatics
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
-
 
 Namespace UnitTests
 	<TestFixture>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
index d7744b6e42..9ca701d372 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
@@ -1,7 +1,6 @@
 
 Imports NUnit.Framework
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
-Imports VectoAuxiliaries.Hvac
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 495e54635d..1dce66661c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -2,9 +2,10 @@
 
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
 Imports System.IO
+Imports Newtonsoft.Json
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index e540b2002a..917d3945b6 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -2,7 +2,7 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
-Imports VectoAuxiliaries.Pneumatics
+
 
 Namespace UnitTests
     <TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
index 2bd0b3ff32..014e74c5ae 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
@@ -2,7 +2,7 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
-Imports VectoAuxiliaries.Electrics
+
 
 <TestFixture()>
 Public Class ElectricalConsumerListTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
index 8c68ad96e3..f7429fd830 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
@@ -1,5 +1,5 @@
 
-Imports VectoAuxiliaries.Electrics
+
 Imports NUnit.Framework
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
index 3671ce1525..80506f039b 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
@@ -1,8 +1,8 @@
 
 
 Imports NUnit.Framework
-Imports VectoAuxiliaries
-Imports FilePathUtils = TUGraz.VectoCore.BusAuxiliaries.Util.FilePathUtils
+Imports TUGraz.VectoCore.BusAuxiliaries.Util
+
 
 Namespace UnitTests
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
index d0179250df..25e6d48600 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
@@ -1,7 +1,6 @@
 
 Imports NUnit.Framework
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
-Imports VectoAuxiliaries.Hvac
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index 1f584b94d8..8c2ec0e6f9 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -1,6 +1,4 @@
 Imports System.IO
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Hvac
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
@@ -134,6 +132,8 @@ Namespace UnitTests
 
 			Assert.AreEqual(expected, actual, 0.000001)
 		End Sub
+
+       
 	End Class
 End Namespace
 
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 60fc60edfb..c4457aed1a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -1,7 +1,5 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Hvac
 Imports System.IO
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
index 50c3809ac9..c47d899441 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
@@ -3,8 +3,9 @@ Imports NUnit.Framework
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-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 d93e314ff2..9f4105f4e0 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -3,8 +3,9 @@ Imports NUnit.Framework
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-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 f6eedbd988..99588d83ba 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -3,8 +3,9 @@ Imports NUnit.Framework
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-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 497cdf5a9d..c2fedc9aba 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -5,8 +5,6 @@ Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-
 
 Namespace UnitTests
 	<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index c4502de3fa..8da2682fce 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -9,7 +9,6 @@ Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.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 25972824b5..0e2b0aae17 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -1,16 +1,15 @@
 
+Imports System.IO
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Hvac
-Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
+
 
 
 Namespace UnitTests
@@ -26,13 +25,14 @@ Namespace UnitTests
 
 
 		Private m0 As IM0_NonSmart_AlternatorsSetEfficiency
-		Private alternatorMap As IAlternatorMap = New AlternatorMap(_GOODMAP)
+		Private alternatorMap As IAlternatorMap 
 		Private alternatorGearEfficiency As Single = 0.8
 		Private compressorGrearEfficiency As Single = 0.8
 
-
-		Public Sub New()
-
+       
+        Public Sub New()
+            Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
+            alternatorMap = New AlternatorMap(_GOODMAP)
 			alternatorMap.Initialise()
 
 			ssm.Load(_SSMMAP)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index f513519e81..b0d0386488 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -6,11 +6,11 @@ Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.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/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 9dc6dd493b..6a21a735f4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -4,13 +4,10 @@ Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.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 8413187244..98577b8a27 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -2,8 +2,8 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
 
 
 Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
index 1f613c71ce..67c209e30d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
@@ -2,9 +2,8 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-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 cf0bc89d54..c3da60c053 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
@@ -3,8 +3,8 @@ Imports NUnit.Framework
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
-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 c5623158a2..7c40d547f0 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -3,10 +3,11 @@ Imports NUnit.Framework
 Imports Moq
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
 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 61114dcfc5..2a9e89fc7b 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
@@ -1,5 +1,4 @@
 
-Imports VectoAuxiliaries.Pneumatics
 Imports NUnit.Framework
 Imports System.IO
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
index 0873919072..607019ffde 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
@@ -3,7 +3,7 @@ Imports NUnit.Framework
 Imports TUGraz.VectoCommon.Utils
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
-Imports VectoAuxiliaries.Electrics
+
 
 <TestFixture()>
 Public Class ResultCardTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index f124929498..d2fc56627e 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -2,7 +2,7 @@
 Imports NUnit.Framework
 Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
 Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports VectoAuxiliaries.Hvac
+
 
 Namespace UnitTests
 	<TestFixture()>
@@ -47,10 +47,10 @@ Namespace UnitTests
 			Assert.IsTrue(src.TechList.Add(newItem, feedback))
 		End Sub
 
-        <OneTimeSetUp>
-        Sub RunBeforeAnyTests()    
-            Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
-        end Sub
+		<OneTimeSetUp>
+		Sub RunBeforeAnyTests()    
+			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
+		end Sub
 
 		'SSMGenInputTests
 		<Test()> _
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index fbc4cc4b88..56cbca9581 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -399,10 +399,6 @@
       <Project>{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}</Project>
       <Name>BusAuxiliaries</Name>
     </ProjectReference>
-    <ProjectReference Include="..\VectoAuxiliaries\VectoAuxiliaries.vbproj">
-      <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
-      <Name>VectoAuxiliaries</Name>
-    </ProjectReference>
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-- 
GitLab