diff --git a/Build/CommonSettings.targets b/Build/CommonSettings.targets
deleted file mode 100644
index 8c96f6da905038abb2bb7f926d886ed486ed927b..0000000000000000000000000000000000000000
--- a/Build/CommonSettings.targets
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project DefaultTargets = "Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
-  <PropertyGroup>
-	<!-- <DefineConstants>$(DefineConstants),RELEASE_CANDIDATE</DefineConstants> -->
-	<!-- <DefineConstants>$(DefineConstants),CERTIFICATION_RELEASE</DefineConstants> -->
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/Build/Packaging.targets b/Build/Packaging.targets
deleted file mode 100644
index f2a758db86a2a9966b8324408907877ca691a915..0000000000000000000000000000000000000000
--- a/Build/Packaging.targets
+++ /dev/null
@@ -1,150 +0,0 @@
-<Project DefaultTargets = "Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
-  <PropertyGroup>
-	<CleanDependsOn>
-		$(CleanDependsOn)
-		CleanVectoDeploy
-	</CleanDependsOn>
-  </PropertyGroup>
-  
-    <UsingTask TaskName="Zip" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-  <ParameterGroup>
-    <OutputFilename ParameterType="System.String" Required="true" />
-    <Files ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
-	<SourcePath ParameterType="System.String" Required="true"/>
-	<DestinationPath ParameterType="System.String" Required="true"/>
-  </ParameterGroup>
-  <Task>
-    <Reference Include="System.IO.Compression" />
-    <Using Namespace="System.IO.Compression" />
-    <Code Type="Fragment" Language="cs">
-    <![CDATA[
-      try
-      {
-        using (Stream zipStream = new FileStream(Path.GetFullPath(OutputFilename), FileMode.Create, FileAccess.Write))
-        using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create))
-        {
-            foreach (ITaskItem fileItem in Files)
-            {
-                string filename = fileItem.ItemSpec;
-                using (Stream fileStream = new FileStream(filename, FileMode.Open, FileAccess.Read))
-				using (Stream fileStreamInZip = archive.CreateEntry(fileItem.ItemSpec.Replace(SourcePath, DestinationPath)).Open())
-                    fileStream.CopyTo(fileStreamInZip);
-            }
-        }
-        return true;
-      }
-      catch (Exception ex)
-      {
-        Log.LogErrorFromException(ex);
-        return false;
-      }
-    ]]>
-    </Code>
-  </Task>
-</UsingTask>
-
-<Target Name="GenerateReleasenotesPDF" BeforeTargets="AfterBuild"  Condition="$(Configuration) == 'Deploy'">  
-	<Message Text="Generating Release Notes PDF"/>
-	<Exec Command="cscript &quot;$(solutiondir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>  
-</Target>  
-<!-- 
-<Target Name="GenerateHelpHTML" BeforeTargets="AfterBuild"  Condition="$(Configuration) == 'Deploy'">
-	<Message Text="Generating Help"/>
-	<Exec Command="&quot;$(solutiondir)documentation\user manual\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\user manual"/>  
-	<Exec Command="&quot;$(solutiondir)documentation\VectoHashingTool\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\VectoHashingTool"/>  
- </Target>   
- -->
-
-<Target Name="AfterBuild" Condition="$(Configuration) == 'Deploy'">
-	<ItemGroup>  
-		<VectoCoreAssembly Include="$(OutputPath)VectoCore.dll" />  
-		<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\vectocmd.exe*"/>
-		
-		<GenericVehicles Include="$(SolutionDir)Generic Vehicles\**\*.*" Exclude="$(SolutionDir)**\*.vmod;$(SolutionDir)**\*.vsum;$(SolutionDir)**\*RSLT_*.xml;$(SolutionDir)**\*.pdf"/>
-		<MissionProfiles Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.csv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.vacc" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.apac" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.aenv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.aaux" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.ahsm" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.acmp" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.vmap" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
-		<VectoXSD Include="$(SolutionDir)VectoCore\VectoCore\Resources\XSD\**\*.*" Exclude="$(SolutionDir)**\*Engineering*"/>
-		<VectoXMLExamples Include="$(SolutionDir)VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\*-sample.xml"/>
-		<UserManual Include="$(SolutionDir)Documentation\User Manual\help.html"/>
-		<UserManual Include="$(SolutionDir)Documentation\VectoHashingTool\HashingToolHelp.html"/>
-		<UserManual Include="$(SolutionDir)Documentation\XML\*.png"/>
-		<UserManual Include="$(SolutionDir)Documentation\XML\VectoParameters.html"/>
-		<UserManual Include="$(SolutionDir)Documentation\User Manual Source\JIRA Quick Start Guide.pdf"/>
-		<UserManual Include="$(SolutionDir)Documentation\Cdv_Generator_VECTO3.2.xlsx"/>
-		<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>
-		
-		<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\HashingTool.exe"/>
-		<HashingTool Include="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\VectoHashing.XML"/>
-		<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\hashingcmd.exe"/>
-		
-		<VectoConfigurationSample Include="$(SolutionDir)VECTO\install.ini"/>
-		
-		<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\VECTOMultistage.exe*"/>
-		<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\*.dll"/>
-	</ItemGroup>
-	
-	<Message Text="@(VectoCommandLine)"/>
-	<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(OutputPath)"/>
-	<Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(OutputPath)"/>
-	<Copy SourceFiles="@(HashingTool)" DestinationFolder="$(OutputPath)"/>
-	<Copy SourceFiles="@(GenericVehicles)" DestinationFiles="@(GenericVehicles->'$(OutputPath)\Generic Vehicles\%(RecursiveDir)%(Filename)%(Extension)')" />
-	<Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(OutputPath)\Declaration" />
-	<Copy SourceFiles="@(MissionProfiles)" DestinationFolder="$(OutputPath)\Mission Profiles" />
-	<Copy SourceFiles="@(VectoXMLExamples)" DestinationFolder="$(OutputPath)\XML\Examples" />
-	<Copy SourceFiles="@(VectoXSD)" DestinationFolder="$(OutputPath)\XML\XSD" />
-	<Copy SourceFiles="@(UserManual)" DestinationFolder="$(OutputPath)\User Manual" />
-	<Copy SourceFiles="@(ReleaseNotes)" DestinationFiles="$(OutputPath)\User Manual\Release Notes.pdf" />
-	<Copy SourceFiles="@(VectoConfigurationSample)" DestinationFolder="$(OutputPath)"/>
-	<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Mission Profiles Directory.txt" DestinationFiles="$(OutputPath)\Mission Profiles\!! README !!.TXT"/>
-	<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Declaration Directory.txt" DestinationFiles="$(OutputPath)\Declaration\!! README !!.TXT"/>
-	<ItemGroup>
-		<ZipFiles Include="$(OutputPath)Declaration\**\*.*" />
-		<ZipFiles Include="$(OutputPath)Generic Vehicles\**\*.*" />
-		<ZipFiles Include="$(OutputPath)Mission Profiles\**\*.*" />
-		<ZipFiles Include="$(OutputPath)User Manual\**\*.*" />
-		<ZipFiles Include="$(OutputPath)XML\**\*.*" />
-	</ItemGroup>
-
-	<GetAssemblyIdentity  AssemblyFiles="@(VectoCoreAssembly)">
-		<Output  TaskParameter="Assemblies"  ItemName="VectoAssemblyIdentities"  />
-	</GetAssemblyIdentity>
-	<ItemGroup>
-		<ZipFiles Include="$(OutputPath)*.dll" />
-		<ZipFiles Include="$(OutputPath)*.ini" />
-		<ZipFiles Include="$(OutputPath)VECTO.exe*" />
-		<ZipFiles Include="$(OutputPath)VECTOMultistage.exe*" />
-		<ZipFiles Include="$(OutputPath)vectocmd.exe*"/>
-		<!-- <ZipFiles Include="$(OutputPath)VECTO3.exe*" /> -->
-		<ZipFiles Include="$(OutputPath)HashingTool.exe*"/>
-		<ZipFiles Include="$(OutputPath)hashingcmd.exe*"/>
-	</ItemGroup>
-	<PropertyGroup>
-		<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
-	</PropertyGroup>
-	<Message Text="Creating ZIP, CurrentDate: $(CurrentDate)"/>
-	<Zip OutputFilename="$(SolutionDir)$(CurrentDate)-VECTO-%(VectoAssemblyIdentities.Version).zip" Files="@(ZipFiles)" SourcePath="$(OutputPath)" DestinationPath="$(CurrentDate)-VECTO-%(VectoAssemblyIdentities.Version)\"/>
-</Target>
-
-<Target Name="CleanVectoDeploy" Condition="$(Configuration) == 'Deploy'">
-	<ItemGroup>
-		<CustomFilesToClean Include="$(OutputPath)Declaration\**\*.*" />
-		<CustomFilesToClean Include="$(OutputPath)Generic Vehicles\**\*.*" />
-		<CustomFilesToClean Include="$(OutputPath)Mission Profiles\**\*.*" />
-		<CustomFilesToClean Include="$(OutputPath)User Manual\**\*.*" />
-		<CustomFilesToClean Include="$(OutputPath)XML\**\*.*" />
-		<CustomFoldersToClean Include="%(CustomFilesToClean.RootDir)%(CustomFilesToClean.Directory)"/>
-	</ItemGroup>
-	<!-- <Message Text="@(CustomFilesToClean)" Importance="normal"/> -->
-	<!-- <Message Text="@(CustomFoldersToClean)" Importance="normal"/> -->
-	<Delete Files="@CustomFilesToClean"/>
-	<RemoveDir Directories="@(CustomFoldersToClean)"/>
-</Target>
-
-</Project>
\ No newline at end of file
diff --git a/Build/TextPreProcessing.targets b/Build/TextPreProcessing.targets
deleted file mode 100644
index a8651aeb4b27de2f93e655b6f72d6e5c4b0aadea..0000000000000000000000000000000000000000
--- a/Build/TextPreProcessing.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project DefaultTargets = "Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
-	<Target Name="BeforeBuild" Condition="$(Configuration) == 'Deploy' OR $(Configuration) == 'Release'">
-		<ItemGroup>
-			<VersionTemplates Include="$(ProjectDir)**\Version.tt"/>
-			<VersionTemplates Include="$(ProjectDir)**\*.tt"/>
-		</ItemGroup>
-		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
-		<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
-		<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
-	</Target>
-</Project>
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index b74b1da271ab96741351b298ec8685e34a504791..554075bfce46562e2bd28eeb05af281dc0a8f299 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -46,4 +46,11 @@
     <WarningLevel>5</WarningLevel>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Deploy|AnyCPU'">
+    <DefineConstants />
+    <DebugType>none</DebugType>
+    <WarningLevel>5</WarningLevel>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 137b6c1c4943c5855778764c2f21938254edf09b..e9fbba074f1b134957e68f94434022c0226c27e1 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,153 @@
-<Project>
-    <!--<Target Name="VersionMessage" AfterTargets="build">
+<Project DefaultTargets = "Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
+	<!--<Target Name="VersionMessage" AfterTargets="build">
         <Message Text="$(AssemblyName) -> $(Version)" importance="high"/>
     </Target>-->
+	<PropertyGroup>
+		<CleanDependsOn>
+			$(CleanDependsOn)
+			CleanVectoDeploy
+		</CleanDependsOn>
+	</PropertyGroup>
+
+	<UsingTask TaskName="Zip" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+		<ParameterGroup>
+			<OutputFilename ParameterType="System.String" Required="true" />
+			<Files ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+			<SourcePath ParameterType="System.String" Required="true"/>
+			<DestinationPath ParameterType="System.String" Required="true"/>
+		</ParameterGroup>
+		<Task>
+			<Reference Include="System.IO.Compression" />
+			<Using Namespace="System.IO.Compression" />
+			<Code Type="Fragment" Language="cs">
+				<![CDATA[
+      try
+      {
+        using (Stream zipStream = new FileStream(Path.GetFullPath(OutputFilename), FileMode.Create, FileAccess.Write))
+        using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create))
+        {
+            foreach (ITaskItem fileItem in Files)
+            {
+                string filename = fileItem.ItemSpec;
+                using (Stream fileStream = new FileStream(filename, FileMode.Open, FileAccess.Read))
+				using (Stream fileStreamInZip = archive.CreateEntry(fileItem.ItemSpec.Replace(SourcePath, DestinationPath)).Open())
+                    fileStream.CopyTo(fileStreamInZip);
+            }
+        }
+        return true;
+      }
+      catch (Exception ex)
+      {
+        Log.LogErrorFromException(ex);
+        return false;
+      }
+    ]]>
+			</Code>
+		</Task>
+	</UsingTask>
+
+	<Target Name="GenerateReleasenotesPDF" BeforeTargets="AfterBuild"  Condition="$(Configuration) == 'Deploy'">
+		<Message Text="Generating Release Notes PDF"/>
+		<Exec Command="cscript &quot;$(solutiondir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
+	</Target>
+	<!-- 
+<Target Name="GenerateHelpHTML" BeforeTargets="AfterBuild"  Condition="$(Configuration) == 'Deploy'">
+	<Message Text="Generating Help"/>
+	<Exec Command="&quot;$(solutiondir)documentation\user manual\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\user manual"/>  
+	<Exec Command="&quot;$(solutiondir)documentation\VectoHashingTool\convert.bat&quot;" WorkingDirectory="$(solutiondir)documentation\VectoHashingTool"/>  
+ </Target>   
+ -->
+
+	<Target Name="AfterBuild" Condition="$(Configuration) == 'Deploy'">
+		<ItemGroup>
+			<VectoCoreAssembly Include="$(OutputPath)VectoCore.dll" />
+			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\vectocmd.exe*"/>
+
+			<GenericVehicles Include="$(SolutionDir)Generic Vehicles\**\*.*" Exclude="$(SolutionDir)**\*.vmod;$(SolutionDir)**\*.vsum;$(SolutionDir)**\*RSLT_*.xml;$(SolutionDir)**\*.pdf"/>
+			<MissionProfiles Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.csv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.vacc" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.apac" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.aenv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.aaux" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.ahsm" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.acmp" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**/*.vmap" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
+			<VectoXSD Include="$(SolutionDir)VectoCore\VectoCore\Resources\XSD\**\*.*" Exclude="$(SolutionDir)**\*Engineering*"/>
+			<VectoXMLExamples Include="$(SolutionDir)VectoCore\VectoCoreTest\TestData\XML\XMLReaderDeclaration\*-sample.xml"/>
+			<UserManual Include="$(SolutionDir)Documentation\User Manual\help.html"/>
+			<UserManual Include="$(SolutionDir)Documentation\VectoHashingTool\HashingToolHelp.html"/>
+			<UserManual Include="$(SolutionDir)Documentation\XML\*.png"/>
+			<UserManual Include="$(SolutionDir)Documentation\XML\VectoParameters.html"/>
+			<UserManual Include="$(SolutionDir)Documentation\User Manual Source\JIRA Quick Start Guide.pdf"/>
+			<UserManual Include="$(SolutionDir)Documentation\Cdv_Generator_VECTO3.2.xlsx"/>
+			<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>
+
+			<HashingTool Include="$(SolutionDir)HashingTool\bin\Release\HashingTool.exe"/>
+			<HashingTool Include="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\VectoHashing.XML"/>
+			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\hashingcmd.exe"/>
+
+			<VectoConfigurationSample Include="$(SolutionDir)VECTO\install.ini"/>
+
+			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\VECTOMultistage.exe*"/>
+			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\*.dll"/>
+		</ItemGroup>
+
+		<Message Text="@(VectoCommandLine)"/>
+		<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(OutputPath)"/>
+		<Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(OutputPath)"/>
+		<Copy SourceFiles="@(HashingTool)" DestinationFolder="$(OutputPath)"/>
+		<Copy SourceFiles="@(GenericVehicles)" DestinationFiles="@(GenericVehicles->'$(OutputPath)\Generic Vehicles\%(RecursiveDir)%(Filename)%(Extension)')" />
+		<Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(OutputPath)\Declaration" />
+		<Copy SourceFiles="@(MissionProfiles)" DestinationFolder="$(OutputPath)\Mission Profiles" />
+		<Copy SourceFiles="@(VectoXMLExamples)" DestinationFolder="$(OutputPath)\XML\Examples" />
+		<Copy SourceFiles="@(VectoXSD)" DestinationFolder="$(OutputPath)\XML\XSD" />
+		<Copy SourceFiles="@(UserManual)" DestinationFolder="$(OutputPath)\User Manual" />
+		<Copy SourceFiles="@(ReleaseNotes)" DestinationFiles="$(OutputPath)\User Manual\Release Notes.pdf" />
+		<Copy SourceFiles="@(VectoConfigurationSample)" DestinationFolder="$(OutputPath)"/>
+		<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Mission Profiles Directory.txt" DestinationFiles="$(OutputPath)\Mission Profiles\!! README !!.TXT"/>
+		<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Declaration Directory.txt" DestinationFiles="$(OutputPath)\Declaration\!! README !!.TXT"/>
+		<ItemGroup>
+			<ZipFiles Include="$(OutputPath)Declaration\**\*.*" />
+			<ZipFiles Include="$(OutputPath)Generic Vehicles\**\*.*" />
+			<ZipFiles Include="$(OutputPath)Mission Profiles\**\*.*" />
+			<ZipFiles Include="$(OutputPath)User Manual\**\*.*" />
+			<ZipFiles Include="$(OutputPath)XML\**\*.*" />
+		</ItemGroup>
+
+		<GetAssemblyIdentity  AssemblyFiles="@(VectoCoreAssembly)">
+			<Output  TaskParameter="Assemblies"  ItemName="VectoAssemblyIdentities"  />
+		</GetAssemblyIdentity>
+		<ItemGroup>
+			<ZipFiles Include="$(OutputPath)*.dll" />
+			<ZipFiles Include="$(OutputPath)*.ini" />
+			<ZipFiles Include="$(OutputPath)VECTO.exe*" />
+			<ZipFiles Include="$(OutputPath)VECTOMultistage.exe*" />
+			<ZipFiles Include="$(OutputPath)vectocmd.exe*"/>
+			<!-- <ZipFiles Include="$(OutputPath)VECTO3.exe*" /> -->
+			<ZipFiles Include="$(OutputPath)HashingTool.exe*"/>
+			<ZipFiles Include="$(OutputPath)hashingcmd.exe*"/>
+		</ItemGroup>
+		<PropertyGroup>
+			<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
+		</PropertyGroup>
+		<Message Text="Creating ZIP, CurrentDate: $(CurrentDate)"/>
+		<Zip OutputFilename="$(SolutionDir)$(CurrentDate)-VECTO-%(VectoAssemblyIdentities.Version).zip" Files="@(ZipFiles)" SourcePath="$(OutputPath)" DestinationPath="$(CurrentDate)-VECTO-%(VectoAssemblyIdentities.Version)\"/>
+	</Target>
+
+	<Target Name="CleanVectoDeploy" Condition="$(Configuration) == 'Deploy'">
+		<ItemGroup>
+			<CustomFilesToClean Include="$(OutputPath)Declaration\**\*.*" />
+			<CustomFilesToClean Include="$(OutputPath)Generic Vehicles\**\*.*" />
+			<CustomFilesToClean Include="$(OutputPath)Mission Profiles\**\*.*" />
+			<CustomFilesToClean Include="$(OutputPath)User Manual\**\*.*" />
+			<CustomFilesToClean Include="$(OutputPath)XML\**\*.*" />
+			<CustomFoldersToClean Include="%(CustomFilesToClean.RootDir)%(CustomFilesToClean.Directory)"/>
+		</ItemGroup>
+		<!-- <Message Text="@(CustomFilesToClean)" Importance="normal"/> -->
+		<!-- <Message Text="@(CustomFoldersToClean)" Importance="normal"/> -->
+		<Delete Files="@CustomFilesToClean"/>
+		<RemoveDir Directories="@(CustomFoldersToClean)"/>
+	</Target>
+
 </Project>
\ No newline at end of file
diff --git a/VECTO.sln b/VECTO.sln
index 08a74b25ab2cb294d512535061bed1f5f2f32433..4a66e71fa08f658adb6390bea4c5f6d2ba9104ad 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -3,26 +3,26 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31112.23
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A} = {E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}
 		{33F9848E-9257-4BE2-915F-68E748AEB204} = {33F9848E-9257-4BE2-915F-68E748AEB204}
 		{60AD4DF0-6648-4374-83CB-C7A162EFB391} = {60AD4DF0-6648-4374-83CB-C7A162EFB391}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCore", "VectoCore\VectoCore\VectoCore.csproj", "{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoCore", "VectoCore\VectoCore\VectoCore.csproj", "{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VectoAuxiliariesTests", "VECTOAux\VectoAuxiliariesTests\VectoAuxiliariesTests.vbproj", "{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VectoAuxiliariesTests", "VECTOAux\VectoAuxiliariesTests\VectoAuxiliariesTests.vbproj", "{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCoreTest", "VectoCore\VectoCoreTest\VectoCoreTest.csproj", "{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoCoreTest", "VectoCore\VectoCoreTest\VectoCoreTest.csproj", "{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoConsole", "VectoConsole\VectoConsole.csproj", "{60AD4DF0-6648-4374-83CB-C7A162EFB391}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoConsole", "VectoConsole\VectoConsole.csproj", "{60AD4DF0-6648-4374-83CB-C7A162EFB391}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphDrawer", "Tools\GraphDrawer\GraphDrawer.csproj", "{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphDrawer", "Tools\GraphDrawer\GraphDrawer.csproj", "{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeclarationCycleZip", "Tools\DeclarationCycleZip\DeclarationCycleZip.csproj", "{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeclarationCycleZip", "Tools\DeclarationCycleZip\DeclarationCycleZip.csproj", "{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LicenceHeader", "Tools\LicenceHeader\LicenceHeader.csproj", "{E8B0B447-1A54-4BEC-A160-AF0017000781}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LicenceHeader", "Tools\LicenceHeader\LicenceHeader.csproj", "{E8B0B447-1A54-4BEC-A160-AF0017000781}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VectoCommon", "VectoCommon", "{73A5BF70-6168-456F-95E5-A1402BFA488C}"
 EndProject
@@ -32,7 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VECTO 3", "VECTO 3", "{CC93
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoCommon", "VectoCommon\VectoCommon\VectoCommon.csproj", "{79A066AD-69A9-4223-90F6-6ED5D2D084F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelbasedTests", "VectoCore\ModelbasedTests\ModelbasedTests.csproj", "{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModelbasedTests", "VectoCore\ModelbasedTests\ModelbasedTests.csproj", "{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{D29E62A2-CF08-469F-B29F-1B25DCB35386}"
 EndProject
@@ -48,13 +48,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoDB", "..\VECTO_API\Vec
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoCore BugReportTests", "..\VECTO-Bugreports\BugReportTests\VectoCore BugReportTests.csproj", "{7C364099-9B85-473A-8A42-BBEBE4798FF5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoHashing", "VectoCommon\VectoHashing\VectoHashing.csproj", "{B673E12F-D323-4C4C-8805-9915B2C72D3D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoHashing", "VectoCommon\VectoHashing\VectoHashing.csproj", "{B673E12F-D323-4C4C-8805-9915B2C72D3D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectoHashingTest", "VectoCommon\VectoHashingTest\VectoHashingTest.csproj", "{760C1C5B-A767-463E-BA85-F0BCFC23A550}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VectoHashingTest", "VectoCommon\VectoHashingTest\VectoHashingTest.csproj", "{760C1C5B-A767-463E-BA85-F0BCFC23A550}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HashingTool", "HashingTool\HashingTool.csproj", "{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HashingTool", "HashingTool\HashingTool.csproj", "{E14FC935-30EA-4BE6-AA8A-85CB76FEBA6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HashingCmd", "HashingCmd\HashingCmd.csproj", "{33F9848E-9257-4BE2-915F-68E748AEB204}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HashingCmd", "HashingCmd\HashingCmd.csproj", "{33F9848E-9257-4BE2-915F-68E748AEB204}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Article10Notifications", "..\VECTO-Article10\Article10Notifications\Article10Notifications.csproj", "{EF99431D-4227-44C3-B2BD-DE8AE3E672CA}"
 EndProject
@@ -62,7 +62,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneApplication", "..
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginsDEV", "PluginsDEV", "{C4D97EBF-BA80-4943-9D27-33179405D8D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VECTO3GUI2020", "VECTO3GUI2020\VECTO3GUI2020.csproj", "{7E9172D4-07E3-4077-814E-7117AB2B3E22}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VECTO3GUI2020", "VECTO3GUI2020\VECTO3GUI2020.csproj", "{7E9172D4-07E3-4077-814E-7117AB2B3E22}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vecto3GUI2020Test", "Vecto3GUI2020Test\Vecto3GUI2020Test.csproj", "{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}"
 EndProject
@@ -115,7 +115,7 @@ Global
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6F31F8B2-6AB3-4F85-8AC9-D09ADCA6432D}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
@@ -128,7 +128,7 @@ Global
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A27F93E-4A58-48F6-B00B-3908C5D3D5A2}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
@@ -155,7 +155,7 @@ Global
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6589CAEC-ECC9-4BCC-9699-DE3F22BBCBD4}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
@@ -168,7 +168,7 @@ Global
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2320CD6F-FE7B-4341-A9BB-3ABCA7EF18F6}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
@@ -181,7 +181,7 @@ Global
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E8B0B447-1A54-4BEC-A160-AF0017000781}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
@@ -204,8 +204,9 @@ Global
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
 		{A0256B2A-09F8-45AD-B46A-FD98D7AAAA0C}.ReleaseTUG|Any CPU.Build.0 = Release|Any CPU
 		{DD260CC4-7978-45E3-8646-AD4F5E6A8FA2}.Debug PerformanceStats|Any CPU.ActiveCfg = Debug|Any CPU
@@ -280,7 +281,7 @@ Global
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.Release|Any CPU.Build.0 = Release|Any CPU
 		{760C1C5B-A767-463E-BA85-F0BCFC23A550}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
@@ -359,7 +360,7 @@ Global
 		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
-		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
 		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F4FF473-96B3-461E-9CE6-76D3B75F87CB}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/VECTO/My Project/Application.Designer.vb b/VECTO/My Project/Application.Designer.vb
index 3c1840c9e0765fd66ad2e9b46d570cb2ec5903d9..b4251198a8bafaed86d97725802b2bcd3d7f1a1b 100644
--- a/VECTO/My Project/Application.Designer.vb	
+++ b/VECTO/My Project/Application.Designer.vb	
@@ -1,39 +1,38 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
 Option Strict On
 Option Explicit On
 
-Imports Microsoft.VisualBasic.ApplicationServices
 
 Namespace My
     
-    'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern
-    ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer.
-    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
-    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
+    ' or if you encounter build errors in this file, go to the Project Designer
+    ' (go to Project Properties or double-click the My Project node in
+    ' Solution Explorer), and make changes on the Application tab.
     '
     Partial Friend Class MyApplication
         
-        <DebuggerStepThrough()>  _
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Public Sub New()
-            MyBase.New(AuthenticationMode.Windows)
+            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
             Me.IsSingleInstance = false
             Me.EnableVisualStyles = true
             Me.SaveMySettingsOnExit = true
-            Me.ShutDownStyle = ShutdownMode.AfterMainFormCloses
+            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
         End Sub
         
-        <DebuggerStepThrough()>  _
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-			Me.MainForm = VECTO.MainForm
+            Me.MainForm = Global.TUGraz.VECTO.MainForm
         End Sub
     End Class
 End Namespace
diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb
deleted file mode 100644
index 8f5181a523ac83c38a40939893f6e59a9e4f5f5f..0000000000000000000000000000000000000000
--- a/VECTO/My Project/AssemblyInfo.vb	
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' Below is the General Information about the Attributes
-' controlling the Assembly. Change these attribute values to modify the information
-' associated with the Assembly.
-
-' Review the values of the Assembly Attributes
-
-<Assembly: AssemblyTitle("VECTO")> 
-<Assembly: AssemblyDescription("Vehicle Energy Consumption Calculation Tool")> 
-<Assembly: AssemblyCompany("")> 
-<Assembly: AssemblyProduct("VECTO")> 
-<Assembly: AssemblyCopyright("© European Commission 2012 - 2017")> 
-<Assembly: AssemblyTrademark("")> 
-
-<Assembly: ComVisible(False)>
-
-'The following GUID is for the ID of the Typelib if this project is exposed to COM
-<Assembly: Guid("175c31e7-2d95-4afb-afec-c4d7719177db")> 
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Release
-'      Minor Release
-'      Build Number
-'      Revision
-'
-' You can specify all the values or use the defaults for Build and Revision Numbers
-' by entering "*" in them:
-' <Assembly: AssemblyVersion("1.0.*")> 
-
-<Assembly: AssemblyVersion("3.2.0.0")> 
-<Assembly: AssemblyFileVersion("3.2.0.0")> 
diff --git a/VECTO/My Project/app.manifest b/VECTO/My Project/app.manifest
deleted file mode 100644
index 7ca715c9ebd96f8c6ac5e3068460c75312df1ebb..0000000000000000000000000000000000000000
--- a/VECTO/My Project/app.manifest	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC-Manifestoptionen
-          Wenn Sie die Zugangsebene für das Windows-Benutzerkonto ändern möchten, ersetzen Sie den 
-          requestedExecutionLevel-Knoten durch eines der folgenden Elemente.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Durch Angeben des requestedExecutionLevel-Knotens wird die Datei- und Registrierungsvirtualisierung deaktiviert.
-            Wenn Sie Datei- und Registrierungsvirtualisierung für Abwärts- 
-            kompatibilität verwenden möchten, löschen Sie den requestedExecutionLevel-Knoten.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-      <applicationRequestMinimum>
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet ID="Custom" SameSite="site" Unrestricted="true" />
-      </applicationRequestMinimum>
-    </security>
-  </trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- Eine Liste aller Windows-Versionen, mit denen die Anwendung kompatibel ist. Windows wählt automatisch die am stärksten kompatible Umgebung aus.-->
-      <!-- Wenn die Anwendung mit Windows 7 kompatibel ist, heben Sie die Kommentierung des folgenden supportedOS-Knotens auf.-->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-    </application>
-  </compatibility>
-  <!-- Designs für allgemeine Windows-Steuerelemente und -Dialogfelder (Windows XP und höher) aktivieren -->
-  <!-- <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>-->
-</asmv1:assembly>
\ No newline at end of file
diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb
deleted file mode 100644
index db2bab88d330593bb52360533d75e6ee8e7463ae..0000000000000000000000000000000000000000
--- a/VECTO/OutputData/JSONFileWriter.vb
+++ /dev/null
@@ -1,535 +0,0 @@
-Imports System.Collections.Generic
-Imports System.IO
-Imports System.Linq
-Imports Newtonsoft.Json
-Imports Newtonsoft.Json.Linq
-Imports TUGraz.VectoCommon.InputData
-Imports TUGraz.VectoCommon.Models
-Imports TUGraz.VectoCommon.OutputData
-Imports TUGraz.VectoCore
-Imports TUGraz.VectoCore.Models.Declaration
-Imports TUGraz.VectoCommon.Utils
-
-Public Class JSONFileWriter
-    Implements IOutputFileWriter
-    Public Const EngineFormatVersion As Integer = 5
-
-    Public Const GearboxFormatVersion As Integer = 6
-
-    Public Const VehicleFormatVersion As Integer = 8
-
-    Private Const VectoJobFormatVersion As Integer = 5
-
-    Private Shared _instance As JSONFileWriter
-
-    Public Shared ReadOnly Property Instance As JSONFileWriter
-        Get
-            If _instance Is Nothing Then _instance = New JSONFileWriter()
-            Return _instance
-        End Get
-    End Property
-
-    Public Sub SaveEngine(eng As IEngineEngineeringInputData, filename As String) _
-        Implements IOutputFileWriter.SaveEngine
-
-        'Header
-        Dim header As Dictionary(Of String, Object) = GetHeader(EngineFormatVersion)
-
-        'Body
-        Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-
-        body.Add("SavedInDeclMode", Cfg.DeclMode)
-
-        body.Add("ModelName", eng.Model)
-
-        body.Add("Displacement", eng.Displacement.ConvertToCubicCentiMeter().ToString())
-        body.Add("IdlingSpeed", eng.EngineModes.First().IdleSpeed.AsRPM)
-        body.Add("Inertia", eng.Inertia.Value())
-
-		Dim fuels As List(Of Object) = New List(Of Object)()
-
-        For Each fuel As IEngineFuelEngineeringInputData In eng.EngineModes.First().Fuels
-            Dim entry As Dictionary(Of String, Object) = New Dictionary(Of String, Object)()
-            entry.Add("WHTC-Urban", fuel.WHTCUrban)
-            entry.Add("WHTC-Rural", fuel.WHTCRural)
-            entry.Add("WHTC-Motorway", fuel.WHTCMotorway)
-            entry.Add("WHTC-Engineering", fuel.WHTCEngineering)
-            entry.Add("ColdHotBalancingFactor", fuel.ColdHotBalancingFactor)
-            entry.Add("CFRegPer", fuel.CorrectionFactorRegPer)
-            entry.Add("FuelMap", GetRelativePath(fuel.FuelConsumptionMap.Source, Path.GetDirectoryName(filename)))
-            entry.Add("FuelType", fuel.FuelType.ToString())
-
-			fuels.Add(entry)
-        Next
-
-		body.Add("Fuels", fuels)
-
-        body.Add("RatedPower", eng.RatedPowerDeclared.Value())
-        body.Add("RatedSpeed", eng.RatedSpeedDeclared.AsRPM)
-        body.Add("MaxTorque", eng.MaxTorqueDeclared.Value())
-
-
-        body.Add("FullLoadCurve",
-                 GetRelativePath(eng.EngineModes.First().FullLoadCurve.Source, Path.GetDirectoryName(filename)))
-
-        Dim whrtypes as List(Of String) = New List(Of String)
-        if (eng.WHRType And WHRType.ElectricalOutput) <> 0 
-            whrtypes.Add(WHRType.ElectricalOutput.ToString())
-        End If
-	    if (eng.WHRType And WHRType.MechanicalOutputDrivetrain) <> 0 
-	        whrtypes.Add(WHRType.MechanicalOutputDrivetrain.ToString())
-	    End If
-	    if (eng.WHRType And WHRType.MechanicalOutputICE) <> 0 
-	        whrtypes.Add(WHRType.MechanicalOutputICE.ToString())
-	    End If
-
-	    body.add("WHRType", if(whrtypes.Count > 0, whrtypes, New List(Of String)() From { whrtype.None.ToString() }))
-
-        Dim whrCF As Dictionary(Of String, Object) = New Dictionary(Of String,Object)
-	    If ((eng.WHRType and whrtype.ElectricalOutput) <> 0) then
-		    Dim whr As Dictionary(Of String,Object) = GetWhr(eng.EngineModes.First().WasteHeatRecoveryDataElectrical)
-	        whrCF.Add("Electrical", whr)
-		End If
-        
-        if ((eng.WHRType and WHRType.MechanicalOutputDrivetrain) <> 0) Then
-            Dim whr As Dictionary(Of String,Object) = GetWhr(eng.EngineModes.First().WasteHeatRecoveryDataMechanical)
-            whrCF.Add("Mechanical", whr)           
-        End If
-	    body.Add("WHRCorrectionFactors", whrCF)
-		WriteFile(header, body, filename)
-	End Sub
-
-    Private Function GetWhr(whrInput As IWHRData) As Dictionary(Of String,Object)
-
-        Dim whr As Dictionary(Of String, Object) = New Dictionary(Of String,Object)
-        whr.Add("Urban", whrInput.UrbanCorrectionFactor)
-        whr.Add("Rural", whrInput.RuralCorrectionFactor)
-        whr.Add("Motorway", whrInput.MotorwayCorrectionFactor)
-        whr.Add("ColdHotBalancingFactor", whrInput.BFColdHot)
-        whr.Add("CFRegPer", whrInput.CFRegPer)
-        whr.Add("EngineeringCorrectionFactor", whrInput.EngineeringCorrectionFactor)
-        Return whr
-    End Function
-
-    Protected Function GetHeader(fileVersion As Integer) As Dictionary(Of String, Object)
-        Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-
-        header.Add("CreatedBy", "")
-        header.Add("Date", Now.ToUniversalTime().ToString("o"))
-        header.Add("AppVersion", VECTOvers)
-        header.Add("FileVersion", fileVersion)
-        Return header
-    End Function
-
-    Public Sub SaveGearbox(gbx As IGearboxEngineeringInputData, axl As IAxleGearInputData,
-                           torqueConverter As ITorqueConverterEngineeringInputData,
-                           gshift As IGearshiftEngineeringInputData, filename As String) _
-        Implements IOutputFileWriter.SaveGearbox
-
-        'Header
-        Dim header As Dictionary(Of String, Object) = GetHeader(GearboxFormatVersion)
-
-
-        'Body
-        Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-
-        body.Add(JsonKeys.SavedInDeclMode, Cfg.DeclMode)
-        body.Add(JsonKeys.Gearbox_ModelName, gbx.Model)
-        body.Add(JsonKeys.Gearbox_Inertia, gbx.Inertia.Value())
-        body.Add(JsonKeys.Gearbox_TractionInterruption, gbx.TractionInterruption.Value())
-
-        Dim ls As New List(Of Dictionary(Of String, Object))
-        Dim axlgDict As New Dictionary(Of String, Object)
-        axlgDict.Add(JsonKeys.Gearbox_Gear_Ratio, axl.Ratio)
-        If axl.LossMap Is Nothing Then
-            axlgDict.Add(JsonKeys.Gearbox_Gear_Efficiency, axl.Efficiency)
-        Else
-            axlgDict.Add(JsonKeys.Gearbox_Gear_LossMapFile,
-                         GetRelativePath(axl.LossMap.Source, Path.GetDirectoryName(filename)))
-        End If
-        ls.Add(axlgDict)
-
-        For Each gear As ITransmissionInputData In gbx.Gears
-            Dim gearDict As New Dictionary(Of String, Object)
-            gearDict.Add(JsonKeys.Gearbox_Gear_Ratio, gear.Ratio)
-            If gear.LossMap Is Nothing Then
-                gearDict.Add(JsonKeys.Gearbox_Gear_Efficiency, gear.Efficiency)
-            Else
-                gearDict.Add(JsonKeys.Gearbox_Gear_LossMapFile,
-                             GetRelativePath(gear.LossMap.Source, Path.GetDirectoryName(filename)))
-            End If
-            gearDict.Add(JsonKeys.Gearbox_Gear_ShiftPolygonFile, If _
-                            (Not gbx.SavedInDeclarationMode AndAlso Not gear.ShiftPolygon Is Nothing,
-                             GetRelativePath(gear.ShiftPolygon.Source, Path.GetDirectoryName(filename)), ""))
-            gearDict.Add("MaxTorque", If(gear.MaxTorque Is Nothing, "", gear.MaxTorque.Value().ToString()))
-            gearDict.Add("MaxSpeed", If(gear.MaxInputSpeed Is Nothing, "", gear.MaxInputSpeed.AsRPM.ToString()))
-
-            ls.Add(gearDict)
-        Next
-        body.Add(JsonKeys.Gearbox_Gears, ls)
-        body.Add(JsonKeys.Gearbox_TorqueReserve, gshift.TorqueReserve*100)
-        body.Add(JsonKeys.Gearbox_ShiftTime, gshift.MinTimeBetweenGearshift.Value())
-        body.Add(JsonKeys.Gearbox_StartTorqueReserve, gshift.StartTorqueReserve*100)
-        body.Add(JsonKeys.Gearbox_StartSpeed, gshift.StartSpeed.Value())
-        body.Add(JsonKeys.Gearbox_StartAcceleration, gshift.StartAcceleration.Value())
-        body.Add(JsonKeys.Gearbox_GearboxType, gbx.Type.ToString())
-
-
-        Dim torqueConverterDict As New Dictionary(Of String, Object)
-        torqueConverterDict.Add("Enabled", Not torqueConverter Is Nothing AndAlso gbx.Type.AutomaticTransmission())
-        If gbx.Type.AutomaticTransmission() AndAlso Not torqueConverter Is Nothing Then
-            torqueConverterDict.Add("File",
-                                    GetRelativePath(torqueConverter.TCData.Source, Path.GetDirectoryName(filename)))
-            torqueConverterDict.Add(JsonKeys.Gearbox_TorqueConverter_ReferenceRPM, torqueConverter.ReferenceRPM.AsRPM)
-            torqueConverterDict.Add(JsonKeys.Gearbox_TorqueConverter_Inertia, torqueConverter.Inertia.Value())
-            torqueConverterDict.Add("MaxTCSpeed", torqueConverter.MaxInputSpeed.AsRPM)
-            torqueConverterDict.Add("ShiftPolygon",
-                                    If _
-                                       (
-                                           Not gbx.SavedInDeclarationMode AndAlso
-                                           Not torqueConverter.ShiftPolygon Is Nothing,
-                                           GetRelativePath(torqueConverter.ShiftPolygon.Source,
-                                                           Path.GetDirectoryName(filename)), ""))
-            torqueConverterDict.Add("CLUpshiftMinAcceleration", gshift.CLUpshiftMinAcceleration.Value())
-            torqueConverterDict.Add("CCUpshiftMinAcceleration", gshift.CCUpshiftMinAcceleration.Value())
-        End If
-        body.Add(JsonKeys.Gearbox_TorqueConverter, torqueConverterDict)
-
-        body.Add("DownshiftAfterUpshiftDelay", gshift.DownshiftAfterUpshiftDelay.Value())
-        body.Add("UpshiftAfterDownshiftDelay", gshift.UpshiftAfterDownshiftDelay.Value())
-        body.Add("UpshiftMinAcceleration", gshift.UpshiftMinAcceleration.Value())
-
-        body.Add("PowershiftShiftTime", gbx.PowershiftShiftTime.Value())
-
-        WriteFile(header, body, filename)
-    End Sub
-
-    Public Sub SaveVehicle(vehicle As IVehicleEngineeringInputData, airdrag As IAirdragEngineeringInputData,
-                           retarder As IRetarderInputData,
-                           pto As IPTOTransmissionInputData, angledrive As IAngledriveInputData, filename As String) _
-        Implements IOutputFileWriter.SaveVehicle
-        Dim basePath As String = Path.GetDirectoryName(filename)
-
-        'Header
-        Dim header As Dictionary(Of String, Object) = GetHeader(VehicleFormatVersion)
-
-        'Body
-        Dim retarderOut As Dictionary(Of String, Object) = New Dictionary(Of String, Object)()
-        If retarder Is Nothing Then
-            retarderOut.Add("Type", RetarderType.None.GetName())
-        Else
-            retarderOut.Add("Type", retarder.Type.GetName())
-            retarderOut.Add("Ratio", retarder.Ratio)
-            retarderOut.Add("File",
-                            If _
-                               (retarder.Type.IsDedicatedComponent AndAlso Not retarder.LossMap Is Nothing,
-                                GetRelativePath(retarder.LossMap.Source, basePath), ""))
-        End If
-
-        Dim ptoOut As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-        If pto Is Nothing Then
-            ptoOut.Add("Type", "None")
-        Else
-            ptoOut.Add("Type", pto.PTOTransmissionType)
-            ptoOut.Add("LossMap",
-                       If _
-                          (pto.PTOTransmissionType <> "None" AndAlso Not pto.PTOLossMap Is Nothing,
-                           GetRelativePath(pto.PTOLossMap.Source, basePath), ""))
-            ptoOut.Add("Cycle",
-                       If _
-						(pto.PTOTransmissionType <> "None" AndAlso Not pto.PTOCycleDuringStop Is Nothing,
-						GetRelativePath(pto.PTOCycleDuringStop.Source, basePath), ""))
-            ptoOut.Add("CycleDriving", If (pto.PTOTransmissionType <> "None" AndAlso Not pto.PTOCycleWhileDriving Is Nothing, GetRelativePath(pto.PTOCycleWhileDriving.Source, basePath), ""))
-        End If
-
-        Dim angledriveOut As Dictionary(Of String, Object) = New Dictionary(Of String, Object) From {
-                {"Type", angledrive.Type.ToString()},
-                {"Ratio", angledrive.Ratio},
-                {"LossMap",
-                If _
-                (angledrive.Type = AngledriveType.SeparateAngledrive AndAlso Not angledrive.LossMap Is Nothing,
-                 GetRelativePath(angledrive.LossMap.Source, basePath), "")}}
-
-        Dim torqueLimits As Dictionary(Of String, String) = New Dictionary(Of String, String)
-        For Each entry As ITorqueLimitInputData In vehicle.TorqueLimits
-            torqueLimits.Add(entry.Gear().ToString(), entry.MaxTorque.Value().ToString())
-        Next
-
-        Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object) From {
-                {"SavedInDeclMode", Cfg.DeclMode},
-                {"VehCat", vehicle.VehicleCategory.ToString()},
-                {"LegislativeClass", vehicle.LegislativeClass.ToString()},
-                {"CurbWeight", vehicle.CurbMassChassis.Value()},
-                {"CurbWeightExtra", vehicle.CurbMassExtra.Value()},
-                {"Loading", vehicle.Loading.Value()},
-                {"MassMax", vehicle.GrossVehicleMassRating.ConvertToTon().Value},
-                {"rdyn", vehicle.DynamicTyreRadius.ConvertToMilliMeter().Value},
-                {"CdCorrMode", airdrag.CrossWindCorrectionMode.GetName()},
-                {"CdCorrFile",
-                If((airdrag.CrossWindCorrectionMode = CrossWindCorrectionMode.SpeedDependentCorrectionFactor OrElse
-                    airdrag.CrossWindCorrectionMode = CrossWindCorrectionMode.VAirBetaLookupTable) AndAlso
-                   Not airdrag.CrosswindCorrectionMap Is Nothing,
-                   GetRelativePath(airdrag.CrosswindCorrectionMap.Source, basePath),
-                   "")
-                },
-                {"Retarder", retarderOut},
-                {"Angledrive", angledriveOut},
-                {"PTO", ptoOut},
-                {"TorqueLimits", torqueLimits},
-                {"IdlingSpeed", vehicle.EngineIdleSpeed.AsRPM},
-                {"AxleConfig", New Dictionary(Of String, Object) From {
-                {"Type", vehicle.AxleConfiguration.GetName()},
-                {"Axles",
-                From axle In vehicle.Components.AxleWheels.AxlesEngineering
-                Select New Dictionary(Of String, Object) From {
-                {"Inertia", axle.Tyre.Inertia.Value()},
-                {"Wheels", axle.Tyre.Dimension},
-                {"AxleWeightShare", axle.AxleWeightShare},
-                {"TwinTyres", axle.TwinTyres},
-                {"RRCISO", axle.Tyre.RollResistanceCoefficient},
-                {"FzISO", axle.Tyre.TyreTestLoad.Value()},
-                {"Type", axle.AxleType.ToString()}                                                                                         
-                }}}}}
-        
-	    if (Not cfg.DeclMode) Then
-            if (not vehicle.PTO_DriveEngineSpeed is nothing) then
-                body.Add("EngineSpeedDuringPTODrive", vehicle.PTO_DriveEngineSpeed?.AsRPM)
-            End If
-            If (vehicle.PTO_DriveGear.HasValue) then
-                body.Add("GearDuringPTODrive", vehicle.PTO_DriveGear)
-            End If
-	    End If
-        If (vehicle.TankSystem.HasValue) Then
-            body("TankSystem") = vehicle.TankSystem.Value.ToString()
-        End If
-
-        body("EngineStopStart") = vehicle.ADAS.EngineStopStart
-        body("EcoRoll") = vehicle.ADAS.EcoRoll.ToString()
-        body("PredictiveCruiseControl") = vehicle.ADAS.PredictiveCruiseControl.ToString()
-        if ( vehicle.ADAS.ATEcoRollReleaseLockupClutch.HasValue) then
-            body("ATEcoRollReleaseLockupClutch") = vehicle.ADAS.ATEcoRollReleaseLockupClutch
-        End If 
-        If (Not IsNothing(airdrag.AirDragArea)) Then
-            body("CdA") = airdrag.AirDragArea.Value()
-        End If
-        If (Not IsNothing(vehicle.Height)) Then
-            body("VehicleHeight") = vehicle.Height.Value()
-        End If
-        WriteFile(header, body, filename)
-    End Sub
-
-    Public Sub SaveJob(input As IEngineeringInputDataProvider, filename As String) _
-        Implements IOutputFileWriter.SaveJob
-        Dim basePath As String = Path.GetDirectoryName(filename)
-        'Header
-        Dim header As Dictionary(Of String, Object) = GetHeader(VectoJobFormatVersion)
-
-        'Body
-        Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-
-        'SavedInDeclMode = Cfg.DeclMode
-
-        Dim job As IEngineeringJobInputData = input.JobInputData()
-
-        body.Add("SavedInDeclMode", job.SavedInDeclarationMode)
-        body.Add("EngineOnlyMode", job.EngineOnlyMode)
-
-        If job.EngineOnlyMode Then
-            body.Add("EngineFile", GetRelativePath(job.EngineOnly.DataSource.SourceFile, basePath))
-            body.Add("Cycles",
-                     job.Cycles.Select(Function(x) GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))) _
-                        .ToArray())
-            WriteFile(header, body, filename)
-            Return
-        End If
-
-        'Main Files
-        body.Add("VehicleFile", GetRelativePath(job.Vehicle.DataSource.SourceFile, basePath))
-        body.Add("EngineFile",
-                 GetRelativePath(input.JobInputData.Vehicle.Components.EngineInputData.DataSource.SourceFile, basePath))
-        body.Add("GearboxFile",
-                 GetRelativePath(input.JobInputData.Vehicle.Components.GearboxInputData.DataSource.SourceFile, basePath))
-        if not job.SavedInDeclarationMode AndAlso Not(input.DriverInputData.GearshiftInputData is Nothing) then
-            body.Add("TCU", GetRelativePath(input.DriverInputData.GearshiftInputData.Source, basePath))
-        end if
-        body.Add("ShiftStrategy", input.JobInputData.ShiftStrategy)
-
-        Dim aux As IAuxiliariesEngineeringInputData = job.Vehicle.Components.AuxiliaryInputData
-        'AA-TB
-        'ADVANCED AUXILIARIES 
-        body.Add("AuxiliaryAssembly", aux.AuxiliaryAssembly.GetName())
-        body.Add("AuxiliaryVersion", aux.AuxiliaryVersion)
-        body.Add("AdvancedAuxiliaryFilePath", GetRelativePath(aux.AdvancedAuxiliaryFilePath, basePath))
-
-        Dim pAdd As Double = 0.0
-        Dim auxList As List(Of Object) = New List(Of Object)
-        For Each auxEntry As IAuxiliaryEngineeringInputData In aux.Auxiliaries
-            If auxEntry.AuxiliaryType = AuxiliaryDemandType.Constant Then
-                pAdd += auxEntry.ConstantPowerDemand.Value()
-                Continue For
-            End If
-            Dim auxOut As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-            Dim engineeringAuxEntry As IAuxiliaryDeclarationInputData = TryCast(auxEntry, IAuxiliaryDeclarationInputData)
-            If Not job.SavedInDeclarationMode Then
-                auxOut.Add("ID", auxEntry.ID)
-                auxOut.Add("Type", AuxiliaryTypeHelper.ParseKey(auxEntry.ID).Name())
-                auxOut.Add("Path", GetRelativePath(auxEntry.DemandMap.Source, basePath))
-                auxOut.Add("Technology", New String() {})
-            Else
-                auxOut.Add("ID", auxEntry.ID)
-                auxOut.Add("Type", AuxiliaryTypeHelper.ParseKey(auxEntry.ID).Name())
-                auxOut.Add("Technology", engineeringAuxEntry.Technology)
-            End If
-            auxList.Add(auxOut)
-        Next
-
-        body.Add("Aux", auxList)
-        If Not job.SavedInDeclarationMode Then
-            body.Add("Padd", pAdd)
-        End If
-
-        Dim driver As IDriverEngineeringInputData = input.DriverInputData
-
-        If Not job.SavedInDeclarationMode Then
-            body.Add("VACC", GetRelativePath(driver.AccelerationCurve.AccelerationCurve.Source, basePath))
-
-            if not(driver.EngineStopStartData Is nothing) then
-                body.Add("EngineStopStartAtVehicleStopThreshold", driver.EngineStopStartData.ActivationDelay.Value())
-                body.Add("EngineStopStartMaxOffTimespan", driver.EngineStopStartData.MaxEngineOffTimespan.Value())
-                body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactor)
-            End if
-
-            if not(driver.EcoRollData Is Nothing) then
-                body.Add("EcoRollMinSpeed", driver.EcoRollData.MinSpeed.AsKmph)
-                body.Add("EcoRollActivationDelay", driver.EcoRollData.ActivationDelay.Value())
-                body.Add("EcoRollUnderspeedThreshold", driver.EcoRollData.UnderspeedThreshold.AsKmph)
-                body.Add("EcoRollMaxAcceleration", driver.EcoRollData.AccelerationUpperLimit.Value())
-            End If
-
-            if not (driver.PCCData is Nothing) then
-                body.Add("PCCEnableSpeed", driver.PCCData.PCCEnabledSpeed.AsKmph)
-                body.add("PCCMinSpeed", driver.PCCData.MinSpeed.AsKmph)
-                body.add("PCCUnderspeed", driver.PCCData.Underspeed.AsKmph)
-                body.Add("PCCOverSpeed", driver.PCCData.OverspeedUseCase3.AsKmph)
-                body.Add("PCCPreviewDistanceUC1", driver.PCCData.PreviewDistanceUseCase1.Value())
-                body.add("PCCPreviewDistanceUC2", driver.PCCData.PreviewDistanceUseCase2.Value())
-            end if
-
-        End If
-        'body.Add("StartStop", New Dictionary(Of String, Object) From {
-        '			{"Enabled", driver.StartStop.Enabled},
-        '			{"MaxSpeed", driver.StartStop.MaxSpeed.AsKmph},
-        '			{"MinTime", driver.StartStop.MinTime.Value()},
-        '			{"Delay", driver.StartStop.Delay.Value()}})
-        If Not job.SavedInDeclarationMode Then
-            Dim dfTargetSpeed As String = If(
-                Not driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup Is Nothing AndAlso
-                File.Exists(driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup.Source),
-                GetRelativePath(driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup.Source, basePath), "")
-            Dim dfVelocityDrop As String = If(
-                Not driver.Lookahead.CoastingDecisionFactorVelocityDropLookup Is Nothing AndAlso
-                File.Exists(driver.Lookahead.CoastingDecisionFactorVelocityDropLookup.Source),
-                GetRelativePath(driver.Lookahead.CoastingDecisionFactorVelocityDropLookup.Source, basePath), "")
-            body.Add("LAC", New Dictionary(Of String, Object) From {
-                        {"Enabled", driver.Lookahead.Enabled},
-                        {"PreviewDistanceFactor", driver.Lookahead.LookaheadDistanceFactor},
-                        {"DF_offset", driver.Lookahead.CoastingDecisionFactorOffset},
-                        {"DF_scaling", driver.Lookahead.CoastingDecisionFactorScaling},
-                        {"DF_targetSpeedLookup", dfTargetSpeed},
-                        {"Df_velocityDropLookup", dfVelocityDrop},
-                        {"MinSpeed", driver.Lookahead.MinSpeed.AsKmph}})
-        End If
-
-        'Overspeed / EcoRoll
-        Dim overspeedDic As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-
-        overspeedDic.Add("Mode", If(driver.OverSpeedData.Enabled, "Overspeed", "Off"))
-
-        overspeedDic.Add("MinSpeed", driver.OverSpeedData.MinSpeed.AsKmph)
-        overspeedDic.Add("OverSpeed", driver.OverSpeedData.OverSpeed.AsKmph)
-        body.Add("OverSpeedEcoRoll", overspeedDic)
-
-        'Cycles
-        If Not job.SavedInDeclarationMode Then
-            body.Add("Cycles",
-                     job.Cycles.Select(Function(x) GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))) _
-                        .ToArray())
-        End If
-
-       WriteFile(header, body, filename)
-    End Sub
-
-    Public Sub SaveJob(input As IVTPDeclarationInputDataProvider, filename As String) _
-        Implements IOutputFileWriter.SaveJob
-        Dim header As Dictionary(Of String, Object) = GetHeader(VectoJobFormatVersion)
-        Dim body As Dictionary(Of string, Object) = SaveVTPJob(input.JobInputData, filename, true)
-        WriteFile(header, body, filename)
-    end Sub
-
-    Public Sub SaveJob(input As IVTPEngineeringInputDataProvider, filename As String) _
-        Implements IOutputFileWriter.SaveJob
-        Dim header As Dictionary(Of String, Object) = GetHeader(VectoJobFormatVersion)
-        Dim body As Dictionary(Of string, Object) = SaveVTPJob(input.JobInputData, filename, False)
-        WriteFile(header, body, filename)
-    End Sub
-
-    Private Function SaveVTPJob(job As IVTPDeclarationJobInputData, filename As String, declarationmode As Boolean) _
-        As Dictionary(Of String,Object)
-
-        'Body
-        Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
-        body.Add("SavedInDeclMode", declarationmode)
-        body.Add("DeclarationVehicle",
-                 GetRelativePath(job.Vehicle.DataSource.SourceFile, Path.GetDirectoryName(filename)))
-        if declarationmode Then
-            body.add("ManufacturerRecord",
-                     GetRelativePath(job.ManufacturerReportInputData.Source, Path.GetDirectoryName(filename)))
-            body.Add("Mileage", job.Mileage.ConvertToKiloMeter().Value)
-        End If
-        body.Add("FanPowerCoefficients", job.FanPowerCoefficents)
-        body.Add("FanDiameter", job.FanDiameter.Value())
-        body.Add("Cycles",
-                 job.Cycles.Select(Function(x) GetRelativePath(x.CycleData.Source, Path.GetDirectoryName(filename))).
-                    ToArray())
-        return body
-    End Function
-
-    Public Sub ExportJob(input As IEngineeringInputDataProvider, filename As String, separateFiles As Boolean) _
-        Implements IOutputFileWriter.ExportJob
-        Throw New NotImplementedException
-    End Sub
-
-    ''' <summary>
-    ''' Writes the Content variable into a JSON file.
-    ''' </summary>
-    ''' <param name="path"></param>
-    ''' <remarks></remarks>
-    Public Shared Sub WriteFile(content As JToken, path As String)
-        Dim file As StreamWriter
-        Dim str As String
-
-        If content.Count = 0 Then
-            Return
-        End If
-
-        Try
-            str = JsonConvert.SerializeObject(content, Formatting.Indented)
-            file = My.Computer.FileSystem.OpenTextFileWriter(path, False)
-        Catch ex As Exception
-            Throw
-        End Try
-
-        file.Write(str)
-        file.Close()
-    End Sub
-
-    Public Shared Sub WriteFile(content As Dictionary(Of String, Object), path As String)
-        WriteFile(JToken.FromObject(content), path)
-    End Sub
-
-    Protected Shared Sub WriteFile(header As Dictionary(Of String, Object), body As Dictionary(Of String, Object),
-                                   path As String)
-        WriteFile(JToken.FromObject(New Dictionary(Of String, Object) From {{"Header", header}, {"Body", body}}), path)
-    End Sub
-End Class
-
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index af0ea1f39eef28e9dabe4a81abfc04776aa35184..9bde1b8cd4e5c132dccdb0669840cb38bece8644 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -1,194 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AAC0F132-0A9F-45B3-B682-77AC9B24B352}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <StartupObject>TUGraz.VECTO.My.MyApplication</StartupObject>
+    <TargetFramework>net45</TargetFramework>
     <RootNamespace>TUGraz.VECTO</RootNamespace>
     <AssemblyName>VECTO</AssemblyName>
-    <MyType>WindowsForms</MyType>
     <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkProfile />
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <PublishUrl>C:\Users\tb28\Documents\VectoOut\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>false</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>VECTO.xml</DocumentationFile>
-    <NoWarn>
-    </NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>1</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>false</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>VECTO.xml</DocumentationFile>
-    <NoWarn>
-    </NoWarn>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-    <WarningLevel>1</WarningLevel>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-    <DefineConstants>RELEASE_CANDIDATE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DocumentationFile>VECTO.xml</DocumentationFile>
-    <NoWarn>
-    </NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <Prefer32Bit>false</Prefer32Bit>
-    <WarningLevel>1</WarningLevel>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DocumentationFile>VECTO.xml</DocumentationFile>
-    <NoWarn>
-    </NoWarn>
-    <DebugType>None</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-    <Prefer32Bit>false</Prefer32Bit>
-    <WarningLevel>1</WarningLevel>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>B392FDC8053AEBCC6B0860DD32DEC702EB46BD4A</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>VECTO_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>false</SignManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetZone>LocalIntranet</TargetZone>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
     <OptionStrict>On</OptionStrict>
+    <UseWindowsForms>true</UseWindowsForms>
+    <MyType>WindowsForms</MyType>
+    <Configurations>Debug;Release;Deploy</Configurations>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|AnyCPU'">
-    <OutputPath>bin\Deploy\</OutputPath>
-    <DocumentationFile>VECTO.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <WarningLevel>1</WarningLevel>
-    <DebugType>None</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DefineConstants>
-    </DefineConstants>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|x86'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x86\Deploy\</OutputPath>
-    <DocumentationFile>VECTO.xml</DocumentationFile>
-    <WarningLevel>1</WarningLevel>
-    <DebugType>None</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.13\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Forms.DataVisualization" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NLog" Version="4.7.13" />
+    <PackageReference Include="Ninject" Version="3.3.4" />
   </ItemGroup>
+
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
     <Import Include="System" />
@@ -198,464 +28,362 @@
     <Import Include="System.Diagnostics" />
     <Import Include="System.Windows.Forms" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="ApplicationEvents.vb" />
-    <Compile Include="BusAuxiliaries\UI\frmAuxiliaryConfig.Designer.vb">
+    <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj" />
+    <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" />
+    
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Windows.Forms.DataVisualization">
+      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.DataVisualization.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="My Project\Application.Designer.vb">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <None Update="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <Compile Update="ApplicationEvents.vb" />
+    <Compile Update="BusAuxiliaries\UI\frmAuxiliaryConfig.Designer.vb">
       <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon>
     </Compile>
-    <Compile Include="BusAuxiliaries\UI\frmAuxiliaryConfig.vb">
+    <Compile Update="BusAuxiliaries\UI\frmAuxiliaryConfig.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BusAuxiliaries\UI\frmCombinedAlternators.Designer.vb">
+    <Compile Update="BusAuxiliaries\UI\frmCombinedAlternators.Designer.vb">
       <DependentUpon>frmCombinedAlternators.vb</DependentUpon>
     </Compile>
-    <Compile Include="BusAuxiliaries\UI\frmCombinedAlternators.vb">
+    <Compile Update="BusAuxiliaries\UI\frmCombinedAlternators.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BusAuxiliaries\UI\frmHVACTool.Designer.vb">
+    <Compile Update="BusAuxiliaries\UI\frmHVACTool.Designer.vb">
       <DependentUpon>frmHVACTool.vb</DependentUpon>
     </Compile>
-    <Compile Include="BusAuxiliaries\UI\frmHVACTool.vb">
+    <Compile Update="BusAuxiliaries\UI\frmHVACTool.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="BusAuxiliaries\Util\DeleteCell.vb" />
-    <Compile Include="BusAuxiliaries\Util\DeleteColumn.vb" />
-    <Compile Include="BusAuxiliaries\Util\SIConvert.vb" />
-    <Compile Include="GUI\BusAuxiliariesEngParametersForm.Designer.vb">
+    <Compile Update="BusAuxiliaries\Util\DeleteCell.vb" />
+    <Compile Update="BusAuxiliaries\Util\DeleteColumn.vb" />
+    <Compile Update="BusAuxiliaries\Util\SIConvert.vb" />
+    <Compile Update="GUI\BusAuxiliariesEngParametersForm.Designer.vb">
       <DependentUpon>BusAuxiliariesEngParametersForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\BusAuxiliariesEngParametersForm.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\REESSPackDialog.Designer.vb">
+    <Compile Update="GUI\BusAuxiliariesEngParametersForm.vb" />
+    <Compile Update="GUI\REESSPackDialog.Designer.vb">
       <DependentUpon>REESSPackDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\REESSPackDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\HybridStrategyParamsForm.Designer.vb">
+    <Compile Update="GUI\REESSPackDialog.vb" />
+    <Compile Update="GUI\HybridStrategyParamsForm.Designer.vb">
       <DependentUpon>HybridStrategyParamsForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\HybridStrategyParamsForm.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\BatteryForm.Designer.vb">
+    <Compile Update="GUI\HybridStrategyParamsForm.vb" />
+    <Compile Update="GUI\BatteryForm.Designer.vb">
       <DependentUpon>BatteryForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\BatteryForm.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\ElectricMotorForm.Designer.vb">
+    <Compile Update="GUI\BatteryForm.vb" />
+    <Compile Update="GUI\ElectricMotorForm.Designer.vb">
       <DependentUpon>ElectricMotorForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\ElectricMotorForm.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\VectoVTPJobForm.Designer.vb">
+    <Compile Update="GUI\ElectricMotorForm.vb" />
+    <Compile Update="GUI\VectoVTPJobForm.Designer.vb">
       <DependentUpon>VectoVTPJobForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\VectoVTPJobForm.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\EMGearRatioDialog.Designer.vb">
+    <Compile Update="GUI\VectoVTPJobForm.vb" />
+    <Compile Update="GUI\EMGearRatioDialog.Designer.vb">
       <DependentUpon>EMGearRatioDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\EMGearRatioDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Input Files\Battery.vb" />
-    <Compile Include="Input Files\BrowserUtils.vb" />
-    <Compile Include="GUI\VehicleTorqueLimitsDialog.Designer.vb">
+    <Compile Update="GUI\EMGearRatioDialog.vb" />
+    <Compile Update="Input Files\Battery.vb" />
+    <Compile Update="Input Files\BrowserUtils.vb" />
+    <Compile Update="GUI\VehicleTorqueLimitsDialog.Designer.vb">
       <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\VehicleTorqueLimitsDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\XMLExportJobDialog.Designer.vb">
+    <Compile Update="GUI\VehicleTorqueLimitsDialog.vb" />
+    <Compile Update="GUI\XMLExportJobDialog.Designer.vb">
       <DependentUpon>XMLExportJobDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\XMLExportJobDialog.vb">
+    <Compile Update="GUI\XMLExportJobDialog.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\XMLImportJobDialog.Designer.vb">
+    <Compile Update="GUI\XMLImportJobDialog.Designer.vb">
       <DependentUpon>XMLImportJobDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\XMLImportJobDialog.vb">
+    <Compile Update="GUI\XMLImportJobDialog.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\GraphForm.Designer.vb">
+    <Compile Update="GUI\GraphForm.Designer.vb">
       <DependentUpon>GraphForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\GraphForm.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\GraphEditChannelDialog.Designer.vb">
+    <Compile Update="GUI\GraphForm.vb" />
+    <Compile Update="GUI\GraphEditChannelDialog.Designer.vb">
       <DependentUpon>GraphEditChannelDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\GraphEditChannelDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\JiraDialog.Designer.vb">
+    <Compile Update="GUI\GraphEditChannelDialog.vb" />
+    <Compile Update="GUI\JiraDialog.Designer.vb">
       <DependentUpon>JiraDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\JiraDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\WelcomeDialog.Designer.vb">
+    <Compile Update="GUI\JiraDialog.vb" />
+    <Compile Update="GUI\WelcomeDialog.Designer.vb">
       <DependentUpon>WelcomeDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\WelcomeDialog.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="GUI\EngineForm.Designer.vb">
+    <Compile Update="GUI\WelcomeDialog.vb" />
+    <Compile Update="GUI\EngineForm.Designer.vb">
       <DependentUpon>EngineForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\EngineForm.vb">
+    <Compile Update="GUI\EngineForm.vb" />
+    <Compile Update="GUI\GearboxForm.Designer.vb">
+      <DependentUpon>GearboxForm.vb</DependentUpon>
+    </Compile>
+    <Compile Update="GUI\GearboxForm.vb" />
+    <Compile Update="GUI\VehicleAuxiliariesDialog.Designer.vb">
+      <DependentUpon>VehicleAuxiliariesDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Update="GUI\VehicleAuxiliariesDialog.vb" />
+    <Compile Update="GUI\VehicleAxleDialog.Designer.vb">
+      <DependentUpon>VehicleAxleDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Update="GUI\VehicleAxleDialog.vb" />
+    <Compile Update="Input Files\ElectricMachine.vb" />
+    <Compile Update="Input Files\Engine.vb" />
+    <Compile Update="Input Files\Gearbox.vb" />
+    <Compile Update="Configuration.vb" />
+    <Compile Update="File Browser\FileBrowser.vb" />
+    <Compile Update="File Browser\FileBrowserDialog.designer.vb">
+      <DependentUpon>FileBrowserDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Update="File Browser\FileBrowserDialog.vb" />
+    <Compile Update="File Browser\FileBrowserFavoritesDialog.designer.vb">
+      <DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Update="File Browser\FileBrowserFavoritesDialog.vb" />
+    <Compile Update="Input Files\BusParamsEngineering.vb" />
+    <Compile Update="Input Files\HybridStrategyParams.vb" />
+    <Compile Update="Input Files\MockComponents.vb" />
+    <Compile Update="Input Files\MockVehicleInputData.vb" />
+    <Compile Update="Input Files\SuperCap.vb" />
+    <Compile Update="Input Files\VectoEPTPJob.vb" />
+    <Compile Update="Input Files\VectoJob.vb" />
+    <Compile Update="Input Files\Vehicle.vb" />
+    <Compile Update="GUI\GearboxGearDialog.Designer.vb">
+      <DependentUpon>GearboxGearDialog.vb</DependentUpon>
+    </Compile>
+    <Compile Update="GUI\GearboxGearDialog.vb" />
+    <Compile Update="Input Files\SubPath.vb" />
+    <Compile Update="GUI\VectoJobForm.Designer.vb">
+      <DependentUpon>VectoJobForm.vb</DependentUpon>
+    </Compile>
+    <Compile Update="GUI\VectoJobForm.vb" />
+    <Compile Update="VECTO_Global.vb" />
+    <Compile Update="VECTO_Types.vb" />
+    <Compile Update="GUI\GUI_Subs.vb" />
+    <Compile Update="GUI\VehicleForm.Designer.vb">
+      <DependentUpon>VehicleForm.vb</DependentUpon>
+    </Compile>
+    <Compile Update="GUI\VehicleForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\GearboxForm.Designer.vb">
-      <DependentUpon>GearboxForm.vb</DependentUpon>
+    <Compile Update="GUI\Settings.Designer.vb">
+      <DependentUpon>Settings.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\GearboxForm.vb">
+    <Compile Update="GUI\Settings.vb" />
+    <Compile Update="GUI\AboutBox.Designer.vb">
+      <DependentUpon>AboutBox.vb</DependentUpon>
+    </Compile>
+    <Compile Update="GUI\AboutBox.vb" />
+    <Compile Update="MainModule.vb" />
+    <Compile Update="GUI\MainForm.vb" />
+    <Compile Update="GUI\MainForm.Designer.vb">
+      <DependentUpon>MainForm.vb</DependentUpon>
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\VehicleAuxiliariesDialog.Designer.vb">
-      <DependentUpon>VehicleAuxiliariesDialog.vb</DependentUpon>
+    <Compile Update="File Browser\FileBrowserModule.vb" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="File Browser\FileBrowserDialog.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\VehicleAuxiliariesDialog.vb">
+    <Compile Update="File Browser\FileBrowserFavoritesDialog.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\VehicleAxleDialog.Designer.vb">
-      <DependentUpon>VehicleAxleDialog.vb</DependentUpon>
+    <Compile Update="GUI\AboutBox.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\VehicleAxleDialog.vb">
+    <Compile Update="GUI\BatteryForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Input Files\ElectricMachine.vb" />
-    <Compile Include="Input Files\Engine.vb" />
-    <Compile Include="Input Files\Gearbox.vb" />
-    <Compile Include="Configuration.vb" />
-    <Compile Include="File Browser\FileBrowser.vb" />
-    <Compile Include="File Browser\FileBrowserDialog.designer.vb">
-      <DependentUpon>FileBrowserDialog.vb</DependentUpon>
+    <Compile Update="GUI\BusAuxiliariesEngParametersForm.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="File Browser\FileBrowserDialog.vb">
+    <Compile Update="GUI\ElectricMotorForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="File Browser\FileBrowserFavoritesDialog.designer.vb">
-      <DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon>
+    <Compile Update="GUI\EMGearRatioDialog.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="File Browser\FileBrowserFavoritesDialog.vb">
+    <Compile Update="GUI\EngineForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Input Files\BusParamsEngineering.vb" />
-    <Compile Include="Input Files\HybridStrategyParams.vb" />
-    <Compile Include="Input Files\MockComponents.vb" />
-    <Compile Include="Input Files\MockVehicleInputData.vb" />
-    <Compile Include="Input Files\SuperCap.vb" />
-    <Compile Include="Input Files\VectoEPTPJob.vb" />
-    <Compile Include="Input Files\VectoJob.vb" />
-    <Compile Include="Input Files\Vehicle.vb" />
-    <Compile Include="GUI\GearboxGearDialog.Designer.vb">
-      <DependentUpon>GearboxGearDialog.vb</DependentUpon>
+    <Compile Update="GUI\GearboxForm.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\GearboxGearDialog.vb">
+    <Compile Update="GUI\GearboxGearDialog.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Input Files\SubPath.vb" />
-    <Compile Include="GUI\VectoJobForm.Designer.vb">
-      <DependentUpon>VectoJobForm.vb</DependentUpon>
+    <Compile Update="GUI\GraphEditChannelDialog.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\VectoJobForm.vb">
+    <Compile Update="GUI\GraphForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="VECTO_Global.vb" />
-    <Compile Include="VECTO_Types.vb" />
-    <Compile Include="GUI\GUI_Subs.vb" />
-    <Compile Include="GUI\VehicleForm.Designer.vb">
-      <DependentUpon>VehicleForm.vb</DependentUpon>
+    <Compile Update="GUI\HybridStrategyParamsForm.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\VehicleForm.vb">
+    <Compile Update="GUI\JiraDialog.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\Settings.Designer.vb">
-      <DependentUpon>Settings.vb</DependentUpon>
+    <Compile Update="GUI\MainForm.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\Settings.vb">
+    <Compile Update="GUI\REESSPackDialog.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\AboutBox.Designer.vb">
-      <DependentUpon>AboutBox.vb</DependentUpon>
+    <Compile Update="GUI\Settings.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\AboutBox.vb">
+    <Compile Update="GUI\VectoJobForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainModule.vb" />
-    <Compile Include="GUI\MainForm.vb">
+    <Compile Update="GUI\VectoVTPJobForm.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="GUI\MainForm.Designer.vb">
-      <DependentUpon>MainForm.vb</DependentUpon>
+    <Compile Update="GUI\VehicleAuxiliariesDialog.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="File Browser\FileBrowserModule.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
+    <Compile Update="GUI\VehicleAxleDialog.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
+    <Compile Update="GUI\VehicleTorqueLimitsDialog.vb">
+      <SubType>Form</SubType>
     </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    <Compile Update="GUI\WelcomeDialog.vb">
+      <SubType>Form</SubType>
     </Compile>
   </ItemGroup>
+
+
   <ItemGroup>
-    <EmbeddedResource Include="BusAuxiliaries\UI\frmAuxiliaryConfig.resx">
+    <EmbeddedResource Update="BusAuxiliaries\UI\frmAuxiliaryConfig.resx">
       <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BusAuxiliaries\UI\frmCombinedAlternators.resx">
+    <EmbeddedResource Update="BusAuxiliaries\UI\frmCombinedAlternators.resx">
       <DependentUpon>frmCombinedAlternators.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BusAuxiliaries\UI\frmHVACTool.resx">
+    <EmbeddedResource Update="BusAuxiliaries\UI\frmHVACTool.resx">
       <DependentUpon>frmHVACTool.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="File Browser\FileBrowserDialog.resx">
+    <EmbeddedResource Update="File Browser\FileBrowserDialog.resx">
       <DependentUpon>FileBrowserDialog.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="File Browser\FileBrowserFavoritesDialog.resx">
+    <EmbeddedResource Update="File Browser\FileBrowserFavoritesDialog.resx">
       <DependentUpon>FileBrowserFavoritesDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\BusAuxiliariesEngParametersForm.resx">
+    <EmbeddedResource Update="GUI\BusAuxiliariesEngParametersForm.resx">
       <DependentUpon>BusAuxiliariesEngParametersForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\REESSPackDialog.resx">
+    <EmbeddedResource Update="GUI\REESSPackDialog.resx">
       <DependentUpon>REESSPackDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\HybridStrategyParamsForm.resx">
+    <EmbeddedResource Update="GUI\HybridStrategyParamsForm.resx">
       <DependentUpon>HybridStrategyParamsForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\BatteryForm.resx">
+    <EmbeddedResource Update="GUI\BatteryForm.resx">
       <DependentUpon>BatteryForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\ElectricMotorForm.resx">
+    <EmbeddedResource Update="GUI\ElectricMotorForm.resx">
       <DependentUpon>ElectricMotorForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\GraphForm.resx">
+    <EmbeddedResource Update="GUI\GraphForm.resx">
       <DependentUpon>GraphForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\GraphEditChannelDialog.resx">
+    <EmbeddedResource Update="GUI\GraphEditChannelDialog.resx">
       <DependentUpon>GraphEditChannelDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\JiraDialog.resx">
+    <EmbeddedResource Update="GUI\JiraDialog.resx">
       <DependentUpon>JiraDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\VectoVTPJobForm.resx">
+    <EmbeddedResource Update="GUI\VectoVTPJobForm.resx">
       <DependentUpon>VectoVTPJobForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\EMGearRatioDialog.resx">
+    <EmbeddedResource Update="GUI\EMGearRatioDialog.resx">
       <DependentUpon>EMGearRatioDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\VehicleTorqueLimitsDialog.resx">
+    <EmbeddedResource Update="GUI\VehicleTorqueLimitsDialog.resx">
       <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\WelcomeDialog.resx">
+    <EmbeddedResource Update="GUI\WelcomeDialog.resx">
       <DependentUpon>WelcomeDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\EngineForm.resx">
+    <EmbeddedResource Update="GUI\EngineForm.resx">
       <DependentUpon>EngineForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\GearboxForm.resx">
+    <EmbeddedResource Update="GUI\GearboxForm.resx">
       <DependentUpon>GearboxForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\MainForm.resx">
+    <EmbeddedResource Update="GUI\MainForm.resx">
       <SubType>Designer</SubType>
       <DependentUpon>MainForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\VectoJobForm.resx">
+    <EmbeddedResource Update="GUI\VectoJobForm.resx">
       <SubType>Designer</SubType>
       <DependentUpon>VectoJobForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\VehicleForm.resx">
+    <EmbeddedResource Update="GUI\VehicleForm.resx">
       <SubType>Designer</SubType>
       <DependentUpon>VehicleForm.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\Settings.resx">
+    <EmbeddedResource Update="GUI\Settings.resx">
       <SubType>Designer</SubType>
       <DependentUpon>Settings.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\AboutBox.resx">
+    <EmbeddedResource Update="GUI\AboutBox.resx">
       <SubType>Designer</SubType>
       <DependentUpon>AboutBox.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\VehicleAuxiliariesDialog.resx">
+    <EmbeddedResource Update="GUI\VehicleAuxiliariesDialog.resx">
       <DependentUpon>VehicleAuxiliariesDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\VehicleAxleDialog.resx">
+    <EmbeddedResource Update="GUI\VehicleAxleDialog.resx">
       <DependentUpon>VehicleAxleDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\GearboxGearDialog.resx">
+    <EmbeddedResource Update="GUI\GearboxGearDialog.resx">
       <DependentUpon>GearboxGearDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\XMLExportJobDialog.resx">
+    <EmbeddedResource Update="GUI\XMLExportJobDialog.resx">
       <DependentUpon>XMLExportJobDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\XMLImportJobDialog.resx">
+    <EmbeddedResource Update="GUI\XMLImportJobDialog.resx">
       <DependentUpon>XMLImportJobDialog.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\app.manifest">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="Resources\Icons.xcf" />
-    <None Include="VECTO_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\TUG-About.png" />
-    <None Include="Resources\VECTO-About.png" />
-    <None Include="Resources\VECTO-VEH.png" />
-    <None Include="Resources\VECTO-GBX.png" />
-    <None Include="Resources\VECTO-ENG.png" />
-    <None Include="Resources\VECTO-VECTO.png" />
-    <None Include="Resources\VECTO-Mainform.png" />
-    <None Include="Resources\Play-icon-gray.png" />
-    <None Include="Resources\Stop-icon.png" />
-    <None Include="Resources\Play-icon.png" />
-    <None Include="Resources\plus-circle-icon.png" />
-    <None Include="Resources\IVT_91x44.png" />
-    <None Include="Resources\Actions-document-save-as-icon.png" />
-    <None Include="Resources\Actions-document-save-icon.png" />
-    <None Include="Resources\minus-circle-icon.png" />
-    <None Include="Resources\Open-icon.png" />
-    <None Include="Resources\Actions-arrow-up-icon.png" />
-    <None Include="Resources\Actions-arrow-down-icon.png" />
-    <None Include="Resources\blue-document-icon.png" />
-    <None Include="Resources\Misc-Tools-icon.png" />
-    <None Include="Resources\export-icon.png" />
-    <None Include="Resources\Information-icon.png" />
-    <None Include="Resources\JRC-About.png" />
-    <None Include="Resources\Icon.png" />
-    <None Include="Resources\Icon2.ico" />
-    <None Include="Resources\IVT_About.png" />
-    <None Include="Resources\Help-icon.png" />
-    <None Include="app.config" />
-    <None Include="Resources\TUG_91x34.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\application-export-icon-small.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Status-dialog-password-icon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Refresh-icon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\application-add-icon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\F_Graph.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\F_ENG.png" />
+    <EmbeddedResource Update="Resources\4x2r.png" />
+    <EmbeddedResource Update="Resources\4x2rt.png" />
+    <EmbeddedResource Update="Resources\4x2tt.png" />
+    <EmbeddedResource Update="Resources\6x2r.png" />
+    <EmbeddedResource Update="Resources\6x2rt.png" />
+    <EmbeddedResource Update="Resources\6x2tt.png" />
+    <EmbeddedResource Update="Resources\Undef.png" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\F_GBX.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\F_VEH.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\F_VECTO.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Libraries\vectolic.dll" />
-    <None Include="Resources\Up.bmp" />
-    <None Include="Resources\up-directory.png" />
-    <None Include="Resources\up-directory16x16.png" />
-    <None Include="Resources\new_dir.png" />
-    <None Include="Resources\desktop.png" />
-    <None Include="Resources\favorites.png" />
-    <None Include="Resources\file-history.png" />
-    <EmbeddedResource Include="Resources\4x2r.png" />
-    <EmbeddedResource Include="Resources\4x2rt.png" />
-    <EmbeddedResource Include="Resources\4x2tt.png" />
-    <EmbeddedResource Include="Resources\6x2r.png" />
-    <EmbeddedResource Include="Resources\6x2rt.png" />
-    <EmbeddedResource Include="Resources\6x2tt.png" />
-    <None Include="Resources\Delete.png" />
-    <Content Include="Resources\F_ENG.ico" />
-    <Content Include="Resources\F_GBX.ico" />
-    <Content Include="Resources\F_VECTO.ico" />
-    <Content Include="Resources\F_VEH.ico" />
-    <Content Include="Resources\Graph.ico" />
-    <None Include="Resources\P_fan_eqn.png" />
-    <Content Include="Resources\Status-dialog-password-icon.ico" />
-    <EmbeddedResource Include="Resources\Undef.png" />
-    <Content Include="Resources\up.ico" />
-    <Content Include="Resources\up.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj">
-      <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
-      <Name>VectoCommon</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj">
-      <Project>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</Project>
-      <Name>VectoCore</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
-  <Import Project="$(SolutionDir)Build\Packaging.targets" />
-  <Import Project="$(SolutionDir)Build\CommonSettings.targets" />
 </Project>
\ No newline at end of file
diff --git a/VECTO/VECTO_TemporaryKey.pfx b/VECTO/VECTO_TemporaryKey.pfx
deleted file mode 100644
index f778dc3527a6d2b20d0ffb1290683a8de66cc447..0000000000000000000000000000000000000000
Binary files a/VECTO/VECTO_TemporaryKey.pfx and /dev/null differ
diff --git a/VECTO/packages.config b/VECTO/packages.config
deleted file mode 100644
index 62fd3b2697b43930c3f6dc9660d11404d4806a82..0000000000000000000000000000000000000000
--- a/VECTO/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
-  <package id="Ninject" version="3.3.4" targetFramework="net45" />
-  <package id="NLog" version="4.7.13" targetFramework="net45" />
-</packages>
\ No newline at end of file